sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:jason.penton/kamailio_ims_extensions: Dialog2: expose API using only callid, from tag and to tag
by Jason Penton 27 Oct '11

27 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 7010ac9a5cd364db4684215fde4496d5a77d400a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7010ac9… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 27 15:57:17 2011 +0200 Dialog2: expose API using only callid, from tag and to tag - Removed the use of struct dlg_cell * for dialog api calls This makes using the API alot safer! --- modules_k/dialog2/dialog.c | 9 +++++-- modules_k/dialog2/dlg_cb.c | 20 +++++++++++++++++++ modules_k/dialog2/dlg_cb.h | 14 +++++++++++- modules_k/dialog2/dlg_hash.c | 25 ++++++++++++++++++++++++ modules_k/dialog2/dlg_hash.h | 2 + modules_k/dialog2/dlg_load.h | 7 ++++- modules_k/dialog2/dlg_req_within.c | 5 ++++ modules_k/dialog2/dlg_var.c | 37 ++++++++++++++++++++++++++++++++++- modules_k/dialog2/dlg_var.h | 3 ++ 9 files changed, 113 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog2/dialog.c b/modules_k/dialog2/dialog.c index 58a0210..1d64c59 100644 --- a/modules_k/dialog2/dialog.c +++ b/modules_k/dialog2/dialog.c @@ -298,11 +298,14 @@ static int fixup_dlg_terminate(void** param, int param_no) } int load_dlg(struct dlg_binds *dlgb) { + dlgb->register_dlgcb = register_dlgcb; - dlgb->set_dlg_var = set_dlg_variable; - dlgb->get_dlg_var = get_dlg_variable; + dlgb->register_dlgcb_nodlg = register_dlgcb_nodlg; + dlgb->set_dlg_var = api_set_dlg_variable; + dlgb->get_dlg_var = api_get_dlg_variable; dlgb->terminate_dlg = w_api_terminate_dlg; - dlgb->get_current_dialog = get_current_dialog; + dlgb->get_dlg_expires = api_get_dlg_expires; + return 1; } diff --git a/modules_k/dialog2/dlg_cb.c b/modules_k/dialog2/dlg_cb.c index 3cfbeae..829c5ed 100644 --- a/modules_k/dialog2/dlg_cb.c +++ b/modules_k/dialog2/dlg_cb.c @@ -100,6 +100,26 @@ void destroy_dlg_callbacks(unsigned int types) } } +int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, + int types, dialog_cb f, + void *param, param_free_cb ff ) +{ + struct dlg_cell *dlg; + + unsigned int dir = DLG_DIR_NONE; + dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! + + if (!dlg) { + LM_ERR("Can't find dialog to register callback\n"); + return -1; + } + + int ret = register_dlgcb(dlg, types, f, param, ff); + unref_dlg(dlg, 1); + + return ret; +} + int register_dlgcb(struct dlg_cell *dlg, int types, dialog_cb f, void *param, param_free_cb ff ) diff --git a/modules_k/dialog2/dlg_cb.h b/modules_k/dialog2/dlg_cb.h index 8eed01d..16be1a9 100644 --- a/modules_k/dialog2/dlg_cb.h +++ b/modules_k/dialog2/dlg_cb.h @@ -53,12 +53,21 @@ typedef void (param_free_cb) (void *param); typedef int (*register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, dialog_cb f, void *param, param_free_cb ff); +typedef int (*register_dlgcb_nodlg_f)(str *callid, str *ftag, str *ttag, int cb_types, + dialog_cb f, void *param, param_free_cb ff); + /* method to set a variable within a dialog */ -typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, +//typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, +// str* key, +// str* val); +typedef int (*set_dlg_variable_f)( str* callid, str* ftag, str* ttag, str* key, str* val); /* method to get a variable from a dialog */ -typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, +//typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, +// str* key); + +typedef str* (*get_dlg_variable_f)( str *callid, str *ftag, str *ttag, str* key); typedef struct dlg_cell* (*get_current_dlg_f)( struct sip_msg* msg); @@ -99,6 +108,7 @@ void destroy_dlg_callbacks(unsigned int type); void destroy_dlg_callbacks_list(struct dlg_callback *cb); +int register_dlgcb_nodlg(str *callid, str *ftag, str *ttag, int types, dialog_cb f, void *param, param_free_cb ff ); int register_dlgcb( struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff); void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg); diff --git a/modules_k/dialog2/dlg_hash.c b/modules_k/dialog2/dlg_hash.c index b7f85ad..57b7c3d 100644 --- a/modules_k/dialog2/dlg_hash.c +++ b/modules_k/dialog2/dlg_hash.c @@ -1712,6 +1712,31 @@ error: return NULL; } +time_t api_get_dlg_expires(str *callid, str *ftag, str *ttag) +{ + struct dlg_cell *dlg; + time_t expires = 0; + time_t start; + + if (!callid || !ftag || !ttag) { LM_ERR("Missing callid, from tag or to tag\n"); return 0; } + + unsigned int direction = DLG_DIR_NONE; + dlg = get_dlg(callid, ftag, ttag, &direction); + if (!dlg) return 0; + + if (dlg->state != DLG_STATE_CONFIRMED || !dlg->start_ts) { + /* Dialog not started yet so lets assume start time is now.*/ + start = time(0); + } else { + start = dlg->start_ts; + } + + expires = start + dlg->lifetime; + unref_dlg(dlg, 1); + + return expires; +} + diff --git a/modules_k/dialog2/dlg_hash.h b/modules_k/dialog2/dlg_hash.h index 71b786d..17602d3 100644 --- a/modules_k/dialog2/dlg_hash.h +++ b/modules_k/dialog2/dlg_hash.h @@ -597,4 +597,6 @@ int update_dlg_out_did(struct dlg_cell_out *dlg_out, str *new_did); int update_dlg_did(struct dlg_cell *dlg, str *new_did); +time_t api_get_dlg_expires(str *callid, str *ftag, str *ttag); + #endif diff --git a/modules_k/dialog2/dlg_load.h b/modules_k/dialog2/dlg_load.h index dd7e9b9..9c6ec4d 100644 --- a/modules_k/dialog2/dlg_load.h +++ b/modules_k/dialog2/dlg_load.h @@ -35,13 +35,16 @@ /* terminate_dlg function prototype */ typedef int (*terminate_dlg_f)(str *callid, str *ftag, str *ttag, str *hdrs, str *reason); +/* get_dlg_lifetime function prototype */ +typedef time_t (*get_dlg_expires_f)(str *callid, str *ftag, str *ttag); + struct dlg_binds { register_dlgcb_f register_dlgcb; + register_dlgcb_nodlg_f register_dlgcb_nodlg; terminate_dlg_f terminate_dlg; set_dlg_variable_f set_dlg_var; get_dlg_variable_f get_dlg_var; - get_current_dlg_f get_current_dialog; - + get_dlg_expires_f get_dlg_expires; }; diff --git a/modules_k/dialog2/dlg_req_within.c b/modules_k/dialog2/dlg_req_within.c index b2341d7..d4ee886 100644 --- a/modules_k/dialog2/dlg_req_within.c +++ b/modules_k/dialog2/dlg_req_within.c @@ -317,12 +317,17 @@ int dlg_terminate(struct dlg_cell *dlg, struct sip_msg *msg, str *reason, int si struct cell* t; str default_reason = {"call failed", 4}; int cfg_cmd = 0; + str default_extra_headers = {0,0}; if (!dlg) { LM_ERR("calling end_dialog with NULL pointer dlg\n"); return -1; } + if (!extra_hdrs) + extra_hdrs = & default_extra_headers; + + if (msg) { //assume called from cfg command -> dlg_terminate, as opposed to internal API or mi interface cfg_cmd = 1; diff --git a/modules_k/dialog2/dlg_var.c b/modules_k/dialog2/dlg_var.c index 8bef6f2..0ce0e7d 100644 --- a/modules_k/dialog2/dlg_var.c +++ b/modules_k/dialog2/dlg_var.c @@ -37,8 +37,7 @@ int msg_id; int dlg_cfg_cb(struct sip_msg *foo, unsigned int flags, void *bar) { - memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); - + memset(&_dlg_ctx, 0, sizeof(dlg_ctx_t)); return 1; } @@ -219,6 +218,22 @@ void print_lists(struct dlg_cell *dlg) { } } +str * api_get_dlg_variable(str *callid, str *ftag, str *ttag, str *key) { + struct dlg_cell *dlg; + + unsigned int dir = DLG_DIR_NONE; + dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! + + if (!dlg) { + LM_ERR("Asked to tear down non existent dialog\n"); + return NULL; + } + + unref_dlg(dlg, 1); + + return get_dlg_variable(dlg, key); +} + str * get_dlg_variable(struct dlg_cell *dlg, str *key) { str* var = NULL; @@ -237,6 +252,24 @@ str * get_dlg_variable(struct dlg_cell *dlg, str *key) return var; } +int api_set_dlg_variable(str *callid, str *ftag, str *ttag, str *key, str *val) { + struct dlg_cell *dlg; + + unsigned int dir = DLG_DIR_NONE; + dlg = get_dlg(callid, ftag, ttag, &dir); //increments ref count! + + if (!dlg) { + LM_ERR("Asked to tear down non existent dialog\n"); + return -1; + } + + unref_dlg(dlg, 1); + + return set_dlg_variable(dlg, key, val); + + +} + int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) { if( !dlg || !key || key->len > strlen(key->s) || (val && val->len > strlen(val->s))) diff --git a/modules_k/dialog2/dlg_var.h b/modules_k/dialog2/dlg_var.h index cd53807..dadde4d 100644 --- a/modules_k/dialog2/dlg_var.h +++ b/modules_k/dialog2/dlg_var.h @@ -49,7 +49,10 @@ struct dlg_var { struct dlg_var *next; }; +str * api_get_dlg_variable(str *callid, str *ftag, str *ttag, str *key); str * get_dlg_variable(struct dlg_cell *dlg, str *key); + +int api_set_dlg_variable(str *callid, str *ftag, str *ttag, str *key, str *val); int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val); int pv_parse_dialog_var_name(pv_spec_p sp, str *in);

