sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
236 discussions

git:master: kamctl: new commands can be defined in separate files
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: ea772b354f84eccff0190234025f057879ff33ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea772b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 22:03:58 2013 +0200 kamctl: new commands can be defined in separate files - write new kamctl commands either in CFGDIR/kamctl.newcmd.ext or ~/.kamctl/kamctl.newcmd.ext - 'newcmd' has to be replaced with the name of the command - the file must include cmd_newcmd() function which is executed with the parameters after the command name - example: adding new command 'sample' - content of ~/.kamctl/kamctl.sample.ext file: usage_sample() { echo mecho " -- command 'sample' - kamctl sample extension command" echo cat <<EOF test ............................... print test message help ............................... help text EOF } cmd_sample() { case $1 in test) echo "message from sample test command" ;; *) usage_sample ;; esac exit 1; } - new command 'sample' can be executed with: kamctl sample test --- utils/kamctl/kamctl | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 4583926..0dee374 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2524,6 +2524,25 @@ tls_ca() { fi } +extcmd() { + if [ -f $ETCDIR/kamctl.${1}.ext ]; then + . $ETCDIR/kamctl.${1}.ext + else + if [ -f ~/.kamctl/kamctl.${1}.ext ]; then + . ~/.kamctl/kamctl.${1}.ext + else + return + fi + fi + + XCMD=cmd_${1} + + shift + $XCMD "$@" + + exit 1 +} + # ##### ================================================ ##### ### main command switch @@ -2705,6 +2724,8 @@ case $1 in ;; *) + extcmd "$@" + usage exit 1 ;;

1 0

git:master: tm: readme updated based on latest docbook
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: af6a5d7422b614e5a143bc987806181086360c34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af6a5d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 19:31:43 2013 +0200 tm: readme updated based on latest docbook --- modules/tm/README | 1973 +++++++++++++++++++++++++++-------------------------- 1 files changed, 994 insertions(+), 979 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=af6…

1 0

git:master: kamctl: set internal version to 4.1.0
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: 0b82af2019d523c680d156d9b95ae33043c79bd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b82af2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 19:33:50 2013 +0200 kamctl: set internal version to 4.1.0 --- utils/kamctl/kamctl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 42d031e..4583926 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -7,7 +7,7 @@ #=================================================================== ### version for this script -VERSION='3.3.0' +VERSION='4.1.0' PATH=$PATH:/usr/local/sbin/

1 0

git:master: tm: documented dn_reuse_rcv_socket parameter
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: 5f1b144a7e63b464af3e5e0e7b74cf7e7e1e8668 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f1b144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 19:30:59 2013 +0200 tm: documented dn_reuse_rcv_socket parameter --- modules/tm/doc/params.xml | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/modules/tm/doc/params.xml b/modules/tm/doc/params.xml index 767a5fc..4d3bf26 100644 --- a/modules/tm/doc/params.xml +++ b/modules/tm/doc/params.xml @@ -1378,4 +1378,34 @@ modparam("tm", "failure_exec_mode", 1) </example> </section> + + <section id="tm.p.dns_reuse_rcv_socket"> + <title><varname>dns_reuse_rcv_socket</varname> (boolean)</title> + <para> + Control reuse of the receive socket for additional branches added + by dns failover. If set to 1, the receive socket is used for + sending out the new branches, unless the socket is forced + explicitely in configuration file. If set to 0, selected socket + is done depending on value of global parameter mhomed (if mhomed=0, + then the first listen socket is used, otherwise the socket is + selected based on routing rules). + </para> + <para> + Do enable it with caution, it might create troubles on dns results + with different transport layer. Better let it disabled and enable + mhomed. + </para> + <para> + Default value is 0 (disabled). + </para> + <example> + <title>Set <varname>dns_reuse_rcv_socket</varname> parameter</title> + <programlisting> +... +modparam("tm", "dns_reuse_rcv_socket", 1) +... + </programlisting> + </example> + </section> + </section>

1 0

