sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: siptrace: several fixes to extra headers management
by Daniel-Constantin Mierla 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 4485f638675dcff339f2af3cc93b762820d0154f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4485f63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 16 22:06:35 2011 +0200 siptrace: several fixes to extra headers management - use pkg for memory needs instead of standard malloc/free - declare variables at beginning of functions for better C compliancy - free allocated pointer in case of a later error --- modules_k/siptrace/siptrace.c | 78 +++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 26 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 9b768e8..5b2b9e5 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -498,12 +498,18 @@ error: // Appends x-headers to the message in sto->body containing data from sto static int sip_trace_xheaders_write(struct _siptrace_data *sto) { + char* buf = NULL; + int bytes_written = 0; + char* eoh = NULL; + int eoh_offset = 0; + char* new_eoh = NULL; + if(xheaders_write_flag==NULL || *xheaders_write_flag==0) return 0; // Memory for the message with some additional headers. // It gets free()ed in sip_trace_xheaders_free(). - char* buf = malloc(sto->body.len + XHEADERS_BUFSIZE); + buf = pkg_malloc(sto->body.len + XHEADERS_BUFSIZE); if (buf == NULL) { LM_ERR("sip_trace_xheaders_write: out of memory\n"); return -1; @@ -513,17 +519,17 @@ static int sip_trace_xheaders_write(struct _siptrace_data *sto) // strstr() to work. Then search for the end-of-header sequence. memcpy(buf, sto->body.s, sto->body.len); buf[sto->body.len] = '\0'; - char* eoh = strstr(buf, "\r\n\r\n"); + eoh = strstr(buf, "\r\n\r\n"); if (eoh == NULL) { LM_ERR("sip_trace_xheaders_write: malformed message\n"); - return -1; + goto error; } eoh += 2; // the first \r\n belongs to the last header => skip it // Write the new headers a the end-of-header position. This overwrites // the \r\n terminating the old headers and the beginning of the message // body. Both will be recovered later. - int bytes_written = snprintf(eoh, XHEADERS_BUFSIZE, + bytes_written = snprintf(eoh, XHEADERS_BUFSIZE, "X-Siptrace-Fromip: %.*s\r\n" "X-Siptrace-Toip: %.*s\r\n" "X-Siptrace-Time: %llu %llu\r\n" @@ -536,31 +542,40 @@ static int sip_trace_xheaders_write(struct _siptrace_data *sto) sto->dir); if (bytes_written >= XHEADERS_BUFSIZE) { LM_ERR("sip_trace_xheaders_write: string too long\n"); - return -1; + goto error; } // Copy the \r\n terminating the old headers and the message body from the // old buffer in sto->body.s to the new end-of-header in buf. - int eoh_offset = eoh - buf; - char* new_eoh = eoh + bytes_written; + eoh_offset = eoh - buf; + new_eoh = eoh + bytes_written; memcpy(new_eoh, sto->body.s + eoh_offset, sto->body.len - eoh_offset); // Change sto to point to the new buffer. sto->body.s = buf; sto->body.len += bytes_written; return 0; +error: + if(buf != NULL) + pkg_free(buf); + return -1; } // Parses x-headers, saves the data back to sto, and removes the x-headers // from the message in sto->buf static int sip_trace_xheaders_read(struct _siptrace_data *sto) { + char* searchend = NULL; + char* eoh = NULL; + char* xheaders = NULL; + long long unsigned int tv_sec, tv_usec; + if(xheaders_read_flag==NULL || *xheaders_read_flag==0) return 0; // Find the end-of-header marker \r\n\r\n - char* searchend = sto->body.s + sto->body.len - 3; - char* eoh = memchr(sto->body.s, '\r', searchend - eoh); + searchend = sto->body.s + sto->body.len - 3; + eoh = memchr(sto->body.s, '\r', searchend - eoh); while (eoh != NULL && eoh < searchend) { if (memcmp(eoh, "\r\n\r\n", 4) == 0) break; @@ -576,7 +591,7 @@ static int sip_trace_xheaders_read(struct _siptrace_data *sto) // message body is shifted towards the beginning of the message // to remove the x-headers. *eoh = '\0'; - char* xheaders = strstr(sto->body.s, "\r\nX-Siptrace-Fromip: "); + xheaders = strstr(sto->body.s, "\r\nX-Siptrace-Fromip: "); if (xheaders == NULL) { LM_ERR("sip_trace_xheaders_read: message without x-headers " "from %.*s, callid %.*s\n", @@ -586,17 +601,16 @@ static int sip_trace_xheaders_read(struct _siptrace_data *sto) // Allocate memory for new strings in sto // (gets free()ed in sip_trace_xheaders_free() ) - sto->fromip.s = malloc(51); - sto->toip.s = malloc(51); - sto->method.s = malloc(51); - sto->dir = malloc(4); + sto->fromip.s = pkg_malloc(51); + sto->toip.s = pkg_malloc(51); + sto->method.s = pkg_malloc(51); + sto->dir = pkg_malloc(4); if (!(sto->fromip.s && sto->toip.s && sto->method.s && sto->dir)) { LM_ERR("sip_trace_xheaders_read: out of memory\n"); goto erroraftermalloc; } // Parse the x-headers: scanf() - long long unsigned int tv_sec, tv_usec; if (sscanf(xheaders, "\r\n" "X-Siptrace-Fromip: %50s\r\n" "X-Siptrace-Toip: %50s\r\n" @@ -626,10 +640,14 @@ static int sip_trace_xheaders_read(struct _siptrace_data *sto) return 0; erroraftermalloc: - if (sto->fromip.s) free(sto->fromip.s); - if (sto->toip.s) free(sto->toip.s); - if (sto->method.s) free(sto->method.s); - if (sto->dir) free(sto->dir); + if (sto->fromip.s) + pkg_free(sto->fromip.s); + if (sto->toip.s) + pkg_free(sto->toip.s); + if (sto->method.s) + pkg_free(sto->method.s); + if (sto->dir) + pkg_free(sto->dir); return -1; } @@ -637,13 +655,17 @@ erroraftermalloc: static int sip_trace_xheaders_free(struct _siptrace_data *sto) { if (xheaders_write_flag != NULL && *xheaders_write_flag != 0) { - free(sto->body.s); + if(sto->body.s) + pkg_free(sto->body.s); } if (xheaders_read_flag != NULL && *xheaders_read_flag != 0) { - free(sto->fromip.s); - free(sto->toip.s); - free(sto->dir); + if(sto->fromip.s) + pkg_free(sto->fromip.s); + if(sto->toip.s) + pkg_free(sto->toip.s); + if(sto->dir) + pkg_free(sto->dir); } return 0; @@ -659,13 +681,17 @@ static int sip_trace_store(struct _siptrace_data *sto) gettimeofday(&sto->tv, NULL); - if (sip_trace_xheaders_read(sto) != 0) return -1; + if (sip_trace_xheaders_read(sto) != 0) + return -1; int ret = sip_trace_store_db(sto); - if (sip_trace_xheaders_write(sto) != 0) return -1; + if (sip_trace_xheaders_write(sto) != 0) + return -1; + trace_send_duplicate(sto->body.s, sto->body.len); - if (sip_trace_xheaders_free(sto) != 0) return -1; + if (sip_trace_xheaders_free(sto) != 0) + return -1; return ret; }

