sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
231 discussions

git:master: utils: Updated auto-generated db schema changes.
by Andreas Granig 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: b30267a4669a7621a4e9b86030d59b6ef9759517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b30267a… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Thu Dec 22 00:23:36 2011 +0100 utils: Updated auto-generated db schema changes. - Generated schema files for lcr ip_addr changes. --- utils/kamctl/db_sqlite/lcr-create.sql | 2 +- utils/kamctl/mysql/lcr-create.sql | 2 +- utils/kamctl/oracle/lcr-create.sql | 2 +- utils/kamctl/postgres/lcr-create.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/db_sqlite/lcr-create.sql b/utils/kamctl/db_sqlite/lcr-create.sql index 0671625..8cb83e6 100644 --- a/utils/kamctl/db_sqlite/lcr-create.sql +++ b/utils/kamctl/db_sqlite/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id INTEGER PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64), diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index f0887c5..696e095 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT UNSIGNED, params VARCHAR(64), diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index bdf3dc2..9c2f090 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id NUMBER(10) PRIMARY KEY, lcr_id NUMBER(5), gw_name VARCHAR2(128), - ip_addr VARCHAR2(15), + ip_addr VARCHAR2(47), hostname VARCHAR2(64), port NUMBER(5), params VARCHAR2(64), diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 316e3ab..669c1c9 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id SERIAL PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64),

1 0

git:master: core/tcp: define option TCP_CLONE_RCVBUF to turn off/ on tcp rcv buffer cloning
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: a510d17d7005fa47d4f2a672b4ceb94fbda9c9ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a510d17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 20 22:34:26 2011 +0100 core/tcp: define option TCP_CLONE_RCVBUF to turn off/on tcp rcv buffer cloning - cloning is on by default, to be safe for topoh and msg_apply_changes() --- tcp_read.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index c180301..c86a2dd 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -856,8 +856,10 @@ skip: * the content of the stream. Safer, make a clone of buf content in a local * buffer and give that to receive_msg() to link to msg->buf */ +#define TCP_CLONE_RCVBUF int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info) { +#ifdef TCP_CLONE_RCVBUF #ifdef DYN_BUF char *buf = NULL; #else @@ -903,6 +905,9 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_inf memcpy(buf, tcpbuf, len); buf[len] = '\0'; return receive_msg(buf, len, rcv_info); +#else /* TCP_CLONE_RCVBUF */ + return receive_msg(tcpbuf, len, rcv_info); +#endif /* TCP_CLONE_RCVBUF */ } int tcp_read_req(struct tcp_connection* con, int* bytes_read, int* read_flags)

2 1

Where to see the content written by "xlog" ??
by Albert (Jinku) Gu 21 Dec '11

21 Dec '11

I am a newer for kamailio. Anybody could help me ? Thanks very much! Albert.gu

2 1

[tracker] Comment added: Add additional tm callbacks
by sip-router 21 Dec '11

21 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#124 - Add additional tm callbacks User who did this - Timo Reimann (tr) ---------- Implemented in branch treimann/master_tm-extend-callbacks. Work left: Merge into master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=124#comment475 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

[tracker] Comment added: Provide processed message in tm callbacks whenever possible
by sip-router 21 Dec '11

21 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#123 - Provide processed message in tm callbacks whenever possible User who did this - Timo Reimann (tr) ---------- Implemented in branch treimann/master_tm-extend-callbacks. Work left: Merge into master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=123#comment474 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:treimann/master_tm-extend-callbacks: Merge branch 'master' into treimann/master_tm-extend-callbacks
by Timo Reimann 21 Dec '11

21 Dec '11

Module: sip-router Branch: treimann/master_tm-extend-callbacks Commit: dfaee1cdfaaf33a0232bbb61cde018fadce500e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfaee1c… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Wed Dec 21 20:01:06 2011 +0100 Merge branch 'master' into treimann/master_tm-extend-callbacks * master: (201 commits) modules: bunch of READMEs regenerated to be sync'ed with docbook modules: coherent naming of Statistics section in docbook sl: regenerated the readme sl: documented exported statistics core/tcp: define option TCP_CLONE_RCVBUF to turn off/on tcp rcv buffer cloning pdt(k): added rpc command pdt.reload pdt(k): MI commands can be disabled via define PDT_NO_MI pdt(k): updates to documentation pdt: refactored prefix-domain translation tcp: fix for ENOTCONN on newer FreeBSDs dialplan: added fnmatch (2) matching operator core/tcp: init max_tls_connections in tcp options check core/tcp: proper init of parameter tls_max_connections textopsx: added fnmatch(value, expr, flags) function core: added function to help fixup of PVE, string and expressions registrar(k): maintaining one contact per AoR has priority over max_contacts lib/srdb1: Enable non-pooled database connections to be defined. modules_k/presence: Added additional return value to pres_auth_status() for polite-block tls: new parameter 'renegotiation' to enable/disable client renegotiation tls: use pkg-config to get cflags and libs for compilation ... ---

