sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
285 discussions

git:master: utils/sercmd: set SRNAME at compile time
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: 1b58b26b7ccf7b2c01185a22ad076a3655e43664 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b58b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 17:18:11 2011 +0100 utils/sercmd: set SRNAME at compile time - it is set to sip server name (e.g., ser, kamailio) - it is used to build the default path to ctl file used to communicate with sip server via ctl module - reported by Henning Westerholt --- utils/sercmd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index bc03b74..2cb406a 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -22,7 +22,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= -DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ +DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called

1 1

git:master: ctl: used flavour's NAME in path of default ctl socket
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: df4dfe61500f4ada6051f0d7c74824efa3c2c628 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df4dfe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 15 23:02:09 2011 +0200 ctl: used flavour's NAME in path of default ctl socket --- modules/ctl/ctl_defaults.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index 6ac7658..c50af47 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,7 +4,7 @@ #ifndef __ctl_defaults_h #define __ctl_defaults_h /*listen by default on: */ -#define DEFAULT_CTL_SOCKET "unixs:/tmp/ser_ctl" +#define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049

2 2

git:master: ctl: use SRNAME define to build default ctl file path
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: b515ac33300f3c1d47195961409812d49fafb58f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b515ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 17:16:36 2011 +0100 ctl: use SRNAME define to build default ctl file path - this define is set by sercmd comilation (NAME is set to sercmd in this case) - otherwise use NAME, which is set by sip server compilation - reported by Henning Westerholt --- modules/ctl/ctl_defaults.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index c50af47..5c10c17 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,7 +4,13 @@ #ifndef __ctl_defaults_h #define __ctl_defaults_h /*listen by default on: */ +#ifdef SRNAME +/* this is used when compiling sercmd tool */ +#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl" +#else +/* this is used when compiling sip server */ #define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl" +#endif /* port used by default for tcp/udp if no port is explicitely specified */ #define DEFAULT_CTL_PORT 2049

1 0

git:master: parser/sdp: updated parse_sdp() description
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: e1c6eafe29973a05f9f9358efbac9bf6be16a92d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1c6eaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:43:28 2011 +0100 parser/sdp: updated parse_sdp() description - reflect properly return codes --- parser/sdp/sdp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 6d53ab9..6a635f8 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -670,10 +670,10 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) } /** - * Parse SDP. + * @brief Parse SIP SDP body and store in _m->body. * - * returns 0 on success. - * non zero on error. + * @param _m the SIP message structure + * @return 0 on success, < 0 on error and 1 if there is no message body */ int parse_sdp(struct sip_msg* _m) {

1 0

git:master: snmpstats: removed c&p duplicated module parameter
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: 50880207fe208df5de065e0f915c560ac255a9d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5088020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:22:37 2011 +0100 snmpstats: removed c&p duplicated module parameter - reported by Klaus Darilion --- modules_k/snmpstats/snmpstats.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 692db9e..3badbfa 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -154,8 +154,6 @@ static param_export_t mod_params[] = (void *)set_snmpget_path }, { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, (void *)set_snmp_community }, - { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, - (void *)set_snmp_community }, { "export_registrar", INT_PARAM, &snmp_export_registrar }, { 0,0,0 }

1 0

git:master: sdpops: check for sdp structure after parse_sdp()
by Daniel-Constantin Mierla 31 Oct '11

31 Oct '11

