sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/tcp_tls_changes: tls: safer destroy_cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 258cc031138b572aa90b4478baed4bb9708b0a37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=258cc03… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 16:18:16 2010 +0200 tls: safer destroy_cfg - tls_destroy_cfg() can now be called safely more then once. --- modules/tls/tls_domain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index a106f4a..891a9c5 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -128,6 +128,7 @@ void tls_destroy_cfg(void) if (tls_cfg_lock) { lock_destroy(tls_cfg_lock); lock_dealloc(tls_cfg_lock); + tls_cfg_lock = 0; } if (tls_cfg) { @@ -138,6 +139,7 @@ void tls_destroy_cfg(void) } shm_free(tls_cfg); + tls_cfg = 0; } }

14 years, 8 months

git:master: fix memset call, set the variable to zero, not to the size with length 0..

by Henning Westerholt

Module: sip-router Branch: master Commit: 355636358c07b8da9b1fcd6d04cdaf337c9f730c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3556363… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 20 15:46:58 2010 +0200 fix memset call, set the variable to zero, not to the size with length 0.. --- cfg/cfg_script.c | 2 +- modules_k/xcap_client/xcap_functions.c | 2 +- rvalue.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 5f33ffd..a4ef236 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -107,7 +107,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type var = (cfg_script_var_t *)pkg_malloc(sizeof(cfg_script_var_t)); if (!var) goto error; - memset(var, sizeof(cfg_script_var_t), 0); + memset(var, 0, sizeof(cfg_script_var_t)); var->type = type; /* add the variable to the group */ diff --git a/modules_k/xcap_client/xcap_functions.c b/modules_k/xcap_client/xcap_functions.c index 1d3cea6..ba049e4 100644 --- a/modules_k/xcap_client/xcap_functions.c +++ b/modules_k/xcap_client/xcap_functions.c @@ -531,7 +531,7 @@ char* send_http_get(char* path, unsigned int xcap_port, char* match_etag, { char* hdr_name= NULL; - memset(buf, 128* sizeof(char), 0); + memset(buf, 0, 128* sizeof(char)); match_header= buf; hdr_name= (match_type==IF_MATCH)?"If-Match":"If-None-Match"; diff --git a/rvalue.c b/rvalue.c index d02b194..38a0eb7 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2448,7 +2448,7 @@ struct rval_expr* mk_rval_expr_v(enum rval_type rv_type, void* val, rve=pkg_malloc(sizeof(*rve)); if (rve==0) return 0; - memset(rve, sizeof(*rve), 0); + memset(rve, 0, sizeof(*rve)); flags=0; switch(rv_type){ case RV_INT: @@ -2522,7 +2522,7 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, ret=pkg_malloc(sizeof(*ret)); if (ret==0) return 0; - memset(ret, sizeof(*ret), 0); + memset(ret, 0, sizeof(*ret)); ret->op=op; ret->left.rve=rve1; if (pos) ret->fpos=*pos; @@ -2575,7 +2575,7 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, ret=pkg_malloc(sizeof(*ret)); if (ret==0) return 0; - memset(ret, sizeof(*ret), 0); + memset(ret, 0, sizeof(*ret)); ret->op=op; ret->left.rve=rve1; ret->right.rve=rve2;

14 years, 8 months

git:master: Extended kamctl with new features built over sercmd:

by Marius Zbihlei

Module: sip-router Branch: master Commit: 833632a0eafcbbbcd7ce53937c4b4a21f99d9bec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=833632a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu May 20 16:24:55 2010 +0300 Extended kamctl with new features built over sercmd: 1. Posibility to run sercmd commands via "kamctl ser" (no readline enhancements yet) 2. A new CTLENGINE ser_mi that besides unixsock and fifo provides access to mi commands. "CTLENGINE=ser_mi kamctl ser_mi debug 3" --- utils/kamctl/Makefile | 10 ++++ utils/kamctl/kamctl | 20 ++++++++- utils/kamctl/kamctl.ser | 60 +++++++++++++++++++++++++++ utils/kamctl/kamctl.ser_mi | 98 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 61bcee0..57677a0 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -48,6 +48,16 @@ install-bin: $(bin_prefix)/$(bin_dir) $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo rm -fr /tmp/kamctl.fifo sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.ser > /tmp/kamctl.ser + $(INSTALL_CFG) /tmp/kamctl.ser \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser + rm -fr /tmp/kamctl.ser + sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.ser_mi > /tmp/kamctl.ser_mi + $(INSTALL_CFG) /tmp/kamctl.ser_mi \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser_mi + rm -fr /tmp/kamctl.ser_mi + sed -e "s#/usr/local#$(bin_target)#g" \ < kamctl.unixsock > /tmp/kamctl.unixsock $(INSTALL_CFG) /tmp/kamctl.unixsock \ $(modules_prefix)/$(lib_dir)/kamctl/kamctl.unixsock diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index afb7a46..09a0fb8 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -127,8 +127,21 @@ case $CTLENGINE in CTLENGINELOADED=1 fi ;; + SER_MI|ser_mi) + if [ -f "$MYLIBDIR/kamctl.ser_mi" ]; then + . "$MYLIBDIR/kamctl.ser_mi" + CTLENGINELOADED=1 + fi + ;; esac +#### ------------------------------------------------- ##### +### Load sercm interface +# +if [ -f "$MYLIBDIR/kamctl.ser" ]; then + . "$MYLIBDIR/kamctl.ser" +fi + if [ $CTLENGINELOADED -eq 1 ] ; then mdbg "Control engine '$CTLENGINE' loaded" else @@ -2313,12 +2326,17 @@ case $1 in trusted "$@" ;; - fifo|unixsock) + fifo|unixsock|ser_mi) require_ctlengine shift $CTLCMD "$@" ;; + ser) + shift + $SERCTLCMD "$@" + ;; + lcr) shift lcr "$@" diff --git a/utils/kamctl/kamctl.ser b/utils/kamctl/kamctl.ser new file mode 100644 index 0000000..b70deed --- /dev/null +++ b/utils/kamctl/kamctl.ser @@ -0,0 +1,60 @@ +# +# $Id$ +# +# control tool for maintaining Kamailio +# +#=================================================================== + +##### ----------------------------------------------- ##### +### FIFO specific variables and functions +# + +##### ----------------------------------------------- ##### +### load CTL base +# +if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then + . "$MYLIBDIR/kamctl.ctlbase" +else + mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..." + # exit -1 +fi + +# +##### ----------------------------------------------- ##### +### parameters +# +SERCMD=`which sercmd` +if [ -z "$SERCMD" ] ; then + SERCMD="/usr/local/sbin/sercmd" +fi + +# +##### ----------------------------------------------- ##### +### functions +# +usage_ser() { + echo + mecho " -- command 'ser'" + echo +cat <<EOF + ser ............................... send command thru sercmd +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" + + +ser_cmd() +{ + mdbg "entering ser_mi_cmd $*" + + if [ "$#" -lt 1 ]; then + merr "ser_cmd must take at least command name as parameter" + exit 1 + fi + + + $SERCMD "$@" +} + +SERCTLCMD=ser_cmd + diff --git a/utils/kamctl/kamctl.ser_mi b/utils/kamctl/kamctl.ser_mi new file mode 100644 index 0000000..fdf247c --- /dev/null +++ b/utils/kamctl/kamctl.ser_mi @@ -0,0 +1,98 @@ +# +# $Id$ +# +# control tool for maintaining Kamailio +# +#=================================================================== + +##### ----------------------------------------------- ##### +### FIFO specific variables and functions +# + +##### ----------------------------------------------- ##### +### load CTL base +# +if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then + . "$MYLIBDIR/kamctl.ctlbase" +else + mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..." + # exit -1 +fi + +# +##### ----------------------------------------------- ##### +### parameters +# +SERCMD=`which sercmd` +if [ -z "$SERCMD" ] ; then + SERCMD="/usr/local/sbin/sercmd" +fi + +# +##### ----------------------------------------------- ##### +### functions +# +usage_ser_mi() { + echo + mecho " -- command 'ser_mi'" + echo +cat <<EOF + ser ............................... send mi command thru sercmd +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi" + + +ser_mi_cmd() +{ + mdbg "entering ser_mi_cmd $*" + + if [ "$#" -lt 1 ]; then + merr "ser_cmd must take at least command name as parameter" + exit 1 + fi + + + $SERCMD mi "$@" +} + +CTLCMD=ser_mi_cmd + +ser_mi_monitor() { + trap "rm $path; clear; echo monitor ^C-ed; exit 1" 2 + attempt=0 + if [ "$2" = "" ]; then + loops=-1; + else + loops=$2; + fi + clear + while [ $loops -ne $attempt ] ; do + attempt=`$EXPR $attempt + 1` + #clear + tput clear + + # print_stats $name $path $attempt + mecho "[cycle #: $attempt; if constant make sure server lives]" + + $SERCMD mi version + $SERCMD mi uptime + mecho "Transaction Statistics" + $SERCMD mi get_statistics UAS_transactions UAC_transactions inuse_transactions + + mecho "Stateless Server Statistics: " + $SERCMD mi get_statistics sent_replies sent_err_replies received_ACKs + + mecho "UsrLoc Stats: " + $SERCMD mi get_statistics usrloc + if [ $loops -ne $attempt ] ; then + sleep $WATCH_PERIOD + fi + done + exit 0 +} + +OPENSER_MONITOR=ser_mi_monitor + + +

14 years, 8 months

git:master: core: bit conting and testing functions

by Miklos Tirpak

Module: sip-router Branch: master Commit: 7ee950eb3e34dc0cdb3e825fa347dd29e7526afc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ee950e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 19 11:53:19 2010 +0200 core: bit conting and testing functions new functions for bit operations: - bit_count() - bit_test() - bit_test_and_set() --- bit_count.c | 44 +++++++++++++++++++++ bit_count.h | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ bit_test.h | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 0 deletions(-) diff --git a/bit_count.c b/bit_count.c new file mode 100644 index 0000000..faef43c --- /dev/null +++ b/bit_count.c @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * Copyright (C) 2010 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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +#include "bit_count.h" + +#if 0 +/* number of bits in a byte */ +int bits_in_char[256] = { + 0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 ,5 ,6 ,6 ,7 ,6 ,7 ,7 ,8 }; +#endif diff --git a/bit_count.h b/bit_count.h new file mode 100644 index 0000000..6e7f62c --- /dev/null +++ b/bit_count.h @@ -0,0 +1,101 @@ +/* + * $Id$ + * + * Copyright (C) 2010 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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +/* Implements the bit counting function: + * int bit_count(unsigned int u) + * Returns the number of bits in u. + */ + +#ifndef _BIT_COUNT_H +#define _BIT_COUNT_H + +/* fix __CPU_i386 -> __CPU_x86 */ +#if defined __CPU_i386 && ! defined __CPU_x86 +#define __CPU_x86 +#endif + +#ifdef CC_GCC_LIKE_ASM +#if defined __CPU_x86 || defined __CPU_x86_64 +#ifdef __SSE4_2__ +/* popcnt requires SSE4.2 support, + * see http://en.wikipedia.org/wiki/SSE4 */ +#define BIT_COUNT_ASM +#endif +#endif +#endif + +#ifdef BIT_COUNT_ASM + +/* Returns the number of 1 bits in u. */ +static inline int bit_count(unsigned int u) +{ + int v; + + asm volatile(" popcnt %1, %0 " : "=r" (v) : "rm" (u)); + return v; +} + +#else /* BIT_COUNT_ASM */ + +/* Returns the number of 1 bits in u. + * source: http://en.wikipedia.org/wiki/Hamming_weight + */ +#if 0 +static inline int bit_count(unsigned int u) +{ + int count; + + /* It is likely to have only few + * bits set to 1, so there will be only + * few iterations */ + for (count=0; u; count++) + u &= u-1; + return count; +} +#endif + +static inline int bit_count(unsigned int i) +{ + i = i - ((i >> 1) & 0x55555555); + i = (i & 0x33333333) + ((i >> 2) & 0x33333333); + return (((i + (i >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24; +} + +#if 0 +/* number of bits in a byte. + * (Only slightly faster then the above version, + * It is not worth the extra memory usage.) + */ +extern int bits_in_char[256]; + +static inline int bit_count(unsigned int u) +{ + return bits_in_char [u & 0xffu] + + bits_in_char [(u >> 8 ) & 0xffu] + + bits_in_char [(u >> 16) & 0xffu] + + bits_in_char [(u >> 24) & 0xffu]; +} +#endif + +#endif /* BIT_COUNT_ASM */ + +#endif /* _BIT_COUNT_H */ diff --git a/bit_test.h b/bit_test.h new file mode 100644 index 0000000..534e502 --- /dev/null +++ b/bit_test.h @@ -0,0 +1,121 @@ +/* + * $Id$ + * + * Copyright (C) 2010 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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +/* Bit test functions: + * - int bit_test(int offset, unsigned int *addr) + * Returns the bit found at offset position + * in a bitstring pointed by addr. + * + * - int bit_test_and_set(int offset, unsigned int *addr) + * Returns the bit found at offset position + * in a bitstring pointed by addr, and sets + * the bit at the given offset. + * + * Note that 0 <= offset <= 128, Make sure that addr points to + * a large enough memory area. + */ + +#ifndef _BIT_TEST_H +#define _BIT_TEST_H + +/* fix __CPU_i386 -> __CPU_x86 */ +#if defined __CPU_i386 && ! defined __CPU_x86 +#define __CPU_x86 +#endif + +#ifdef CC_GCC_LIKE_ASM +#if defined __CPU_x86 || defined __CPU_x86_64 +#define BIT_TEST_ASM +#endif +#endif + +#ifdef BIT_TEST_ASM + +/* Returns the bit found at offset position in the bitstring + * pointed by addr. + * Note that the CPU can access 4 bytes starting from addr, + * hence 0 <= offset < 128 holds. Make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test(int offset, unsigned int *addr) +{ + unsigned char v; + + asm volatile( + " bt %2, %1 \n\t" + " setc %0 \n\t" + : "=qm" (v) : "m" (*addr), "r" (offset) + ); + return (int)v; +} + +/* Returns the bit found at offset position in the bitstring + * pointed by addr and sets it to 1. + * Note that the CPU can access 4 bytes starting from addr, + * hence 0 <= offset < 128 holds. Make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test_and_set(int offset, unsigned int *addr) +{ + unsigned char v; + + asm volatile( + " bts %2, %1 \n\t" + " setc %0 \n\t" + : "=qm" (v) : "m" (*addr), "r" (offset) + ); + return (int)v; +} + +#else /* BIT_TEST_ASM */ + +/* Returns the bit found at offset position in the bitstring + * pointed by addr. + * Note that offset can be grater than 32, make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test(int offset, unsigned int *addr) +{ + return ((*(addr + offset/32)) & (1U << (offset % 32))) ? 1 : 0; +} + +/* Returns the bit found at offset position in the bitstring + * pointed by addr and sets it to 1. + * Note that offset can be grater than 32, make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test_and_set(int offset, unsigned int *addr) +{ + unsigned int *i; + int mask, res; + + i = addr + offset/32; + mask = 1U << (offset % 32); + res = ((*i) & mask) ? 1 : 0; + (*i) |= mask; + + return res; +} + +#endif /* BIT_TEST_ASM */ + +#endif /* #ifndef _BIT_TEST_H */

14 years, 8 months

[tracker] Assignee added: SDP parsing when dealing with multi-part bodies

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#73 - SDP parsing when dealing with multi-part bodies User who did this - Pascal Maugeri (pmaugeri) http://sip-router.org/tracker/index.php?do=details&task_id=73 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.

14 years, 8 months

[tracker] Task opened: SDP parsing when dealing with multi-part bodies

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Pascal Maugeri (pmaugeri) Attached to Project - sip-router Summary - SDP parsing when dealing with multi-part bodies Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I got the following error when dealing with SIP INVITE with multi-part when the client is behind NAT: May 12 15:27:04 test /usr/sbin/kamailio[1792]: ERROR: nathelper [nathelper.c:2954]: can't extract body from the message The SIP INVITE message looks like: INVITE sip:toto@test.net SIP/2.0 [...] Content-Type: multipart/mixed;boundary=gnkr Content-Length: 659 --gnkr Content-Type: application/sdp Content-Length: 330 v=0 o=pascal 1273565967736 1273565967737 IN IP4 10.1.1.226 [...] It looks the Content-length within the multi-part is not accepted. I fixed it changing the source code of parser/sdp/sdp_helpr_funcs.c, in get_sdp_hdr_field() function: switch(hdr->type){ case HDR_CONTENTTYPE_T: case HDR_CONTENTDISPOSITION_T: replaced with: switch(hdr->type){ case HDR_CONTENTTYPE_T: case HDR_CONTENTDISPOSITION_T: case HDR_CONTENTLENGTH_T: (I'm using kamailio 3.0.1) Cheers Pascal More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=73 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.

14 years, 8 months

git:master: pkg: updated kamailio spec file for CentOS

by Ovidiu Sas

Module: sip-router Branch: master Commit: 0acd8963f76a4854e101210db17854ca8062ff61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0acd896… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: 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. --- pkg/kamailio/rpm/kamailio.default | 25 ++ pkg/kamailio/rpm/kamailio.init | 88 ++++- pkg/kamailio/rpm/kamailio.spec.CenOS | 633 ++++++++++++++++++++++++++++++++++ 3 files changed, 733 insertions(+), 13 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0ac…

14 years, 8 months

[tracker] Task opened: allow rewriting request uri also in failure route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - allow rewriting request uri also in failure route Task Type - Improvement Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - in order to make life of module and script writer easier, allow rewriting of request uri also in failure route similar to what has been done in opensips 1.5: There is no need to call "append_branch()" function in failure_route in order to use the RURI - you still need to use it only if you want to do parallel forking. Ex: # in 1.4.x failure_route[2] if (t_check_status("408")) { # set new RURI rewritehostport("my_voicemail.com:5060"); append_branch(); t_relay(); } } -> # in 1.5.x failure_route[2] if (t_check_status("408")) { # set new RURI rewritehostport("my_voicemail.com:5060"); t_relay(); } } -- juha More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=72 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.

14 years, 8 months

[tracker] Assignee added: allow rewriting request uri also in failure route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#72 - allow rewriting request uri also in failure route User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=72 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.

14 years, 8 months

git:master: modules/lcr: caller_uri argument of load_gws() is now optional

by Juha Heinanen

Module: sip-router Branch: master Commit: de490ed1559028ba737b0dea81eaba50a6e72852 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de490ed… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 16 19:25:13 2010 +0300 modules/lcr: caller_uri argument of load_gws() is now optional - If not given, it defaults to empty string. --- modules/lcr/README | 11 +++++---- modules/lcr/doc/lcr_admin.xml | 5 ++- modules/lcr/lcr_mod.c | 44 +++++++++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index ce1ffb4..2e5a025 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -59,7 +59,7 @@ Juha Heinanen 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -162,7 +162,7 @@ Chapter 1. Admin Guide 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -625,7 +625,7 @@ modparam("lcr", "fetch_rows", 3000) 4. Exported Functions - 4.1. load_gws(lcr_id, caller_uri) + 4.1. load_gws(lcr_id[, caller_uri]) 4.2. next_gw() 4.3. defunct_gw(period) 4.4. from_gw(lcr_id [, ip_addr]) @@ -633,13 +633,14 @@ modparam("lcr", "fetch_rows", 3000) 4.6. to_gw(lcr_id [, ip_addr]) 4.7. to_any_gw([ip_addr]) -4.1. load_gws(lcr_id, caller_uri) +4.1. load_gws(lcr_id[, caller_uri]) Loads URI schemes, IP addresses, hostnames, ports, params, and transports of matching gateways to gw_uri_avp (see Overview section). Argument lcr_id specifies the used LCR instance. It can be an integer or a pseudo variable containing an integer value. Caller's URI is given - by caller_uri argument, which must be a pseudo variable. + by caller_uri argument, which must be a pseudo variable. If caller_uri + argument is omitted, it defaults to empty string. Returns 1 if at least one matching gateway was found, 2 if no matching gateways was found, and -1 on error. diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 04ba61c..55d5cfd 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -765,7 +765,7 @@ modparam("lcr", "fetch_rows", 3000) <title>Exported Functions</title> <section> <title> - <function moreinfo="none">load_gws(lcr_id, caller_uri)</function> + <function moreinfo="none">load_gws(lcr_id[, caller_uri])</function> </title> <para> Loads URI schemes, IP addresses, hostnames, ports, @@ -775,7 +775,8 @@ modparam("lcr", "fetch_rows", 3000) LCR instance. It can be an integer or a pseudo variable containing an integer value. Caller's URI is given by caller_uri argument, which - must be a pseudo variable. + must be a pseudo variable. If caller_uri argument is + omitted, it defaults to empty string. </para> <para> Returns 1 if at least one matching gateway was found, 2 diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 13fb7e0..add81d9 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -246,7 +246,8 @@ struct lcr_info ***lcrtp = (struct lcr_info ***)NULL; /* * Functions that are defined later */ -static int load_gws(struct sip_msg* _m, char* _s1, char* _s2); +static int load_gws_1(struct sip_msg* _m, char* _s1, char* _s2); +static int load_gws_2(struct sip_msg* _m, char* _s1, char* _s2); static int next_gw(struct sip_msg* _m, char* _s1, char* _s2); static int defunct_gw(struct sip_msg* _m, char* _s1, char* _s2); static int from_gw_1(struct sip_msg* _m, char* _s1, char* _s2); @@ -262,7 +263,9 @@ static int to_any_gw_1(struct sip_msg* _m, char* _s1, char* _s2); * Exported functions */ static cmd_export_t cmds[] = { - {"load_gws", (cmd_function)load_gws, 2, fixup_igp_pvar, + {"load_gws", (cmd_function)load_gws_1, 1, fixup_igp_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"load_gws", (cmd_function)load_gws_2, 2, fixup_igp_pvar, fixup_free_igp_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, {"next_gw", (cmd_function)next_gw, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -1536,7 +1539,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, /* * Load info of matching GWs into gw_uri_avps */ -static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) +static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) { str ruri_user, from_uri; int i, j, lcr_id; @@ -1548,7 +1551,7 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) char *hostname; /* Get and check parameter values */ - if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { + if (get_int_fparam(&lcr_id, _m, _lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } @@ -1556,14 +1559,18 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } - - if (get_str_fparam(&from_uri, _m, (fparam_t *)_from_uri) != 0) { - LM_ERR("no from_uri parameter value\n"); - return -1; - } - if (from_uri.len == 0) { - LM_ERR("empry from_uri param value\n"); - return -1; + if (_from_uri) { + if (get_str_fparam(&from_uri, _m, _from_uri) != 0) { + LM_ERR("no from_uri parameter value\n"); + return -1; + } + if (from_uri.len == 0) { + LM_ERR("empty from_uri parameter value\n"); + return -1; + } + } else { + from_uri.len = 0; + from_uri.s = (char *)0; } /* Use gws and lcr rules with index lcr_id */ @@ -1677,6 +1684,18 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) } +static int load_gws_1(struct sip_msg* _m, char *_lcr_id, char *_s2) +{ + return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)0); +} + + +static int load_gws_2(struct sip_msg* _m, char *_lcr_id, char *_from_uri) +{ + return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)_from_uri); +} + + /* Generate Request-URI and Destination URI */ static int generate_uris(char *r_uri, str *r_uri_user, unsigned int *r_uri_len, char *dst_uri, unsigned int *dst_uri_len, @@ -1938,6 +1957,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) if (dst_uri_len > 0) { uri_str.s = dst_uri; uri_str.len = dst_uri_len; + LM_DBG("setting du to <%.*s>\n", uri_str.len, uri_str.s); rval = set_dst_uri(_m, &uri_str); if (rval != 0) { LM_ERR("calling do_action failed with return value <%d>\n", rval);

14 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev