sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:3.1: pkg debian generic
by Jon Bonilla 11 Oct '10

11 Oct '10

Module: sip-router Branch: 3.1 Commit: 21a3752bf31a8e6cc488d26e43a48dae11b90575 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21a3752… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 18:56:52 2010 +0200 pkg debian generic geoip modules added to the debian generic folder --- pkg/kamailio/deb/debian/control | 22 +++++++++++----------- pkg/kamailio/deb/debian/rules | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 73a1e26..1f44925 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ @@ -257,16 +257,16 @@ Description: contains the app_python module This package provides the app_python module, an extension allowing to execute embedded Python applications within configuration file. -#Package: kamailio-geoip-modules -#Architecture: any -#Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) -#Description: contains the geoip module -# Kamailio is a very fast and flexible SIP (RFC3261) -# proxy server. Written entirely in C, Kamailio can handle thousands calls -# per second even on low-budget hardware. -# . -# This package provides the geoip module, an extension allowing to -# use GeoIP API within configuration file. +Package: kamailio-geoip-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) +Description: contains the geoip module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the geoip module, an extension allowing to + use GeoIP API within configuration file. Package: kamailio-nth Architecture: any diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 4ed1149..5ec2077 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -20,7 +20,7 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" # modules not in the "main" kamailio package -EXCLUDED_MODULES= geoip +EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python + snmpstats carrierroute xmpp cpl lua python geoip # directories with possible duplicate libraries (that should be deleted # from current module* packages)

1 0

git:master: modules_k/rtpproxy: fix rtpproxy_offer/ answer when called with a second parameter
by Ovidiu Sas 11 Oct '10

11 Oct '10

Module: sip-router Branch: master Commit: 0af3944586c881f5d3ea0be19242cdf84906269e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af3944… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 8 12:02:30 2010 -0400 modules_k/rtpproxy: fix rtpproxy_offer/answer when called with a second parameter - closes FS#69 - nathelper.c: rtpproxy_offer / rtpproxy_answer (str2 parameter ignored) - reported by Marc Villacorta --- modules_k/rtpproxy/rtpproxy.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index e9a0832..920bdd6 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -284,7 +284,7 @@ static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport static char *gencookie(); static int rtpp_test(struct rtpp_node*, int, int); static int unforce_rtp_proxy_f(struct sip_msg *, char *, char *); -static int force_rtp_proxy(struct sip_msg *, char *, char *, int); +static int force_rtp_proxy(struct sip_msg *, char *, char *, int, int); static int start_recording_f(struct sip_msg *, char *, char *); static int rtpproxy_answer1_f(struct sip_msg *, char *, char *); static int rtpproxy_answer2_f(struct sip_msg *, char *, char *); @@ -1672,13 +1672,13 @@ rtpproxy_offer1_f(struct sip_msg *msg, char *str1, char *str2) cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return rtpproxy_offer2_f(msg, str1, newip); + return force_rtp_proxy(msg, str1, newip, 1, 0); } static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) { - return force_rtp_proxy(msg, param1, param2, 1); + return force_rtp_proxy(msg, param1, param2, 1, 1); } static int @@ -1687,9 +1687,13 @@ rtpproxy_answer1_f(struct sip_msg *msg, char *str1, char *str2) char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + if (msg->first_line.type == SIP_REQUEST) + if (msg->first_line.u.request.method_value != METHOD_ACK) + return -1; + cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return rtpproxy_answer2_f(msg, str1, newip); + return force_rtp_proxy(msg, str1, newip, 0, 0); } static int @@ -1700,7 +1704,7 @@ rtpproxy_answer2_f(struct sip_msg *msg, char *param1, char *param2) if (msg->first_line.u.request.method_value != METHOD_ACK) return -1; - return force_rtp_proxy(msg, param1, param2, 0); + return force_rtp_proxy(msg, param1, param2, 0, 1); } @@ -1751,7 +1755,7 @@ free_opts(struct options *op1, struct options *op2, struct options *op3) } while (0); static int -force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) +force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forcedIP) { str body, body1, oldport, oldip, newport, newip; str callid, from_tag, to_tag, tmp, payload_types; @@ -2165,8 +2169,16 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) newip.len = 7; } } else { - newip.s = (argc < 2) ? str2 : argv[1]; - newip.len = strlen(newip.s); + if (forcedIP) { + newip.s = str2; + newip.len = strlen(newip.s); +#ifdef EXTRA_DEBUG + LM_DBG("forcing IP='%.*s'\n", newip.len, newip.s); +#endif + } else { + newip.s = (argc < 2) ? str2 : argv[1]; + newip.len = strlen(newip.s); + } } /* marker to double check : newport goes: str -> int -> str ?!?! */ newport.s = int2str(port, &newport.len); /* beware static buffer */

2 2

db_postgres/sqlops support of no return values
by Alex Balashov 11 Oct '10

11 Oct '10

Is it difficult to make db_postgres and/or sqlops support no values returned - i.e. a void result set? Recent versions of Postgres allow stored procedures to return 'void'. I like to call these a lot, but unfortunately sqlops or the database layer does not like that. So, I have to either write wrappers or make the procedures return things like a boolean 't' just to fix this. -- Alex Balashov - Principal Evariste Systems LLC 1170 Peachtree Street 12th Floor, Suite 1200 Atlanta, GA 30309 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/

3 4

git:3.1: siptrace: print error message if trace flag is invalid
by Daniel-Constantin Mierla 11 Oct '10

11 Oct '10

Module: sip-router Branch: 3.1 Commit: b349f8591c305fb64afebbb89cfdd64e06d89f8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b349f85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 11 17:06:36 2010 +0200 siptrace: print error message if trace flag is invalid (cherry picked from commit 69092c2f26a34c398c020a1b47eba64cfb5423b8) --- modules_k/siptrace/siptrace.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 343beb6..d0d1789 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -254,7 +254,10 @@ static int mod_init(void) trace_local_ip.len = strlen(trace_local_ip.s); if (trace_flag<0 || trace_flag>(int)MAX_FLAG) + { + LM_ERR("invalid trace flag %d\n", trace_flag); return -1; + } trace_flag = 1<<trace_flag; /* Find a database module */

1 0

git:3.1: sl: init register_cb in SL API
by Daniel-Constantin Mierla 11 Oct '10

11 Oct '10

Module: sip-router Branch: 3.1 Commit: 97decac9266dcd1d839bafb2680a14a1c95ea560 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97decac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 11 17:05:19 2010 +0200 sl: init register_cb in SL API - used by siptrace, discovered while investigating issue reported by MÉSZÁROS Mihály (cherry picked from commit dd135dbf86d899e96fa8ecad5a6f66ca3b2ca5da) --- modules/sl/sl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 4af524b..2ca7592 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -362,6 +362,7 @@ static int bind_sl(sl_api_t* api) api->dreply = sl_send_reply_dlg; api->freply = send_reply; api->get_reply_totag = get_reply_totag; + api->register_cb = sl_register_callback; return 0; }

1 0

about matrix module
by Juha Heinanen 11 Oct '10

11 Oct '10

i was searching for a module that could be used to implement lookup of a string value based on two other strings. matrix module would otherwise be ok, but i would need to have at least two matrixes. so a matrix_name column would need to be added to matrix table and matrix name argument to matrix function. also, i'm worried about the linked list implementation and would prefer a hash table based one: first look for the first index from a hash table, which would then point to the hash table of the second index. use of dialplan module is another alternative. it would require giving a numerical index to each first string value, which could then be used as dpid. second string values would then be stored in match_exp column in rows of that that dpid and the value would in attrs column. third alternative is htable module, i.e., use table_name::first_string::second_string as keyname and put string value in key_value column. in fact, that sounds like the best fit for the problem. i would be interested to learn, why matrix module was developed in the first place. why is is better suited for the job than htable module? and if there are good reasons, why matrix module is better for its intended job than htable module, is there interest in developing matrix module further along the lines i described in above? -- juha

3 5

git:master: modules_k/rtpproxy: remove obsolete force_rtp_proxy and swap flag
by Ovidiu Sas 11 Oct '10

11 Oct '10

Module: sip-router Branch: master Commit: bf155292ef19658638892b20a5894a3c6b37db32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf15529… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 8 11:41:24 2010 -0400 modules_k/rtpproxy: remove obsolete force_rtp_proxy and swap flag --- modules_k/rtpproxy/README | 197 +++++++++++------------------ modules_k/rtpproxy/doc/rtpproxy.xml | 2 +- modules_k/rtpproxy/doc/rtpproxy_admin.xml | 101 +++------------ modules_k/rtpproxy/rtpproxy.c | 92 +------------- 4 files changed, 101 insertions(+), 291 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bf1…

1 0

git:master: siptrace: print error message if trace flag is invalid
by Daniel-Constantin Mierla 11 Oct '10

11 Oct '10

Module: sip-router Branch: master Commit: 69092c2f26a34c398c020a1b47eba64cfb5423b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69092c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 11 17:06:36 2010 +0200 siptrace: print error message if trace flag is invalid --- modules_k/siptrace/siptrace.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 343beb6..d0d1789 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -254,7 +254,10 @@ static int mod_init(void) trace_local_ip.len = strlen(trace_local_ip.s); if (trace_flag<0 || trace_flag>(int)MAX_FLAG) + { + LM_ERR("invalid trace flag %d\n", trace_flag); return -1; + } trace_flag = 1<<trace_flag; /* Find a database module */

1 0

git:master: sl: init register_cb in SL API
by Daniel-Constantin Mierla 11 Oct '10

11 Oct '10

Module: sip-router Branch: master Commit: dd135dbf86d899e96fa8ecad5a6f66ca3b2ca5da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd135db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 11 17:05:19 2010 +0200 sl: init register_cb in SL API - used by siptrace, discovered while investigating issue reported by MÉSZÁROS Mihály --- modules/sl/sl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 4af524b..2ca7592 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -362,6 +362,7 @@ static int bind_sl(sl_api_t* api) api->dreply = sl_send_reply_dlg; api->freply = send_reply; api->get_reply_totag = get_reply_totag; + api->register_cb = sl_register_callback; return 0; }

1 0

git:master: mqueue: free items removed because of exceeding queue size
by Elena-Ramona Modroiu 11 Oct '10

11 Oct '10

Module: sip-router Branch: master Commit: 115d33ede1736f7bf8dd151af5e6ca64a23433e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=115d33e… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Oct 11 15:27:37 2010 +0200 mqueue: free items removed because of exceeding queue size --- modules/mqueue/mqueue_api.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index 6007ef0..b6b72ef 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -343,6 +343,7 @@ int mq_item_add(str *qname, str *key, str *val) mh->ilast = NULL; else mh->ifirst->prev = NULL; + shm_free(mi); } lock_release(&mh->lock); return 0;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010