sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
148 discussions

git:master: rtpproxy-ng: fix possible segfault in rtpproxy_manage
by Richard Fuchs 28 Aug '13

28 Aug '13

Module: sip-router Branch: master Commit: fbcee0221cd6e22477dc9d1d5a7767c1e572235a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbcee02… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Aug 28 15:03:01 2013 -0400 rtpproxy-ng: fix possible segfault in rtpproxy_manage Reported by Hugh Waite --- modules/rtpproxy-ng/bencode.c | 2 ++ modules/rtpproxy-ng/bencode.h | 31 ++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/modules/rtpproxy-ng/bencode.c b/modules/rtpproxy-ng/bencode.c index 6402ac9..7a4b2ed 100644 --- a/modules/rtpproxy-ng/bencode.c +++ b/modules/rtpproxy-ng/bencode.c @@ -100,6 +100,8 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + if (!buf) + return NULL; if (buf->error) return NULL; diff --git a/modules/rtpproxy-ng/bencode.h b/modules/rtpproxy-ng/bencode.h index dff73d0..5628db9 100644 --- a/modules/rtpproxy-ng/bencode.h +++ b/modules/rtpproxy-ng/bencode.h @@ -88,6 +88,9 @@ bencode_item_t *bencode_list(bencode_buffer_t *buf); * object is destroyed, the specified function will be called on this pointer. */ void bencode_buffer_destroy_add(bencode_buffer_t *buf, free_func_t, void *); +/* Returns the buffer associated with an item, or NULL if pointer given is NULL */ +static inline bencode_buffer_t *bencode_item_buffer(bencode_item_t *); + @@ -344,6 +347,12 @@ static inline bencode_item_t *bencode_dictionary_get_expect(bencode_item_t *dict /**************************/ +static inline bencode_buffer_t *bencode_item_buffer(bencode_item_t *i) { + if (!i) + return NULL; + return i->buffer; +} + static inline bencode_item_t *bencode_string(bencode_buffer_t *buf, const char *s) { return bencode_string_len(buf, s, strlen(s)); } @@ -369,49 +378,49 @@ static inline bencode_item_t *bencode_dictionary_add(bencode_item_t *dict, const static inline bencode_item_t *bencode_dictionary_add_string(bencode_item_t *dict, const char *key, const char *val) { if (!val) return NULL; - return bencode_dictionary_add(dict, key, bencode_string(dict->buffer, val)); + return bencode_dictionary_add(dict, key, bencode_string(bencode_item_buffer(dict), val)); } static inline bencode_item_t *bencode_dictionary_add_string_dup(bencode_item_t *dict, const char *key, const char *val) { if (!val) return NULL; - return bencode_dictionary_add(dict, key, bencode_string_dup(dict->buffer, val)); + return bencode_dictionary_add(dict, key, bencode_string_dup(bencode_item_buffer(dict), val)); } static inline bencode_item_t *bencode_dictionary_add_str(bencode_item_t *dict, const char *key, const str *val) { if (!val) return NULL; - return bencode_dictionary_add(dict, key, bencode_str(dict->buffer, val)); + return bencode_dictionary_add(dict, key, bencode_str(bencode_item_buffer(dict), val)); } static inline bencode_item_t *bencode_dictionary_add_str_dup(bencode_item_t *dict, const char *key, const str *val) { if (!val) return NULL; - return bencode_dictionary_add(dict, key, bencode_str_dup(dict->buffer, val)); + return bencode_dictionary_add(dict, key, bencode_str_dup(bencode_item_buffer(dict), val)); } static inline bencode_item_t *bencode_dictionary_add_integer(bencode_item_t *dict, const char *key, long long int val) { - return bencode_dictionary_add(dict, key, bencode_integer(dict->buffer, val)); + return bencode_dictionary_add(dict, key, bencode_integer(bencode_item_buffer(dict), val)); } static inline bencode_item_t *bencode_dictionary_add_dictionary(bencode_item_t *dict, const char *key) { - return bencode_dictionary_add(dict, key, bencode_dictionary(dict->buffer)); + return bencode_dictionary_add(dict, key, bencode_dictionary(bencode_item_buffer(dict))); } static inline bencode_item_t *bencode_dictionary_add_list(bencode_item_t *dict, const char *key) { - return bencode_dictionary_add(dict, key, bencode_list(dict->buffer)); + return bencode_dictionary_add(dict, key, bencode_list(bencode_item_buffer(dict))); } static inline bencode_item_t *bencode_list_add_string(bencode_item_t *list, const char *s) { - return bencode_list_add(list, bencode_string(list->buffer, s)); + return bencode_list_add(list, bencode_string(bencode_item_buffer(list), s)); } static inline bencode_item_t *bencode_list_add_list(bencode_item_t *list) { - return bencode_list_add(list, bencode_list(list->buffer)); + return bencode_list_add(list, bencode_list(bencode_item_buffer(list))); } static inline bencode_item_t *bencode_list_add_dictionary(bencode_item_t *list) { - return bencode_list_add(list, bencode_dictionary(list->buffer)); + return bencode_list_add(list, bencode_dictionary(bencode_item_buffer(list))); } static inline bencode_item_t *bencode_dictionary_get(bencode_item_t *dict, const char *key) { @@ -515,7 +524,7 @@ static inline str *bencode_get_str(bencode_item_t *in, str *out) { static inline bencode_item_t *bencode_dictionary_add_iovec(bencode_item_t *dict, const char *key, const struct iovec *iov, int iov_cnt, int str_len) { - return bencode_dictionary_add(dict, key, bencode_string_iovec(dict->buffer, iov, iov_cnt, str_len)); + return bencode_dictionary_add(dict, key, bencode_string_iovec(bencode_item_buffer(dict), iov, iov_cnt, str_len)); } #endif

1 0

Crash in rtpproxy-ng module
by Hugh Waite 28 Aug '13

28 Aug '13

Hello, I have discovered that calling rtpproxy_manage for a failure response will cause a segfault if certain flags are passed. E.g. A "488 Not Acceptable Here" response that calls "rtpproxy_manage("fco+SP") during a failure_route will crash. This is because the OP_DELETE operation does not initialise the flags variable. See rtpproxy.c:1119 (rtpp_function_call(...)) I've attached a patch that will only add items to initialised lists. I assume that no flags are required for a DELETE operation, but please confirm this and review! Regards, Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

2 1

git:master: dialog: fixed typo related to module name inside log message
by Daniel-Constantin Mierla 28 Aug '13

28 Aug '13

Module: sip-router Branch: master Commit: e0e0a753d1365d340c17f33bd868085bee304910 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0e0a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 28 12:02:34 2013 +0200 dialog: fixed typo related to module name inside log message --- modules/dialog/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index ae105d4..8d7be33 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -455,7 +455,7 @@ static int mod_init(void) #ifdef STATISTICS /* register statistics */ if (register_module_stats( exports.name, mod_stats)!=0 ) { - LM_ERR("failed to register core statistics\n"); + LM_ERR("failed to register %s statistics\n", exports.name); return -1; } #endif

1 0

git:master: permissions: fix ws support on allow_trusted function.
by Victor Seva 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: bf68c071723bda24b07e64660f77872e2bceff1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf68c07… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Aug 27 18:43:39 2013 +0200 permissions: fix ws support on allow_trusted function. Thanks to Alex Hermann <alex(a)speakup.nl> Reminder: Never commit with more than one glass of wine. --- modules/permissions/trusted.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index 78c0b1e..dd76a64 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -512,7 +512,7 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) return -1; } - if(proto.len<2 && proto.len>4) + if(proto.len<2 || proto.len>4) goto error; switch(proto.s[0]) {

1 0

git:rfuchs/rtpproxy-ng DELETED: Merge branch 'master' into rfuchs/ rtpproxy-ng
by Richard Fuchs 27 Aug '13

27 Aug '13

Module: sip-router Branch: rfuchs/rtpproxy-ng DELETED Commit: dd76f37bfff59d5ae07b34346d0ab0a81136649b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd76f37… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Fri Jul 12 12:27:06 2013 -0400 Merge branch 'master' into rfuchs/rtpproxy-ng ---

1 0

git:master: core: set to-params pointer to null after freeing
by Daniel-Constantin Mierla 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: 14835f89fc2b761f73a0caad67d229ec3fedba29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14835f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 27 14:44:17 2013 +0200 core: set to-params pointer to null after freeing - avoid potential double freeing issues or invalid pointer access --- parser/parse_addr_spec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/parser/parse_addr_spec.c b/parser/parse_addr_spec.c index 41b2ac7..1820e6c 100644 --- a/parser/parse_addr_spec.c +++ b/parser/parse_addr_spec.c @@ -915,6 +915,7 @@ void free_to_params(struct to_body* const tb) pkg_free(tp); tp=foo; } + tb->param_lst = NULL; }

1 0

git:master: kamdbctl: new command add-tables
by Daniel-Constantin Mierla 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: 727aa357d9ee8abcb8471733e22886d2cff386db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=727aa35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 27 14:00:17 2013 +0200 kamdbctl: new command add-tables - creates only tables that are groupped under same id, thus have the sql script in a file - syntax: kamdbctl add-tables <gid> - there has to be a <gid>-create.sql script - eg: kamdbctl add-tables lcr --- utils/kamctl/kamdbctl | 17 +++++++++++++++++ utils/kamctl/kamdbctl.base | 1 + utils/kamctl/kamdbctl.mysql | 22 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 935e106..e9249d8 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -444,6 +444,23 @@ case $1 in kamailio_db_revoke $DBNAME exit $? ;; + add-tables) + if [ "$USED_DBENGINE" != "mysql" ] ; then + merr "$USED_DBENGINE don't support add-tables operation" + exit 1 + fi + if [ $# -ne 2 ] ; then + merr "add-tables requires 1 parameter: group id of tables" + exit 1 + fi + if [ -z "$DBNAME" ] ; then + merr "DBNAME is not set" + exit 1 + fi + + kamailio_add_tables $DBNAME $2 + exit $? + ;; bdb|db_berkeley) shift kamailio_berkeley "$@" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index ab4dc87..364e4c2 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -107,6 +107,7 @@ usage: $COMMAND create <db name or db_path, optional> ...(creates a new database $COMMAND dbonly ..................................(creates empty database) $COMMAND grant ...................................(grant privileges to database) $COMMAND revoke ..................................(revoke privileges to database) + $COMMAND add-tables <gid> ........................(creates only tables groupped in gid) if you want to manipulate database as other database user than root, want to change database name from default value "$DBNAME", diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index e4825ab..0c6d5d3 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -345,6 +345,28 @@ dbuid_create () # pars: <database name> } # end uid_create +kamailio_add_tables () # params: <database name> <tables group name> +{ + if [ $# -ne 2 ] ; then + merr "kamailio_add_tables function takes two params" + exit 1 + fi + + minfo "creating group of tables [$2] into database [$1] ..." + + if [ -e $DB_SCHEMA/$2-create.sql ] + then + sql_query $1 < $DB_SCHEMA/$2-create.sql + if [ $? -ne 0 ] ; then + merr "Creating group of tables [$2] failed" + exit 1 + fi + else + merr "Script for creating group of tables [$2] not found" + exit 1 + fi +} # end kamailio_add_tables + migrate_table () # 4 paremeters (dst_table, dst_cols, src_table, src_cols) { if [ $# -ne 4 ] ; then

1 0

git:master: kamctl: use FIFOPATH instead of OSER_FIFO in kamctlrc
by Daniel-Constantin Mierla 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: a075383454c92bed225b7904920090f515a938d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a075383… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 27 11:16:52 2013 +0200 kamctl: use FIFOPATH instead of OSER_FIFO in kamctlrc - no longer relation to former project name, however OSER_FIFO can still be set to keep the compatibility with older deployemnts, but will be used only when FIFOPATH is not explicitely set --- utils/kamctl/kamctl.fifo | 34 +++++++++++++++++++--------------- utils/kamctl/kamctlrc | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/utils/kamctl/kamctl.fifo b/utils/kamctl/kamctl.fifo index fead9de..50c8e92 100644 --- a/utils/kamctl/kamctl.fifo +++ b/utils/kamctl/kamctl.fifo @@ -23,8 +23,12 @@ fi ##### ----------------------------------------------- ##### ### parameters # -if [ -z "$OSER_FIFO" ]; then - OSER_FIFO=/tmp/kamailio_fifo +if [ -z "$FIFOPATH" ]; then + if [ -z "$OSER_FIFO" ]; then + FIFOPATH=/tmp/kamailio_fifo + else + FIFOPATH=$OSER_FIFO + fi fi # @@ -53,12 +57,12 @@ fifo_cmd() fi name=kamailio_receiver_$$ path=$CHROOT_DIR/tmp/$name - if [ ! -w $OSER_FIFO ]; then - merr "Error opening Kamailio's FIFO $OSER_FIFO" - merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$OSER_FIFO\")' in your config" + if [ ! -w $FIFOPATH ]; then + merr "Error opening Kamailio's FIFO $FIFOPATH" + merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$FIFOPATH\")' in your config" merr "and also have loaded the mi_fifo module." if [ ! -z $CHROOT_DIR ]; then - merr "[chrooted environment] Check that $OSER_FIFO is symlinked to ${CHROOT_DIR}${OSER_FIFO}" + merr "[chrooted environment] Check that $FIFOPATH is symlinked to ${CHROOT_DIR}${FIFOPATH}" fi exit 2 fi @@ -87,7 +91,7 @@ fifo_cmd() cat < $path | filter_fl & # issue FIFO request (printf taken to deal with \n) - printf "$CMD" > $OSER_FIFO + printf "$CMD" > $FIFOPATH # wait for the reader to complete wait @@ -102,9 +106,9 @@ CTLCMD=fifo_cmd fifo_kamailio_monitor() { name=kamailio_receiver_$$ path=$CHROOT_DIR/tmp/$name - if [ ! -w $OSER_FIFO ]; then - merr "Error opening Kamailio's FIFO $OSER_FIFO" - merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$OSER_FIFO\")' in your config" + if [ ! -w $FIFOPATH ]; then + merr "Error opening Kamailio's FIFO $FIFOPATH" + merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$FIFOPATH\")' in your config" merr "and also have loaded the mi_fifo module." exit 1 fi @@ -133,14 +137,14 @@ fifo_kamailio_monitor() { mecho "[cycle #: $attempt; if constant make sure server lives]" cat < $path | filter_fl & - cat > $OSER_FIFO <<EOF + cat > $FIFOPATH <<EOF :version:$name EOF wait cat < $path | filter_fl & - cat > $OSER_FIFO << EOF + cat > $FIFOPATH << EOF :uptime:$name EOF @@ -149,7 +153,7 @@ EOF mecho "Transaction Statistics: " cat < $path | filter_fl & - cat > $OSER_FIFO <<EOF + cat > $FIFOPATH <<EOF :get_statistics:$name UAS_transactions UAC_transactions @@ -161,7 +165,7 @@ EOF mecho "Stateless Server Statistics: " cat < $path | filter_fl & - cat > $OSER_FIFO <<EOF + cat > $FIFOPATH <<EOF :get_statistics:$name sent_replies sent_err_replies @@ -173,7 +177,7 @@ EOF mecho "UsrLoc Stats: " cat < $path | filter_fl & - cat > $OSER_FIFO <<EOF + cat > $FIFOPATH <<EOF :get_statistics:$name usrloc: diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index e5d8311..472d991 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -122,7 +122,7 @@ # CTLENGINE="FIFO" ## path to FIFO file -# OSER_FIFO="FIFO" +# FIFOPATH="/tmp/kamailio_fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1

1 0

git:master: permissions: fix ws support on allow_trusted function.
by Victor Seva 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: 573c9031a44168df356818f572f10f69791a1458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=573c903… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Aug 27 00:03:49 2013 +0200 permissions: fix ws support on allow_trusted function. --- modules/permissions/trusted.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index ef79dc7..78c0b1e 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -512,7 +512,7 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) return -1; } - if(proto.len!=3 && proto.len!=4) + if(proto.len<2 && proto.len>4) goto error; switch(proto.s[0]) {

2 2

permission module issue for WS proto
by Andreas Granig 26 Aug '13

26 Aug '13

Hi, In modules/permissions/trusted.c in function allow_trusted_2() there is if(proto.len!=3 && proto.len!=4) goto error; but later it checks for "ws" which is never reached due to len=2. Also the docs don't seem to be up to date in regards to support for WS and WSS. Unfortunately I'm travelling the next 3 days, maybe someone can quickly pick it up? Thanks, Andreas

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013