1 0

git:master: siptrace: support to use sip_trace() in onsend_route
by Daniel-Constantin Mierla 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 9d8df2527d13878cee23af5b14f142a0cc4cd878 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d8df25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 16 17:59:30 2011 +0200 siptrace: support to use sip_trace() in onsend_route --- modules_k/siptrace/siptrace.c | 52 +++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 5869e27..9b768e8 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -780,6 +780,7 @@ error: static int sip_trace(struct sip_msg *msg, char *dir, char *s2) { struct _siptrace_data sto; + struct onsend_info *snd_inf = NULL; if(msg==NULL) { LM_DBG("nothing to trace\n"); @@ -798,8 +799,6 @@ static int sip_trace(struct sip_msg *msg, char *dir, char *s2) if(sip_trace_prepare(msg)<0) return -1; - sto.body.s = msg->buf; - sto.body.len = msg->len; sto.callid = msg->callid->body; if(msg->first_line.type==SIP_REQUEST) { @@ -816,21 +815,44 @@ static int sip_trace(struct sip_msg *msg, char *dir, char *s2) sto.status.len = 0; } - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff,":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + snd_inf=get_onsend_info(); + if(snd_inf==NULL) { + sto.body.s = msg->buf; + sto.body.len = msg->len; - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff,":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); + strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); + strcat(sto.fromip_buff,":"); + strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); - sto.dir = (dir)?dir:"in"; + siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); + strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + + sto.dir = (dir)?dir:"in"; + } else { + sto.body.s = snd_inf->buf; + sto.body.len = snd_inf->len; + + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + + siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); + strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to))); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str((int)su_getport(snd_inf->to), NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + + sto.dir = "out"; + } sto.fromtag = get_from(msg)->tag_value;