1 0

Kamailio variable -> Kamailio script.
by Luis Martin Gil 27 Oct '11

27 Oct '11

Hi, I'm trying to pass a variable back to the Kamailio script from the Kamailio module. Let's say that my module is called "random" and it exports the function: static int do_this(struct sip_msg *msg, char* _information); - I pass some "_param1" and "_param2" parameters to this function from Kamailio script: (Kamailio script code) loadmodule "random.so" modparam("random", "_param1", "www.host.com") modparam("random", "_param2", 8877) - "_information" is the content I get back from the function. Reading _param1 and _param2 from the function of the module is pretty straight forward. In order to write the "_information" variable and being able to read from Kamailio script : (Module code) // this is inside do_this() function // "content" has the value of the information that I would like to pass back from the function. pv_spec_t* dst; pv_value_t val; val.rs.s = content; val.rs.len = strlen(content); val.flags = PV_VAL_STR; dst = (pv_spec_t *) _information; dst->setf(msg, &dst->pvp, (int)EQ_T, &val); >From Kamailio script I can do: (Kamailio script code) xlog("L_INFO","Calling do_this()\n"); $var(result) = do_this("$var(response)"); xlog("L_INFO","Returning do_this(). result=$var(result). uri=$var(response)\n"); And works fine. Now, I was wondering If I can have the _information parameter as this : (Kamailio script code) loadmodule "random.so" modparam("random", "_param1", "www.host.com") modparam("random", "_param2", 8877) modparam("random", "_information", $(response)) Changing the interface of the function as: static int do_this(struct sip_msg *msg); Calling from the kamailio script as this: (Kamailio script code) xlog("L_INFO","Calling do_this()\n"); $var(result) = do_this(); xlog("L_INFO","Returning do_this(). result=$var(result). uri=$var(response)\n"); But it doesn't work. Anyone is welcome to provide insight. Thanks, Luis

