sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: usrloc: update connection id for registration refresh
by Daniel-Constantin Mierla 13 Sep '13

13 Sep '13

Module: sip-router Branch: master Commit: 605360798fbad43cbd3ef1aca3ae76cd9c95c50f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6053607… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 13 11:05:07 2013 +0200 usrloc: update connection id for registration refresh --- modules/usrloc/doc/usrloc_admin.xml | 20 ++++++++++++++++++++ modules/usrloc/ucontact.c | 1 + modules/usrloc/udomain.c | 3 +++ modules/usrloc/ul_mod.c | 2 +- 4 files changed, 25 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index ce7ddfb..4f7e3e5 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -875,6 +875,26 @@ modparam("usrloc", "db_ops_ruid", 1) </example> </section> + <section id="usrloc.p.handle_lost_tcp"> + <title><varname>handle_lost_tcp</varname> (int)</title> + <para> + If set to 1, Kamailio will remove location records made via + TCP/TLS/WS/WSS transports when it looses corresponding tcp connections. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + <example> + <title>Set <varname>handle_lost_tcp</varname> parameter</title> + <programlist format="linespecific"> +... +modparam("usrloc", "handle_lost_tcp", 1) +... +<programlisting> + </example> + </section> + </section> <section> diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index e7f8938..9cc2e06 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -307,6 +307,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->tcpconn_id = _ci->tcpconn_id; return 0; } diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index f587c1b..244f8e7 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -351,6 +351,9 @@ static inline ucontact_info_t* dbrow2info( db_val_t *vals, str *contact) ci.reg_id = VAL_UINT(vals+15); } + /* tcp connection id */ + ci.tcpconn_id = -1; + return &ci; } diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 7d88f67..b1be56b 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -161,7 +161,7 @@ int timer_interval = 60; /*!< Timer interval in seconds */ int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ -int handle_lost_tcp = 0; +int handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 9;

1 0

git:master: usrloc: fixed xml tags and regenerated readme
by Daniel-Constantin Mierla 13 Sep '13

13 Sep '13

Module: sip-router Branch: master Commit: 56d02f02627bb1d2eca7befaaefbed17ced1f52f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56d02f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 13 11:08:48 2013 +0200 usrloc: fixed xml tags and regenerated readme --- modules/usrloc/README | 16 ++++++++++++++++ modules/usrloc/doc/usrloc_admin.xml | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 4fd7a0d..2a3767d 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -68,6 +68,7 @@ Bogdan-Andrei Iancu 3.30. timer_procs (string) 3.31. xavp_contact (string) 3.32. db_ops_ruid (int) + 3.33. handle_lost_tcp (int) 4. Functions 5. MI Commands @@ -157,6 +158,7 @@ Bogdan-Andrei Iancu 1.30. Set timer_procs parameter 1.31. Set xavp_contact parameter 1.32. Set db_ops_ruid parameter + 1.33. Set handle_lost_tcp parameter Chapter 1. Admin Guide @@ -205,6 +207,7 @@ Chapter 1. Admin Guide 3.30. timer_procs (string) 3.31. xavp_contact (string) 3.32. db_ops_ruid (int) + 3.33. handle_lost_tcp (int) 4. Functions 5. MI Commands @@ -325,6 +328,7 @@ Chapter 1. Admin Guide 3.30. timer_procs (string) 3.31. xavp_contact (string) 3.32. db_ops_ruid (int) + 3.33. handle_lost_tcp (int) 3.1. nat_bflag (integer) @@ -764,6 +768,18 @@ modparam("usrloc", "xavp_contact", "ulattrs") modparam("usrloc", "db_ops_ruid", 1) ... +3.33. handle_lost_tcp (int) + + If set to 1, Kamailio will remove location records made via + TCP/TLS/WS/WSS transports when it looses corresponding tcp connections. + + Default value is "0". + + Example 1.33. Set handle_lost_tcp parameter +... +modparam("usrloc", "handle_lost_tcp", 1) +... + 4. Functions There are no exported functions that could be used in scripts. diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 4f7e3e5..9648303 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -885,13 +885,14 @@ modparam("usrloc", "db_ops_ruid", 1) <emphasis> Default value is <quote>0</quote>. </emphasis> + </para> <example> <title>Set <varname>handle_lost_tcp</varname> parameter</title> - <programlist format="linespecific"> + <programlisting format="linespecific"> ... modparam("usrloc", "handle_lost_tcp", 1) ... -<programlisting> +</programlisting> </example> </section>