1 0

git:master: modules_k/dialog: Add multiple features.
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: c021559e414892b9bafae0f1ce40081945fff49a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c021559… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 2 18:29:05 2011 +0200 modules_k/dialog: Add multiple features. - Set and get dialog variables programmatically (needed in certain cases where PV access does not suffice). - Change dialog callback signature to pass both request and response message instead of just the request. This is to enable access to at least one type of message when the other is not available; e.g., DLGCB_FAILED callbacks due to a local timeout (408) do not provide requests but responses only. Also, adapt callback usages accordingly at multiple spots. - Provide additional callback DLGCB_TERMINATED_CONFIRMED that is executed whenever the response to a BYE request is sent. - Move unreference_dialog() to a more suitable location. - Provide functions to add and remove a dialog from a transaction (required for referencing at certain occassions). - Move spiral detection functionality into dlg_new_dialog() to faciliate spiral detection when dlg_manage() is used. - Add a dialog's reference count to list of printable statistics. Credits to Sven Knoblich, sven.knoblich(a)1und1.de . --- modules_k/dialog/dialog.c | 4 +- modules_k/dialog/dlg_cb.c | 18 +- modules_k/dialog/dlg_cb.h | 19 ++- modules_k/dialog/dlg_handlers.c | 429 ++++++++++++++++++++++++------------- modules_k/dialog/dlg_hash.c | 21 ++- modules_k/dialog/dlg_load.h | 2 + modules_k/dialog/dlg_profile.c | 39 ++-- modules_k/dialog/dlg_profile.h | 6 + modules_k/dialog/dlg_req_within.c | 2 +- modules_k/dialog/dlg_var.c | 59 +++++- modules_k/dialog/dlg_var.h | 2 + 11 files changed, 421 insertions(+), 180 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c02…

2 2

git:master: modules_k/acc: Fix typos.
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 9f45de90eb684e058d4c6a195fb774abbe71a52e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f45de9… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 19:58:12 2011 +0200 modules_k/acc: Fix typos. --- modules_k/acc/acc_cdr.c | 2 +- modules_k/acc/acc_cdr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index e8678df..c2ecf44 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -23,7 +23,7 @@ /*! \file * \ingroup acc - * \brief Acc:: File to handle CRD generation by the help of the dialog-module + * \brief Acc:: File to handle CDR generation with the help of the dialog module * * - Module: \ref acc */ diff --git a/modules_k/acc/acc_cdr.h b/modules_k/acc/acc_cdr.h index 46687ef..4a679a4 100644 --- a/modules_k/acc/acc_cdr.h +++ b/modules_k/acc/acc_cdr.h @@ -23,7 +23,7 @@ /*! \file * \ingroup acc - * \brief Acc:: File to handle CRD generation by the help of the dialog-module + * \brief Acc:: File to handle CDR generation with the help of the dialog module * * - Module: \ref acc */

1 0

[tracker] Task closed: 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 is now closed: FS#125 - spiraled dialogs not detected when calling dlg_manage() on in-dialog requests User who did this - Timo Reimann (tr) Reason for closing: Fixed Additional comments about closing: To be shipped in SR 3.2. 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

[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 - Timo Reimann (tr) ---------- Fix has been merged into master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=125#comment249 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: Merge branch 'master' into treimann/acc-cdr
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master 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

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

16 Aug '11

Module: sip-router Branch: master Commit: 83c9d7187ab144d3f7f7adc31ccbb129a798c521 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83c9d71… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Aug 15 14:58:20 2011 +0200 Merge branch 'master' into treimann/acc-cdr * master: (76 commits) core: new core event for received datagrams Added documentation to the DMQ module htable: docs updated with db_expires parameter htable: control load/save of expires value from db via parameter srdb1: updated the definition of siptrace table to include time_us column modules_k/siptrace: Add time to x-headers modules_k/siptrace: Add column time_us modules_k/siptrace: Add "x-headers" feature modules_k/siptrace: Add trace_to_database configuration parameter modules_k/siptrace: separately store to db and/or send duplicate pua_xmpp: fixes to SIP-XMPP presence status translations Expose terminate_dlg through C API Expose terminate_dlg through C API Added terminate_dlg description Expose terminate_dlg through C API modules_k/dialog: Fix a bug that would cause a segfault when caller bind address information could not be retrieved from database and "dlg_list" was fifo-issued. modules_k/dialog: Improve dialog timer list handling. modules/tm, modules_k/pua: Fix for concurrency issue in PUA module tm: keep internal retr. intervals in ms lib/srdb1/schema: forgot to increase version number of pua table ... Conflicts: modules_k/dialog/dialog.c modules_k/dialog/dlg_load.h ---

1 0

git:master: modules_k/acc: Implement CDR-based logging.
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: bbb6df5dffc1187acce2fcdd8c716e034eb5f70e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbb6df5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 3 13:17:24 2011 +0200 modules_k/acc: Implement CDR-based logging. Full credits to Sven Knoblich, sven.knoblich(a)1und1.de . --- modules_k/acc/acc.h | 1 + modules_k/acc/acc_cdr.c | 692 +++++++++++++++++++++++++++++++++++++++ modules_k/acc/acc_cdr.h | 49 +++ modules_k/acc/acc_mod.c | 47 +++- modules_k/acc/acc_mod.h | 3 + modules_k/acc/doc/acc.xml | 16 + modules_k/acc/doc/acc_admin.xml | 203 +++++++++++- 7 files changed, 999 insertions(+), 12 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bbb…

1 0

git:master: modules_k/dialog: Allow configuration of when initial dialog
by Timo Reimann 16 Aug '11

16 Aug '11

Module: sip-router Branch: master Commit: 48b8190c3fa1e42ed153f92d96e0fb7839712557 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48b8190… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 2 20:14:52 2011 +0200 modules_k/dialog: Allow configuration of when initial dialog callbacks are executed (either in-script or post-script). - Implement functionality. - Add documentation. --- modules_k/dialog/dialog.c | 14 ++++++++++- modules_k/dialog/dlg_handlers.c | 23 ++++++++++++++---- modules_k/dialog/dlg_handlers.h | 2 +- modules_k/dialog/dlg_var.c | 8 ++++++ modules_k/dialog/dlg_var.h | 2 + modules_k/dialog/doc/dialog_admin.xml | 40 +++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 7 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 5e751ac..7f029d8 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -104,6 +104,7 @@ static char* profiles_wv_s = NULL; static char* profiles_nv_s = NULL; str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; +int initial_cbs_inscript = 1; str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; @@ -241,6 +242,7 @@ static param_export_t mod_params[]={ { "profiles_no_value", STR_PARAM, &profiles_nv_s }, { "bridge_controller", STR_PARAM, &dlg_bridge_controller.s }, { "ruri_pvar", STR_PARAM, &ruri_pvar_param.s }, + { "initial_cbs_inscript", INT_PARAM, &initial_cbs_inscript }, { 0,0,0 } }; @@ -503,6 +505,11 @@ static int mod_init(void) return -1; } + if (initial_cbs_inscript != 0 && initial_cbs_inscript != 1) { + LM_ERR("invalid parameter for running initial callbacks in-script (must be either 0 or 1)\n"); + return -1; + } + /* update the len of the extra headers */ if (dlg_extra_hdrs.s) dlg_extra_hdrs.len = strlen(dlg_extra_hdrs.s); @@ -575,6 +582,11 @@ static int mod_init(void) return -1; } + if (register_script_cb( spiral_detect_reset, POST_SCRIPT_CB|REQUEST_CB,0)<0) { + LM_ERR("cannot register req pre-script spiral detection reset callback\n"); + return -1; + } + if ( register_timer( dlg_timer_routine, 0, 1)<0 ) { LM_ERR("failed to register timer \n"); return -1; @@ -902,7 +914,7 @@ static int w_dlg_manage(struct sip_msg *msg, char *s1, char *s2) dlg_onroute(msg, NULL, NULL); seq_match_mode = backup_mode; } else { - if(dlg_new_dialog(msg, 0)!=0) + if(dlg_new_dialog(msg, 0, initial_cbs_inscript)!=0) return -1; } return 1; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a701fee..450fd09 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -83,6 +83,8 @@ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; +extern int initial_cbs_inscript; +int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -609,11 +611,17 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) { struct sip_msg *req = param->req; + if (!initial_cbs_inscript) { + if (spiral_detected == 1) + run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, req, NULL, DLG_DIR_DOWNSTREAM, 0); + else if (spiral_detected == 0) + run_create_callbacks( current_dlg_pointer, req); + } if((req->flags&dlg_flag)!=dlg_flag) return; if (current_dlg_pointer!=NULL) return; - dlg_new_dialog(req, t); + dlg_new_dialog(req, t, 1); } @@ -754,7 +762,7 @@ static void store_dlg_in_tm_cb (struct cell* t, * \param t transaction * \return 0 on success, -1 on failure */ -int dlg_new_dialog(struct sip_msg *req, struct cell *t) +int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cbs) { struct dlg_cell *dlg; str s; @@ -787,6 +795,9 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) if (detect_spirals) { + if (spiral_detected == 1) + return 0; + dir = DLG_DIR_NONE; dlg = get_dlg(&callid, &ftag, &ttag, &dir, &del); @@ -801,14 +812,16 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) { LM_DBG("Callid '%.*s' found, must be a spiraled request\n", callid.len, callid.s); + spiral_detected = 1; - run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); - + if (run_initial_cbs) + run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); // get_dlg with del==0 has incremented the ref count by 1 unref_dlg(dlg, 1); goto finish; } } + spiral_detected = 0; dlg = build_new_dlg (&callid /*callid*/, &(get_from(req)->uri) /*from uri*/, @@ -837,7 +850,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) link_dlg(dlg,0); - run_create_callbacks(dlg, req); + if (run_initial_cbs) run_create_callbacks( dlg, req); /* first INVITE seen (dialog created, unconfirmed) */ if ( seq_match_mode!=SEQ_MATCH_NO_ID && diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index d56b7fb..eef5a8f 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -128,7 +128,7 @@ void dlg_ontimeout( struct dlg_tl *tl); * \param t transaction * \return 0 on success, -1 on failure */ -int dlg_new_dialog(struct sip_msg *msg, struct cell *t); +int dlg_new_dialog(struct sip_msg *msg, struct cell *t, const int run_initial_cbs); /*! diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 42a7e91..6483233 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -29,6 +29,7 @@ #include "dlg_db_handler.h" dlg_ctx_t _dlg_ctx; +extern int spiral_detected; /*! global variable table, in case the dialog does not exist yet */ struct dlg_var * var_table = 0; @@ -721,3 +722,10 @@ dlg_ctx_t* dlg_get_dlg_ctx(void) { return &_dlg_ctx; } + +int spiral_detect_reset(struct sip_msg *foo, unsigned int flags, void *bar) +{ + spiral_detected = -1; + + return 0; +} diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index 99ab746..cd53807 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -83,4 +83,6 @@ struct dlg_cell* dlg_get_ctx_dialog(void); dlg_ctx_t* dlg_get_dlg_ctx(void); +int spiral_detect_reset(struct sip_msg *foo, unsigned int flags, void *bar); + #endif diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 34ac2ac..ae6c95d 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1054,6 +1054,46 @@ modparam("dialog", "bridge_controller", "sip:ctd@kamailio.org") </example> </section> + <section> + <title><varname>initial_cbs_inscript</varname> (string)</title> + <para> + If the initial dialog callbacks (i.e., DLGCB_CREATED and + DLGCB_SPIRALED) should be executed in-script or post-script. + If dlg_manage() is not used, the setting of this parameter does + not matter; otherwise, initial callbacks will be executed + directly after dlg_manage() is called if this parameter is + enabled. If it is disabled, initial callback execution will be + postponed until configuration script execution completes. + </para> + <para> + The supported values are: + </para> + <itemizedlist> + <listitem><para> + <emphasis>0 - POST-SCRIPT</emphasis> - execute initial + callbacks after the script completes; + </para></listitem> + <listitem><para> + <emphasis>1 - IN-SCRIPT</emphasis> - execute initial + callbacks during script execution, i.e., right after + dlg_manage() is called; + </para></listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>initial_cbs_inscript</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "initial_cbs_inscript", "0") +... +</programlisting> + </example> + </section> + </section>

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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