sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:ez/sdpops: modules/sdpops: fixed segfault wnen msg-> body is NULL on invalid sdp.
by Konstantin Mosesov 13 May '13

13 May '13

Module: sip-router Branch: ez/sdpops Commit: 9fc6f005f1019f2f311bc04d9ed9ffbd2672563f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fc6f00… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Mon May 13 14:02:16 2013 +0300 modules/sdpops: fixed segfault wnen msg->body is NULL on invalid sdp. --- modules/sdpops/sdpops_mod.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index de6914b..6a34bb2 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -1128,6 +1128,7 @@ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) */ static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *prefix) { + sdp_info_t *sdp = NULL; str body = {NULL, 0}; str line = {NULL, 0}; char* p = NULL; @@ -1137,6 +1138,7 @@ static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *prefix) int_str avp_name; pv_spec_t *avp_spec = NULL; static unsigned short avp_type = 0; + int sdp_missing=1; if (prefix == NULL || strlen(prefix) <= 0) { @@ -1146,13 +1148,23 @@ static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *prefix) pprefix.s = prefix; pprefix.len = strlen(prefix); - if(parse_sdp(msg) < 0) { + sdp_missing = parse_sdp(msg); + + if(sdp_missing < 0) { LM_ERR("Unable to parse sdp\n"); return -1; } - body.s = ((sdp_info_t*)msg->body)->raw_sdp.s; - body.len = ((sdp_info_t*)msg->body)->raw_sdp.len; + sdp = (sdp_info_t *)msg->body; + + if (sdp_missing || sdp == NULL) + { + LM_DBG("No SDP\n"); + return -2; + } + + body.s = sdp->raw_sdp.s; + body.len = sdp->raw_sdp.len; if (body.s==NULL) { LM_ERR("failed to get the message body\n");

1 0

binary packages and OpenSSL
by Daniel Pocock 13 May '13

13 May '13

Just some further thoughts on the problems facing binary packages with TLS support I don't know the TLS code in any detail at all, but to what extent could it be split into a standalone binary module? Here is the possible solution: - single source package (kamailio.tar.gz) or maybe even separate source - TLS-related files in a subdirectory for building a module - TLS-related files re-licensed under BSD terms - compiling and running core doesn't require the TLS source or binary When uploading to Debian, Fedora, etc, there would be two artifacts: kamailio-core.deb (GPL license) kamailio-tls.deb (optional, BSD licensed, depends: openssl) It then becomes possible for users who want TLS support to just do # apt-get install kamailio kamailio-tls or something like that. The challenges: - ensuring that the low-level TLS support (any code that uses OpenSSL API) can be separated into a module - ensuring that any previous contributors on the affected code are happy to have it re-licensed Of course, solving the first challenge (separating the low level code) probably brings the project closer to having adaptable support for GnuTLS in future. I realise that TLS is intricately tied up in the SIP protocol (e.g. inserting proper transport parameters in Via headers, sips URI, ...), but the licensing problem really only kicks in where the OpenSSL API is used. As long as there is an abstraction layer and the high-level code doesn't use OpenSSL API directly, this may not be difficult to solve. Regards, Daniel

2 1

git:master: modules/usrloc and registrar: added possibility to unregister without aor
by Juha Heinanen 13 May '13

13 May '13

Module: sip-router Branch: master Commit: 6c3853981a7574cd162117ef0d98dba205193d1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c38539… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 13 15:26:57 2013 +0300 modules/usrloc and registrar: added possibility to unregister without aor - added possibility to unregister without aor if usrloc uses db_mode=3 - added new usrloc api function delete_urecord_by_ruid() --- modules/registrar/README | 4 +- modules/registrar/doc/registrar_admin.xml | 5 +- modules/registrar/reg_mod.c | 6 +- modules/registrar/save.c | 52 ++++++++++---- modules/usrloc/README | 109 ++++++++++++++++------------- modules/usrloc/doc/usrloc_devel.xml | 25 +++++++ modules/usrloc/urecord.c | 44 ++++++++++++ modules/usrloc/urecord.h | 10 +++ modules/usrloc/usrloc.c | 1 + modules/usrloc/usrloc.h | 3 + 10 files changed, 192 insertions(+), 67 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6c3…

1 0

git:ez/sdpops: modules/tm: added missing callid in uac_req_t definition
by Konstantin Mosesov 13 May '13

13 May '13

Module: sip-router Branch: ez/sdpops Commit: 24e2418eceac5fe029d945ff99680ed409ba0a80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24e2418… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Mon May 13 12:58:03 2013 +0300 modules/tm: added missing callid in uac_req_t definition --- modules/tm/uac.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 619d43e..69376b4 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -58,6 +58,7 @@ typedef struct uac_req { int cb_flags; transaction_cb *cb; void *cbp; + str *callid; } uac_req_t; /* macro for setting the values of uac_req_t struct */

1 0

git:ez/sdpops: modules/sdpops: added sdp_get_line_startswith(avpvar, string ) - fetch 'string' in SDP body and store line in an AVP.
by Konstantin Mosesov 13 May '13

13 May '13

Module: sip-router Branch: ez/sdpops Commit: ac324a6163fecd30be24074cd34778b6d600a225 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac324a6… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 11 20:49:41 2013 +0300 modules/sdpops: added sdp_get_line_startswith(avpvar, string) - fetch 'string' in SDP body and store line in an AVP. --- modules/sdpops/doc/sdpops_admin.xml | 22 +++++++ modules/sdpops/sdpops_mod.c | 110 +++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 0 deletions(-) diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index 831669e..d644625 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -366,6 +366,28 @@ if(sdp_content()) { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">sdp_get_line_startswith(avpvar, string)</function> + </title> + <para> + Store the search part of SDP body message with line beginning with 'string' in an AVP. + Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sdp_get_line_startswith</function> usage</title> + <programlisting format="linespecific"> +... +if(sdp_get_line_startswith("m=", "$avp(mline)")) { + xlog("m-line: $avp(mline)\n"); +} +... +</programlisting> + </example> + </section> </section> </chapter> diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 2d2e668..de6914b 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -52,6 +52,8 @@ static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); static int w_sdp_get(sip_msg_t* msg, char *bar); static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar); +static int w_sdp_get_line_startswith(sip_msg_t* msg, char *foo, char* bar); + static int mod_init(void); @@ -84,6 +86,8 @@ static cmd_export_t cmds[] = { 1, 0, 0, ANY_ROUTE}, {"sdp_content", (cmd_function)w_sdp_content, 0, 0, 0, ANY_ROUTE}, + {"sdp_get_line_startswith", (cmd_function)w_sdp_get_line_startswith, + 2, 0, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -1122,6 +1126,112 @@ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) /** * */ +static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *prefix) +{ + str body = {NULL, 0}; + str line = {NULL, 0}; + char* p = NULL; + str s; + str pprefix; + int_str avp_val; + int_str avp_name; + pv_spec_t *avp_spec = NULL; + static unsigned short avp_type = 0; + + if (prefix == NULL || strlen(prefix) <= 0) + { + LM_ERR("Prefix is null or empty\n"); + return -1; + } + pprefix.s = prefix; + pprefix.len = strlen(prefix); + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + body.s = ((sdp_info_t*)msg->body)->raw_sdp.s; + body.len = ((sdp_info_t*)msg->body)->raw_sdp.len; + + if (body.s==NULL) { + LM_ERR("failed to get the message body\n"); + return -1; + } + body.len = msg->len - (body.s - msg->buf); + if (body.len==0) { + LM_DBG("message body has zero length\n"); + return -1; + } + + if (avp == NULL || strlen(avp) <= 0) + { + LM_ERR("avp variable is null or empty\n"); + return -1; + } + + s.s = avp; + s.len = strlen(s.s); + + if (pv_locate_name(&s) != s.len) + { + LM_ERR("invalid parameter\n"); + return -1; + } + + if (((avp_spec = pv_cache_get(&s)) == NULL) + || avp_spec->type!=PVT_AVP) { + LM_ERR("malformed or non AVP %s AVP definition\n", avp); + return -1; + } + + if(pv_get_avp_name(0, &avp_spec->pvp, &avp_name, &avp_type)!=0) + { + LM_ERR("[%s]- invalid AVP definition\n", avp); + return -1; + } + + p = find_sdp_line(body.s, body.s+body.len, pprefix.s[0]); + while (p != NULL) + { + if (sdp_locate_line(msg, p, &line) != 0) + { + LM_ERR("sdp_locate_line fail\n"); + return -1; + } + + if (strncmp(line.s, pprefix.s, pprefix.len) == 0) + { + avp_val.s.s = line.s; + avp_val.s.len = line.len; + + // removed ending \r\n if exists + if (avp_val.s.s[line.len-2] == '\r' && avp_val.s.s[line.len-1] == '\n') + { + avp_val.s.s[line.len-2] = '\0'; + avp_val.s.len -= 2; + } + + + if (add_avp(AVP_VAL_STR | avp_type, avp_name, avp_val) != 0) + { + LM_ERR("Failed to add SDP line avp"); + return -1; + } + + return 1; + } + + p = find_sdp_line(line.s + line.len, body.s + body.len, pprefix.s[0]); + } + + return 0; +} + + +/** + * + */ int bind_sdpops(struct sdpops_binds *sob){ if (sob == NULL) { LM_WARN("bind_sdpops: Cannot load sdpops API into a NULL pointer\n");

3 2

git:ez/sdpops: modules/sdpops: corrected arguments misstype in dp_get_line_startswith()
by Konstantin Mosesov 13 May '13

13 May '13

Module: sip-router Branch: ez/sdpops Commit: 7d094f8940f160b60c9ae100777028a615c28868 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d094f8… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Mon May 13 12:13:04 2013 +0300 modules/sdpops: corrected arguments misstype in dp_get_line_startswith() --- modules/sdpops/doc/sdpops_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index d644625..6ddce4b 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -381,7 +381,7 @@ if(sdp_content()) { <title><function>sdp_get_line_startswith</function> usage</title> <programlisting format="linespecific"> ... -if(sdp_get_line_startswith("m=", "$avp(mline)")) { +if(sdp_get_line_startswith("$avp(mline)", "m=")) { xlog("m-line: $avp(mline)\n"); } ...

1 0

unregister does not lock udomain
by Juha Heinanen 13 May '13

13 May '13

while reading registrar/usrloc code, i noticed that save.c/unregister() calls ul.unlock_udomain() without ever calling ul.lock_udomain(). is this a bug? -- juha

2 3

git:master: core: debug message to show mapping of routing block names to ids
by Daniel-Constantin Mierla 13 May '13

13 May '13

Module: sip-router Branch: master Commit: 80e8058d9acea7c994819d043456fd1b449b048b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80e8058… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 13 10:59:20 2013 +0200 core: debug message to show mapping of routing block names to ids --- route.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/route.c b/route.c index 17c1b56..1c5897c 100644 --- a/route.c +++ b/route.c @@ -161,6 +161,7 @@ static int route_add(struct route_list* rt, char* name, int i) LOG(L_CRIT, "ERROR: route_add: out of memory\n"); goto error; } + LM_DBG("mapping routing block (%p)[%s] to %d\n", rt, name, i); e->key.s=name; e->key.len=strlen(name); e->flags=0;

1 0

git:master: msrp: cache in a local variable if tls module is loaded
by Daniel-Constantin Mierla 13 May '13

13 May '13

Module: sip-router Branch: master Commit: 32951506dff11df32c03230c1548553838140574 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3295150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 13 10:35:35 2013 +0200 msrp: cache in a local variable if tls module is loaded - avoid looping at runtime through the list of modules --- modules/msrp/msrp_cmap.c | 5 +++-- modules/msrp/msrp_mod.c | 3 +++ modules/msrp/msrp_vars.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/msrp/msrp_cmap.c b/modules/msrp/msrp_cmap.c index 5ae3b0c..0ae14a6 100644 --- a/modules/msrp/msrp_cmap.c +++ b/modules/msrp/msrp_cmap.c @@ -43,6 +43,7 @@ static sruid_t _msrp_sruid; extern int msrp_auth_min_expires; extern int msrp_auth_max_expires; +extern int msrp_tls_module_loaded; extern str msrp_use_path_addr; /** @@ -211,8 +212,8 @@ int msrp_cmap_save(msrp_frame_t *mf) hid = msrp_get_hashid(&_msrp_sruid.uid); idx = msrp_get_slot(hid, _msrp_cmap_head->mapsize); - srcaddr.s = sbuf;; - if (module_loaded("tls")) + srcaddr.s = sbuf; + if (msrp_tls_module_loaded) { memcpy(srcaddr.s, "msrps://", 8); srcaddr.s+=8; diff --git a/modules/msrp/msrp_mod.c b/modules/msrp/msrp_mod.c index edc4666..4b85ffe 100644 --- a/modules/msrp/msrp_mod.c +++ b/modules/msrp/msrp_mod.c @@ -69,6 +69,7 @@ int msrp_auth_min_expires = 60; int msrp_auth_max_expires = 3600; int msrp_timer_interval = 60; str msrp_use_path_addr = { 0 }; +int msrp_tls_module_loaded = 0; static int msrp_frame_received(void *data); sip_msg_t *msrp_fake_sipmsg(msrp_frame_t *mf); @@ -172,6 +173,8 @@ static int mod_init(void) LM_WARN("\"tls\" module is not loaded. TLS is mandatory for" " MSRP Relays. To comply with RFC 4976 you must use" " TLS.\n"); + } else { + msrp_tls_module_loaded = 1; } return 0; diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 673b20d..7e135e5 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -36,6 +36,8 @@ #include "msrp_parser.h" #include "msrp_vars.h" +extern int msrp_tls_module_loaded; + /** * */ @@ -274,7 +276,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); s.s = pv_get_buffer(); p = s.s; - if (module_loaded("tls")) + if (msrp_tls_module_loaded) { memcpy(p, "msrps://", 8); p+=8;

1 0

git:master: Makefile.defs: devel version set to 4.1.0-dev4
by Daniel-Constantin Mierla 13 May '13

13 May '13

Module: sip-router Branch: master Commit: 65881c31b9a8aa1d4646891e8ea20d22646ce850 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65881c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 13 11:01:28 2013 +0200 Makefile.defs: devel version set to 4.1.0-dev4 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 206b9d1..87371f7 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -163,7 +163,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013