sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:carstenbock/rtpproxy: The Timeout socket must be sent with Update after session confirmation.

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: d16d34b1ed18e572705f1c1a8b3113f274e618b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d16d34b… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 15:33:30 2010 +0200 The Timeout socket must be sent with Update after session confirmation. --- modules_k/rtpproxy/rtpproxy.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 1e26b61..e2d7e55 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -407,7 +407,7 @@ static param_export_t params[] = { {"rtpproxy_disable_tout", INT_PARAM, &rtpproxy_disable_tout }, {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, - {"timeout_socket_str", STR_PARAM, &timeout_socket_str.s }, + {"timeout_socket", STR_PARAM, &timeout_socket_str.s }, {0, 0, 0} }; @@ -2173,12 +2173,12 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) } if (to_tag.len > 0) { iovec_param_count = 18; - } else { - iovec_param_count = 14; if (timeout_socket_str.len > 0) { - iovec_param_count = 16; - STR2IOVEC(timeout_socket_str, v[15]); + iovec_param_count = 20; + STR2IOVEC(timeout_socket_str, v[19]); } + } else { + iovec_param_count = 14; } cp = send_rtpp_command(node, v, iovec_param_count);

14 years, 5 months

preparing kamailio 3.0.3

by Daniel-Constantin Mierla

Hello, I am planning to release minor version 3.0.3 by beginning of next week. Please commit there what you think it needs to be fixed for this release. Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

14 years, 5 months

New commits on branch sr_3.0

by Andrei Pelinescu-Onciul

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0451e20… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 18 13:45:37 2010 +0200 pdbt: fix two bugs in debian packaging (cherry picked from commit cd71125fcdb434d50f6e7b5d208d260ebc49fca6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7465ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 17:14:38 2010 +0200 presence(k): copy evs_subs_handl to presence event list - patch by Nikita Kozlov, closes FS#82 (cherry picked from commit 9216a2ffa4c6ffd4bdd387530cad359f75acf0d7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40d2b9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 23:29:43 2010 +0200 presence_dialoginfo(k): don't exeed array size in error case - error handling could get to the size of array as index, resulting in out of bounds operation - patch by Marius-Ovidiu Bucur (cherry picked from commit 48f3159cdcc9ef06114a6d8f853687dc1338a8f0) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cf04be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 23:26:35 2010 +0200 presence(k): set properly db updated flag - patch by Marius-Ovidiu Bucur (cherry picked from commit b31c53abf1c3bafafb59d3fa6456135f1da6e6c9) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=264af2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:25:52 2010 +0200 pua(k): use the outbound proxy on updates - patch by Alex Hermann, SF#3035780 (cherry picked from commit f39cb1976978f0860d41a05ed181e45e14c88c58) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fee4f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:15:13 2010 +0200 pv: fixed tobody.params transformation - len was wrong when having quoted parameters - patch by Alex Hermann, closes SF#3035382 (cherry picked from commit 6cc5f8ec90db48483d644430bc2628356833fc1e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12945f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:07:45 2010 +0200 core: fix parsing quoted paramers in To header - fix off-by-one bug for quoted parameter values in parse_to - patch by Alex Hermann, SF#3035382 (cherry picked from commit 8593bc83c748835c6132eaa678064a2466316ae7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f394c9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 19:40:50 2010 +0200 registrar(k): reset local contact holder - when an UA fetches the bindings for a user and the user isn't registered, properly return an empty contact. - closes SF#3035778, patch by Alex Hermann (cherry picked from commit 776d941bef2e97089493a896bf0b57607078c52d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef9135e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jul 24 08:44:56 2010 +0200 sl(k): removed not needed var (cherry picked from commit 52e256540d8d2e6aa17256887fb9ff17580af3f8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a5bee9… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 18:17:01 2010 +0200 modules_k/dialog: Remove trailing whitespace. (cherry picked from commit 3ed75d129730ffe30fb3c1d5f8fa7870c9b5516a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5391968… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 18:12:17 2010 +0200 modules_k/dialog: Provide new fix to prevent "unable to find dialog" WARN messages caused by accessing a dialog in the "deleted" state (often happens with simultaneous BYE requests when both UAs hang up at the same time). This commit uses a different approach where a "deleted" flag is set in get_dlg() and lookup_dlg() which callers may evaluate. Callers who only care about existing dialogs can ignore the flag by passing a NULL argument. The commit "replaces" 9b7f25d7 and follows up 0723496c. (cherry picked from commit d1693b2c64dfc44f0271bdd1c38315578ebe7135) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e947a1… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 5 17:23:34 2010 +0200 modules_k/dialog: Revert "Prevent 'unable to find dialog' WARN messages caused by accessing a dialog in the "deleted" state". The approach chosen was incomplete as it requires extending checks of return values for all calls to get_dlg() and lookup_dlg() against POINTER_CLOSED_MARKER. Otherwise, it may lead to server crashes when code mistakes POINTER_CLOSED_MARKER for an existing dialog. However, having to check against two return values requires a lot of logic changes. Therefore, a better approach will be taken in a follow-up commit. This reverts commit 9b7f25d7196e41cbcc77c1d6e316cb1a8664ed81. (cherry picked from commit 0723496c037d8e22210861d6a0e9041351097f63) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54ae4e8… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:31:02 2010 +0300 modules:carrierroute Better handling of fclose (cherry picked from commit b5ef768bcabf905d455ca26225c55f858cbe4c48) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17e5609… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:02:14 2010 +0300 modules/carrierroute: Prevent resource leak in case of error the 2 FILE* opened in file mode where not properly closed on all code paths (cherry picked from commit 821a4322a0902b827add7913705f72d5e50176b5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebe2908… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Aug 2 17:26:20 2010 +0300 modules/tm: Fixed memory leak related to several tm function exports Mk_proxy() call allocates a new proxy_t* structure. The free_proxy() call does not free this structure, it frees only the content. Another pkg_free is necessary in this case. (cherry picked from commit 2ae7c6779188e053aa6d1cbd891c428ccc2b63fa) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a5a830… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jul 29 19:09:51 2010 +0200 modules_k/sst: Setting AVPs from integer values requires the PV_TYPE_INT flag to be set. (cherry picked from commit 61c4a93486fd3d215efb8d045c7415d752d3f057) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a15477… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 29 18:42:27 2010 +0200 reg(k): only store path if indicated by the configuration (cherry picked from commit 1ede271e9b669b2f335858edb47dd260f0d28ad2) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f37b2f9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 27 18:51:07 2010 +0200 auth_db(k): proper initialization for the default column (cherry picked from commit 42a27402b74d44eebd702bcd5b5afa598205b520) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=997bf8f… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 14:37:06 2010 +0200 modules_k/dialog: Prevent "unable to find dialog" WARN messages caused by accessing a dialog in the "deleted" state (often happens with simultaneous BYE requests when both UAs hang up at the same time). - Move POINTER_CLOSED_MARKER from dlg_cb.c into dlg_hash.h for common usage. - in lookup_dlg() and internal_get_dlg(), return POINTER_CLOSED_MARKER when dialog is found but in the DLG_STATE_DELETED state. - in dlg_onroute(), abort request processing if dialog is found to be in the "deleted" state. (cherry picked from commit 9b7f25d7196e41cbcc77c1d6e316cb1a8664ed81) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78f24f7… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 14:06:11 2010 +0200 modules_k/dialog: Move comment regarding dialog-destroying unreference operation to proper new location. (cherry picked from commit 191cc1d6437a252516d76c6249aa701a5b39b4e4) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e01faf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 26 19:02:04 2010 +0200 Revert "db_postgres(old API) FS#77: fix BLOBs with postgres" This reverts commit a6141a32738b8610c70ba7e0a88c0d79561cb7a6. (cherry picked from commit c3964dbca625de202db16ae6a4f9ea91128ccb48) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3ba989… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jul 26 17:39:18 2010 +0300 modules_k/presence and modules_k/rls Fixed parse_to() usage In case of error parse_to returns a pointer to the last parsed character. This is not a strict error check, as several other modules provide a relaxed way of parsing To header (the uri is still parseable even if the TO headers are not). (cherry picked from commit 53c179bb3042bb767c43cd1a87a2cb8ab0ea92b7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10c1756… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jul 23 13:51:11 2010 +0200 dialog(k): also update README after doc change (cherry picked from commit 3fe08c96578a49fb70af11dd869de9572057afcd) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45725d2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jul 23 11:32:25 2010 +0300 modules_k/pv : Fixed a bug in pv transformation (tobody transformation), that caused a segmentation fault. The bug was caused by a incorrect error handling of the parse_to() method (defined in parser/parse_to.c). The function returns a char* (pointer to the last character parsed), in case of error it updates an error status. On incorrect to params, a segmentation fault happened after some time.(Because of a double pkg_free). (cherry picked from commit e7096bf24310b71623520a3b963ddc50c111827c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e53d567… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jul 21 16:19:06 2010 +0200 modules_k/dialog (doc update): Be specific on the fact that only confirmed dialogs can be terminated by means of "dlg_end_dlg". (cherry picked from commit 03e20458bc83a8d918c2ea17c3f46a073ce7cdd8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fd5c35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 16 17:22:05 2010 +0200 dispatcher: doc updated to reflect PV parameter options - ds_select_dst() can take PVs as parameters (cherry picked from commit f3d351355852c7df6582bcd7939ee3855168a60a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a270ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 16 17:19:48 2010 +0200 tm: use warn to print message if load_tm is not found - in case of sl trying to import tm api for stateful reply, is not an error if tm is not found - modules importing tm api print error message if the function returns error code and they need the tm (cherry picked from commit 5a25609343f5697e6ebcf8f49e589b992a8af72e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa2eec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 15 13:48:21 2010 +0200 core: print line for include_file errors - easier to localize the error, reported by Raul Alexis Betancor Santana (cherry picked from commit 2b680bde0605cbc1cb4840105fafc83a2a235ec5) (cherry picked from commit d9a4c3b4aefeb87f62b06dd2bd55f23bdb804b43) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec91266… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 8 12:34:40 2010 +0200 tmx: use TM api function to get tm table - fix missing symbol for mode=debug, reported by Santiago Gimeno (cherry picked from commit fb39052ff574c133c74f1f0a1c8d5f43b5bc93be) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32ad357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 8 12:32:45 2010 +0200 tm: export function to get access to tm table - to fix missing symbol in tmx for mode=debug, reported by Santiago Gimeno (cherry picked from commit 181f81b2458ee04241b36c65ac1d95f38003250d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87e30e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 5 10:36:58 2010 +0200 core: typos in comments (cherry picked from commit 39ac6a5c0a7833ad0c29ae7711f37b92c5c81e95) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d6e8ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 2 18:21:10 2010 +0200 tm: TMCB_RESPONSE_READY executes by its own - removed the define of it to TMCB_RESPONSE_OUT - now this callback is executed before writing reply to network (cherry picked from commit f1c35c13252d3160334e9b3f56094404f06009ba) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=945fb41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 21:03:36 2010 +0200 msilo(k): updated readme file - documented the new parameter add_contact - readme file regenerated (cherry picked from commit 9d8c55287ea9ac93440d762c511afe531c629552) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc5707b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 20:56:23 2010 +0200 msilo(k): parameter to control contact header - add_contact parameter controls whether contact header is added to msilo generated messages - default is off (no contact added, as per RFC3428), reported by Juha Heinanen (cherry picked from commit 8ffb09ce908088af89e70a5acd87a318baf5a029) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15d098d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:19:17 2010 +0200 pdb: avoid child re-init - for mi cmd when used over xmlrpc module (cherry picked from commit bc34a82fbf5bd903cc50cb34c73afb7b685603a7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6466180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:08:04 2010 +0200 presence_xml: avoid re-init of db handler - safety check for usage of xmlrpc module for mi cmds (cherry picked from commit 098deec785ab7c4e927104e83fc84b6c1b347719) (cherry picked from commit b4b903e1df57d290b2fcf3b7463b863ad402e15c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2e4496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:07:18 2010 +0200 presence: avoid re-init of db handler - safety check for usage of xmlrpc for mi cmds (cherry picked from commit 8a1d985743fe6ec544a215b8ddb6e54adbb024d9) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c495bdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:00:51 2010 +0200 kex: check if uptime value was initialized (cherry picked from commit 7537d27782b185a20d32b08f7bcb30557bb3b7ff) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22aedb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:57:09 2010 +0200 userblacklist: avoid double child initialization - safety check for cases when xmlrpc module is used to run mi commands (cherry picked from commit 3f2ca85f4254746240177830e85a87b81d8cfd85) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed8cd79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:43:54 2010 +0200 usrloc(k): avoid re-initialization of db handler - can happen if mi commands are used over rpc interface via xmlrpc module (cherry picked from commit 8948fe654b83217979b2d2154934a973aefa9ae3) (cherry picked from commit 705a61b1b9f03c11c10b266f6743124afaf40ea4) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa35a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:35:27 2010 +0200 domain(k): safety check for db handler initialization - avoid double initialization of db handler when using xmlrpc module for mi commands (cherry picked from commit c65fc04ff83c6304d5889f3426b3b96b5ac7ee69) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8c4886… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:31:14 2010 +0200 drouting: check if db connection is initialized - applied for the case of mi reload command (cherry picked from commit 76266ca085d05be949ddc34df513de6810c5d65f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=deedf6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:22:15 2010 +0200 htable: close db connection in case of mi cmd errors - in some error cases while processing mi reload command, db connection was left open (cherry picked from commit e723b2b24a87599d538b652ee60c862f769f8036) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=595d71f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:15:33 2010 +0200 pdt(k): safety check for db handler initialization - there can be two attepts to initialize if xmlrpc module is loaded (cherry picked from commit 2e8d469de4253444d61cb186395d40c0fd492fe6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dafd395… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:13:54 2010 +0200 mi_rpc: initialize mi cmds for sip workers - xmlrpc module re-uses sip workers to process xmlrpc request which can execute mi commands, therefore is need to initialize mi cmds as for a mi process - initialization is done only when xmlrpc module is loaded (cherry picked from commit b2b2a82d497ee37428abab933f4862255bc5c4a1) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bd3fa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 17:40:20 2010 +0200 permissions(k): safety check for db_handle - avoid double initialization of trusted ops db handler (cherry picked from commit df2d92a1f0698e0d108ec080de5fc3673d332209) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bb2261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 12:10:34 2010 +0200 permissions(k): reverted incomplete fix for mi cmd - the mi command execution via rpc is fixed by initialization of mi commands done now by mi_rpc module (cherry picked from commit a92bb2ee265c6d7f44d3fe848725b458c441b207) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44c8572… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 12:08:42 2010 +0200 mi_rpc: call MI init child functions - MI init child functions called for RPC processes - fix for several MI commands that can be executed now via RPC and they needed to do specific initialization for each process - reported by Juha Heinanen (cherry picked from commit af18dae034cf8836f1627929f189983ca6010428) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd74c78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 12:04:52 2010 +0200 kmi: allow multiple initializations of mi child - safety check to detect if mi child was initialized - protect against multiple initializations that can occure due to usage from MI or RPC processes (cherry picked from commit 4047fc33053898d17498104b849dae9e45bee1e6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bfcbcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 29 19:48:59 2010 +0200 core: safety check for free contact - patch by Sebastian Z., checking if the content is null before freeing it (cherry picked from commit 7aed7d72c98a8228e9687773c3bab20d8934251a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33b02f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 1 23:02:14 2010 +0200 presence_xml: fixed log message (cherry picked from commit 134edd5fcdfffcf18299f0673a1ecb65bd8b3241) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47c0f96… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jun 28 10:50:05 2010 +0200 modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_DESTROY to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. (cherry picked from commit 3537c2d8c27617023cb9f9a569435483748fef1f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a223c7… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jul 5 17:52:12 2010 +0200 Increase failed_dlgs when a non-2xx final response has been received only. (cherry picked from commit dd9681ce5f6602c888d847a283eaaf637318994d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a650c5… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 14:46:54 2010 +0200 Fix minor typo (cherry picked from commit d4c63b7f3e7be5a2a86c929d013f19d6c8cbb4eb) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=565b659… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 13:21:40 2010 +0200 modules/dialog: Do not send BYE request for non-confirmed dialogs (not supported). (cherry picked from commit 4a84c8c410ce45d9e5443eb52ac4c79e47ab5f3c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c780337… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Jul 7 12:39:58 2010 +0300 Fixed a memory leak on shm memory, caused by the dtrie implementation. dtrie_destroy and dtrie_clear could leak 10 * sizeof(void*) for each node in the trie. Mainly affected carrierroute and userblacklist modules (cherry picked from commit 5c5cc3df5301e86ee78d79f52aa917e0f67f37e8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=893d9fa… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jun 30 18:25:55 2010 +0200 Do not consider in-early-dialog BYE requests to be bogus. (cherry picked from commit 8bf53ec54beab825794b8345cce7fdb41c783809) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62e4a6b… Author: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 30 17:15:37 2010 +0300 modules_k/msilo: do not include Contact header in msilo generated messages (cherry picked from commit 37940ea09b861b18994c4243abf8c6d8e711a2ef) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=481cdc8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 29 18:11:58 2010 +0200 db_postgres(old API) FS#77: fix BLOBs with postgres fix BLOBs with postgres, also add a null-termination as the other SQL databases in order to be able to work with the presence modules (cherry picked from commit 2e56720769913c55cacc83fe3a31f44f072e7590) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3013511… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 29 12:26:30 2010 +0200 auc(k): fix error in authentification: Digest should be compared case insensitive (cherry picked from commit 3f5909fd3ca55aa43148d81a8874eaeaeaf91968) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82931de… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 18:39:49 2010 +0200 modules_k/dialog: Fix timer reset and improve timeout value logging - Fix a bug that caused dialog timeout values to be refreshed only when a custom timeout was provided by the user via AVP. - Do not log failure to get timeout from AVP when in fact no AVP was used. - Add missing newline character. (cherry picked from commit 3d1d941dde7a2b4a764dcfc9939501e5ddf83f04) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af3586d… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:50:52 2010 +0200 Correct typo in comment referring to other file. (cherry picked from commit 927351a2c4bd222db8a58b877a5fb018fdce2d00) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43331dc… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:01:13 2010 +0200 modules_k/dialog: Reduce log verbosity for list traversal of expired dialogs. - Change logging of start/previous/next pointers from WARN to DBG when traversing the list of expired dialogs. (cherry picked from commit a5f03adcad92993e170be1d2a5dbb879b4777347) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9208ca4… Author: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jun 23 15:39:21 2010 +0200 Do not consider in-early-dialog requests to be bogus. (cherry picked from commit cbbc5eff256565a3eae29a9353bbb4e3064640bb) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d82a1f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Jun 16 14:11:48 2010 +0300 Always set data payload to NULL, thus avoiding problems when root node had data associated with it Credits for the patch go to Henning Westerholt. (cherry picked from commit f05a578613ca1c9cc15e27cc01c5573e1cf0b888) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe5f4eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:03:22 2010 +0200 db_berkeley: get rid of compile warnings (cherry picked from commit 8b506f7d9b8eba682d180e458b0e2a278053d29a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e491cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:34:47 2010 +0200 srdb1: updated entities.xml path in db schema (cherry picked from commit 387e7ec22e736d1ce51f5c12d9f4e8533ead8512) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11064eb… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Jun 6 13:26:31 2010 +0200 *PKG Debian - Mantainer header changed to $me (cherry picked from commit 3224810f6fc75b0f7a498e8bfe3947c0e05bc98f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=019bd70… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Wed Jun 2 00:49:56 2010 +0200 PKG Debian: More version support - debian-squeeze added. Purple excluded from the compile list. Seems that purple module does not work with libpurple 2.7+ - ubuntu-lucid added Universe has to be enabled in sources.list for radius and memcached module dependency matching (cherry picked from commit 64db1af36c67e7ecb5bc3451f94a11b69edc1fa6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fa239a… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Tue Jun 1 23:31:14 2010 +0200 PKG Debian version dependant changes - debian-lenny is erased and symlinks now to debian - debian-etch is recreated from debian. This provides consistency to all debian* folders - Berkeley and purple modules excluded in debian-etch to avoid dependency problems (cherry picked from commit aa2526dce7e5fcade57f577de5d701c990705cee) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3bf155… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sat May 29 22:13:26 2010 +0200 pkg Changes to debian/control - Dependency changes to match lenny and squeeze at least. This will allow to drop debian-lenny folder in the future. - Added "Replaces" to kamailio-*-modules since the name of the modules has changed since kamailio-1.5 and the upgrade would not work properly. - VCS lines erased since the pointed to wrong URLs and we do not have a 3.0.2 tag to point. - Added "Conflicts" to erase old packages that do not exist in this version and could cause upgrade not to work properly. (cherry picked from commit e0eeace9b3c0c90d390bba63dee6d161c3f34d40) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80a1c90… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Fri May 28 22:27:42 2010 +0200 pkg: update debian changelog version for kamailio - Updated kamailio version to 3.0.2.99. This will allow development builds to update the stable branch and will be clear that it's an unreleased version. This will change just before releasing 3.0.3 and then change again to 3.0.3.99 (cherry picked from commit 754e46dd87756c0aef7046c143ff090d76299159) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7197863… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Fri May 28 21:44:39 2010 +0200 pkg: Update debian changelog files - Update kamailio version to 3.0.2 for debian-etch and debian-lenny builds. (cherry picked from commit db3dc3f305409ad34dcf985c5dc63bddd4dd9e1b) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86cf155… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:29:24 2010 +0200 centos spec: version set to 3.0.2 (cherry picked from commit e5560029f04058642bebb09a1a1b7df699c5f80b) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f863e0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 10:28:16 2010 +0200 debian: updated changelog for 3.0.2 (cherry picked from commit a2dbcec4278631ec78944098e7b407cebd682e92) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58783eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 15 11:20:52 2010 +0200 pkg(k): extended rules for mysql depends - closes FS#65, reported by Jon Bonilla (cherry picked from commit edfbfab6590381872dbd0f9ea89b496cb1c911d6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab87fe7… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 31 14:05:51 2010 -0400 pkg: updated kamailio spec file for CentOS - updated kamailio spec file for CentOS along with default and init scripts. (cherry picked from commit 0acd8963f76a4854e101210db17854ca8062ff61) (cherry picked from commit 48015a8e471ecadfb571fa94daa7300992fe6674) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e84b2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 8 23:12:39 2010 +0100 - changelog updated (cherry picked from commit 679736aed2719cacbc328cf4561b6e2562feb9fb) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c86c624… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 11 18:37:10 2010 +0100 pkg: set version to 3.0.0 in debian changelog (cherry picked from commit 6d1e9f74d658942a0a5714ae452a6231e5f831e6)

14 years, 5 months

git:carstenbock/rtpproxy: Merge branch 'master' into rtpproxy

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: fdebd2b7a11dfb31d243b433f8fc5a389b6167a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdebd2b… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 22:44:53 2010 +0200 Merge branch 'master' into rtpproxy * master: modules*: add k stats. includes where needed kstats: cleanup - move type defs. to separate file modules_k/*: add missing lib/kmi/mi.h include mi: cleanup - move type defs. to separate file ---

14 years, 5 months

git:carstenbock/rtpproxy: Tiny typo.

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: 449cde48834574b069d930842d406ac709083654 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=449cde4… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 22:57:37 2010 +0200 Tiny typo. --- modules_k/rtpproxy/rtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 732369e..1e26b61 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -1814,7 +1814,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) {" ", 1}, /* separator */ {NULL, 0}, /* to_tag */ {";", 1}, /* separator */ - {NULL, 0} /* medianum */ + {NULL, 0}, /* medianum */ {" ", 1}, /* separator */ {NULL, 0}, /* Timeout-Socket */ };