git:master: tm: copy tm routing blocks ids for new branches added by dns failover
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: 350f4f8971a679f0d6566361b2a7bb17956a6a7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=350f4f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 18:54:59 2013 +0200 tm: copy tm routing blocks ids for new branches added by dns failover - patch by Jasmin Schnatterbeck, part of FS#313 --- modules/tm/t_fwd.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 86c5daa..e0b2642 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1001,6 +1001,11 @@ static int add_uac_from_buf( struct cell *t, struct sip_msg *request, t->uac[branch].location_ua.s[location_ua->len]=0; memcpy( t->uac[branch].location_ua.s, location_ua->s, location_ua->len); } + + t->uac[branch].on_reply = t->on_reply; + t->uac[branch].on_failure = t->on_failure; + t->uac[branch].on_branch_failure = t->on_branch_failure; + membar_write(); /* to allow lockless ops (e.g. prepare_to_cancel()) we want to be sure everything above is fully written before updating branches no. */

1 0

git:master: tm: new module parameter - dns_reuse_rcv_socket
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: 30e26f22600c3f50f0ea556bf2872ef7b0807c6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30e26f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 19:08:38 2013 +0200 tm: new module parameter - dns_reuse_rcv_socket - control reuse of the receive socket for additional branches added by dns failover - if 1, the rcv socket is used, if not it depends on mhomed - when that is 0, the first socket is used, otherwise will be selected based on routing table - default is 0 - therefore beware when setting this parameter and mhomed=1 - based on discussion for FS#313 --- modules/tm/t_fwd.c | 12 +++++++++--- modules/tm/tm.c | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index e0b2642..55d45f4 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -127,6 +127,7 @@ extern int tm_failure_exec_mode; +extern int tm_dns_reuse_rcv_socket; static int goto_on_branch = 0, branch_route = 0; @@ -1073,14 +1074,16 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, &old_uac->path, (old_uac->request.dst.send_flags.f & SND_F_FORCE_SOCKET)? - old_uac->request.dst.send_sock:0, + old_uac->request.dst.send_sock: + ((tm_dns_reuse_rcv_socket) + ?msg->rcv.bind_address:0), old_uac->request.dst.send_flags, old_uac->request.dst.proto, old_uac->request.buffer, old_uac->request.buffer_len, &old_uac->instance, &old_uac->ruid, &old_uac->location_ua); - }else + } else { /* add_uac will use dns_h => next_hop will be ignored. * Unfortunately we can't reuse the old buffer, the branch id * must be changed and the send_socket might be different => @@ -1088,11 +1091,14 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, ret=add_uac(t, msg, &old_uac->uri, 0, &old_uac->path, 0, (old_uac->request.dst.send_flags.f & SND_F_FORCE_SOCKET)? - old_uac->request.dst.send_sock:0, + old_uac->request.dst.send_sock: + ((tm_dns_reuse_rcv_socket) + ?msg->rcv.bind_address:0), old_uac->request.dst.send_flags, old_uac->request.dst.proto, UAC_DNS_FAILOVER_F, &old_uac->instance, &old_uac->ruid, &old_uac->location_ua); + } if (ret<0){ /* failed, delete the copied dns_h */ diff --git a/modules/tm/tm.c b/modules/tm/tm.c index f7407d6..5b410c1 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -316,6 +316,8 @@ int tm_remap_503_500 = 1; int tm_failure_exec_mode = 0; +int tm_dns_reuse_rcv_socket = 0; + static rpc_export_t tm_rpc[]; static int fixup_t_check_status(void** param, int param_no); @@ -540,6 +542,7 @@ static param_export_t params[]={ {"faked_reply_prio", PARAM_INT, &faked_reply_prio }, {"remap_503_500", PARAM_INT, &tm_remap_503_500 }, {"failure_exec_mode", PARAM_INT, &tm_failure_exec_mode }, + {"dns_reuse_rcv_socket",PARAM_INT, &tm_dns_reuse_rcv_socket }, #ifdef CANCEL_REASON_SUPPORT {"local_cancel_reason", PARAM_INT, &default_tm_cfg.local_cancel_reason }, {"e2e_cancel_reason", PARAM_INT, &default_tm_cfg.e2e_cancel_reason },

