sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: modules_k/dialog: Add documentation for DLGCB_TERMINATED_CONFIRMED
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: d0db79902cf248b03a1e7d3b058feaf99c5ea290 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0db799… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 2 19:52:02 2011 +0200 modules_k/dialog: Add documentation for DLGCB_TERMINATED_CONFIRMED callback. --- modules_k/dialog/doc/dialog_devel.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/doc/dialog_devel.xml b/modules_k/dialog/doc/dialog_devel.xml index 322d45b..f9d6357 100644 --- a/modules_k/dialog/doc/dialog_devel.xml +++ b/modules_k/dialog/doc/dialog_devel.xml @@ -67,6 +67,12 @@ </para> </listitem> <listitem> + <para><emphasis>DLGCB_TERMINATED_CONFIRMED</emphasis> - + called when response to a BYE request is received - it's a + per dialog type. + </para> + </listitem> + <listitem> <para><emphasis>DLGCB_EXPIRED</emphasis> - called when the dialog expires without receiving a BYE - it's a per dialog type.

1 0

git:master: Adjust several modules to modified dialog callback signature
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: f1853abaeb51f8b7de77115479ead6929109b009 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1853ab… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 2 19:39:13 2011 +0200 Adjust several modules to modified dialog callback signature (request and response messages given instead of just request; see commit 5d4473297 for rationale). Full credits to Sven Knoblich, sven.knoblich(a)1und1.de . --- modules/mediaproxy/mediaproxy.c | 6 +++--- modules_k/call_control/call_control.c | 9 ++++++--- modules_k/nat_traversal/nat_traversal.c | 6 +++--- modules_k/qos/qos_handlers.c | 8 ++++---- modules_k/sst/sst_handlers.c | 6 +++--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index c17971f..614c7a4 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -1903,14 +1903,14 @@ __free_dialog_data(void *data) static void __dialog_requests(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - use_media_proxy(_params->msg, get_dialog_id(dlg), (ice_candidate_data*)*_params->param); + use_media_proxy(_params->req, get_dialog_id(dlg), (ice_candidate_data*)*_params->param); } static void __dialog_replies(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *reply = _params->msg; + struct sip_msg *reply = _params->rpl; if (reply == FAKED_REPLY) return; @@ -1934,7 +1934,7 @@ __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) static void __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *request = _params->msg; + struct sip_msg *request = _params->req; ice_candidate_data *ice_data; if (request->REQ_METHOD != METHOD_INVITE) diff --git a/modules_k/call_control/call_control.c b/modules_k/call_control/call_control.c index 6d9dad8..fc3b0fc 100644 --- a/modules_k/call_control/call_control.c +++ b/modules_k/call_control/call_control.c @@ -946,7 +946,7 @@ typedef enum { static void __dialog_replies(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *reply = _params->msg; + struct sip_msg *reply = _params->rpl; if (reply!=FAKED_REPLY && reply->REPLY_STATUS==200) { call_control_start(reply, dlg); @@ -958,7 +958,10 @@ static void __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { if ((int)(long)*_params->param == CCActive) { - call_control_stop(_params->msg, dlg->callid); + struct sip_msg* msg = _params->rpl; + if( !msg || msg == FAKED_REPLY) + msg = _params->req; + call_control_stop(msg, dlg->callid); *_params->param = CCInactive; } } @@ -967,7 +970,7 @@ __dialog_ended(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) static void __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *request = _params->msg; + struct sip_msg *request = _params->req; if (request->REQ_METHOD != METHOD_INVITE) return; diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 791488d..cc65354 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1035,7 +1035,7 @@ __dialog_early(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) return; } - uri = get_source_uri(_params->msg); + uri = get_source_uri(_params->rpl); if (!Dialog_Param_has_candidate(param, uri)) { if (!Dialog_Param_add_candidate(param, uri)) { LM_ERR("cannot add callee candidate uri to the list\n"); @@ -1079,7 +1079,7 @@ __dialog_confirmed(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params param->confirmed = True; - callee_uri = get_source_uri(_params->msg); + callee_uri = get_source_uri(_params->rpl); // remove all keepalives on unanswered branches for (i=0; i<param->callee_candidates.count; i++) { @@ -1224,7 +1224,7 @@ __dialog_destroy(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) static void __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { - struct sip_msg *request = _params->msg; + struct sip_msg *request = _params->req; NAT_Contact *contact; SIP_Dialog *dialog; Dialog_Param *param; diff --git a/modules_k/qos/qos_handlers.c b/modules_k/qos/qos_handlers.c index b832cd9..ea6686c 100644 --- a/modules_k/qos/qos_handlers.c +++ b/modules_k/qos/qos_handlers.c @@ -116,7 +116,7 @@ static void setup_dialog_callbacks(struct dlg_cell *did, qos_ctx_t *ctx) void qos_dialog_created_CB(struct dlg_cell *did, int type, struct dlg_cb_params * params) { qos_ctx_t *qos_ctx = NULL; - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->req; unsigned int dir = params->direction, role, other_role; if (dir == DLG_DIR_UPSTREAM) { @@ -173,7 +173,7 @@ void qos_dialog_created_CB(struct dlg_cell *did, int type, struct dlg_cb_params */ static void qos_dialog_destroy_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) { - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->req; qos_ctx_t* qos_ctx = (qos_ctx_t*)*(params->param); /* run the QOSCB_TERMINATED callback */ @@ -196,7 +196,7 @@ static void qos_dialog_destroy_CB(struct dlg_cell* did, int type, struct dlg_cb_ */ static void qos_dialog_request_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) { - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->req; unsigned int dir = params->direction, role, other_role; qos_ctx_t* qos_ctx = (qos_ctx_t*)*(params->param); @@ -245,7 +245,7 @@ static void qos_dialog_request_CB(struct dlg_cell* did, int type, struct dlg_cb_ */ static void qos_dialog_response_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) { - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->rpl; unsigned int dir = params->direction, role, other_role; qos_ctx_t* qos_ctx = (qos_ctx_t*)*(params->param); diff --git a/modules_k/sst/sst_handlers.c b/modules_k/sst/sst_handlers.c index 6a17c37..fb3351f 100644 --- a/modules_k/sst/sst_handlers.c +++ b/modules_k/sst/sst_handlers.c @@ -252,7 +252,7 @@ void sst_dialog_created_CB(struct dlg_cell *did, int type, { sst_info_t *info = NULL; sst_msg_info_t minfo; - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->req; memset(&minfo, 0, sizeof(sst_msg_info_t)); /* @@ -431,7 +431,7 @@ static void sst_dialog_request_within_CB(struct dlg_cell* did, int type, { sst_info_t *info = (sst_info_t *)*(params->param); sst_msg_info_t minfo = {0,0,0,0}; - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->req; if (msg->first_line.type == SIP_REQUEST) { if ((msg->first_line.u.request.method_value == METHOD_INVITE || @@ -497,7 +497,7 @@ static void sst_dialog_request_within_CB(struct dlg_cell* did, int type, static void sst_dialog_response_fwded_CB(struct dlg_cell* did, int type, struct dlg_cb_params * params) { - struct sip_msg* msg = params->msg; + struct sip_msg* msg = params->rpl; /* * This test to see if the message is a response sould ALWAYS be

1 0

git:treimann/acc-cdr: Merge branch 'master' into treimann/acc-cdr
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: treimann/acc-cdr Commit: 94338392c1202c1c7e5e3f3fdebef3ca915ef20a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9433839… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 19:44:41 2011 +0200 Merge branch 'master' into treimann/acc-cdr * master: modules_k/dialog: In docs, fix indention of example to "detect_spirals". modules/app_lua, modules/sdpops: Exported sdpops:sdp_with_media() to app_lua modules_k/dispatcher: Added new feature that enables routes to be run when destinations fail/recover tmx: fixed mix-up between $T(id_index) and $T(id_label) ---

1 0

[tracker] Comment added: spiraled dialogs not detected when calling dlg_manage() on in-dialog requests
by sip-router 16 Aug '11

16 Aug '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#125 - spiraled dialogs not detected when calling dlg_manage() on in-dialog requests User who did this - Jon Bonilla (manwe) ---------- If the patch can be merged into my custom 3.1.3 build I could test it in my failing scenario and report back. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=125#comment248 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] Task changed: spiraled dialogs not detected when calling dlg_manage() on in-dialog requests
by sip-router 16 Aug '11

16 Aug '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#125 - spiraled dialogs not detected when calling dlg_manage() on in-dialog requests User who did this: Timo Reimann (tr) Task details edited: ------- When calling dlg_manage() while an in-dialog request is being processed, spirals are not detected even when spiral detection is enabled in the dialog module. The reason for this is that spiral detection is implemented in dlg_onreq(). However, dlg_manage() calls dlg_new_dialog() directly, thereby circumventing spiral detection functionality. A fix is to move the spiral detection code into dlg_new_dialog(). This should make it work regardless of how a dialog is (possibly) created. ------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=125 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/dialog: In docs, fix indention of example to
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 1df01c1027cedddc2eb1a59d2036766e060865a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1df01c1… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 18:12:58 2011 +0200 modules_k/dialog: In docs, fix indention of example to "detect_spirals". --- modules_k/dialog/doc/dialog_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 34ac2ac..a970430 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -341,9 +341,9 @@ modparam("dialog", "dlg_match_mode", 1) <example> <title>Set <varname>detect_spirals</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("dialog", "detect_spirals", 1) - ... +... +modparam("dialog", "detect_spirals", 1) +... </programlisting> </example> </section>

1 0

git:master: modules_k/dispatcher: Added new feature that enables routes to be run when destinations fail/ recover
by Peter Dunkley 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 085638299508ef6bf0c96673a663453da76d0a4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0856382… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 16 11:24:44 2011 +0100 modules_k/dispatcher: Added new feature that enables routes to be run when destinations fail/recover - Two new exported parameters ds_dst_unavailable_route and ds_dst_available_route allow you to specify routes to run when a destination is marked PROBING and unmarked PROBING respectively. This is useful for integration with NMC and alarms equipment as these routes can be used to trigger/log these status changes. --- modules_k/dispatcher/README | 114 ++++++++++++++++++------- modules_k/dispatcher/dispatch.c | 64 ++++++++++++-- modules_k/dispatcher/dispatch.h | 5 +- modules_k/dispatcher/dispatcher.c | 94 ++++++++++++++++++++ modules_k/dispatcher/doc/dispatcher_admin.xml | 64 ++++++++++++++- 5 files changed, 299 insertions(+), 42 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=085…

2 2

git:master: modules/app_lua, modules/sdpops: Exported sdpops:sdp_with_media () to app_lua
by Peter Dunkley 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: c44a269969e8b8bc19e3dbc2af374fe858ce2c7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c44a269… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 16 14:39:41 2011 +0100 modules/app_lua, modules/sdpops: Exported sdpops:sdp_with_media() to app_lua - Also fixed a bug relating to logging levels within app_lua (sr.log()) - Feature added by Hugh Waite at Crocodile RCS --- modules/app_lua/Makefile | 1 + modules/app_lua/app_lua_exp.c | 59 +++++++++++++++++++++++++++++++++++++--- modules/app_lua/app_lua_sr.c | 6 +++- modules/sdpops/api.h | 26 ++++++++++++++++++ modules/sdpops/sdpops_mod.c | 16 +++++++++- 5 files changed, 100 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 47d6072..e4dbc69 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -46,5 +46,6 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore +LIBS+=-lm include ../../Makefile.modules diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index c998b7e..0893089 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -41,6 +41,7 @@ #include "../../modules_k/registrar/api.h" #include "../../modules_k/dispatcher/api.h" #include "../../modules/xhttp/api.h" +#include "../../modules/sdpops/api.h" #include "app_lua_api.h" @@ -54,6 +55,7 @@ #define SR_LUA_EXP_MOD_REGISTRAR (1<<7) #define SR_LUA_EXP_MOD_DISPATCHER (1<<8) #define SR_LUA_EXP_MOD_XHTTP (1<<9) +#define SR_LUA_EXP_MOD_SDPOPS (1<<10) /** * @@ -112,6 +114,11 @@ static tm_xapi_t _lua_xtmb; static xhttp_api_t _lua_xhttpb; /** + * sdpops + */ +static sdpops_api_t _lua_sdpopsb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -1224,6 +1231,17 @@ static int lua_sr_dispatcher_is_from(lua_State *L) return app_lua_return_int(L, ret); } +/** + * + */ +static const luaL_reg _sr_dispatcher_Map [] = { + {"select", lua_sr_dispatcher_select}, + {"next", lua_sr_dispatcher_next}, + {"mark", lua_sr_dispatcher_mark}, + {"is_from", lua_sr_dispatcher_is_from}, + {NULL, NULL} +}; + /** * @@ -1276,18 +1294,34 @@ static const luaL_reg _sr_xhttp_Map [] = { {NULL, NULL} }; +/** + * + */ +static int lua_sr_sdpops_with_media(lua_State *L) +{ + int ret; + str media; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + media.s = (char*)lua_tostring(L, -1); + media.len = strlen(media.s); + + ret = _lua_sdpopsb.sdp_with_media(env_L->msg, &media); + + return app_lua_return_int(L, ret); +} /** * */ -static const luaL_reg _sr_dispatcher_Map [] = { - {"select", lua_sr_dispatcher_select}, - {"next", lua_sr_dispatcher_next}, - {"mark", lua_sr_dispatcher_mark}, - {"is_from", lua_sr_dispatcher_is_from}, +static const luaL_reg _sr_sdpops_Map [] = { + {"sdp_with_media", lua_sr_sdpops_with_media}, {NULL, NULL} }; + /** * */ @@ -1399,6 +1433,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded xhttp api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SDPOPS) + { + /* bind the SDPOPS API */ + if (sdpops_load_api(&_lua_sdpopsb) < 0) + { + LM_ERR("cannot bind to SDPOPS API\n"); + return -1; + } + LM_DBG("loaded sdpops api\n"); + } return 0; } @@ -1442,6 +1486,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==5 && strcmp(mname, "xhttp")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_XHTTP; return 0; + } else if(len==6 && strcmp(mname, "sdpops")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_SDPOPS; + return 0; } return -1; @@ -1472,5 +1519,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.dispatcher", _sr_dispatcher_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP) luaL_openlib(L, "sr.xhttp", _sr_xhttp_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SDPOPS) + luaL_openlib(L, "sr.sdpops", _sr_sdpops_Map, 0); } diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 7a8575a..c5f5bf8 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -91,7 +91,11 @@ static int lua_sr_log (lua_State *L) { LM_ERR("%s", txt); } else { - if(strcasecmp(level, "warn")==0) { + if(strcasecmp(level, "dbg")==0) { + LM_DBG("%s", txt); + } else if(strcasecmp(level, "info")==0) { + LM_INFO("%s", txt); + } else if(strcasecmp(level, "warn")==0) { LM_WARN("%s", txt); } else if(strcasecmp(level, "crit")==0) { LM_CRIT("%s", txt); diff --git a/modules/sdpops/api.h b/modules/sdpops/api.h new file mode 100644 index 0000000..215dcce --- /dev/null +++ b/modules/sdpops/api.h @@ -0,0 +1,26 @@ +#ifndef SDPOPS_API_H +#define SDPOPS_API_H +#include "../../str.h" + +typedef int (*sdp_with_media_t)(struct sip_msg*, str*); + +typedef struct sdpops_binds { + sdp_with_media_t sdp_with_media; +} sdpops_api_t; + +typedef int (*bind_sdpops_f)(sdpops_api_t*); + +int bind_sdpops(struct sdpops_binds*); + +inline static int sdpops_load_api(sdpops_api_t *sob) +{ + bind_sdpops_f bind_sdpops_exports; + if (!(bind_sdpops_exports = (bind_sdpops_f)find_export("bind_sdpops", 0, 0))) + { + LM_ERR("Failed to import bind_sdpops\n"); + return -1; + } + return bind_sdpops_exports(sob); +} + +#endif /*SDPOPS_API_H*/ diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 7b587e6..1212053 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -34,6 +34,7 @@ #include "../../trim.h" #include "../../data_lump.h" +#include "api.h" #include "sdpops_data.h" MODULE_VERSION @@ -54,7 +55,9 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_print", (cmd_function)w_sdp_print, 1, fixup_igp_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0} + {"bind_sdpops", (cmd_function)bind_sdpops, + 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} }; static pv_export_t mod_pvs[] = { @@ -360,7 +363,7 @@ static int sdp_with_media(sip_msg_t *msg, str *media) return -1; } - LM_ERR("attempting to search for media type: [%.*s]\n", + LM_DBG("attempting to search for media type: [%.*s]\n", media->len, media->s); sdp = (sdp_info_t*)msg->body; @@ -437,3 +440,12 @@ static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) print_sdp(sdp, llevel); return 1; } + +int bind_sdpops(struct sdpops_binds *sob){ + if (sob == NULL) { + LM_WARN("bind_sdpops: Cannot load sdpops API into a NULL pointer\n"); + return -1; + } + sob->sdp_with_media = sdp_with_media; + return 0; +}

1 0

Mix-up in TMX Pseudo Variables
by Martin Hoffmann 16 Aug '11

16 Aug '11

Heisann, it appears the new $T() pvars from the TMX module have a slight mixup. $T(id_index) actually returns the label and $T(id_label) the index. The attached patch fixes that. I could probably commit it myself, but rather not start messing with the repository just yet ;) Regards, Martin

2 1

git:master: tmx: fixed mix-up between $T(id_index) and $T(id_label)
by Daniel-Constantin Mierla 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: b0a7ef14887814c39f01416d19088982c55324ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0a7ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 16 12:21:14 2011 +0200 tmx: fixed mix-up between $T(id_index) and $T(id_label) - patch by Martin Hoffmann --- modules_k/tmx/t_var.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index ff78f45..366afe3 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -507,8 +507,8 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - return pv_get_uintval(msg, param, res, t->label); - default: return pv_get_uintval(msg, param, res, t->hash_index); + default: + return pv_get_uintval(msg, param, res, t->label); } }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011