Module: sip-router Branch: master Commit: 704c619f401b6286588c43c8dec9e04670f4ad43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=704c619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 31 11:20:05 2011 +0100 sdpops: check for sdp structure after parse_sdp() - the function can return 1 in case of no body - reported by Juha Heinanen --- modules/sdpops/sdpops_mod.c | 46 +++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 725dcf6..7923bf0 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -276,11 +276,16 @@ int sdp_remove_codecs_by_id(sip_msg_t* msg, str* codecs) return -1; } - LM_ERR("attempting to remove codecs from sdp: [%.*s]\n", - codecs->len, codecs->s); - sdp = (sdp_info_t*)msg->body; + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + LM_DBG("attempting to remove codecs from sdp: [%.*s]\n", + codecs->len, codecs->s); + sdp_session_num = 0; for(;;) { @@ -346,6 +351,7 @@ static int w_sdp_remove_codecs_by_id(sip_msg_t* msg, char* codecs, char* bar) */ int sdp_remove_codecs_by_name(sip_msg_t* msg, str* codecs) { + sdp_info_t *sdp = NULL; str idslist; if(parse_sdp(msg) < 0) { @@ -353,10 +359,17 @@ int sdp_remove_codecs_by_name(sip_msg_t* msg, str* codecs) return -1; } - LM_ERR("attempting to remove codecs from sdp: [%.*s]\n", + sdp = (sdp_info_t*)msg->body; + + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + LM_DBG("attempting to remove codecs from sdp: [%.*s]\n", codecs->len, codecs->s); - if(sdpops_build_ids_list((sdp_info_t*)msg->body, codecs, &idslist)<0) + if(sdpops_build_ids_list(sdp, codecs, &idslist)<0) return -1; if(sdp_remove_codecs_by_id(msg, &idslist)<0) @@ -409,11 +422,16 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) return -1; } - LM_ERR("attempting to keep codecs in sdp: [%.*s]\n", - codecs->len, codecs->s); - sdp = (sdp_info_t*)msg->body; + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + LM_DBG("attempting to keep codecs in sdp: [%.*s]\n", + codecs->len, codecs->s); + sdp_session_num = 0; for(;;) { @@ -481,6 +499,7 @@ static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char* bar) */ int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) { + sdp_info_t *sdp = NULL; str idslist; if(parse_sdp(msg) < 0) { @@ -488,10 +507,17 @@ int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) return -1; } - LM_ERR("attempting to keep codecs in sdp: [%.*s]\n", + sdp = (sdp_info_t*)msg->body; + + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + LM_DBG("attempting to keep codecs in sdp: [%.*s]\n", codecs->len, codecs->s); - if(sdpops_build_ids_list((sdp_info_t*)msg->body, codecs, &idslist)<0) + if(sdpops_build_ids_list(sdp, codecs, &idslist)<0) return -1; if(sdp_keep_codecs_by_id(msg, &idslist)<0)

1 0

[tracker] Comment added: get_body_part2 (parse_body)
by sip-router 31 Oct '11

31 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#170 - get_body_part2 (parse_body) User who did this - Luis Martin (lmartin) ---------- There could scenarios where more than one multipart part with the same TYPE/SUBTYPE are conveyed within the SIP message. How to search for the correct one? In that cases the Content-ID should be provided and is gonna be the key in your multipart search. Let's say there is an incoming SIP INVITE with some xml information: Session Initiation Protocol Request-Line: INVITE Method: INVITE (...) Message Header (...) Content-Type: multipart/mixed;boundary=unique-boundary-001 Content-Length: 900 Message Body MIME Multipart Media Encapsulation, Type: multipart/mixed, Boundary: "unique-boundary-001" [Type: multipart/mixed] Preamble First boundary: --unique-boundary-001\r\n Encapsulated multipart part: (application/sdp) Content-Type: application/sdp\r\n Content-Length: 400\r\n\r\n Session Description Protocol (...) Boundary: \r\n--unique-boundary-001\r\n Encapsulated multipart part: (application/xml) Content-ID: content1\r\n Content-Type: application/xml\r\n Content-Length: 300\r\n\r\n eXtensible Markup Language (...) Boundary: \r\n--unique-boundary-001\r\n Encapsulated multipart part: (application/xml) Content-ID: content2\r\n Content-Type: application/xml\r\n Content-Length: 200\r\n\r\n eXtensible Markup Language (...) Last boundary: \r\n--unique-boundary-001--\r\n What if you want to get the second application/xml part of the multipart message? get_body_part can't retrieve that get_body_part2 can retrieve that part with: "get_body_part2(msg, APPLICATION, XML, "content2", NULL, &len)" and also with: "get_body_part2(msg, 0, 0, "content2", NULL, &len)" Hope it helps, Luis ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=170#comment313 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules_k/textops: added missing in_list() implementation
by Juha Heinanen 29 Oct '11

29 Oct '11

Module: sip-router Branch: master Commit: f4f9bf6f33feee9efbd38944c45e4fad0db594ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4f9bf6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Oct 29 18:57:50 2011 +0300 modules_k/textops: added missing in_list() implementation - For some reason merge from jh/32plus branch to master missed in_list() implementation. --- modules_k/textops/textops.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 8d2a2a7..4fabd22 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -123,6 +123,8 @@ static int set_body_f(struct sip_msg* msg, char*, char *); static int set_rpl_body_f(struct sip_msg* msg, char*, char *); static int is_method_f(struct sip_msg* msg, char* , char *); static int has_body_f(struct sip_msg *msg, char *type, char *str2 ); +static int in_list_f(struct sip_msg* _msg, char* _subject, char* _list, + char* _sep); static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); @@ -135,6 +137,8 @@ static int free_hname_fixup(void** param, int param_no); static int fixup_method(void** param, int param_no); static int add_header_fixup(void** param, int param_no); static int fixup_body_type(void** param, int param_no); +static int fixup_in_list(void** param, int param_no); +static int fixup_free_in_list(void** param, int param_no); int fixup_regexpNL_none(void** param, int param_no); static int mod_init(void); @@ -240,6 +244,9 @@ static cmd_export_t cmds[]={ {"is_privacy", (cmd_function)is_privacy_f, 1, fixup_privacy, 0, ANY_ROUTE}, + {"in_list", (cmd_function)in_list_f, 3, fixup_in_list, + fixup_free_in_list, + ANY_ROUTE}, {"cmp_str", (cmd_function)cmp_str_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, @@ -1770,6 +1777,42 @@ int fixup_privacy(void** param, int param_no) return 0; } +/* + * Fix in_list params: subject and list (strings that may contain pvars), + * separator (string) + */ +static int fixup_in_list(void** param, int param_no) +{ + if ((param_no == 1) || (param_no == 2)) return fixup_spve_null(param, 1); + + if (param_no == 3) { + if ((strlen((char *)*param) != 1) || (*((char *)(*param)) == 0)) { + LM_ERR("invalid separator parameter\n"); + return -1; + } + return 0; + } + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + +/* + * Free in_list params + */ +static int fixup_free_in_list(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 0; + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + static int add_header_fixup(void** param, int param_no) { if(param_no==1) @@ -1861,6 +1904,59 @@ int is_privacy_f(struct sip_msg *msg, char *_privacy, char *str2 ) } +/* + * Checks if subject is found in list + */ +int in_list_f(struct sip_msg* _m, char* _subject, char* _list, char* _sep) +{ + str subject, list; + int sep; + char *at, *past, *s; + + if (fixup_get_svalue(_m, (gparam_p)_subject, &subject) != 0) { + LM_ERR("cannot get subject value\n"); + return -1; + } else { + if (subject.len == 0) { + LM_ERR("subject cannot be empty string\n"); + return -1; + } + } + + if (fixup_get_svalue(_m, (gparam_p)_list, &list) != 0) { + LM_ERR("cannot get list value\n"); + return -1; + } else { + if (list.len == 0) return -1; + } + + sep = _sep[0]; + + at = list.s; + past = list.s + list.len; + + while (at < past) { + s = index(at, sep); + if (s == NULL) { + if ((subject.len == (past - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + return -1; + } + } else { + if ((subject.len == (s - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + at = s + 1; + } + } + } + + return -1; +} + static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ) { str s1;

1 0

[tracker] Comment added: get_body_part2 (parse_body)
by sip-router 29 Oct '11

29 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#170 - get_body_part2 (parse_body) User who did this - Iñaki Baz Castillo (ibc) ---------- Hi, I'm not an expert in multipart bodies. What is the use case of matching by Content-ID? Could you please explain it with an example? Thanks a lot. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=170#comment312 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.1: dialog(k): remove invalid html tags from docbook xml
by Daniel-Constantin Mierla 28 Oct '11

28 Oct '11

Module: sip-router Branch: 3.1 Commit: d2aa35ea1ee08cb89d56a7e426bca1d0eb72863a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2aa35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 28 21:24:23 2011 +0200 dialog(k): remove invalid html tags from docbook xml --- modules_k/dialog/README | 192 +++++++++++++++++---------------- modules_k/dialog/doc/dialog_admin.xml | 4 +- 2 files changed, 102 insertions(+), 94 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d2a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011