sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:sr_3.0: tls: fix wrong string variable length overwrite

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: c39346b6f52c2e661e26f46a37b3c6e57abb1b85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c39346b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 16:57:33 2010 +0200 tls: fix wrong string variable length overwrite Some per-domain config string variables (cert_file, ca_file, pkey_file & cipher_list) had their length truncated to that of the corresponding variable in the parent domain. Mostly invisible since the string length was in general ignored (asciiz strings). (cherry picked from commit e63610186803cfcc0ff14d8871df8ae70df83103) --- modules/tls/tls_domain.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 628b3e2..80dd614 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -167,7 +167,7 @@ char* tls_domain_str(tls_domain_t* d) /* * Initialize parameters that have not been configured from - * parent domain (usualy one of default domains + * parent domain (usually one of default domains */ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) { @@ -179,27 +179,36 @@ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) return -1; } - if (!d->cert_file.s && - shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) return -1; - d->cert_file.len = parent->cert_file.len; + if (!d->cert_file.s) { + if (shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) + return -1; + d->cert_file.len = parent->cert_file.len; + } LOG(L_INFO, "%s: certificate='%s'\n", tls_domain_str(d), d->cert_file.s); - if (!d->ca_file.s && - shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) return -1; - d->ca_file.len = parent->ca_file.len; + if (!d->ca_file.s){ + if (shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) + return -1; + d->ca_file.len = parent->ca_file.len; + } LOG(L_INFO, "%s: ca_list='%s'\n", tls_domain_str(d), d->ca_file.s); if (d->require_cert == -1) d->require_cert = parent->require_cert; - LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), d->require_cert); + LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), + d->require_cert); - if (!d->cipher_list.s && - shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) return -1; - d->cipher_list.len = parent->cipher_list.len; + if (!d->cipher_list.s) { + if ( shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) + return -1; + d->cipher_list.len = parent->cipher_list.len; + } LOG(L_INFO, "%s: cipher_list='%s'\n", tls_domain_str(d), d->cipher_list.s); - if (!d->pkey_file.s && - shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) return -1; - d->pkey_file.len = parent->pkey_file.len; + if (!d->pkey_file.s) { + if (shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) + return -1; + d->pkey_file.len = parent->pkey_file.len; + } LOG(L_INFO, "%s: private_key='%s'\n", tls_domain_str(d), d->pkey_file.s); if (d->verify_cert == -1) d->verify_cert = parent->verify_cert;

13 years, 10 months

git:sr_3.0: iptrtpproxy: s/cfg_parse/sr_cfg_parse/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: de22c5106ae51b475ed5fe92e322f461e06d3281 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de22c51… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:02:31 2010 +0200 iptrtpproxy: s/cfg_parse/sr_cfg_parse/ cfg_parse name changed into sr_cfg_parse (since commit 50ca02e5). (cherry picked from commit b5c339deff8c1b5b325cac96071902ebde341082) --- modules/iptrtpproxy/iptrtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 3f9fb7a..c3dc8af 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -1053,7 +1053,7 @@ static int parse_iptrtpproxy_cfg() { cfg_section_parser(parser, parse_switchboard_section, NULL); cfg_set_options(parser, section_options); memset(&parse_config_vals, 0, sizeof(parse_config_vals)); - if (cfg_parse(parser)) { + if (sr_cfg_parse(parser)) { return -1; } cfg_parser_close(parser);

13 years, 10 months

git:sr_3.0: iptrtpproxy: makefile LIBS update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 38383b04b9b4002ed5d4ac9a27771a50f32d824a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38383b0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:01:07 2010 +0200 iptrtpproxy: makefile LIBS update Look for libipt_RTPPROXY first under /lib/xtables (default install dir) and if not found in $(iptdir)/extensions (compile dir). (cherry picked from commit 6b9f6a324851b87d37eaa1f576f3e88d5863ee2a) --- modules/iptrtpproxy/Makefile | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/iptrtpproxy/Makefile b/modules/iptrtpproxy/Makefile index 4576575..4d6fd76 100644 --- a/modules/iptrtpproxy/Makefile +++ b/modules/iptrtpproxy/Makefile @@ -6,14 +6,17 @@ # WARNING: do not run this directly, it should be run by the master Makefile # -# define path to netfilter/iptables directory -iptdir = ~/work/netfilter/iptables +# define path to netfilter/iptables source directory +iptdir = ~/iptables include ../../Makefile.defs auto_gen= NAME=iptrtpproxy.so -LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ - -L $(iptdir)/extensions -lext -INCLUDES = -I $(iptdir)/include +#LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ +# -L $(iptdir)/extensions -lext +# look for libipt_RTPPROXY first under /lib/xtables (default install dir) +# and if not found in $(iptdir)/extensions (compile dir) +LIBS = -L/lib/xtables -L$(iptdir)/extensions -lipt_RTPPROXY -ldl +INCLUDES = -I$(iptdir)/include DEFS+=-DSER_MOD_INTERFACE

13 years, 10 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; }

13 years, 10 months

git:sr_3.0: db_postgres: reset row_buf for each row

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: b0da607b75c978282b49a31d2858177ec6232941 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0da607… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 18 11:58:21 2010 +0200 db_postgres: reset row_buf for each row - DB1 interface was reusing local buffer to convert returned rows, resulting in misusage of values from previous rows for null values - reported by Jan Klepal (cherry picked from commit 63c724b42d4c4ff45eaa660508d6358f3e894d0a) --- modules/db_postgres/km_res.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index c4148ec..106ad22 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -220,7 +220,6 @@ int db_postgres_convert_rows(const db1_con_t* _h, db1_res_t* _r) return -1; } LM_DBG("allocate for %d columns %d bytes in row buffer at %p\n", RES_COL_N(_r), len, row_buf); - memset(row_buf, 0, len); if (db_allocate_rows(_r) < 0) { LM_ERR("could not allocate rows\n"); @@ -230,6 +229,8 @@ int db_postgres_convert_rows(const db1_con_t* _h, db1_res_t* _r) } for(row = RES_LAST_ROW(_r); row < (RES_LAST_ROW(_r) + RES_ROW_N(_r)); row++) { + /* reset row buf content */ + memset(row_buf, 0, len); for(col = 0; col < RES_COL_N(_r); col++) { /* * The row data pointer returned by PQgetvalue points to storage

13 years, 10 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;

13 years, 10 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);

13 years, 10 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…

13 years, 10 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/

13 years, 10 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; }

13 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010