1 1

SIP identity - AUTH_identity
by Olle E. Johansson 27 Oct '11

27 Oct '11

Hello! Today at SIPit 29 we successfully tested the kamailio auth_identity module that implements RFC 4474. We could successfully add SIP identity headers and verify incoming headers from one other implementation. Now, the module is not built for scalability and redundance. A lot of stuff is cached in RAM, like certificates - which could lead to an DOS attack vector. It doesn't make it simple either when you have multiple servers for one domain. Maybe a memcached backend could help. We will also try to look for other attack vectors, like sending bad HTTPS URL's. Regardless, this was the first time I got SIP identity working and the others are struggling with their code to get their end working :-) Kamailio rocks. /O

3 2

git:master: docbook/Makefile: option to not use local catalog
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: master Commit: a5c9d7e4bfe5949177290671072616ab054722bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5c9d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 04:21:24 2011 +0200 docbook/Makefile: option to not use local catalog - if nocatalog=yes, the xsltproc is started without XML_CATALOG_FILES and the default ones from system are used --- docbook/Makefile | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile index 6d5408d..afe583d 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -113,6 +113,12 @@ ifeq ($(validate), 0) override xsltproc_flags := $(xsltproc_flags) --novalid endif +ifeq ($(nocatalog),yes) +XMLCATALOGX= +else +XMLCATALOGX="XML_CATALOG_FILES=$(catalog)" +endif + all_deps = Makefile $(docbook_dir)/Makefile $(docbook_dir)/entities.xml \ $(dep_xsl) $(catalog) $(extra_deps) @@ -133,12 +139,12 @@ txt text plaintext: $(txt_files) readme README: ../README ../README: $(readme_docs) $(readme_deps) $(readme_xsl) $(all_deps) - XML_CATALOG_FILES=$(catalog) $(xsltproc) $(xsltproc_flags) \ + $(XMLCATALOGX) $(xsltproc) $(xsltproc_flags) \ --xinclude \ $(readme_xsl) $< | $(lynx) $(lynx_flags) -stdin -dump > $@ $(output_dir)/%.html: %.xml %.d $(single_html_xsl) $(all_deps) - XML_CATALOG_FILES=$(catalog) $(xsltproc) $(xsltproc_flags) \ + $(XMLCATALOGX) $(xsltproc) $(xsltproc_flags) \ --xinclude \ --stringparam base.dir "$(output_dir)/" \ --stringparam root.filename "$(basename $<)" \ @@ -148,7 +154,7 @@ $(output_dir)/%.html: %.xml %.d $(single_html_xsl) $(all_deps) $(output_dir)/%.txt: %.xml %.d $(txt_xsl) $(all_deps) - XML_CATALOG_FILES=$(catalog) $(xsltproc) $(xsltproc_flags) \ + $(XMLCATALOGX) $(xsltproc) $(xsltproc_flags) \ --xinclude \ $(txt_xsl) $< | $(lynx) $(lynx_flags) -stdin -dump > $@ @@ -164,7 +170,7 @@ $(output_dir)/%.txt: %.xml %.d $(txt_xsl) $(all_deps) .PHONY: check check: $(docs) $(html_docs) $(txt_docs) $(readme_docs) - XML_CATALOG_FILES=$(catalog) $(xmllint) $(xmllint_flags) $< + $(XMLCATALOGX) $(xmllint) $(xmllint_flags) $< .PHONY: clean clean:

1 0

git:master: dialog(k): regenerated readme
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: master Commit: 5c1388c536a35d7cc8df3620b72b4eba0d31e10c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c1388c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 04:20:56 2011 +0200 dialog(k): regenerated readme --- modules_k/dialog/README | 199 ++++++++++++++++++++++++----------------------- 1 files changed, 103 insertions(+), 96 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c1…

1 0

git:3.2: dialog(k): removed invalid html tag for docbook source
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: 3.2 Commit: 639f0a4b7608217679e63e9121fcff34a5c6424c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=639f0a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 03:50:56 2011 +0200 dialog(k): removed invalid html tag for docbook source (cherry picked from commit 1d917dac68bdaf3a6aabcb644e08c00fd2f9ae0f) --- modules_k/dialog/doc/dialog_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 86a5ad2..cdc3f19 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1435,7 +1435,7 @@ dlg_refer("caller", "sip:annoucement@kamailio.org"); This function can be used from REQUEST_ROUTE. </para> <para> - IMPORTANT: Users of this function should make sure that the + IMPORTANT: Users of this function should make sure that the dialog created is further processed statefully. Specifically, if a stateless response is sent out after dlg_manage() is called, the dialog cannot be handled properly. So make sure that a transaction

1 0

git:3.2: Dialog: Fixed lurking html tag in XML doc
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: 3.2 Commit: 6eeaecbf81f07ee4f3d9453c5c3090ef8e90954b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6eeaecb… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 26 14:32:00 2011 +0200 Dialog: Fixed lurking html tag in XML doc (cherry picked from commit db308939b551a920b31bdebd76c28b5b104db68c) --- modules_k/dialog/doc/dialog_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 9bcbea1..86a5ad2 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1439,7 +1439,7 @@ dlg_refer("caller", "sip:annoucement@kamailio.org"); dialog created is further processed statefully. Specifically, if a stateless response is sent out after dlg_manage() is called, the dialog cannot be handled properly. So make sure that a transaction - exists or create it explicitly using the tm module. This is a + exists or create it explicitly using the tm module. This is a shortcoming of the current implementation that may be resolved in a future version hopefully. </para>

