sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: tls: safety check for current cipher
by Daniel-Constantin Mierla 04 Aug '11

04 Aug '11

Module: sip-router Branch: master Commit: 816a0218130782ea86a3cc16feb2a008fe6fff68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=816a021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 4 11:41:32 2011 +0200 tls: safety check for current cipher - SSL_get_current_cipher(...) may return NULL, in case of the cipher was not set yet for the connection - caused crash when RPC command tls.list was used in such moment - cipher description is set to 'unknown' for such case - reported by Francesco Castellano --- modules/tls/tls_rpc.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 3fabcf6..1dfa6ac 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -133,11 +133,15 @@ static void tls_list(rpc_t* rpc, void* c) "dst_ip", dst_ip, "dst_port", con->rcv.dst_port); if (tls_d) { - tls_info = SSL_CIPHER_description( + if(SSL_get_current_cipher(tls_d->ssl)) { + tls_info = SSL_CIPHER_description( SSL_get_current_cipher(tls_d->ssl), buf, sizeof(buf)); - len = strlen(buf); - if (len && buf[len - 1] == '\n') buf[len - 1] = '\0'; + len = strlen(buf); + if (len && buf[len - 1] == '\n') buf[len - 1] = '\0'; + } else { + tls_info = "unknown"; + } /* tls data */ state = "unknown/error"; lock_get(&con->write_lock);

1 0

git:master: debian: fix in init script ( somewhere it was still using $MEMORY rather than the new $SHM_MEMORY).
by I�aki Baz Castillo 04 Aug '11

04 Aug '11

Module: sip-router Branch: master Commit: 399fad110b0a92cca851b041389b65228caed051 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=399fad1… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 4 11:40:43 2011 +0200 debian: fix in init script (somewhere it was still using $MEMORY rather than the new $SHM_MEMORY). --- pkg/kamailio/deb/debian/kamailio.init | 2 +- pkg/kamailio/deb/lenny/kamailio.init | 2 +- pkg/kamailio/deb/lucid/kamailio.init | 2 +- pkg/kamailio/deb/squeeze/kamailio.init | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/deb/debian/kamailio.init b/pkg/kamailio/deb/debian/kamailio.init index 4c9a4a5..6bbb2f7 100644 --- a/pkg/kamailio/deb/debian/kamailio.init +++ b/pkg/kamailio/deb/debian/kamailio.init @@ -138,7 +138,7 @@ if [ "$SSD_SUID" != "yes" ]; then OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index 4c9a4a5..6bbb2f7 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -138,7 +138,7 @@ if [ "$SSD_SUID" != "yes" ]; then OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index 4c9a4a5..6bbb2f7 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -138,7 +138,7 @@ if [ "$SSD_SUID" != "yes" ]; then OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index 4c9a4a5..6bbb2f7 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -138,7 +138,7 @@ if [ "$SSD_SUID" != "yes" ]; then OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi

1 0

Is it possible to backport Async module to kamailio 3.1?
by Iñaki Baz Castillo 04 Aug '11

04 Aug '11

Is it possible to backport Async module to kamailio 3.1? or does it depend on heavy changes in the core? Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

git:master: debian: /etc/default/ kamailio now includes SHM_MEMORY and PKG_MEMORY variables ( rather than just MEMORY).
by I�aki Baz Castillo 04 Aug '11

04 Aug '11

Module: sip-router Branch: master Commit: 0d91623616c2459ef8330a7ecb943d7b4f942787 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d91623… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 4 10:33:36 2011 +0200 debian: /etc/default/kamailio now includes SHM_MEMORY and PKG_MEMORY variables (rather than just MEMORY). The init script takes those values for -m (shared memory) and -M (private memory) command options. check_kamailio_config() function within the init script also uses "-M $PKG_MEMORY" (so very long configuration files can be parsed by increasing PKG_MEMORY). --- pkg/kamailio/deb/debian/kamailio.default | 7 +++++-- pkg/kamailio/deb/debian/kamailio.init | 12 +++++++----- pkg/kamailio/deb/lenny/kamailio.default | 13 +++++++++++-- pkg/kamailio/deb/lenny/kamailio.init | 12 +++++++----- pkg/kamailio/deb/lucid/kamailio.default | 13 +++++++++++-- pkg/kamailio/deb/lucid/kamailio.init | 12 +++++++----- pkg/kamailio/deb/squeeze/kamailio.default | 13 +++++++++++-- pkg/kamailio/deb/squeeze/kamailio.init | 12 +++++++----- 8 files changed, 66 insertions(+), 28 deletions(-) diff --git a/pkg/kamailio/deb/debian/kamailio.default b/pkg/kamailio/deb/debian/kamailio.default index 4d51e42..3221104 100644 --- a/pkg/kamailio/deb/debian/kamailio.default +++ b/pkg/kamailio/deb/debian/kamailio.default @@ -11,8 +11,11 @@ USER=kamailio # Group to run as GROUP=kamailio -# Amount of memory to allocate for the running Kamailio server (in Mb) -MEMORY=64 +# Amount of shared memory to allocate for the running Kamailio server (in Mb) +SHM_MEMORY=64 + +# Amount of private memory for each Kamailio process (in Mb) +PKG_MEMORY=4 # Switch to USER and GROUP by start-stop-daemon or by kamailio itself # - with recent kernels, changing user ID inside applicaton prevents diff --git a/pkg/kamailio/deb/debian/kamailio.init b/pkg/kamailio/deb/debian/kamailio.init index 0df2b84..4c9a4a5 100644 --- a/pkg/kamailio/deb/debian/kamailio.init +++ b/pkg/kamailio/deb/debian/kamailio.init @@ -39,7 +39,7 @@ check_kamailio_config () { # Check if kamailio configuration is valid before starting the server. set +e - out=$($DAEMON -c 2>&1 > /dev/null) + out=$($DAEMON -M $PKG_MEMORY -c 2>&1 > /dev/null) retcode=$? set -e if [ "$retcode" != '0' ]; then @@ -114,10 +114,12 @@ fi set -e -MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) +SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`)) +PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) +[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64 +[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 [ -z "$USER" ] && USER=kamailio [ -z "$GROUP" ] && GROUP=kamailio -[ $MEMORY -le 0 ] && MEMORY=32 if test "$DUMP_CORE" = "yes" ; then @@ -133,10 +135,10 @@ fi if [ "$SSD_SUID" != "yes" ]; then - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -u $USER -g $GROUP" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/lenny/kamailio.default b/pkg/kamailio/deb/lenny/kamailio.default index 4317664..3221104 100644 --- a/pkg/kamailio/deb/lenny/kamailio.default +++ b/pkg/kamailio/deb/lenny/kamailio.default @@ -11,8 +11,17 @@ USER=kamailio # Group to run as GROUP=kamailio -# Amount of memory to allocate for the running Kamailio server (in Mb) -MEMORY=64 +# Amount of shared memory to allocate for the running Kamailio server (in Mb) +SHM_MEMORY=64 + +# Amount of private memory for each Kamailio process (in Mb) +PKG_MEMORY=4 + +# Switch to USER and GROUP by start-stop-daemon or by kamailio itself +# - with recent kernels, changing user ID inside applicaton prevents +# dumping core files. If the value is 'yes', the suid is done by +# start-stop-daemon, otherwise it is done by kamailio itself +SSD_SUID=no # Enable the server to leave a core file when it crashes. # Set this to 'yes' to enable Kamailio to leave a core file when it crashes diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index 0df2b84..4c9a4a5 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -39,7 +39,7 @@ check_kamailio_config () { # Check if kamailio configuration is valid before starting the server. set +e - out=$($DAEMON -c 2>&1 > /dev/null) + out=$($DAEMON -M $PKG_MEMORY -c 2>&1 > /dev/null) retcode=$? set -e if [ "$retcode" != '0' ]; then @@ -114,10 +114,12 @@ fi set -e -MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) +SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`)) +PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) +[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64 +[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 [ -z "$USER" ] && USER=kamailio [ -z "$GROUP" ] && GROUP=kamailio -[ $MEMORY -le 0 ] && MEMORY=32 if test "$DUMP_CORE" = "yes" ; then @@ -133,10 +135,10 @@ fi if [ "$SSD_SUID" != "yes" ]; then - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -u $USER -g $GROUP" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/lucid/kamailio.default b/pkg/kamailio/deb/lucid/kamailio.default index 4317664..3221104 100644 --- a/pkg/kamailio/deb/lucid/kamailio.default +++ b/pkg/kamailio/deb/lucid/kamailio.default @@ -11,8 +11,17 @@ USER=kamailio # Group to run as GROUP=kamailio -# Amount of memory to allocate for the running Kamailio server (in Mb) -MEMORY=64 +# Amount of shared memory to allocate for the running Kamailio server (in Mb) +SHM_MEMORY=64 + +# Amount of private memory for each Kamailio process (in Mb) +PKG_MEMORY=4 + +# Switch to USER and GROUP by start-stop-daemon or by kamailio itself +# - with recent kernels, changing user ID inside applicaton prevents +# dumping core files. If the value is 'yes', the suid is done by +# start-stop-daemon, otherwise it is done by kamailio itself +SSD_SUID=no # Enable the server to leave a core file when it crashes. # Set this to 'yes' to enable Kamailio to leave a core file when it crashes diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index 0df2b84..4c9a4a5 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -39,7 +39,7 @@ check_kamailio_config () { # Check if kamailio configuration is valid before starting the server. set +e - out=$($DAEMON -c 2>&1 > /dev/null) + out=$($DAEMON -M $PKG_MEMORY -c 2>&1 > /dev/null) retcode=$? set -e if [ "$retcode" != '0' ]; then @@ -114,10 +114,12 @@ fi set -e -MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) +SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`)) +PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) +[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64 +[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 [ -z "$USER" ] && USER=kamailio [ -z "$GROUP" ] && GROUP=kamailio -[ $MEMORY -le 0 ] && MEMORY=32 if test "$DUMP_CORE" = "yes" ; then @@ -133,10 +135,10 @@ fi if [ "$SSD_SUID" != "yes" ]; then - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -u $USER -g $GROUP" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi diff --git a/pkg/kamailio/deb/squeeze/kamailio.default b/pkg/kamailio/deb/squeeze/kamailio.default index 4317664..3221104 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.default +++ b/pkg/kamailio/deb/squeeze/kamailio.default @@ -11,8 +11,17 @@ USER=kamailio # Group to run as GROUP=kamailio -# Amount of memory to allocate for the running Kamailio server (in Mb) -MEMORY=64 +# Amount of shared memory to allocate for the running Kamailio server (in Mb) +SHM_MEMORY=64 + +# Amount of private memory for each Kamailio process (in Mb) +PKG_MEMORY=4 + +# Switch to USER and GROUP by start-stop-daemon or by kamailio itself +# - with recent kernels, changing user ID inside applicaton prevents +# dumping core files. If the value is 'yes', the suid is done by +# start-stop-daemon, otherwise it is done by kamailio itself +SSD_SUID=no # Enable the server to leave a core file when it crashes. # Set this to 'yes' to enable Kamailio to leave a core file when it crashes diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index 0df2b84..4c9a4a5 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -39,7 +39,7 @@ check_kamailio_config () { # Check if kamailio configuration is valid before starting the server. set +e - out=$($DAEMON -c 2>&1 > /dev/null) + out=$($DAEMON -M $PKG_MEMORY -c 2>&1 > /dev/null) retcode=$? set -e if [ "$retcode" != '0' ]; then @@ -114,10 +114,12 @@ fi set -e -MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) +SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`)) +PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) +[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64 +[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 [ -z "$USER" ] && USER=kamailio [ -z "$GROUP" ] && GROUP=kamailio -[ $MEMORY -le 0 ] && MEMORY=32 if test "$DUMP_CORE" = "yes" ; then @@ -133,10 +135,10 @@ fi if [ "$SSD_SUID" != "yes" ]; then - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -u $USER -g $GROUP" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP" SSDOPTS="" else - OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY" + OPTIONS="-f $CFGFILE -P $PIDFILE -m $MEMORY -M $PKG_MEMORY" SSDOPTS="--chuid $USER:$GROUP" fi

1 0

git:master: lcr: fixed README for from_gw() arguments.
by I�aki Baz Castillo 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: 5a99a114e6608cbe2ec8c452d837ff3223748f1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a99a11… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 4 00:23:05 2011 +0200 lcr: fixed README for from_gw() arguments. --- modules/lcr/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 9b50e80..ebbdb63 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -865,7 +865,7 @@ defunct_gw(60); lcr_id can be an integer constant or a pseudo variable holding an integer value. ip_addr can be a string or a pseudo variable holding a - string value. proto can be an integer constant (0 = 1 = UDP, 2 = TCP, 3 + string value. proto can be an integer constant (0 = ANY, 1 = UDP, 2 = TCP, 3 = TLS, 4 = SCTP) or a pseudo variable holding such an integer value. If request comes from a gateway, gateway's tag and flags are stored as

1 0

git:master: lcr: Fixed doc in from_gw() arguments.
by I�aki Baz Castillo 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: 3e8867456b19bc8fd1a83be1830d0e31620cd710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e88674… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Thu Aug 4 00:21:35 2011 +0200 lcr: Fixed doc in from_gw() arguments. --- modules/lcr/doc/lcr_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 57f0ea8..50a0aa8 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -1116,7 +1116,7 @@ defunct_gw(60); lcr_id can be an integer constant or a pseudo variable holding an integer value. ip_addr can be a string or a pseudo variable holding a string value. proto can be an integer - constant (0 = 1 = UDP, 2 = TCP, + constant (0 = ANY, 1 = UDP, 2 = TCP, 3 = TLS, 4 = SCTP) or a pseudo variable holding such an integer value. </para>

1 0

git:master: tm: don't set dst_uri to next hop for branch_route
by Daniel-Constantin Mierla 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: fb4ecbf986f4af366e5be9cbad26ceba924c77fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb4ecbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 23:03:54 2011 +0200 tm: don't set dst_uri to next hop for branch_route - added flag to skip setting dst_uri to next hop for branch_route if the dst_uri was not set before - there is already a select and a pseudo-variable to access next hop value, in case it is needed in branch route - reported by Alex Hermann --- modules/tm/t_fwd.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 6385812..30558ab 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -151,6 +151,8 @@ unsigned int get_on_branch(void) /* prepare_new_uac flags */ #define UAC_DNS_FAILOVER_F 1 /**< new branch due to dns failover */ +#define UAC_SKIP_BR_DST_F 2 /**< don't set next hop as dst_uri for + branch_route */ /** prepares a new branch "buffer". @@ -176,7 +178,7 @@ unsigned int get_on_branch(void) * @param fsocket - forced send socket for forwarding. * @param send_flags - special flags for sending (see SND_F_* / snd_flags_t). * @param fproto - forced proto for forwarding. Used only if next_hop!=0. - * @param flags - 0 or UAC_DNS_FAILOVER_F for now. + * @param flags - 0, UAC_DNS_FAILOVER_F or UAC_SKIP_BR_DST_F for now. * * @return 0 on success, < 0 (ser_errror E***) on failure. */ @@ -302,10 +304,12 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->dst_uri.s=0; i_req->dst_uri.len=0; if (likely(next_hop)){ - /* set dst uri to next_hop for the on_branch route */ - if (unlikely(set_dst_uri(i_req, next_hop)<0)){ - ret=E_OUT_OF_MEM; - goto error03; + if(unlikely((flags & UAC_SKIP_BR_DST_F)==0)){ + /* set dst uri to next_hop for the on_branch route */ + if (unlikely(set_dst_uri(i_req, next_hop)<0)){ + ret=E_OUT_OF_MEM; + goto error03; + } } } @@ -1475,7 +1479,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , try_new=1; branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket, - p_msg->fwd_send_flags, proto, 0); + p_msg->fwd_send_flags, proto, + (p_msg->dst_uri.len)?0:UAC_SKIP_BR_DST_F); if (branch_ret>=0) added_branches |= 1<<branch_ret; else @@ -1491,7 +1496,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , branch_ret=add_uac( t, p_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, proxy, si, p_msg->fwd_send_flags, - proto, 0); + proto, (dst_uri.len)?0:UAC_SKIP_BR_DST_F); /* pick some of the errors in case things go wrong; note that picking lowest error is just as good as any other algorithm which picks any other negative

1 0

git:master: debian: If RUN=no in /etc/default/ kamailio then return 0 isntead of LSB compliant error codes (if not, dpkg returns error in the instalation as kamailio init script is called automatically to start when installed ).
by I�aki Baz Castillo 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: 9b553a5c25da040569d385039c6f24a9e0622d9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b553a5… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Aug 3 18:29:55 2011 +0200 debian: If RUN=no in /etc/default/kamailio then return 0 isntead of LSB compliant error codes (if not, dpkg returns error in the instalation as kamailio init script is called automatically to start when installed). --- pkg/kamailio/deb/debian/kamailio.init | 11 +---------- pkg/kamailio/deb/lenny/kamailio.init | 11 +---------- pkg/kamailio/deb/lucid/kamailio.init | 11 +---------- pkg/kamailio/deb/squeeze/kamailio.init | 11 +---------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/pkg/kamailio/deb/debian/kamailio.init b/pkg/kamailio/deb/debian/kamailio.init index 0490282..0df2b84 100644 --- a/pkg/kamailio/deb/debian/kamailio.init +++ b/pkg/kamailio/deb/debian/kamailio.init @@ -107,16 +107,7 @@ fi if [ "$RUN_KAMAILIO" != "yes" ]; then echo "$DESC not yet configured. Edit $DEFAULTS first." - case "$1" in - status) - # LSB - 4: program or service status is unknown. - exit 4 - ;; - *) - # LSB - 6: program is not configured. - exit 6 - ;; - esac + exit 0 fi diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index 0490282..0df2b84 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -107,16 +107,7 @@ fi if [ "$RUN_KAMAILIO" != "yes" ]; then echo "$DESC not yet configured. Edit $DEFAULTS first." - case "$1" in - status) - # LSB - 4: program or service status is unknown. - exit 4 - ;; - *) - # LSB - 6: program is not configured. - exit 6 - ;; - esac + exit 0 fi diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index 0490282..0df2b84 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -107,16 +107,7 @@ fi if [ "$RUN_KAMAILIO" != "yes" ]; then echo "$DESC not yet configured. Edit $DEFAULTS first." - case "$1" in - status) - # LSB - 4: program or service status is unknown. - exit 4 - ;; - *) - # LSB - 6: program is not configured. - exit 6 - ;; - esac + exit 0 fi diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index 0490282..0df2b84 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -107,16 +107,7 @@ fi if [ "$RUN_KAMAILIO" != "yes" ]; then echo "$DESC not yet configured. Edit $DEFAULTS first." - case "$1" in - status) - # LSB - 4: program or service status is unknown. - exit 4 - ;; - *) - # LSB - 6: program is not configured. - exit 6 - ;; - esac + exit 0 fi

1 0

git:master: Makefile: Add async module
by Jon Bonilla 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: bd671575e308877e86189839f9132511a4bcbad5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd67157… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Wed Aug 3 22:12:14 2011 +0200 Makefile: Add async module --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index e24b846..01f8f41 100644 --- a/Makefile +++ b/Makefile @@ -208,7 +208,7 @@ module_group_kstandard=acc alias_db auth auth_db benchmark call_control \ avpops cfg_db cfg_rpc ctl db_flatstore dialplan enum \ iptrtpproxy lcr mediaproxy mi_rpc pdb sanity tm topoh \ blst prefix_route counters debugger matrix mqueue mtree \ - pipelimit rtpproxy textopsx xhttp ipops p_usrloc sdpops + pipelimit rtpproxy textopsx xhttp ipops p_usrloc sdpops async # K mysql module module_group_kmysql=db_mysql

1 0

git:master: tm: allow nested backup of avp lists when sending local requests
by Daniel-Constantin Mierla 03 Aug '11

03 Aug '11

Module: sip-router Branch: master Commit: 08798a6d06b628fa5888ded867c5d18416b9f013 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08798a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 19:34:09 2011 +0200 tm: allow nested backup of avp lists when sending local requests - added ability to use a local variable instead static var to backup/restore avps lists for local generated transactions --- modules/tm/h_table.c | 7 +++++-- modules/tm/h_table.h | 2 +- modules/tm/uac.c | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 4870920..aff447d 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -492,12 +492,15 @@ error0: * - mode = 0 - from msg context to _txdata and use T lists * - mode = 1 - restore to msg context from _txdata */ -void tm_xdata_swap(tm_cell_t *t, int mode) +void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode) { static tm_xdata_t _txdata; tm_xdata_t *x; - x = &_txdata; + if(xd==NULL) + x = &_txdata; + else + x = xd; if(mode==0) { if(t==NULL) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 2ad42ce..c802ab6 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -565,7 +565,7 @@ inline static void remove_from_hash_table_unsafe( struct cell * p_cell) /** * backup xdata from/to msg context to local var and use T lists */ -void tm_xdata_swap(tm_cell_t *t, int mode); +void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode); #endif diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 0f36a4c..c552f5a 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -216,6 +216,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int backup_route_type; #endif snd_flags_t snd_flags; + tm_xdata_t backup_xd; ret=-1; hi=0; /* make gcc happy */ @@ -353,7 +354,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, lreq.rcv.comp=dst.comp; #endif /* USE_COMP */ sflag_bk = getsflags(); - tm_xdata_swap(new_cell, 0); + tm_xdata_swap(new_cell, &backup_xd, 0); /* run the route */ backup_route_type = get_route_type(); @@ -372,7 +373,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, set_route_type( backup_route_type ); /* restore original environment */ - tm_xdata_swap(new_cell, 1); + tm_xdata_swap(new_cell, &backup_xd, 1); setsflagsval(sflag_bk); if (unlikely(lreq.new_uri.s))

1 0

← Newer
1
...
23
24
25
26
27
28
29
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