14 years, 5 months

git:carstenbock/dialog: - added support to terminate a single dialog by providing call-id and from-tag

by Carsten Bock

Module: sip-router Branch: carstenbock/dialog Commit: df1c754e9563bc20f0c5e740ab1102f9f27c435b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df1c754… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 22:35:01 2010 +0200 - added support to terminate a single dialog by providing call-id and from-tag - can also be used to terminate all dialogs on proxy (e.g. before shutdown) Missing: Provide optional headers for the BYE-Message. --- modules_k/dialog/dialog.c | 1 + modules_k/dialog/dlg_hash.c | 50 +++++++++++++++++++++++++++++++++ modules_k/dialog/dlg_hash.h | 7 ++++ modules_k/dialog/dlg_req_within.h | 1 + modules_k/dialog/doc/dialog_admin.xml | 39 +++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 0ca60b4..e19e56b 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -232,6 +232,7 @@ static mi_export_t mi_cmds[] = { { "dlg_list", mi_print_dlgs, 0, 0, 0}, { "dlg_list_ctx", mi_print_dlgs_ctx, 0, 0, 0}, { "dlg_end_dlg", mi_terminate_dlg, 0, 0, 0}, + { "dlg_terminate_dlgs", mi_terminate_dlgs, 0, 0, 0}, { "profile_get_size", mi_get_profile, 0, 0, 0}, { "profile_list_dlgs", mi_profile_list, 0, 0, 0}, { "dlg_bridge", mi_dlg_bridge, 0, 0, 0}, diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index b004cef..80f506f 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -60,6 +60,7 @@ #include "dlg_timer.h" #include "dlg_hash.h" #include "dlg_profile.h" +#include "dlg_req_within.h" #define MAX_LDG_LOCKS 2048 #define MIN_LDG_LOCKS 2 @@ -1065,3 +1066,52 @@ error: free_mi_tree(rpl_tree); return NULL; } + +/*! + * \brief Terminate all or selected dialogs via the MI interface + * \param cmd_tree MI command tree + * \param param unused + * \return mi node with the dialog information, or NULL on failure + */ +struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ) +{ + struct mi_root* rpl_tree= NULL; + struct dlg_cell* dlg = NULL; + str headers = {0, 0}; + unsigned int i; + + rpl_tree = process_mi_params( cmd_tree, &dlg); + if (rpl_tree) + /* param error */ + return rpl_tree; + + rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); + if (rpl_tree==0) + return 0; + + if (dlg==NULL) { + LM_DBG("terminating %i dialogs\n", d_table->size); + + for( i=0 ; i<d_table->size ; i++ ) { + dlg_lock( d_table, &(d_table->entries[i]) ); + + for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if (dlg_bye_all(dlg, &headers)!=0) + goto error_all; + } + dlg_unlock( d_table, &(d_table->entries[i]) ); + } + } else { + if (dlg_bye_all(dlg, &headers)!=0) + goto error; + } + return rpl_tree; +error_all: + dlg_unlock( d_table, &(d_table->entries[i]) ); + free_mi_tree(rpl_tree); + return NULL; +error: + free_mi_tree(rpl_tree); + return NULL; +} + diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index e555837..aa70d84 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -327,6 +327,13 @@ struct mi_root * mi_print_dlgs(struct mi_root *cmd, void *param ); */ struct mi_root * mi_print_dlgs_ctx(struct mi_root *cmd, void *param ); +/*! + * \brief Terminate all or selected dialogs via the MI interface + * \param cmd_tree MI command tree + * \param param unused + * \return mi node with the dialog information, or NULL on failure + */ +struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ); /*! * \brief Check if a dialog structure matches to a SIP message dialog diff --git a/modules_k/dialog/dlg_req_within.h b/modules_k/dialog/dlg_req_within.h index 732f430..066361f 100644 --- a/modules_k/dialog/dlg_req_within.h +++ b/modules_k/dialog/dlg_req_within.h @@ -31,6 +31,7 @@ #define DLG_REQUEST_WITHIN_H #include "dlg_hash.h" +#include "../../modules/tm/tm_load.h" #define MAX_FWD "70" #define MAX_SIZE 256 diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index af697d9..98769f5 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1530,6 +1530,45 @@ if(dlg_get("abcdef", "123", "456")) </section> <section> + <title><varname>dlg_terminate_dlgs</varname></title> + <para> + Terminates a dialog or of all dialogs (calls). If only + one dialogs is to be terminated, the dialog identifiers are to be passed + as parameter (callid and fromtag). + </para> + <para> + Name: <emphasis>dlg_terminate_dlgs</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>callid</emphasis> (optional) - callid if a single + dialog to be terminated. + </para></listitem> + <listitem><para> + <emphasis>from_tag</emphasis> (optional, but cannot be present + without the callid parameter) - from tag (as per initial request) + of the dialog to be terminated. Note that if the from_tag is not + specified, only dialogs created by a request without a from tag + are matched, which will only occur with broken clients and is + thus a very rare situation. + </para></listitem> + </itemizedlist> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :dlg_terminate_dlgs:_reply_fifo_file_ + _empty_line_ + </programlisting> + <programlisting format="linespecific"> + :dlg_terminate_dlgs:_reply_fifo_file_ + abcdrssfrs122444(a)192.168.1.1 + AAdfeEFF33 + </programlisting> + </section> + + <section> <title><varname>profile_get_size</varname></title> <para> Returns the number of dialogs belonging to a profile. If the profile

14 years, 5 months

git:carstenbock/rtpproxy: - added support for the retrieval of RTP-Statistics through $rtpstat

by Carsten Bock

Module: sip-router Branch: carstenbock/rtpproxy Commit: ac84acd54496dec044b2c27ddf80139432f9ae28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac84acd… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 21:27:30 2010 +0200 - added support for the retrieval of RTP-Statistics through $rtpstat - added support for sending a timeout socket towards the RTP-Proxy (for timeout notifications) --- modules_k/rtpproxy/doc/rtpproxy_admin.xml | 42 +++++++++++++- modules_k/rtpproxy/rtpproxy.c | 88 ++++++++++++++++++++++++++++- 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/modules_k/rtpproxy/doc/rtpproxy_admin.xml b/modules_k/rtpproxy/doc/rtpproxy_admin.xml index 671dff1..f23bc58 100644 --- a/modules_k/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules_k/rtpproxy/doc/rtpproxy_admin.xml @@ -232,7 +232,29 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") </example> </section> </section> - + <section> + <title><varname>timeout_socket</varname> (string)</title> + <para> + The parameter sets timeout socket, which is transmitted to the RTP-Proxy. + </para> + <para> + If it is an empty string, no timeout socket will be transmitted to the RTP-Proxy. + </para> + <para> + <emphasis> + Default value is <quote></quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timeout_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "timeout_socket", "http://127.0.0.1:8000/RPC2") +... +</programlisting> + </example> + </section> + </section> <section> <title>Exported Functions</title> @@ -589,6 +611,24 @@ start_recording(); <section> <title>Exported Pseudo Variables</title> + <section> + <title><function moreinfo="none">$rtpstart</function></title> + <para> + Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy + are provided as a string and it does contain several packet-counters. The statistics + must be retrieved before the session is deleted (before unforce_rtpproxy). + </para> + + <example> + <title>$rtpstat-Usage</title> + <programlisting format="linespecific"> +... + append_hf("X-RTP-Statistics: $rtpstat\r\n"); +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 4303844..8f68a0f 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -306,6 +306,9 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); +/* Pseudo-Variables */ +static int pv_get_rtpstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); + /*mi commands*/ static struct mi_root* mi_enable_rtp_proxy(struct mi_root* cmd_tree, void* param ); @@ -337,6 +340,8 @@ static int *rtpp_socks = 0; /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state=0; +static str timeout_socket_str = {0, 0}; + static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, fixup_set_id, 0, @@ -390,6 +395,8 @@ static cmd_export_t cmds[] = { }; static pv_export_t mod_pvs[] = { + {{"rtpstat", (sizeof("rtpstat")-1)}, /* RTP-Statistics */ + PVT_OTHER, pv_get_rtpstat_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -400,6 +407,7 @@ static param_export_t params[] = { {"rtpproxy_disable_tout", INT_PARAM, &rtpproxy_disable_tout }, {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, + {"timeout_socket_str", STR_PARAM, &timeout_socket_str.s }, {0, 0, 0} }; @@ -854,9 +862,17 @@ mod_init(void) if(rtpp_strings[i]) pkg_free(rtpp_strings[i]); } + if (timeout_socket_str.s==NULL || timeout_socket_str.s[0]==0) { + timeout_socket_str.len = 0; + timeout_socket_str.s = NULL; + } else { + timeout_socket_str.len = strlen(timeout_socket_str.s); + } + if (rtpp_strings) pkg_free(rtpp_strings); + return 0; } @@ -1799,7 +1815,11 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) {NULL, 0}, /* to_tag */ {";", 1}, /* separator */ {NULL, 0} /* medianum */ + {" ", 1}, /* separator */ + {NULL, 0}, /* Timeout-Socket */ }; + int iovec_param_count; + char *c1p, *c2p, *bodylimit, *o1p; char medianum_buf[20]; int medianum, media_multi; @@ -2151,7 +2171,17 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) } else { v[3].iov_len = 0; } - cp = send_rtpp_command(node, v, (to_tag.len > 0) ? 18 : 14); + if (to_tag.len > 0) { + iovec_param_count = 18; + } else { + iovec_param_count = 14; + if (timeout_socket_str.len > 0) { + iovec_param_count = 16; + STR2IOVEC(timeout_socket_str, v[15]); + } + } + + cp = send_rtpp_command(node, v, iovec_param_count); } while (cp == NULL); LM_DBG("proxy reply: %s\n", cp); /* Parse proxy reply to <argc,argv> */ @@ -2389,3 +2419,59 @@ static int start_recording_f(struct sip_msg* msg, char *foo, char *bar) return 1; } +/* + * Returns the current RTP-Statistics from the RTP-Proxy + */ +static int +pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str ret_val = {0, 0}; + int nitems; + str callid = {0, 0}; + str from_tag = {0, 0}; + str to_tag = {0, 0}; + struct rtpp_node *node; + struct iovec v[1 + 4 + 3 + 1] = {{NULL, 0}, {"Q", 1}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}, {";1 ", 3}, {";1", }, {NULL, 0}}; + + if (get_callid(msg, &callid) == -1 || callid.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return -1; + } + if (get_to_tag(msg, &to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return -1; + } + if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return -1; + } + if(msg->id != current_msg_id){ + selected_rtpp_set = default_rtpp_set; + } + + STR2IOVEC(callid, v[3]); + STR2IOVEC(from_tag, v[5]); + STR2IOVEC(to_tag, v[7]); + node = select_rtpp_node(callid, 1); + if (!node) { + LM_ERR("no available proxies\n"); + return -1; + } + nitems = 8; + if (msg->first_line.type == SIP_REPLY) { + if (to_tag.len == 0) + return -1; + STR2IOVEC(to_tag, v[5]); + STR2IOVEC(from_tag, v[7]); + } else { + STR2IOVEC(from_tag, v[5]); + STR2IOVEC(to_tag, v[7]); + if (to_tag.len <= 0) + nitems = 6; + } + ret_val.s = send_rtpp_command(node, v, nitems); + ret_val.len = strlen(ret_val.s); + return pv_get_strval(msg, param, res, &ret_val); +} +

14 years, 5 months

Suggesting fix for t_request and pua_dialoginfo

by Jasmin Schnatterbeck

Hello List, some months ago I reported a problem with pua_dialoginfo: Avps declared in request route are not available anymore in branch route, if pua_dialoginfo module is loaded. I do not know whether there are some experiences with this problem or not, so I looked for the reason. pua_dialoginfo uses pua for sending PUBLISH request pua uses tm t_request for sending PUBLISH request t_request() is located in uac.c (tm): - in line 411 avp list is reset - in line 276 build_cell() is called: build_cell() is located in h_table.c, where lines 305-323 delete avps If I comment out the mentioned lines, which delete avps, then avps set in request route are also available in branch route. But I do not know, what is also affected by this change. So would it be reasonable, to add a parameter to build_cell() for not changing the AVP list? Best Regards Jasmin

14 years, 5 months

git:refs/tags/sr_3.1_freeze: tmx: updated for last tm changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: refs/tags/sr_3.1_freeze Commit: aff441b32d2f87dfeee112432174e6692c4d6f42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aff441b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:35:45 2010 +0200 tmx: updated for last tm changes - cancel_uacs() takes new type of paraeters - reply function takes str* parameters --- modules_k/tmx/t_mi.c | 41 ++++++++++++++++++++--------------------- modules_k/tmx/tmx_mod.c | 29 +++++++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 84288df..44c5054 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -663,6 +663,7 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) */ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) { + struct cancel_info cancel_data; struct mi_node *node; struct cell *trans; @@ -676,7 +677,9 @@ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) /* cancel the call */ LM_DBG("cancelling transaction %p\n",trans); - _tmx_tmb.cancel_uacs( trans, ~0/*all branches*/, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = ~0; /*all branches*/ + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); _tmx_tmb.unref_cell(trans); @@ -753,11 +756,11 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) unsigned int hash_label; unsigned int rpl_code; struct cell *trans; - char *reason; - char *totag; - char *new_hdrs; - char *body; - str tmp; + str reason = {0, 0}; + str totag = {0, 0}; + str new_hdrs = {0, 0}; + str body = {0, 0}; + str tmp = {0, 0}; char *p; int n; @@ -774,49 +777,45 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) /* reason text (param 2) */ node = node->next; - reason = as_asciiz(&node->value); + reason = node->value; /* trans_id (param 3) */ node = node->next; tmp = node->value; p = memchr( tmp.s, ':', tmp.len); - if ( p==NULL) + if(p==NULL) return init_mi_tree( 400, "Invalid trans_id", 16); tmp.len = p-tmp.s; - if( str2int( &tmp, &hash_index)!=0 ) + if(str2int(&tmp, &hash_index)!=0) return init_mi_tree( 400, "Invalid index in trans_id", 25); tmp.s = p+1; tmp.len = (node->value.s+node->value.len) - tmp.s; - if( str2int( &tmp, &hash_label)!=0 ) + if(str2int(&tmp, &hash_label)!=0) return init_mi_tree( 400, "Invalid label in trans_id", 25); - if( _tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0 ) + if(_tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0) return init_mi_tree( 404, "Transaction not found", 21); /* to_tag (param 4) */ node = node->next; - totag = as_asciiz(&node->value); + totag = node->value; /* new headers (param 5) */ node = node->next; - if (node->value.len==1 && node->value.s[0]=='.') - new_hdrs = 0; - else - new_hdrs = as_asciiz(&node->value); + if (!(node->value.len==1 && node->value.s[0]=='.')) + new_hdrs = node->value; /* body (param 5 - optional) */ node = node->next; if (node) - body = as_asciiz(&node->value); - else - body = 0; + body = node->value; /* it's refcounted now, t_reply_with body unrefs for me -- I can * continue but may not use T anymore */ - n = _tmx_tmb.t_reply_with_body( trans, rpl_code, reason, body, - new_hdrs, totag); + n = _tmx_tmb.t_reply_with_body(trans, rpl_code, &reason, &body, + &new_hdrs, &totag); if (n<0) return init_mi_tree( 500, "Reply failed", 12); diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 420cb30..3714fed 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -232,7 +232,7 @@ static int fixup_cancel_branches(void** param, int param_no) */ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) { - branch_bm_t cb = 0; + struct cancel_info cancel_data; struct cell *t = 0; tm_ctx_t *tcx = 0; int n=0; @@ -244,26 +244,30 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) if(tcx != NULL) idx = tcx->branch_index; n = (int)(long)k; + init_cancel_info(&cancel_data); switch(n) { case 1: /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); case 2: if(msg->first_line.u.reply.statuscode>=200) break; - cb = 1<<idx; + cancel_data.cancel_bitmap = 1<<idx; break; default: if (msg->first_line.u.reply.statuscode>=200) /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); else - _tmx_tmb.prepare_to_cancel(t, &cb, 0); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 0); } - LM_DBG("canceling %d/%d\n", n, (int)cb); - if(cb==0) + LM_DBG("canceling %d/%d\n", n, (int)cancel_data.cancel_bitmap); + if(cancel_data.cancel_bitmap==0) return -1; - _tmx_tmb.cancel_uacs(t, cb, 0); + _tmx_tmb.cancel_uacs(t, &cancel_data, 0); return 1; } @@ -287,12 +291,11 @@ static int fixup_cancel_callid(void** param, int param_no) static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag) { struct cell *trans; - branch_bm_t cancel_bm; + struct cancel_info cancel_data; str cseq_s; str callid_s; int fl; - cancel_bm=0; fl = -1; if(fixup_get_svalue(msg, (gparam_p)cid, &callid_s)<0) @@ -321,8 +324,10 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla DBG("Now calling cancel_uacs\n"); if(trans->uas.request && fl>0 && fl<32) setflag(trans->uas.request, fl); - _tmx_tmb.prepare_to_cancel(trans, &cancel_bm, 0); - _tmx_tmb.cancel_uacs(trans, cancel_bm, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = 0; + _tmx_tmb.prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); //_tmx_tmb.unref_cell(trans);

14 years, 5 months

git:master: mi: cleanup - move type defs. to separate file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 627a1969b49446360f227fe23c56b80683145e5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=627a196… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 19:54:09 2010 +0200 mi: cleanup - move type defs. to separate file Moved MI types defs to mi/mi_types.h (from lib/kmi/mi.h). This removes core dependency on lib/mi include files (mi types are needed for kamailio module interface defs). --- lib/kmi/mi.h | 16 +---------- lib/kmi/tree.h | 18 ++---------- mi/mi.h | 35 ------------------------ mi/mi_types.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sr_module.h | 2 +- 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/lib/kmi/mi.h b/lib/kmi/mi.h index 5c0ac19..988bcd1 100644 --- a/lib/kmi/mi.h +++ b/lib/kmi/mi.h @@ -23,6 +23,7 @@ * History: * --------- * 2006-09-08 first version (bogdan) + * 2010-08-18 use mi types from ../../mi/mi_types.h (andrei) */ /*! @@ -36,6 +37,7 @@ #define _MI_MI_H_ #include "../../str.h" +#include "../../mi/mi_types.h" #include "tree.h" #define MI_ASYNC_RPL_FLAG (1<<0) @@ -43,11 +45,6 @@ #define MI_ROOT_ASYNC_RPL ((struct mi_root*)-1) -struct mi_handler; - -typedef struct mi_root* (mi_cmd_f)(struct mi_root*, void *param); -typedef int (mi_child_init_f)(void); -typedef void (mi_handler_f)(struct mi_root *, struct mi_handler *, int); struct mi_handler { @@ -66,15 +63,6 @@ struct mi_cmd { }; -typedef struct mi_export_ { - char *name; - mi_cmd_f *cmd; - unsigned int flags; - void *param; - mi_child_init_f *init_f; -}mi_export_t; - - int register_mi_cmd( mi_cmd_f f, char *name, void *param, mi_child_init_f in, unsigned int flags); diff --git a/lib/kmi/tree.h b/lib/kmi/tree.h index 4a42823..ef6e657 100644 --- a/lib/kmi/tree.h +++ b/lib/kmi/tree.h @@ -23,6 +23,7 @@ * History: * --------- * 2006-09-08 first version (bogdan) + * 2010-08-18 use mi types from ../../mi/mi_types.h (andrei) */ /*! @@ -39,6 +40,7 @@ #include <stdarg.h> #include "../../str.h" +#include "../../mi/mi_types.h" struct mi_node; struct mi_handler; @@ -63,21 +65,7 @@ struct mi_handler; #define MI_MISSING_PARM MI_MISSING_PARM_S #define MI_BAD_PARM MI_BAD_PARM_S -struct mi_node { - str value; - str name; - struct mi_node *kids; - struct mi_node *next; - struct mi_node *last; - struct mi_attr *attributes; -}; - -struct mi_root { - unsigned int code; - str reason; - struct mi_handler *async_hdl; - struct mi_node node; -}; + struct mi_root *init_mi_tree(unsigned int code, char *reason, int reason_len); diff --git a/mi/mi.h b/mi/mi.h deleted file mode 100644 index b3c106f..0000000 --- a/mi/mi.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * mi compatibility wrapper for kamailio - * for now it doesn't do anything, it just a compile helper - * (obsolete, do not use anymore) - * - * History: - * -------- - * 2008-11-17 initial version compatible with kamailio mi/mi.h (andrei) - */ - -#ifndef _mi_h_ -#define _mi_h_ - -#include "../lib/kmi/mi.h" - -#endif /* _mi_h_ */ - - diff --git a/mi/mi_types.h b/mi/mi_types.h new file mode 100644 index 0000000..4da303c --- /dev/null +++ b/mi/mi_types.h @@ -0,0 +1,80 @@ +/* + * $Id$ + * + * Copyright (C) 2008 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * mi compatibility wrapper for kamailio + * It contains only the type definition, needed for loading kamilio modules + * (used by sr_module.c). + * Note that MI usage in new modules is opsolete. They should implement RPCs + * instead. To use MI include lib/kmi/mi.h and link with lib kmi. + * + * History: + * -------- + * 2008-11-17 initial version compatible with kamailio mi/mi.h (andrei) + * 2010-08-18 remove everything but the data types definition (andrei) + */ + +#ifndef _mi_h_ +#define _mi_h_ + +#include "../str.h" + +struct mi_node { + str value; + str name; + struct mi_node *kids; + struct mi_node *next; + struct mi_node *last; + struct mi_attr *attributes; +}; + + +struct mi_handler; + +struct mi_root { + unsigned int code; + str reason; + struct mi_handler *async_hdl; + struct mi_node node; +}; + +typedef struct mi_root* (mi_cmd_f)(struct mi_root*, void *param); +typedef int (mi_child_init_f)(void); +typedef void (mi_handler_f)(struct mi_root *, struct mi_handler *, int); + +/* FIXME +struct mi_handler { + mi_handler_f *handler_f; + void * param; +}; +*/ + + +struct mi_export_ { + char *name; + mi_cmd_f *cmd; + unsigned int flags; + void *param; + mi_child_init_f *init_f; +}; + +typedef struct mi_export_ mi_export_t; + + +#endif /* _mi_h_ */ + + diff --git a/sr_module.h b/sr_module.h index 1940a96..baf1081 100644 --- a/sr_module.h +++ b/sr_module.h @@ -69,7 +69,7 @@ /* kamailio compat */ #include "statistics.h" -#include "mi/mi.h" +#include "mi/mi_types.h" #include "pvar.h"

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev