sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:sr_3.0: tm: t_save_lumps() verifies the route type

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 173ec2af5eb41dcc03df4739ecaa229cb98ab6e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=173ec2a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 30 10:42:57 2010 +0200 tm: t_save_lumps() verifies the route type Even though the t_save_lumps() function is registered only for request route, in some corner case, the function might be called from failure_route. (For example a failure route executes a request route block which calls this function.) This scenario resulted in overwriting the already cloned lump list which is not allowed because of the lockless read, and also resulted in a memory leak. An extra check is also added to save_msg_lumps() to catch this bug. (cherry picked from commit a7bbaf7cd83b5d044ff8c7fff7b19c7ff392da74) --- modules/tm/sip_msg.c | 8 ++++++++ modules/tm/tm.c | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index e7bebcc..ab093f8 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -116,6 +116,14 @@ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg) return -1; } +#ifdef EXTRA_DEBUG + membar_depends(); + if (shm_msg->add_rm || shm_msg->body_lumps || shm_msg->reply_lump) { + LOG(L_ERR, "ERROR: save_msg_lumps: BUG, trying to overwrite the already cloned lumps\n"); + return -1; + } +#endif + /* needless to clone the lumps for ACK, they will not be used again */ if (shm_msg->REQ_METHOD == METHOD_ACK) return 0; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 69106a5..ed46e53 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1811,17 +1811,19 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) #ifdef POSTPONE_MSG_CLONING struct cell *t; - t=get_t(); - if (!t || t==T_UNDEFINED) { - LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); - return -1; - } + if (is_route_type(REQUEST_ROUTE)) { + t=get_t(); + if (!t || t==T_UNDEFINED) { + LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); + return -1; + } - if (save_msg_lumps(t->uas.request, msg)) { - LOG(L_ERR, "ERROR: w_t_save_lumps: " - "failed to save the message lumps\n"); - return -1; - } + if (save_msg_lumps(t->uas.request, msg)) { + LOG(L_ERR, "ERROR: w_t_save_lumps: " + "failed to save the message lumps\n"); + return -1; + } + } /* else nothing to do, the lumps have already been saved */ return 1; #else LOG(L_ERR, "ERROR: w_t_save_lumps: POSTPONE_MSG_CLONING is not defined,"

14 years, 4 months