1 0

git:master: kamailio.cfg: route subscribe for event message-summary to voicemail server
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: e7da9f72beb1c97b79a516ecdd19db8971dea508 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7da9f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 15 18:23:48 2013 +0200 kamailio.cfg: route subscribe for event message-summary to voicemail server --- etc/kamailio.cfg | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 911b7d6..c8ac439 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -680,21 +680,25 @@ route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; + if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { + route(TOVOICEMAIL); + # returns here if no voicemail server is configured + sl_send_reply("404", "No voicemail service"); + exit; + } + #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; - }; + } if(is_method("PUBLISH")) { handle_publish(); t_release(); - } - else - if( is_method("SUBSCRIBE")) - { + } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } @@ -868,7 +872,7 @@ route[XMLRPC] { # route to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL - if(!is_method("INVITE")) + if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined @@ -876,11 +880,17 @@ route[TOVOICEMAIL] { xlog("SCRIPT: VoiceMail rotuing enabled but IP not defined\n"); return; } - if($avp(oexten)==$null) - return; - - $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + if(is_method("INVITE")) { + if($avp(oexten)==$null) + return; + $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); + } else { + if($rU==$null) + return; + $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + + ":" + $sel(cfg_get.voicemail.srv_port); + } route(RELAY); exit; #!endif

1 0

git:master: kamctl: added show command to display user attributes in subscriber table
by Daniel-Constantin Mierla 15 Jun '13

15 Jun '13

Module: sip-router Branch: master Commit: da016636be6e0ca9a65b645b6e30ec0b1dafeef4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da01663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 14 08:42:37 2013 +0200 kamctl: added show command to display user attributes in subscriber table --- utils/kamctl/kamctl | 26 ++++++++++++++++++++++++++ utils/kamctl/kamctl.base | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 01c99c9..42d031e 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2151,6 +2151,28 @@ subscriber() { fi ;; + show) + if [ $# -ne 2 ] ; then + usage_subscriber + exit 1 + fi + shift + + set_user $1 + + case $DBENGINE in + MYSQL|mysql|MySQL) + QUERY="SELECT * FROM $SUB_TABLE \ +WHERE $SUBSCRIBER_COLUMN='$OSERUSER' AND $REALM_COLUMN='$OSERDOMAIN'\G" + ;; + *) + QUERY="SELECT * FROM $SUB_TABLE \ +WHERE $SUBSCRIBER_COLUMN='$OSERUSER' AND $REALM_COLUMN='$OSERDOMAIN';" + ;; + esac + $DBROCMD "$QUERY" + ;; + passwd) if [ $# -ne 3 ] ; then usage_subscriber @@ -2516,6 +2538,10 @@ case $1 in subscriber "$@" ;; + show) + subscriber "$@" + ;; + passwd) subscriber "$@" ;; diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 589e0a0..034ac51 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -422,6 +422,7 @@ usage_subscriber() { echo cat <<EOF add <username> <password> .......... add a new subscriber (*) + show <username> .................... show subscriber attributes (*) passwd <username> <passwd> ......... change user's password (*) rm <username> ...................... delete a user (*) EOF

1 0

[tracker] Comment added: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache (Attachment added)
by sip-router 15 Jun '13

15 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this - Víctor Seva (linuxmaniac) ---------- Refreshed patch: - added more checks. - fixed xavp dump output. - changed some messages from ERR to WARN ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307#comment957 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

send CANCEL to timed out branch?
by Jasmin Schnatterbeck 14 Jun '13

14 Jun '13

Hi, I am thinking about whether it makes sense to send a CANCEL Request to a branch, that did not reply within the fr_timer when using DNS-Failover. It is possible, that the first gateway (because of various reasons) takes too long to reply, but nevertheless processes the call. This can lead to the result, that the callee receives 2 calls (from both gateways), which is in fact one call from the caller. It should be possible to prevent that in most cases, if DNS failover sends a CANCEL to a timed out branch and then forgets about it (stateless). Are there any comments or feedback/experiences on that idea? Cheers Jasmin

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013