1 0

git:master: sdpops: readme is updated with documentation of latest additions
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: 3f442da8cd9b02bd942a7a8098e6803e9c0b77e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f442da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 17:42:23 2011 +0100 sdpops: readme is updated with documentation of latest additions --- modules/sdpops/README | 105 ++++++++++++++++++++++++++++------- modules/sdpops/doc/sdpops_admin.xml | 89 ++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 24 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3f4…

1 0

git:master: sdpops: keep codecs functions can do filtering on media type
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: 53d2ca58c013289e55a771ff69ad1448ef912aae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53d2ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 14:18:51 2011 +0100 sdpops: keep codecs functions can do filtering on media type - a second optional paramter with media type can be given to keep codecs function to avoid removing codecs from wrong media stream --- modules/sdpops/sdpops_mod.c | 69 ++++++++++++++++++++++++++++++------------ 1 files changed, 49 insertions(+), 20 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 6806c4b..2dc8aaa 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -57,8 +57,12 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_keep_codecs_by_id", (cmd_function)w_sdp_keep_codecs_by_id, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_keep_codecs_by_id", (cmd_function)w_sdp_keep_codecs_by_id, + 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sdp_keep_codecs_by_name", (cmd_function)w_sdp_keep_codecs_by_name, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_keep_codecs_by_name", (cmd_function)w_sdp_keep_codecs_by_name, + 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sdp_with_media", (cmd_function)w_sdp_with_media, 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_codecs_by_id", (cmd_function)w_sdp_with_codecs_by_id, @@ -412,7 +416,7 @@ static int w_sdp_remove_codecs_by_name(sip_msg_t* msg, char* codecs, char* bar) /** * */ -int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) +int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs, str *media) { sdp_info_t *sdp = NULL; int sdp_session_num; @@ -452,20 +456,26 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) LM_DBG("stream %d of %d - payloads [%.*s]\n", sdp_stream_num, sdp_session_num, sdp_stream->payloads.len, sdp_stream->payloads.s); - sdp_codecs = sdp_stream->payloads; - tmp_codecs = sdp_stream->payloads; - while(str_find_token(&tmp_codecs, &rm_codec, ' ')==0 - && rm_codec.len>0) + if((media==NULL) + || (media->len==sdp_stream->media.len + && strncasecmp(sdp_stream->media.s, media->s, + media->len)==0)) { - tmp_codecs.len -=(int)(&rm_codec.s[rm_codec.len]-tmp_codecs.s); - tmp_codecs.s = rm_codec.s + rm_codec.len; - - if(sdp_codec_in_str(codecs, &rm_codec, ',')==0) { - LM_DBG("codecs [%.*s] - remove [%.*s]\n", - sdp_codecs.len, sdp_codecs.s, - rm_codec.len, rm_codec.s); - sdp_remove_str_codec_id(msg, &sdp_codecs, &rm_codec); - sdp_remove_str_codec_id_attrs(msg, sdp_stream, &rm_codec); + sdp_codecs = sdp_stream->payloads; + tmp_codecs = sdp_stream->payloads; + while(str_find_token(&tmp_codecs, &rm_codec, ' ')==0 + && rm_codec.len>0) + { + tmp_codecs.len -=(int)(&rm_codec.s[rm_codec.len]-tmp_codecs.s); + tmp_codecs.s = rm_codec.s + rm_codec.len; + + if(sdp_codec_in_str(codecs, &rm_codec, ',')==0) { + LM_DBG("codecs [%.*s] - remove [%.*s]\n", + sdp_codecs.len, sdp_codecs.s, + rm_codec.len, rm_codec.s); + sdp_remove_str_codec_id(msg, &sdp_codecs, &rm_codec); + sdp_remove_str_codec_id_attrs(msg, sdp_stream, &rm_codec); + } } } sdp_stream_num++; @@ -479,9 +489,10 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs) /** * */ -static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char* bar) +static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char* media) { str lcodecs = {0, 0}; + str lmedia = {0, 0}; if(codecs==0) { @@ -494,8 +505,16 @@ static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char* bar) LM_ERR("unable to get the list of codecs\n"); return -1; } + if(media!=NULL) + { + if(fixup_get_svalue(msg, (gparam_p)media, &lmedia)!=0) + { + LM_ERR("unable to get the media type\n"); + return -1; + } + } - if(sdp_keep_codecs_by_id(msg, &lcodecs)<0) + if(sdp_keep_codecs_by_id(msg, &lcodecs, (media)?&lmedia:NULL)<0) return -1; return 1; } @@ -503,7 +522,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) +int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs, str *media) { sdp_info_t *sdp = NULL; str idslist; @@ -526,7 +545,7 @@ int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) if(sdpops_build_ids_list(sdp, codecs, &idslist)<0) return -1; - if(sdp_keep_codecs_by_id(msg, &idslist)<0) + if(sdp_keep_codecs_by_id(msg, &idslist, media)<0) return -1; return 0; @@ -536,9 +555,10 @@ int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) /** * */ -static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char* bar) +static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char* media) { str lcodecs = {0, 0}; + str lmedia = {0, 0}; if(codecs==0) { @@ -552,7 +572,16 @@ static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char* bar) return -1; } - if(sdp_keep_codecs_by_name(msg, &lcodecs)<0) + if(media!=NULL) + { + if(fixup_get_svalue(msg, (gparam_p)media, &lmedia)!=0) + { + LM_ERR("unable to get the media type\n"); + return -1; + } + } + + if(sdp_keep_codecs_by_name(msg, &lcodecs, (media)?&lmedia:NULL)<0) return -1; return 1; }