git:sr_3.0: core: fix mod_register & dlflags

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 18368c6bd4d4679d11074d0c9a61386ce1d958a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18368c6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 24 11:43:36 2010 +0200 core: fix mod_register & dlflags dlflags changes in mod_register() functions were discarded resulting in modules failing to load. (cherry picked from commit 931bd29d504f01eeab738ee5dad72fe7be858adb) --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index 351d7fa..97c13af 100644 --- a/sr_module.c +++ b/sr_module.c @@ -414,7 +414,7 @@ reload: if (((error =(char*)dlerror())==0) && mr) { /* no error call it */ new_dlflags=dlflags; - if (mr(path, &dlflags, 0, 0)!=0) { + if (mr(path, &new_dlflags, 0, 0)!=0) { LOG(L_ERR, "ERROR: load_module: %s: mod_register failed\n", path); goto error1; }

14 years, 4 months

git:sr_3.0: Modules_k:pv No warning message for branch(count) if no branches

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: c1802e9ff5861cd52e5a692a6a2aa236a20ccfa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1802e9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 25 14:08:35 2010 +0300 Modules_k:pv No warning message for branch(count) if no branches Patch by Carsten Gross (carsten.gross at 1und1 dot de) (cherry picked from commit 54f04ae93503f1d24763b6b6cb0ceec3045b26d9) --- modules_k/pv/pv_branch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 163fc73..5c8b56d 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -47,7 +47,8 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); - if(uri.s == 0) + /* branch(count) doesn't need a valid branch, everything else does */ + if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { LM_ERR("error accessing branch [%d]\n", idx); return pv_get_null(msg, param, res);

14 years, 4 months

git:sr_3.0: * debian-lenny symlink added for debian builds

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: d4a8ef3d6ef64f9cce0d6847b50d091b1eedde33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a8ef3… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 4 17:49:18 2010 +0200 * debian-lenny symlink added for debian builds (cherry picked from commit 191502e739dcd888177fd4653b50c76ea89603c6) --- pkg/kamailio/debian-lenny | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian-lenny b/pkg/kamailio/debian-lenny new file mode 120000 index 0000000..b2f7fd3 --- /dev/null +++ b/pkg/kamailio/debian-lenny @@ -0,0 +1 @@ +debian \ No newline at end of file

14 years, 4 months

git:sr_3.0: permissions(k): fixed misleading out of shm

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: e5dfdb012649cc766ca62fa27c6b3c4850fb9566 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5dfdb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 9 10:56:38 2010 +0200 permissions(k): fixed misleading out of shm - out of shm memory was printed even when db load failed - some identations to reveal the inner blocks (cherry picked from commit 80928443fcd9548bd2e4599e76f1c96498aed4a7) --- modules_k/permissions/address.c | 161 ++++++++++++++++++++------------------- 1 files changed, 81 insertions(+), 80 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..93e5f5c 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -90,20 +90,20 @@ int reload_address_table(void) /* Choose new hash table and free its old contents */ if (*addr_hash_table == addr_hash_table_1) { - empty_addr_hash_table(addr_hash_table_2); - new_hash_table = addr_hash_table_2; + empty_addr_hash_table(addr_hash_table_2); + new_hash_table = addr_hash_table_2; } else { - empty_addr_hash_table(addr_hash_table_1); - new_hash_table = addr_hash_table_1; + empty_addr_hash_table(addr_hash_table_1); + new_hash_table = addr_hash_table_1; } /* Choose new subnet table */ if (*subnet_table == subnet_table_1) { - empty_subnet_table(subnet_table_2); - new_subnet_table = subnet_table_2; + empty_subnet_table(subnet_table_2); + new_subnet_table = subnet_table_2; } else { - empty_subnet_table(subnet_table_1); - new_subnet_table = subnet_table_1; + empty_subnet_table(subnet_table_1); + new_subnet_table = subnet_table_1; } row = RES_ROWS(res); @@ -111,52 +111,52 @@ int reload_address_table(void) LM_DBG("Number of rows in address table: %d\n", RES_ROW_N(res)); for (i = 0; i < RES_ROW_N(res); i++) { - val = ROW_VALUES(row + i); - if ((ROW_N(row + i) == 4) && - (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && - (VAL_INT(val) > 0) && - (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && - inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && - (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && - ((unsigned int)VAL_INT(val + 2) > 0) && - ((unsigned int)VAL_INT(val + 2) <= 32) && - (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { - if ((unsigned int)VAL_INT(val + 2) == 32) { - if (addr_hash_table_insert(new_hash_table, + val = ROW_VALUES(row + i); + if ((ROW_N(row + i) == 4) && + (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && + (VAL_INT(val) > 0) && + (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && + inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && + (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && + ((unsigned int)VAL_INT(val + 2) > 0) && + ((unsigned int)VAL_INT(val + 2) <= 32) && + (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { + if ((unsigned int)VAL_INT(val + 2) == 32) { + if (addr_hash_table_insert(new_hash_table, (unsigned int)VAL_INT(val), (unsigned int)ip_addr.s_addr, (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("hash table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } - LM_DBG("Tuple <%u, %s, %u> inserted into address hash " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2)); - } else { - if (subnet_table_insert(new_subnet_table, - (unsigned int)VAL_INT(val), - (unsigned int)ip_addr.s_addr, - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("subnet table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; + == -1) { + LM_ERR("hash table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u> inserted into address hash " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2)); + } else { + if (subnet_table_insert(new_subnet_table, + (unsigned int)VAL_INT(val), + (unsigned int)ip_addr.s_addr, + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)) + == -1) { + LM_ERR("subnet table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)); + } + } else { + LM_ERR("database problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; } - LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)); - } - } else { - LM_ERR("database problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } } perm_dbf.free_result(db_handle, res); @@ -176,19 +176,19 @@ int reload_address_table(void) int init_addresses(void) { if (!db_url.s) { - LM_INFO("db_url parameter of permissions module not set, " - "disabling allow_address\n"); - return 0; + LM_INFO("db_url parameter of permissions module not set, " + "disabling allow_address\n"); + return 0; } else { - if (db_bind_mod(&db_url, &perm_dbf) < 0) { - LM_ERR("load a database support module\n"); - return -1; - } + if (db_bind_mod(&db_url, &perm_dbf) < 0) { + LM_ERR("load a database support module\n"); + return -1; + } - if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { - LM_ERR("database module does not implement 'query' function\n"); - return -1; - } + if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { + LM_ERR("database module does not implement 'query' function\n"); + return -1; + } } addr_hash_table_1 = addr_hash_table_2 = 0; @@ -212,9 +212,11 @@ int init_addresses(void) addr_hash_table_2 = new_addr_hash_table(); if (!addr_hash_table_2) goto error; - addr_hash_table = (struct addr_list ***)shm_malloc - (sizeof(struct addr_list **)); - if (!addr_hash_table) goto error; + addr_hash_table = (struct addr_list ***)shm_malloc(sizeof(struct addr_list **)); + if (!addr_hash_table) { + LM_ERR("no more shared memory\n"); + goto error; + } *addr_hash_table = addr_hash_table_1; @@ -230,8 +232,8 @@ int init_addresses(void) *subnet_table = subnet_table_1; if (reload_address_table() == -1) { - LM_CRIT("reload of address table failed\n"); - goto error; + LM_CRIT("reload of address table failed\n"); + goto error; } perm_dbf.close(db_handle); @@ -240,30 +242,29 @@ int init_addresses(void) return 0; error: - LM_ERR("no more shm memory\n"); if (addr_hash_table_1) { - free_addr_hash_table(addr_hash_table_1); - addr_hash_table_1 = 0; + free_addr_hash_table(addr_hash_table_1); + addr_hash_table_1 = 0; } if (addr_hash_table_2) { - free_addr_hash_table(addr_hash_table_2); - addr_hash_table_2 = 0; + free_addr_hash_table(addr_hash_table_2); + addr_hash_table_2 = 0; } if (addr_hash_table) { - shm_free(addr_hash_table); - addr_hash_table = 0; + shm_free(addr_hash_table); + addr_hash_table = 0; } if (subnet_table_1) { - free_subnet_table(subnet_table_1); - subnet_table_1 = 0; + free_subnet_table(subnet_table_1); + subnet_table_1 = 0; } if (subnet_table_2) { - free_subnet_table(subnet_table_2); - subnet_table_2 = 0; + free_subnet_table(subnet_table_2); + subnet_table_2 = 0; } - if (subnet_table) { - shm_free(subnet_table); - subnet_table = 0; + if (subnet_table) { + shm_free(subnet_table); + subnet_table = 0; } perm_dbf.close(db_handle); db_handle = 0;

14 years, 4 months

git:sr_3.0: modules_k/regex Fixed a memory leak when using pcre regex

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 3ba5c5d3574b35fae31d1f029e8b77a53120c84b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ba5c5d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 22 18:35:37 2010 +0300 modules_k/regex Fixed a memory leak when using pcre regex The compiled regular expression when using pcre_match was not freed. (cherry picked from commit 61f4d7f12723c4a3d989d37a414433e5ed71abff) --- modules_k/regex/regex_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index fcefa51..3610646 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -575,9 +575,10 @@ static int w_pcre_match(struct sip_msg* _msg, char* _s1, char* _s2) LM_DBG("matching error '%d'\n", pcre_rc); break; } + pcre_free(pcre_re); return -1; } - + pcre_free(pcre_re); LM_DBG("'%s' matches '%s'\n", string.s, regex.s); return 1; }

14 years, 4 months

git:sr_3.0: pkg debian

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 5f59aab2561854a151d4e71ab2993b04ae5f4dde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f59aab… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Oct 10 01:32:45 2010 +0200 pkg debian * Use libreadline-dev generic instead of libreadline5-dev as dependency (cherry picked from commit b532368d655fb7b08c44120c85eb09ff545bab44) --- pkg/kamailio/debian-squeeze/control | 2 +- pkg/kamailio/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index 5178bec..3878ce5 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/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, libmemcache-dev, libreadline5-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, libmemcache-dev, libreadline-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index d4f1d6c..d3d5c1b 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/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, libreadline5-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 Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 4 months

git:sr_3.0: PKG: Debian changelog updates

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 45a4215397e1ed5aac6158facb256b9c1050be15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45a4215… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 20 14:05:12 2010 +0200 PKG: Debian changelog updates (cherry picked from commit 938b4fac168309d4b5e774b4e3a1bc6bf1f7ae53) --- pkg/kamailio/debian-etch/changelog | 104 +++++++++++++++++++++++++++++++++ pkg/kamailio/debian-squeeze/changelog | 104 +++++++++++++++++++++++++++++++++ pkg/kamailio/debian/changelog | 102 +++++++++++++++++++++++++++++++- 3 files changed, 308 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=45a…

14 years, 4 months

git:sr_3.0: core: socket_str enclose IPv6 addresses in betwen [ ]

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 722228264fae8dbf6329385806d610ffc84325e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7222282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 3 10:14:26 2010 +0200 core: socket_str enclose IPv6 addresses in betwen [ ] - string representation of socket string takes in consideration IPv6 addresses (cherry picked from commit 426c6b7e2103d38aca47ca9728d22355bd44b7e9) Conflicts: pkg/kamailio/debian-lenny --- pkg/kamailio/debian-lenny | 1 - socket_info.c | 9 +++++++++ socket_info.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/debian-lenny b/pkg/kamailio/debian-lenny deleted file mode 120000 index b2f7fd3..0000000 --- a/pkg/kamailio/debian-lenny +++ /dev/null @@ -1 +0,0 @@ -debian \ No newline at end of file diff --git a/socket_info.c b/socket_info.c index 6627d70..a1f8bb0 100644 --- a/socket_info.c +++ b/socket_info.c @@ -321,6 +321,9 @@ int socket2str(char* s, int* len, struct socket_info* si) proto.len = strlen(proto.s); l = proto.len + si->address_str.len + si->port_no_str.len + 2; + + if(si->address.af==AF_INET6) + l += 2; if (*len < l) { ERR("socket2str: Destionation buffer too short\n"); @@ -331,8 +334,14 @@ int socket2str(char* s, int* len, struct socket_info* si) memcpy(s, proto.s, proto.len); s += proto.len; *s = ':'; s++; + if(si->address.af==AF_INET6) { + *s = '['; s++; + } memcpy(s, si->address_str.s, si->address_str.len); s += si->address_str.len; + if(si->address.af==AF_INET6) { + *s = ']'; s++; + } *s = ':'; s++; memcpy(s, si->port_no_str.s, si->port_no_str.len); s += si->port_no_str.len; diff --git a/socket_info.h b/socket_info.h index 6da9437..7923e65 100644 --- a/socket_info.h +++ b/socket_info.h @@ -47,7 +47,7 @@ * the text description of any socket, not counting the terminating zero added * by socket2str */ #define MAX_SOCKET_STR (sizeof("unknown") - 1 + IP_ADDR_MAX_STR_SIZE + \ - INT2STR_MAX_LEN + 2) + INT2STR_MAX_LEN + 2 + 2) int socket2str(char* s, int* len, struct socket_info* si);

14 years, 4 months

git:sr_3.0: usrloc(k): updated index of domain column

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 653edd03e251e82e30e33a20ef6b1730817e9590 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=653edd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 18 11:24:20 2010 +0200 usrloc(k): updated index of domain column - index is 14 - harmless case since domain value is tested against null as well (cherry picked from commit 390eefb442f0b3b41cf5a708270ecd98765b4a66) --- modules_k/usrloc/udomain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index ce3fde3..8f21e0f 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -433,7 +433,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) if (use_domain) { domain = (char*)VAL_STRING(ROW_VALUES(row) + 14); - if (VAL_NULL(ROW_VALUES(row)+13) || domain==0 || domain[0]==0){ + if (VAL_NULL(ROW_VALUES(row)+14) || domain==0 || domain[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue;

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev