sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
117 discussions

dialog2 modules
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Hi Jason, I was looking briefly over the dialog2 module in your branch. Is no database (persistence) support for it? Anyhow, from my point of view it can be added to master branch, so it is more visible and interested people can start playing with it. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

git:master: dialog(k): documented parameter wait_ack and event_route[dialog :failed]
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 70e81cbf79ac3d4d25792feaed0af4d712368418 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70e81cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 09:36:18 2012 +0100 dialog(k): documented parameter wait_ack and event_route[dialog:failed] --- modules_k/dialog/README | 77 ++++++++++++++++++++++----------- … [View More]modules_k/dialog/doc/dialog_admin.xml | 29 ++++++++++++ 2 files changed, 80 insertions(+), 26 deletions(-) diff --git a/modules_k/dialog/README b/modules_k/dialog/README index eef1210..36f0187 100644 --- a/modules_k/dialog/README +++ b/modules_k/dialog/README @@ -85,6 +85,7 @@ Alex Balashov 5.42. bridge_controller (string) 5.43. initial_cbs_inscript (int) 5.44. send_bye (int) + 5.45. wait_ack (int) 6. Functions @@ -144,6 +145,7 @@ Alex Balashov 11.1. event_route[dialog:start] 11.2. event_route[dialog:end] + 11.3. event_route[dialog:failure] 2. Developer Guide @@ -201,19 +203,20 @@ Alex Balashov 1.42. Set bridge_controller parameter 1.43. Set initial_cbs_inscript parameter 1.44. Set send_bye parameter - 1.45. set_dlg_profile usage - 1.46. unset_dlg_profile usage - 1.47. is_in_profile usage - 1.48. get_profile_size usage - 1.49. dlg_isflagset usage - 1.50. dlg_setflag usage - 1.51. dlg_resetflag usage - 1.52. dlg_bye usage - 1.53. dlg_refer usage - 1.54. dlg_manage usage - 1.55. dlg_bridge usage - 1.56. dlg_get usage - 1.57. is_known_dlg() usage + 1.45. Set wait_ack parameter + 1.46. set_dlg_profile usage + 1.47. unset_dlg_profile usage + 1.48. is_in_profile usage + 1.49. get_profile_size usage + 1.50. dlg_isflagset usage + 1.51. dlg_setflag usage + 1.52. dlg_resetflag usage + 1.53. dlg_bye usage + 1.54. dlg_refer usage + 1.55. dlg_manage usage + 1.56. dlg_bridge usage + 1.57. dlg_get usage + 1.58. is_known_dlg() usage Chapter 1. Admin Guide @@ -273,6 +276,7 @@ Chapter 1. Admin Guide 5.42. bridge_controller (string) 5.43. initial_cbs_inscript (int) 5.44. send_bye (int) + 5.45. wait_ack (int) 6. Functions @@ -332,6 +336,7 @@ Chapter 1. Admin Guide 11.1. event_route[dialog:start] 11.2. event_route[dialog:end] + 11.3. event_route[dialog:failure] 1. Overview @@ -464,6 +469,7 @@ Chapter 1. Admin Guide 5.42. bridge_controller (string) 5.43. initial_cbs_inscript (int) 5.44. send_bye (int) + 5.45. wait_ack (int) 5.1. enable_stats (integer) @@ -1028,6 +1034,20 @@ modparam("dialog", "initial_cbs_inscript", 0) modparam("dialog", "send_bye", 1) ... +5.45. wait_ack (int) + + If set to 1, dialog will be keept a bit longer in memory in order to + absorb the ACK negative replies of initial INVITE. If not, the dialog + is destroyed when negative reply is sent out (less internal + complexity). + + Default value is "1". + + Example 1.45. Set wait_ack parameter +... +modparam("dialog", "wait_ack", 0) +... + 6. Functions 6.1. set_dlg_profile(profile,[value]) @@ -1060,7 +1080,7 @@ modparam("dialog", "send_bye", 1) This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.45. set_dlg_profile usage + Example 1.46. set_dlg_profile usage ... set_dlg_profile("inbound_call"); set_dlg_profile("caller","$fu"); @@ -1079,7 +1099,7 @@ set_dlg_profile("caller","$fu"); This function can be used from BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.46. unset_dlg_profile usage + Example 1.47. unset_dlg_profile usage ... unset_dlg_profile("inbound_call"); unset_dlg_profile("caller","$fu"); @@ -1102,7 +1122,7 @@ unset_dlg_profile("caller","$fu"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.47. is_in_profile usage + Example 1.48. is_in_profile usage ... if (is_in_profile("inbound_call")) { log("this request belongs to a inbound call\n"); @@ -1131,7 +1151,7 @@ if (is_in_profile("caller","XX")) { This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.48. get_profile_size usage + Example 1.49. get_profile_size usage ... if(get_profile_size("inbound_call","$avp(size)")) xlog("currently there are $avp(size) inbound calls\n"); @@ -1150,7 +1170,7 @@ if(get_profile_size("caller","$fu","$avp(size)")) This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.49. dlg_isflagset usage + Example 1.50. dlg_isflagset usage ... if(dlg_isflagset("1")) { @@ -1168,7 +1188,7 @@ if(dlg_isflagset("1")) This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.50. dlg_setflag usage + Example 1.51. dlg_setflag usage ... dlg_setflag("1"); ... @@ -1183,7 +1203,7 @@ dlg_setflag("1"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.51. dlg_resetflag usage + Example 1.52. dlg_resetflag usage ... redlg_setflag("1"); ... @@ -1199,7 +1219,7 @@ redlg_setflag("1"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.52. dlg_bye usage + Example 1.53. dlg_bye usage ... dlg_bye("all"); ... @@ -1216,7 +1236,7 @@ dlg_bye("all"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.53. dlg_refer usage + Example 1.54. dlg_refer usage ... dlg_refer("caller", "sip:announcement@kamailio.org"); ... @@ -1229,7 +1249,7 @@ dlg_refer("caller", "sip:announcement@kamailio.org"); This function can be used from REQUEST_ROUTE. - Example 1.54. dlg_manage usage + Example 1.55. dlg_manage usage ... modparam("dialog", "default_timeout", 100) ... @@ -1257,7 +1277,7 @@ route { This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.55. dlg_bridge usage + Example 1.56. dlg_bridge usage ... dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", "sip:kamailio.org:5080"); @@ -1276,7 +1296,7 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.56. dlg_get usage + Example 1.57. dlg_get usage ... if(dlg_get("abcdef", "123", "456")) { @@ -1300,7 +1320,7 @@ if(dlg_get("abcdef", "123", "456")) This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.57. is_known_dlg() usage + Example 1.58. is_known_dlg() usage ... if(!uri == myself) { if(is_known_dlg()) { @@ -1671,6 +1691,7 @@ if(!uri == myself) { 11.1. event_route[dialog:start] 11.2. event_route[dialog:end] + 11.3. event_route[dialog:failure] 11.1. event_route[dialog:start] @@ -1680,6 +1701,10 @@ if(!uri == myself) { Executed when BYE is processed or dialog timed out. +11.3. event_route[dialog:failure] + + Executed when dialog is not completed (+300 reply to INVITE). + Chapter 2. Developer Guide Table of Contents diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index f32ce05..b5898c2 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1137,6 +1137,29 @@ modparam("dialog", "send_bye", 1) </example> </section> + <section> + <title><varname>wait_ack</varname> (int)</title> + <para> + If set to 1, dialog will be keept a bit longer in memory + in order to absorb the ACK negative replies of initial + INVITE. If not, the dialog is destroyed when negative reply + is sent out (less internal complexity). + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>wait_ack</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "wait_ack", 0) +... +</programlisting> + </example> + </section> + </section> @@ -2163,6 +2186,12 @@ if(!uri == myself) { Executed when BYE is processed or dialog timed out. </para> </section> + <section> + <title><varname>event_route[dialog:failure]</varname></title> + <para> + Executed when dialog is not completed (+300 reply to INVITE). + </para> + </section> </section> </chapter> [View Less]

1 0

git:master: dialog(k): more dialog info stored in db
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 82fe2bff11a6b1d75701591b571fab44ed7b06a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82fe2bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 09:26:19 2012 +0100 dialog(k): more dialog info stored in db - profiles the dialog belongs to are stored in xdata column, serialized as json document. A restart will restore them - … [View More]

1 0

git:master: srdb1: updated schema for dialog table
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 3cb33d3a5a24e228be69596910349c4732297f55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cb33d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 09:21:37 2012 +0100 srdb1: updated schema for dialog table - new column xdata to store aditional info per dialog - it will store the profiles dialog belongs to, serialized as json - … [View More]

1 0

git:master: dialog: timeout route executed only for confirmed dialogs
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 29036bcc8fe90ab3281be95b4b69beff61f0cf0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29036bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 16 12:18:44 2012 +0100 dialog: timeout route executed only for confirmed dialogs - avoid some extra conditions when it is not the case - use dlg internal id to lookup dialog in callbacks … [View More]for replies of generated BYEs --- modules_k/dialog/dlg_handlers.c | 50 +++++++++++++++++++----------------- modules_k/dialog/dlg_handlers.h | 10 +++++++ modules_k/dialog/dlg_hash.c | 3 +- modules_k/dialog/dlg_hash.h | 5 +++ modules_k/dialog/dlg_req_within.c | 26 +++++++++++++------ 5 files changed, 61 insertions(+), 33 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index fe6c104..a2208bb 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -107,8 +107,6 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' -void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate); - int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int mode); @@ -314,7 +312,7 @@ dlg_iuid_t *dlg_get_iuid_shm_clone(dlg_cell_t *dlg) /*! * \brief Free dialog internal unique id stored in shared memory */ -static void dlg_iuid_sfree(void *iuid) +void dlg_iuid_sfree(void *iuid) { if(iuid) shm_free(iuid); @@ -1251,31 +1249,35 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if(dlg->toroute>0 && dlg->toroute<main_rt.entries - && main_rt.rlist[dlg->toroute]!=NULL) + if(dlg->state==DLG_STATE_CONFIRMED_NA + || dlg->state==DLG_STATE_CONFIRMED) { - fmsg = faked_msg_next(); - if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)>0) + if(dlg->toroute>0 && dlg->toroute<main_rt.entries + && main_rt.rlist[dlg->toroute]!=NULL) { - dlg_ref(dlg, 1); - dlg_set_ctx_iuid(dlg); - LM_DBG("executing route %d on timeout\n", dlg->toroute); - set_route_type(REQUEST_ROUTE); - run_top_route(main_rt.rlist[dlg->toroute], fmsg, 0); - dlg_reset_ctx_iuid(); - exec_post_script_cb(fmsg, REQUEST_CB_TYPE); - dlg_unref(dlg, 1); + fmsg = faked_msg_next(); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)>0) + { + dlg_ref(dlg, 1); + dlg_set_ctx_iuid(dlg); + LM_DBG("executing route %d on timeout\n", dlg->toroute); + set_route_type(REQUEST_ROUTE); + run_top_route(main_rt.rlist[dlg->toroute], fmsg, 0); + dlg_reset_ctx_iuid(); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + dlg_unref(dlg, 1); + } } - } - if ((dlg->dflags&DLG_FLAG_TOBYE) - && (dlg->state==DLG_STATE_CONFIRMED_NA - || dlg->state==DLG_STATE_CONFIRMED)) - { - dlg_bye_all(dlg, NULL); - dlg_unref(dlg, 1); - if_update_stat(dlg_enable_stats, expired_dlgs, 1); - return; + if(dlg->dflags&DLG_FLAG_TOBYE) + { + dlg_bye_all(dlg, NULL); + /* run event route for end of dlg */ + dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); + dlg_unref(dlg, 1); + if_update_stat(dlg_enable_stats, expired_dlgs, 1); + return; + } } next_state_dlg( dlg, DLG_EVENT_REQBYE, &old_state, &new_state, &unref); diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index 0f45ce9..1149241 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -167,4 +167,14 @@ void dlg_tmcb_dummy(tm_cell_t *t, int type, struct tmcb_params *param); */ dlg_cell_t *dlg_get_msg_dialog(sip_msg_t *msg); +/*! + * \brief Clone dialog internal unique id to shared memory + */ +dlg_iuid_t *dlg_get_iuid_shm_clone(dlg_cell_t *dlg); + +/*! + * \brief Free dialog internal unique id stored in shared memory + */ +void dlg_iuid_sfree(void *iuid); + #endif diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index e9ea0a0..23930e7 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -162,7 +162,7 @@ int init_dlg_table(unsigned int size) for( i=0 ; i<size; i++ ) { memset( &(d_table->entries[i]), 0, sizeof(struct dlg_entry) ); - d_table->entries[i].next_id = rand(); + d_table->entries[i].next_id = rand() % (3*size); d_table->entries[i].lock_idx = i % d_table->locks_no; } @@ -572,6 +572,7 @@ void link_dlg(struct dlg_cell *dlg, int n) /* keep id 0 for special cases */ dlg->h_id = 1 + d_entry->next_id++; + LM_DBG("linking dialog [%u:%u]\n", dlg->h_entry, dlg->h_id); if (d_entry->first==0) { d_entry->first = d_entry->last = dlg; } else { diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index dae6e02..f262c72 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -503,6 +503,11 @@ static inline int match_downstream_dialog(dlg_cell_t *dlg, str *callid, str *fta return 1; } +/*! + * + */ +void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate); + /*! * \brief Output a dialog via the MI interface diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index f5e3c90..20f254f 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -40,6 +40,7 @@ #include "../../lib/kcore/kstats_wrapper.h" #include "dlg_timer.h" #include "dlg_hash.h" +#include "dlg_handlers.h" #include "dlg_req_within.h" #include "dlg_db_handler.h" @@ -131,6 +132,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ struct dlg_cell* dlg; int event, old_state, new_state, unref, ret; + dlg_iuid_t *iuid = NULL; if(ps->param == NULL || *ps->param == NULL){ LM_ERR("invalid parameter\n"); @@ -144,11 +146,14 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ LM_DBG("receiving a final reply %d\n",ps->code); - dlg = (struct dlg_cell *)(*(ps->param)); + iuid = (dlg_iuid_t*)(*ps->param); + dlg = dlg_get_by_iuid(iuid); + if(dlg==0) + return; + event = DLG_EVENT_REQBYE; next_state_dlg(dlg, event, &old_state, &new_state, &unref); - if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED){ LM_DBG("removing dialog with h_entry %u and h_id %u\n", @@ -192,7 +197,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ /* force delete from mem */ dlg_unref(dlg, 1); } - + dlg_iuid_sfree(iuid); } @@ -240,6 +245,8 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) dlg_t* dialog_info; str met = {"BYE", 3}; int result; + dlg_iuid_t *iuid = NULL; + /* do not send BYE request for non-confirmed dialogs (not supported) */ if (cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) { LM_ERR("terminating non-confirmed dialogs not supported\n"); @@ -255,16 +262,21 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) LM_DBG("sending BYE to %s\n", (dir==DLG_CALLER_LEG)?"caller":"callee"); - dlg_ref(cell, 1); + iuid = dlg_get_iuid_shm_clone(cell); + if(iuid==NULL) + { + LM_ERR("failed to create dialog unique id clone\n"); + goto err; + } memset(&uac_r,'\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, - bye_reply_cb, (void*)cell); + bye_reply_cb, (void*)iuid); result = d_tmb.t_request_within(&uac_r); if(result < 0){ LM_ERR("failed to send the BYE request\n"); - goto err1; + goto err; } free_tm_dlg(dialog_info); @@ -272,8 +284,6 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) LM_DBG("BYE sent to %s\n", (dir==0)?"caller":"callee"); return 0; -err1: - dlg_unref(cell, 1); err: if(dialog_info) free_tm_dlg(dialog_info); [View Less]

1 0

git:master: libsrjson: new helper functions to deal with str and unlink node
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: f7b72bf06870c3fd3ad602051e8695c11a2fcdc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7b72bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 09:20:44 2012 +0100 libsrjson: new helper functions to deal with str and unlink node --- lib/srutils/srjson.c | 23 +++++++++++++++++++++++ lib/srutils/srjson.h | 3 +++ 2 files … [View More]changed, 26 insertions(+), 0 deletions(-) diff --git a/lib/srutils/srjson.c b/lib/srutils/srjson.c index 55b43b0..4a7e261 100644 --- a/lib/srutils/srjson.c +++ b/lib/srutils/srjson.c @@ -822,6 +822,15 @@ void srjson_AddItemToObject(srjson_doc_t *doc, srjson_t *object, const char *str srjson_AddItemToArray(doc, object, item); } +void srjson_AddStrItemToObject(srjson_doc_t *doc, srjson_t *object, const char *string, int len, srjson_t *item) { + if (!item) + return; + if (item->string) + doc->free_fn(item->string); + item->string = srjson_strndupz(doc, string, len); + srjson_AddItemToArray(doc, object, item); +} + void srjson_AddItemReferenceToArray(srjson_doc_t *doc, srjson_t *array, srjson_t *item) { srjson_AddItemToArray(doc, array, create_reference(doc, item)); } @@ -830,6 +839,20 @@ void srjson_AddItemReferenceToObject(srjson_doc_t *doc, srjson_t *object, const srjson_AddItemToObject(doc, object, string, create_reference(doc, item)); } +srjson_t *srjson_UnlinkItemFromObj(srjson_doc_t *doc, srjson_t *obj, srjson_t *c) +{ + if (!c) + return 0; + if (c->prev) + c->prev->next = c->next; + if (c->next) + c->next->prev = c->prev; + if (c == obj->child) + obj->child = c->next; + c->prev = c->next = 0; + return c; +} + srjson_t *srjson_DetachItemFromArray(srjson_doc_t *doc, srjson_t *array, int which) { srjson_t *c = array->child; diff --git a/lib/srutils/srjson.h b/lib/srutils/srjson.h index 3740e2a..4d8306f 100644 --- a/lib/srutils/srjson.h +++ b/lib/srutils/srjson.h @@ -148,6 +148,7 @@ extern srjson_t *srjson_CreateStringArray(srjson_doc_t *doc, const char **string /* Append item to the specified array/object. */ extern void srjson_AddItemToArray(srjson_doc_t *doc, srjson_t *array, srjson_t *item); extern void srjson_AddItemToObject(srjson_doc_t *doc, srjson_t *object, const char *string, srjson_t *item); +extern void srjson_AddStrItemToObject(srjson_doc_t *doc, srjson_t *object, const char *string, int len, srjson_t *item); /* * Append reference to item to the specified array/object. Use this @@ -158,6 +159,7 @@ extern void srjson_AddItemReferenceToArray(srjson_doc_t *doc, srjson_t *array, s extern void srjson_AddItemReferenceToObject(srjson_doc_t *doc, srjson_t *object, const char *string, srjson_t *item); /* Remove/Detatch items from Arrays/Objects. */ +extern srjson_t *srjson_UnlinkItemFromObj(srjson_doc_t *doc, srjson_t *obj, srjson_t *item); extern srjson_t *srjson_DetachItemFromArray(srjson_doc_t *doc, srjson_t *array, int which); extern void srjson_DeleteItemFromArray(srjson_doc_t *doc, srjson_t *array, int which); extern srjson_t *srjson_DetachItemFromObject(srjson_doc_t *doc, srjson_t *object, const char *string); @@ -173,6 +175,7 @@ extern void srjson_ReplaceItemInObject(srjson_doc_t *doc, srjson_t *object, cons #define srjson_AddNumberToObject(doc, object,name,n) srjson_AddItemToObject(doc, object, name, srjson_CreateNumber(doc,n)) #define srjson_AddStringToObject(doc, object,name,s) srjson_AddItemToObject(doc, object, name, srjson_CreateString(doc,s)) #define srjson_AddStrToObject(doc, object,name,s,l) srjson_AddItemToObject(doc, object, name, srjson_CreateStr(doc,s,l)) +#define srjson_AddStrStrToObject(doc, object,name,ln,s,l) srjson_AddStrItemToObject(doc, object, name, ln, srjson_CreateStr(doc,s,l)) #ifdef __cplusplus } [View Less]

1 0

git:master: kamctl: regenerated dialog table creation scripts
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 5fdf9d43e750c4a8acc9e3565738a09c4c767db2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fdf9d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 09:25:16 2012 +0100 kamctl: regenerated dialog table creation scripts --- utils/kamctl/db_berkeley/kamailio/dialog | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- … [View More]utils/kamctl/db_sqlite/dialog-create.sql | 7 ++++--- utils/kamctl/dbtext/kamailio/dialog | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/dialog-create.sql | 7 ++++--- utils/kamctl/oracle/dialog-create.sql | 7 ++++--- utils/kamctl/postgres/dialog-create.sql | 7 ++++--- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/dialog b/utils/kamctl/db_berkeley/kamailio/dialog index 8eb740b..7318a40 100644 --- a/utils/kamctl/db_berkeley/kamailio/dialog +++ b/utils/kamctl/db_berkeley/kamailio/dialog @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(str) req_uri(str) +id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) iflags(int) toroute_name(str) req_uri(str) xdata(str) METADATA_KEY 1 2 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL|NIL +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL|NIL|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 09b177d..51069f2 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -27,7 +27,7 @@ cpl|1 dbaliases| dbaliases|1 dialog| -dialog|5 +dialog|6 dialog_vars| dialog_vars|1 dialplan| diff --git a/utils/kamctl/db_sqlite/dialog-create.sql b/utils/kamctl/db_sqlite/dialog-create.sql index b21c992..780ef0f 100644 --- a/utils/kamctl/db_sqlite/dialog-create.sql +++ b/utils/kamctl/db_sqlite/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','5'); +INSERT INTO version (table_name, table_version) values ('dialog','6'); CREATE TABLE dialog ( id INTEGER PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, @@ -20,9 +20,10 @@ CREATE TABLE dialog ( start_time INTEGER NOT NULL, timeout INTEGER DEFAULT 0 NOT NULL, sflags INTEGER DEFAULT 0 NOT NULL, - toroute INTEGER DEFAULT 0 NOT NULL, + iflags INTEGER DEFAULT 0 NOT NULL, toroute_name VARCHAR(32), - req_uri VARCHAR(128) NOT NULL + req_uri VARCHAR(128) NOT NULL, + xdata VARCHAR(512) ); CREATE INDEX dialog_hash_idx ON dialog (hash_entry, hash_id); diff --git a/utils/kamctl/dbtext/kamailio/dialog b/utils/kamctl/dbtext/kamailio/dialog index f58f905..3b24e90 100644 --- a/utils/kamctl/dbtext/kamailio/dialog +++ b/utils/kamctl/dbtext/kamailio/dialog @@ -1 +1 @@ -id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(string,null) req_uri(string) +id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) iflags(int) toroute_name(string,null) req_uri(string) xdata(string,null) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index d326bbf..0535359 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -8,7 +8,7 @@ carrierfailureroute:2 carrierroute:3 cpl:1 dbaliases:1 -dialog:5 +dialog:6 dialog_vars:1 dialplan:1 dispatcher:4 diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index 6d73ca0..0fbbdb6 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','5'); +INSERT INTO version (table_name, table_version) values ('dialog','6'); CREATE TABLE dialog ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, hash_entry INT(10) UNSIGNED NOT NULL, @@ -20,9 +20,10 @@ CREATE TABLE dialog ( start_time INT(10) UNSIGNED NOT NULL, timeout INT(10) UNSIGNED DEFAULT 0 NOT NULL, sflags INT(10) UNSIGNED DEFAULT 0 NOT NULL, - toroute INT(10) UNSIGNED DEFAULT 0 NOT NULL, + iflags INT(10) UNSIGNED DEFAULT 0 NOT NULL, toroute_name VARCHAR(32), - req_uri VARCHAR(128) NOT NULL + req_uri VARCHAR(128) NOT NULL, + xdata VARCHAR(512) ) ENGINE=MyISAM; CREATE INDEX hash_idx ON dialog (hash_entry, hash_id); diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index 9fdc370..ebedcf8 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','5'); +INSERT INTO version (table_name, table_version) values ('dialog','6'); CREATE TABLE dialog ( id NUMBER(10) PRIMARY KEY, hash_entry NUMBER(10), @@ -20,9 +20,10 @@ CREATE TABLE dialog ( start_time NUMBER(10), timeout NUMBER(10) DEFAULT 0 NOT NULL, sflags NUMBER(10) DEFAULT 0 NOT NULL, - toroute NUMBER(10) DEFAULT 0 NOT NULL, + iflags NUMBER(10) DEFAULT 0 NOT NULL, toroute_name VARCHAR2(32), - req_uri VARCHAR2(128) + req_uri VARCHAR2(128), + xdata VARCHAR2(512) ); CREATE OR REPLACE TRIGGER dialog_tr diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index c72c5ca..9e44305 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','5'); +INSERT INTO version (table_name, table_version) values ('dialog','6'); CREATE TABLE dialog ( id SERIAL PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, @@ -20,9 +20,10 @@ CREATE TABLE dialog ( start_time INTEGER NOT NULL, timeout INTEGER DEFAULT 0 NOT NULL, sflags INTEGER DEFAULT 0 NOT NULL, - toroute INTEGER DEFAULT 0 NOT NULL, + iflags INTEGER DEFAULT 0 NOT NULL, toroute_name VARCHAR(32), - req_uri VARCHAR(128) NOT NULL + req_uri VARCHAR(128) NOT NULL, + xdata VARCHAR(512) ); CREATE INDEX dialog_hash_idx ON dialog (hash_entry, hash_id); [View Less]

1 0

git:master: dialog: documented event routes
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: dc434e7a0a811acada8fba17a77ec39f033bd929 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc434e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 16 10:58:34 2012 +0100 dialog: documented event routes --- modules_k/dialog/README | 23 +++++++++++++++++++++++ modules_k/dialog/doc/dialog_admin.xml | 16 ++++++++++++… [View More]

1 0

git:master: dialog(k): one more event_route[dialog:failed]
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 65889069b9cbffc2f2ee746f14cef46db65cb5c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6588906… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 16 14:51:30 2012 +0100 dialog(k): one more event_route[dialog:failed] - executed when >=300 is replied to the INVITE --- modules_k/dialog/dialog.c | 1 + modules_k/dialog/… [View More]

1 0

git:master: dialog(k): option to wait for negative ack
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 53ec53db6b2e164dbdd6d6162c547d064a4cbe34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53ec53d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 16 15:46:19 2012 +0100 dialog(k): option to wait for negative ack - new parameter wait_ack, default 1 (wait for negative ack) - if set to 0, dlg structure is deleted when the negative … [View More]reply is sent out - restore functionality existing in previous versions, lost with the latest refactoring, reported by Timo Reimann - negative ACK can trigger a dialog callback, also the dialog profiles can stay until this ACK is processed - configurable as there is no always useful usage, adds some extra processing, so it is good to be able to disactivate it --- modules_k/dialog/dialog.c | 2 + modules_k/dialog/dlg_handlers.c | 71 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 8c3559d..362fa8c 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -105,6 +105,7 @@ static char* profiles_nv_s = NULL; str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; int initial_cbs_inscript = 1; +int dlg_wait_ack = 1; int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -247,6 +248,7 @@ static param_export_t mod_params[]={ { "ruri_pvar", STR_PARAM, &ruri_pvar_param.s }, { "initial_cbs_inscript", INT_PARAM, &initial_cbs_inscript }, { "send_bye", INT_PARAM, &dlg_send_bye }, + { "wait_ack", INT_PARAM, &dlg_wait_ack }, { 0,0,0 } }; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 6bc3670..06f5584 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -85,6 +85,7 @@ extern int detect_spirals; extern int initial_cbs_inscript; extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; +extern int dlg_wait_ack; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -109,6 +110,7 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int mode); +int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg); /*! * \brief Initialize the dialog handlers @@ -314,8 +316,12 @@ dlg_iuid_t *dlg_get_iuid_shm_clone(dlg_cell_t *dlg) */ void dlg_iuid_sfree(void *iuid) { - if(iuid) + if(iuid) { + LM_DBG("freeing dlg iuid [%u:%u] (%p)\n", + ((dlg_iuid_t*)iuid)->h_entry, + ((dlg_iuid_t*)iuid)->h_id, iuid); shm_free(iuid); + } } @@ -398,6 +404,25 @@ static void dlg_terminated(sip_msg_t *req, dlg_cell_t *dlg, unsigned int dir) } /*! + * \brief Function that is registered as TM callback and called on T destroy + * + * - happens when wait_ack==1 + * + */ +static void dlg_ontdestroy(struct cell* t, int type, struct tmcb_params *param) +{ + dlg_cell_t *dlg = NULL; + dlg_iuid_t *iuid = NULL; + + iuid = (dlg_iuid_t*)(*param->param); + dlg = dlg_get_by_iuid(iuid); + if(dlg==0) + return; + /* 1 for callback and 1 for dlg lookup */ + dlg_unref(dlg, 2); +} + +/*! * \brief Function that is registered as TM callback and called on replies * * Function that is registered as TM callback and called on replies. It @@ -512,7 +537,9 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) goto done; } - if ( old_state!=DLG_STATE_DELETED && new_state==DLG_STATE_DELETED ) { + if ( new_state==DLG_STATE_DELETED + && (old_state==DLG_STATE_UNCONFIRMED + || old_state==DLG_STATE_EARLY) ) { LM_DBG("dialog %p failed (negative reply)\n", dlg); /* dialog setup not completed (3456XX) */ run_dlg_callbacks( DLGCB_FAILED, dlg, req, rpl, DLG_DIR_UPSTREAM, 0); @@ -524,6 +551,8 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) if_update_stat(dlg_enable_stats, failed_dlgs, 1); + if(dlg_wait_ack==1) + dlg_set_tm_waitack(t, dlg); goto done; } @@ -865,13 +894,13 @@ error: int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int smode) { - dlg_iuid_t *iuid; + dlg_iuid_t *iuid = NULL; if(t==NULL) return -1; if(smode==0) { iuid = dlg_get_iuid_shm_clone(dlg); - if(iuid==NULL) + if(iuid==NULL) { LM_ERR("failed to create dialog unique id clone\n"); goto error; @@ -888,9 +917,43 @@ int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, return 0; error: + dlg_iuid_sfree(iuid); return -1; } +/*! + * \brief add dlg structure to tm callbacks to wait for negative ACK + * \param t current transaction + * \param dlg current dialog + * \return 0 on success, -1 on failure + */ +int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg) +{ + dlg_iuid_t *iuid = NULL; + if(t==NULL) + return -1; + + LM_ERR("registering TMCB to wait for negative ACK\n"); + iuid = dlg_get_iuid_shm_clone(dlg); + if(iuid==NULL) + { + LM_ERR("failed to create dialog unique id clone\n"); + goto error; + } + dlg_ref(dlg, 1); + if ( d_tmb.register_tmcb( NULL, t, + TMCB_DESTROY, + dlg_ontdestroy, (void*)iuid, dlg_iuid_sfree)<0 ) { + LM_ERR("failed to register TMCB to wait for negative ACK\n"); + dlg_unref(dlg, 1); + goto error; + } + + return 0; +error: + dlg_iuid_sfree(iuid); + return -1; +} /*! * \brief Parse the record-route parameter, to get dialog information back [View Less]

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012