1 0

git:master: sdpops: added sdp_remove_media(type)
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: ea6338ea145a393f147ea31739a4d7580c6e11da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6338e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 15:15:25 2011 +0100 sdpops: added sdp_remove_media(type) - remove the media streams matching the type - e.g., sdp_remove_media("video"); --- modules/sdpops/sdpops_mod.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 2dc8aaa..be2e840 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -46,6 +46,7 @@ static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codec, char *bar); +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 mod_init(void); @@ -65,6 +66,8 @@ static cmd_export_t cmds[] = { 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sdp_with_media", (cmd_function)w_sdp_with_media, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_remove_media", (cmd_function)w_sdp_remove_media, + 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_codecs_by_id", (cmd_function)w_sdp_with_codecs_by_id, 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_codecs_by_name", (cmd_function)w_sdp_with_codecs_by_name, @@ -659,6 +662,107 @@ static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar) } /** + * @brief remove streams matching the m='media' + * @return -1 - error; 0 - not found; >=1 - found + */ +static int sdp_remove_media(sip_msg_t *msg, str *media) +{ + sdp_info_t *sdp = NULL; + int sdp_session_num; + int sdp_stream_num; + sdp_session_cell_t* sdp_session; + sdp_stream_cell_t* sdp_stream; + sdp_stream_cell_t* nxt_stream; + int ret = 0; + char *dstart = NULL; + int dlen = 0; + struct lump *anchor; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + LM_DBG("attempting to search for media type: [%.*s]\n", + media->len, media->s); + + sdp = (sdp_info_t*)msg->body; + + sdp_session_num = 0; + for(;;) + { + sdp_session = get_sdp_session(msg, sdp_session_num); + if(!sdp_session) break; + sdp_stream_num = 0; + for(;;) + { + sdp_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num); + if(!sdp_stream) break; + + LM_DBG("stream %d of %d - media [%.*s]\n", + sdp_stream_num, sdp_session_num, + sdp_stream->media.len, sdp_stream->media.s); + if(media->len==sdp_stream->media.len + && strncasecmp(sdp_stream->media.s, media->s, + media->len)==0) + { + /* found - remove */ + LM_DBG("removing media stream: %.*s", media->len, media->s); + nxt_stream = get_sdp_stream(msg, sdp_session_num, + sdp_stream_num+1); + /* skip back 'm=' */ + dstart = sdp_stream->media.s - 2; + if(!nxt_stream) { + /* delete to end of sdp */ + dlen = (int)(sdp->text.s + sdp->text.len - dstart); + } else { + /* delete to start of next stream */ + dlen = (int)(nxt_stream->media.s - 2 - dstart); + } + anchor = del_lump(msg, dstart - msg->buf, dlen, 0); + if (anchor == NULL) { + LM_ERR("failed to remove media type [%.*s]\n", + media->len, media->s); + return -1; + } + + ret++; + } + sdp_stream_num++; + } + sdp_session_num++; + } + + return ret; +} + + +/** + * + */ +static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar) +{ + str lmedia = {0, 0}; + + if(media==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)media, &lmedia)!=0) + { + LM_ERR("unable to get the media value\n"); + return -1; + } + + if(sdp_remove_media(msg, &lmedia)<=0) + return -1; + return 1; +} + + +/** * */ int sdp_with_codecs_by_id(sip_msg_t* msg, str* codecs)