1 0

Crash in PUA_REGINFO module
by 원빈 조 13 Sep '13

13 Sep '13

Hi, I found that Kamailio 4.0.x crashes when used with the 'reginfo_handle_notify' function of the PUA_REGINFO module. Regarding this, I opened a bugtracker task to provide details and to suggest a possible solution. (FS#338) Although I could got it work with a couple of fixes, it seems that the module needs to be updated to reflect changes in its dependent modules. (FYI please refer to FS#339) I have been working with Kamilio for almost 2 years and would love to see this great product advance continually. I appreciate your kind assistence and hard works. Best regards, Wonbin

1 0

DMQ module
by Charles Chance 12 Sep '13

12 Sep '13

Hi, Sorry if this is the wrong list. I have managed to get the dmq module working with a couple of minor fixes and have also updated the documentation so hopefully it is now usable. I am now about start adding support into some of the other modules. Should I just submit these changes as patches to the bug tracker? Or is there some other preferred way? Last time, when I made some updates to the memcache module, Henning (as the author of the module) was kind enough to take the patch and apply it along with some other changes. Please let me know the best way to go. Many thanks, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Unit 10 iBIC, Birmingham Science Park, Holt Court South, Birmingham B7 4EJ.

3 5

git:master: pkg/kamailio/centos: moved stun from it' s own RPM to the main RPM
by Peter Dunkley 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: f3190358e02141c98304c4c0019bba95490da32c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f319035… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Sep 12 22:54:35 2013 +0100 pkg/kamailio/centos: moved stun from it's own RPM to the main RPM - stun no longer has external dependencies and doesn't need to be in its own RPM --- pkg/kamailio/centos/6/kamailio.spec | 36 +++++++++++----------------------- 1 files changed, 12 insertions(+), 24 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 4dc01f7..023fa80 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -24,11 +24,11 @@ Conflicts: kamailio-perl < %ver, kamailio-postgresql < %ver Conflicts: kamailio-presence < %ver, kamailio-purple < %ver Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-sctp < %ver, kamailio-snmpstats < %ver -Conflicts: kamailio-sqlite < %ver, kamailio-stun < %ver -Conflicts: kamailio-tls < %ver, kamailio-unixODBC < %ver -Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver -Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver -Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver +Conflicts: kamailio-sqlite < %ver, kamailio-tls < %ver +Conflicts: kamailio-unixODBC < %ver, kamailio-utils < %ver +Conflicts: kamailio-websocket < %ver, kamailio-xhttp-pi < %ver +Conflicts: kamailio-xmlops < %ver, kamailio-xmlrpc < %ver +Conflicts: kamailio-xmpp < %ver BuildRequires: bison, flex, gcc, make, redhat-rpm-config %description @@ -256,17 +256,6 @@ BuildRequires: sqlite-devel SQLite database connectivity for Kamailio. -%package stun -Summary: Limited STUN (RFC 5389) support for Kamailio. -Group: System Environment/Daemons -Requires: openssl, kamailio = %ver -BuildRequires: openssl-devel - -%description stun -Limited RFC 5389, "Session Traversal Utilities for NAT (STUN)" support for -Kamailio. - - %package tls Summary: TLS transport for Kamailio. Group: System Environment/Daemons @@ -362,7 +351,7 @@ make every-module skip_modules="app_java db_cassandra db_oracle dnssec \ group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \ kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython ksqlite \ - kims koutbound ksctp kstun kautheph" + kims koutbound ksctp kautheph" make utils @@ -376,7 +365,7 @@ make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \ group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \ kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \ ktls kwebsocket kpresence klua kpython ksqlite \ - kims koutbound ksctp kstun kautheph" + kims koutbound ksctp kautheph" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -506,6 +495,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sqlops %doc %{_docdir}/kamailio/modules/README.sst %doc %{_docdir}/kamailio/modules/README.statistics +%doc %{_docdir}/kamailio/modules/README.stun %doc %{_docdir}/kamailio/modules/README.textops %doc %{_docdir}/kamailio/modules/README.textopsx %doc %{_docdir}/kamailio/modules/README.timer @@ -643,6 +633,7 @@ fi %{_libdir}/kamailio/modules/sqlops.so %{_libdir}/kamailio/modules/sst.so %{_libdir}/kamailio/modules/statistics.so +%{_libdir}/kamailio/modules/stun.so %{_libdir}/kamailio/modules/textops.so %{_libdir}/kamailio/modules/textopsx.so %{_libdir}/kamailio/modules/timer.so @@ -924,12 +915,6 @@ fi %{_datadir}/kamailio/db_sqlite/* -%files stun -%defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.stun -%{_libdir}/kamailio/modules/stun.so - - %files tls %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.tls @@ -982,6 +967,9 @@ fi %changelog +* Thu Sep 12 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> + - stun no longer depends on OpenSSL so it has been moved to the standard + module set * Wed Sep 11 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> - Removed Fedora stuff as I am only maintaining this for CentOS now - Updated rel to dev8

1 0

git:master: Makefiles: moved stun to the standard module group now that it has no external dependencies
by Peter Dunkley 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: 291d6ece47d164d64487c8545de87c64fdc31718 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=291d6ec… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Sep 12 22:41:37 2013 +0100 Makefiles: moved stun to the standard module group now that it has no external dependencies --- Makefile.groups | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index e365362..d6854f7 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -13,7 +13,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mediaproxy mi_datagram mi_fifo mi_rpc mqueue \ nat_traversal nathelper path pike pv ratelimit rr rtimer \ rtpproxy sanity sdpops siputils sl statistics textops \ - textopsx tm tmx topoh xlog rtpproxy-ng + textopsx tm tmx topoh xlog rtpproxy-ng stun # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control cnxcc dmq domainpolicy msrp pdb \ @@ -95,9 +95,6 @@ mod_list_outbound=outbound # - modules depending on openssl and unistring library mod_list_websocket=websocket -# - modules depending on openssl library -mod_list_stun=stun - # - modules depending on libval-threads libcrypto libsres libpthread mod_list_dnssec=dnssec @@ -177,9 +174,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_cassandra) $(mod_list_oracle) \ $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \ $(mod_list_outbound) $(mod_list_osp) \ - $(mod_list_java) $(mod_list_stun) \ - $(mod_list_dnssec) $(mod_list_sctp) \ - $(mod_list_autheph)) + $(mod_list_java) $(mod_list_dnssec) \ + $(mod_list_sctp) $(mod_list_autheph)) @@ -328,9 +324,6 @@ module_group_koutbound=$(mod_list_outbound) # pkg java module module_group_kjava=$(mod_list_java) -# pkg stun module -module_group_kstun=$(mod_list_stun) - # pkg dnssec module module_group_kdnssec=$(mod_list_dnssec)

1 0

git:master: modules/stun: removed dependency on OpenSSL
by Peter Dunkley 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: 42722f3e70d3316b7c6881907b626b02303d58a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42722f3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Sep 12 16:36:28 2013 +0100 modules/stun: removed dependency on OpenSSL --- modules/stun/Makefile | 26 +------------------------- modules/stun/kam_stun.c | 1 - modules/stun/kam_stun.h | 6 ++++-- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/modules/stun/Makefile b/modules/stun/Makefile index 40a6ba6..beced1f 100644 --- a/modules/stun/Makefile +++ b/modules/stun/Makefile @@ -6,32 +6,8 @@ include ../../Makefile.defs auto_gen= NAME=stun.so +LIBS= -ifeq ($(CROSS_COMPILE),) -SSL_BUILDER=$(shell \ - if pkg-config --exists libssl; then \ - echo 'pkg-config libssl'; \ - fi) -endif - -ifneq ($(SSL_BUILDER),) - DEFS += $(shell $(SSL_BUILDER) --cflags) - LIBS += $(shell $(SSL_BUILDER) --libs) -else - DEFS += -I$(LOCALBASE)/ssl/include - LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ - -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ - -lssl -lcrypto - # NOTE: depending on the way in which libssl was compiled you might - # have to add -lz -lkrb5 (zlib and kerberos5). - # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" -endif - -LIBS+= $(TLS_EXTRA_LIBS) - -# Static linking, if you'd like to use TLS and STUN at the same time -# -#LIBS+= /usr/lib/libcurl.a /usr/lib/libssl.a /usr/lib/libcrypto.a -lkrb5 -lidn -lz -lgssapi_krb5 -lrt DEFS+=-DKAMAILIO_MOD_INTERFACE include ../../Makefile.modules diff --git a/modules/stun/kam_stun.c b/modules/stun/kam_stun.c index 7a7a88e..c9c5dd3 100644 --- a/modules/stun/kam_stun.c +++ b/modules/stun/kam_stun.c @@ -24,7 +24,6 @@ */ #include <arpa/inet.h> -#include <openssl/sha.h> #include "kam_stun.h" #include "../../forward.h" diff --git a/modules/stun/kam_stun.h b/modules/stun/kam_stun.h index 6ec30b6..a5a55c6 100644 --- a/modules/stun/kam_stun.h +++ b/modules/stun/kam_stun.h @@ -26,8 +26,6 @@ #ifndef _kam_stun_h #define _kam_stun_h -#include <openssl/sha.h> - #include "../../str.h" #include "../../tcp_conn.h" #include "../../ip_addr.h" @@ -106,6 +104,10 @@ #define IP_ADDR 4 #define XOR 1 +#ifndef SHA_DIGEST_LENGTH +#define SHA_DIGEST_LENGTH 20 +#endif + /** padd len to a multiple of sz. * sz must be a power of the form 2^k (e.g. 2, 4, 8, 16 ...) */

1 0

git:master: Add support for sending POST-Requests to http_query() method.
by Carsten Bock 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: 8017fa7c67dbb3dd4bdd937be9b841097a44674e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8017fa7… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Aug 21 20:02:23 2013 +0200 Add support for sending POST-Requests to http_query() method. --- modules/utils/doc/utils.xml | 12 ++++++++++++ modules/utils/doc/utils_admin.xml | 20 ++++++++++++++++++-- modules/utils/functions.c | 32 +++++++++++++++++++++++++++++--- modules/utils/functions.h | 3 ++- modules/utils/utils.c | 28 +++++++++++++++++++++++++--- 5 files changed, 86 insertions(+), 9 deletions(-) diff --git a/modules/utils/doc/utils.xml b/modules/utils/doc/utils.xml index dfdb290..49b2cbb 100644 --- a/modules/utils/doc/utils.xml +++ b/modules/utils/doc/utils.xml @@ -21,11 +21,23 @@ <email>jh(a)tutpro.com</email> </address> </author> + <author> + <firstname>Carsten</firstname> + <surname>Bock</surname> + <affiliation><orgname>ng-voice GmbH</orgname></affiliation> + <address> + <email>carsten(a)ng-voice.com</email> + </address> + </author> </authorgroup> <copyright> <year>2008-2009</year> <holder>Juha Heinanen</holder> </copyright> + <copyright> + <year>2013</year> + <holder>Carsten Bock, ng-voice GmbH</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index ab59350..3600f7d 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -158,13 +158,18 @@ modparam("utils", "xcap_table", "pres_xcap") <title>Functions</title> <section id="utils.f.http_query"> <title> - <function moreinfo="none">http_query(url, result)</function> + <function moreinfo="none">http_query(url, [post-data], result)</function> </title> <para> - Sends HTTP GET request according to URL given in + Sends HTTP GET or POST request according to URL given in <quote>url</quote> parameter, which is a string that may contain pseudo variables. </para> + <para> + If you want to make a POST-Request, you have to define + the <quote>post</quote>-data, that should be submitted + in that request as the second parameter. + </para> <para> If HTTP server returns a class 2xx or 3xx reply, the first line of the reply's body (if any) is @@ -183,6 +188,7 @@ modparam("utils", "xcap_table", "pres_xcap") <title><function>http_query()</function> usage</title> <programlisting format="linespecific"> ... +# GET-Request http_query("http://tutpro.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.es…", "$var(result)") switch ($retcode) { @@ -190,6 +196,16 @@ switch ($retcode) { } ... </programlisting> + <programlisting format="linespecific"> +... +# POST-Request +http_query("http://tutpro.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)") +switch ($retcode) { + ... +} +... + </programlisting> </example> </section> <section id="utils.f.xcap_auth_status"> diff --git a/modules/utils/functions.c b/modules/utils/functions.c index aadfdd5..1225ba8 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -2,6 +2,7 @@ * script functions of utils module * * Copyright (C) 2008 Juha Heinanen + * Copyright (C) 2013 Carsten Bock, ng-voice GmbH * * This file is part of Kamailio, a free SIP server. * @@ -70,12 +71,12 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) * Performs http_query and saves possible result (first body line of reply) * to pvar. */ -int http_query(struct sip_msg* _m, char* _url, char* _dst) +int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) { CURL *curl; CURLcode res; - str value; - char *url, *at; + str value, post_value; + char *url, *at, *post; char* stream; long stat; pv_spec_t *dst; @@ -103,6 +104,28 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) *(url + value.len) = (char)0; curl_easy_setopt(curl, CURLOPT_URL, url); + if (_post) { + /* Now specify we want to POST data */ + curl_easy_setopt(curl, CURLOPT_POST, 1L); + + if (fixup_get_svalue(_m, (gparam_p)_post, &post_value) != 0) { + LM_ERR("cannot get post value\n"); + pkg_free(url); + return -1; + } + post = pkg_malloc(post_value.len + 1); + if (post == NULL) { + curl_easy_cleanup(curl); + pkg_free(url); + LM_ERR("cannot allocate pkg memory for post\n"); + return -1; + } + memcpy(post, post_value.s, post_value.len); + *(post + post_value.len) = (char)0; + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post); + } + + curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1); curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)http_query_timeout); @@ -112,6 +135,9 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) res = curl_easy_perform(curl); pkg_free(url); + if (_post) { + pkg_free(post); + } curl_easy_cleanup(curl); if (res != CURLE_OK) { diff --git a/modules/utils/functions.h b/modules/utils/functions.h index 5e666f9..910a4d5 100644 --- a/modules/utils/functions.h +++ b/modules/utils/functions.h @@ -2,6 +2,7 @@ * headers of script functions of utils module * * Copyright (C) 2008 Juha Heinanen + * Copyright (C) 2013 Carsten Bock, ng-voice GmbH * * This file is part of Kamailio, a free SIP server. * @@ -39,7 +40,7 @@ * Performs http_query and saves possible result (first body line of reply) * to pvar. */ -int http_query(struct sip_msg* _m, char* _page, char* _params, char* _dst); +int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post); #endif /* UTILS_FUNCTIONS_H */ diff --git a/modules/utils/utils.c b/modules/utils/utils.c index b734a69..8109a11 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -3,6 +3,7 @@ * * Copyright (C) 2008 Juha Heinanen * Copyright (C) 2009 1&1 Internet AG + * Copyright (C) 2013 Carsten Bock, ng-voice GmbH * * This file is part of Kamailio, a free SIP server. * @@ -91,12 +92,19 @@ static void destroy(void); static int fixup_http_query(void** param, int param_no); static int fixup_free_http_query(void** param, int param_no); +/* Wrappers for http_query to be defined later */ +static int w_http_query(struct sip_msg* _m, char* _url, char* _result); +static int w_http_query_post(struct sip_msg* _m, char* _url, char* _post, char* _result); + /* forward function */ int utils_forward(struct sip_msg *msg, int id, int proto); /* Exported functions */ static cmd_export_t cmds[] = { - {"http_query", (cmd_function)http_query, 2, fixup_http_query, + {"http_query", (cmd_function)w_http_query, 2, fixup_http_query, + fixup_free_http_query, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"http_query", (cmd_function)w_http_query_post, 3, fixup_http_query, fixup_free_http_query, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"xcap_auth_status", (cmd_function)xcap_auth_status, 2, fixup_pvar_pvar, @@ -325,7 +333,7 @@ static int fixup_http_query(void** param, int param_no) return fixup_spve_null(param, 1); } - if (param_no == 2) { + if ((param_no == 2) || (param_no == 3)) { if (fixup_pvar_null(param, 1) != 0) { LM_ERR("failed to fixup result pvar\n"); return -1; @@ -351,7 +359,7 @@ static int fixup_free_http_query(void** param, int param_no) return 0; } - if (param_no == 2) { + if ((param_no == 2) || (param_no == 3)) { return fixup_free_pvar_null(param, 1); } @@ -359,6 +367,20 @@ static int fixup_free_http_query(void** param, int param_no) return -1; } +/* + * Wrapper for HTTP-Query (GET) + */ +static int w_http_query(struct sip_msg* _m, char* _url, char* _result) { + return http_query(_m, _url, _result, NULL); +} + + +/* + * Wrapper for HTTP-Query (POST-Variant) + */ +static int w_http_query_post(struct sip_msg* _m, char* _url, char* _post, char* _result) { + return http_query(_m, _url, _result, _post); +} /*! * \brief checks precondition, switch, filter and forwards msg if necessary

1 0

git:master: Added support for HTTP-Post to utils: http_query
by Carsten Bock 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: 0d0c4cc11022a62edfcf5041b36fe4cf5ca95a4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d0c4cc… Author: Carsten Bock <Carsten.Bock(a)silentcircle-llc.com> Committer: Carsten Bock <Carsten.Bock(a)silentcircle-llc.com> Date: Thu Sep 12 17:16:09 2013 +0200 Added support for HTTP-Post to utils: http_query Merge branch 'carstenbock/utils_post' ---

1 0

git:master: Fix fixup functions.
by Carsten Bock 12 Sep '13

12 Sep '13

Module: sip-router Branch: master Commit: b23a74a4732f276315176d9b438bd2596e616799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b23a74a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Aug 21 20:14:16 2013 +0200 Fix fixup functions. --- modules/utils/utils.c | 61 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 8109a11..735ea0d 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -101,11 +101,11 @@ int utils_forward(struct sip_msg *msg, int id, int proto); /* Exported functions */ static cmd_export_t cmds[] = { - {"http_query", (cmd_function)w_http_query, 2, fixup_http_query, - fixup_free_http_query, + {"http_query", (cmd_function)w_http_query, 2, fixup_http_query_get, + fixup_free_http_query_get, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_query", (cmd_function)w_http_query_post, 3, fixup_http_query, - fixup_free_http_query, + {"http_query", (cmd_function)w_http_query_post, 3, fixup_http_query_post, + fixup_free_http_query_post, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"xcap_auth_status", (cmd_function)xcap_auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, @@ -327,13 +327,13 @@ static void destroy(void) * Fix http_query params: url (string that may contain pvars) and * result (writable pvar). */ -static int fixup_http_query(void** param, int param_no) +static int fixup_http_query_get(void** param, int param_no) { if (param_no == 1) { return fixup_spve_null(param, 1); } - if ((param_no == 2) || (param_no == 3)) { + if (param_no == 2) { if (fixup_pvar_null(param, 1) != 0) { LM_ERR("failed to fixup result pvar\n"); return -1; @@ -352,14 +352,59 @@ static int fixup_http_query(void** param, int param_no) /* * Free http_query params. */ -static int fixup_free_http_query(void** param, int param_no) +static int fixup_free_http_query_get(void** param, int param_no) { if (param_no == 1) { LM_WARN("free function has not been defined for spve\n"); return 0; } - if ((param_no == 2) || (param_no == 3)) { + if (param_no == 2) { + return fixup_free_pvar_null(param, 1); + } + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + + +/* + * Fix http_query params: url (string that may contain pvars) and + * result (writable pvar). + */ +static int fixup_http_query_post(void** param, int param_no) +{ + if ((param_no == 1) || (param_no == 2)) { + return fixup_spve_null(param, 1); + } + + if (param_no == 3) { + if (fixup_pvar_null(param, 1) != 0) { + LM_ERR("failed to fixup result pvar\n"); + return -1; + } + if (((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("result pvar is not writeble\n"); + return -1; + } + return 0; + } + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + +/* + * Free http_query params. + */ +static int fixup_free_http_query_post(void** param, int param_no) +{ + if ((param_no == 1) || (param_no == 2)) { + LM_WARN("free function has not been defined for spve\n"); + return 0; + } + + if (param_no == 3) { return fixup_free_pvar_null(param, 1); }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013