1 0

git:master: Makefile: increased dev version
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: master Commit: 64d6ebf337ac2df7a2334c3d0e03770e7418ed67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64d6ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 03:10:00 2011 +0200 Makefile: increased dev version --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 69f8d74..067e0cd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory debugger switcher # 0 - off (release mode)

1 0

git:master: dialog(k): removed invalid html tag for docbook source
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: master Commit: 1d917dac68bdaf3a6aabcb644e08c00fd2f9ae0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d917da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 27 03:50:56 2011 +0200 dialog(k): removed invalid html tag for docbook source --- modules_k/dialog/doc/dialog_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 86a5ad2..cdc3f19 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1435,7 +1435,7 @@ dlg_refer("caller", "sip:annoucement@kamailio.org"); This function can be used from REQUEST_ROUTE. </para> <para> - IMPORTANT: Users of this function should make sure that the + IMPORTANT: Users of this function should make sure that the dialog created is further processed statefully. Specifically, if a stateless response is sent out after dlg_manage() is called, the dialog cannot be handled properly. So make sure that a transaction

1 0

git:master: sdpops: find codec ids in sdp when not found in static table
by Daniel-Constantin Mierla 27 Oct '11

27 Oct '11

Module: sip-router Branch: master Commit: 511dc62e6a6ca74324f42b66a23bd9d80b377252 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=511dc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 26 21:21:22 2011 +0200 sdpops: find codec ids in sdp when not found in static table - functions to keep/remove codecs by name work now with dynamic ids for codecs - reported by Juha Heinanen --- modules/sdpops/sdpops_data.c | 60 +++++++++++++++++++++++++++++++++++++++-- modules/sdpops/sdpops_data.h | 4 ++- modules/sdpops/sdpops_mod.c | 4 +- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/modules/sdpops/sdpops_data.c b/modules/sdpops/sdpops_data.c index 178c705..d1d2a56 100644 --- a/modules/sdpops/sdpops_data.c +++ b/modules/sdpops/sdpops_data.c @@ -138,9 +138,53 @@ int sdpops_get_ids_by_name(str *name, str *ids) } /** + * get codec ID from a= line based on name + */ +int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cid) +{ + int sdp_session_num; + int sdp_stream_num; + sdp_session_cell_t *sdp_session; + sdp_stream_cell_t *sdp_stream; + sdp_payload_attr_t *sdp_payload; + + sdp_session_num = 0; + for(;;) + { + sdp_session = get_sdp_session_sdp(sdp, sdp_session_num); + if(!sdp_session) break; + sdp_stream_num = 0; + for(;;) + { + sdp_stream = get_sdp_stream_sdp(sdp, sdp_session_num, + sdp_stream_num); + if(!sdp_stream) break; + sdp_payload = sdp_stream->payload_attr; + while (sdp_payload) { + if(sdp_payload->rtp_enc.len==cname->len + && strncasecmp(cname->s, sdp_payload->rtp_enc.s, + cname->len)==0) + { + *cid = sdp_payload->rtp_payload; + return 0; + } + + sdp_payload=sdp_payload->next; + } + sdp_stream_num++; + } + sdp_session_num++; + } + + cid->s = NULL; + cid->len = 0; + return -1; +} + +/** * build the csv list of ids from csv list of names */ -int sdpops_build_ids_list(str *names, str *ids) +int sdpops_build_ids_list(sdp_info_t *sdp, str *names, str *ids) { #define SDPOPS_MAX_LIST_SIZE 64 static char _local_idslist[SDPOPS_MAX_LIST_SIZE]; @@ -159,11 +203,21 @@ int sdpops_build_ids_list(str *names, str *ids) tmp.len -= (int)(&codec.s[codec.len]-codec.s); tmp.s = codec.s + codec.len; - if( sdpops_get_ids_by_name(&codec, &cids)==0) { - LM_DBG("codecs list [%.*s] - at name [%.*s] with ids [%.*s]\n", + cids.s = NULL; + if(sdpops_get_ids_by_name(&codec, &cids)==0) { + LM_DBG("codecs list [%.*s] - at name [%.*s] with list ids [%.*s]\n", names->len, names->s, codec.len, codec.s, cids.len, cids.s); + } else { + if(sdpops_sdp_get_ids_by_name(sdp, &codec, &cids)==0) { + LM_DBG("codecs list [%.*s] - at name [%.*s] with sdp id [%.*s]\n", + names->len, names->s, + codec.len, codec.s, + cids.len, cids.s); + } + } + if(cids.s!=NULL) { if(ids->len + cids.len>=SDPOPS_MAX_LIST_SIZE) { LM_ERR("the list with codecs ids is too big\n"); diff --git a/modules/sdpops/sdpops_data.h b/modules/sdpops/sdpops_data.h index 2d05f2b..3112ac2 100644 --- a/modules/sdpops/sdpops_data.h +++ b/modules/sdpops/sdpops_data.h @@ -24,10 +24,12 @@ #ifndef _SDPOPS_DATA_H_ #define _SDPOPS_DATA_H_ + #include "../../str.h" +#include "../../parser/sdp/sdp.h" int sdpops_get_ids_by_name(str *name, str *ids); int str_find_token(str *text, str *result, char delim); -int sdpops_build_ids_list(str *names, str *ids); +int sdpops_build_ids_list(sdp_info_t *sdp, str *names, str *ids); #endif diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 732acf2..725dcf6 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -356,7 +356,7 @@ int sdp_remove_codecs_by_name(sip_msg_t* msg, str* codecs) LM_ERR("attempting to remove codecs from sdp: [%.*s]\n", codecs->len, codecs->s); - if(sdpops_build_ids_list(codecs, &idslist)<0) + if(sdpops_build_ids_list((sdp_info_t*)msg->body, codecs, &idslist)<0) return -1; if(sdp_remove_codecs_by_id(msg, &idslist)<0) @@ -491,7 +491,7 @@ int sdp_keep_codecs_by_name(sip_msg_t* msg, str* codecs) LM_ERR("attempting to keep codecs in sdp: [%.*s]\n", codecs->len, codecs->s); - if(sdpops_build_ids_list(codecs, &idslist)<0) + if(sdpops_build_ids_list((sdp_info_t*)msg->body, codecs, &idslist)<0) return -1; if(sdp_keep_codecs_by_id(msg, &idslist)<0)

1 0

← Newer
1
2
3
4
5
6
7
...
29
Older →

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