1 0

git:master: sdpops: added functions to test the presence of codecs
by Daniel-Constantin Mierla 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: 0331f328d1dcdfc7f95fbe1181ec669421184ced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0331f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 13:56:15 2011 +0100 sdpops: added functions to test the presence of codecs - sdp_with_codecs_by_id(idlist) - sdp_with_codecs_by_name(namelist) --- modules/sdpops/sdpops_mod.c | 149 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index cfd4ae0..6806c4b 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -44,6 +44,8 @@ static int w_sdp_remove_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar); static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar); +static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codec, char *bar); +static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); static int mod_init(void); @@ -59,6 +61,10 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_media", (cmd_function)w_sdp_with_media, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_with_codecs_by_id", (cmd_function)w_sdp_with_codecs_by_id, + 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sdp_with_codecs_by_name", (cmd_function)w_sdp_with_codecs_by_name, + 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_print", (cmd_function)w_sdp_print, 1, fixup_igp_null, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, @@ -623,6 +629,149 @@ static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar) return 1; } +/** + * + */ +int sdp_with_codecs_by_id(sip_msg_t* msg, str* codecs) +{ + sdp_info_t *sdp = NULL; + int sdp_session_num; + int sdp_stream_num; + sdp_session_cell_t* sdp_session; + sdp_stream_cell_t* sdp_stream; + str sdp_codecs; + str tmp_codecs; + str fnd_codec; + int foundone = 0; + int notfound = 0; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + sdp = (sdp_info_t*)msg->body; + + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + LM_DBG("attempting to search codecs in sdp: [%.*s]\n", + codecs->len, codecs->s); + + sdp_session_num = 0; + for(;;) + { + sdp_session = get_sdp_session(msg, sdp_session_num); + if(!sdp_session) break; + sdp_stream_num = 0; + for(;;) + { + sdp_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num); + if(!sdp_stream) break; + + LM_DBG("stream %d of %d - payloads [%.*s]\n", + sdp_stream_num, sdp_session_num, + sdp_stream->payloads.len, sdp_stream->payloads.s); + sdp_codecs = sdp_stream->payloads; + tmp_codecs = *codecs; + while(str_find_token(&tmp_codecs, &fnd_codec, ',')==0 + && fnd_codec.len>0) + { + tmp_codecs.len -=(int)(&fnd_codec.s[fnd_codec.len]-tmp_codecs.s); + tmp_codecs.s = fnd_codec.s + fnd_codec.len; + + if(sdp_codec_in_str(&sdp_codecs, &fnd_codec, ' ')==0) { + LM_DBG("codecs [%.*s] - not found [%.*s]\n", + sdp_codecs.len, sdp_codecs.s, + fnd_codec.len, fnd_codec.s); + notfound = 1; + } else { + LM_DBG("codecs [%.*s] - found [%.*s]\n", + sdp_codecs.len, sdp_codecs.s, + fnd_codec.len, fnd_codec.s); + foundone = 1; + } + } + sdp_stream_num++; + } + sdp_session_num++; + } + + return (foundone + ((foundone)?notfound:0)); +} + +/** + * + */ +static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codecs, char *bar) +{ + str lcodecs = {0, 0}; + int ret; + + if(codecs==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)codecs, &lcodecs)!=0) + { + LM_ERR("unable to get the codecs\n"); + return -1; + } + + ret = sdp_with_codecs_by_id(msg, &lcodecs); + /* ret: -1 error; 0 not found */ + if(ret<=0) + return (ret - 1); + return ret; +} + +/** + * + */ +static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar) +{ + str lcodecs = {0, 0}; + str idslist; + sdp_info_t *sdp = NULL; + int ret; + + if(codecs==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)codecs, &lcodecs)!=0) + { + LM_ERR("unable to get the codecs\n"); + return -1; + } + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + + sdp = (sdp_info_t*)msg->body; + + if(sdp==NULL) { + LM_DBG("No sdp body\n"); + return -1; + } + + if(sdpops_build_ids_list(sdp, &lcodecs, &idslist)<0) + return -1; + + ret = sdp_with_codecs_by_id(msg, &idslist); + /* ret: -1 error; 0 not found */ + if(ret<=0) + return (ret - 1); + return ret; +} /** *

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011