sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

add script counter.
by Zhong, Alec (NSB - CN/Qingdao) 26 Mar '19

26 Mar '19

Hello, Could you please help check below error? I would like to add a script counter to count the number of received message by kamailio. Anything wrong to use counters module? Thank you in advance. Kamailio.cfg change [cid:image001.png@01D4E3C2.32E8DFB0] Kamailo log [cid:image002.png@01D4E3C2.8237E9D0]

2 2

git:master:d4adb838: kamctl: internal OSERBIN renamed to KAMBIN
by Daniel-Constantin Mierla 26 Mar '19

26 Mar '19

Module: kamailio Branch: master Commit: d4adb838908e9129cd84643e625a287dba01d604 URL: https://github.com/kamailio/kamailio/commit/d4adb838908e9129cd84643e625a287… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-26T04:08:47+01:00 kamctl: internal OSERBIN renamed to KAMBIN --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/d4adb838908e9129cd84643e625a287… Patch: https://github.com/kamailio/kamailio/commit/d4adb838908e9129cd84643e625a287… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 012cf20a05..3a25443355 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1982,16 +1982,16 @@ kamailio_start() { exit 1 fi - if [ ! -x "$OSERBIN" ] ; then + if [ ! -x "$KAMBIN" ] ; then echo - merr "Kamailio binaries not found at $OSERBIN" - merr "set OSERBIN to the path of kamailio in $0 or ~/.kamctlrc" + merr "Kamailio binaries not found at $KAMBIN" + merr "set KAMBIN to the path of kamailio in $0 or ~/.kamctlrc" exit 1 fi if [ $SYSLOG = 1 ] ; then - $OSERBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null + $KAMBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null else - $OSERBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS + $KAMBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index ef94526d21..16f61e04a5 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -112,8 +112,8 @@ fi if [ -z "$DIR" ] ; then DIR=`dirname $0` fi -if [ -z "$OSERBIN" ] ; then - OSERBIN=$DIR/kamailio +if [ -z "$KAMBIN" ] ; then + KAMBIN=$DIR/kamailio fi ##### ------------------------------------------------ #####

1 0

git:master:e2784b5e: kamctl: added acc command
by Daniel-Constantin Mierla 25 Mar '19

25 Mar '19

Module: kamailio Branch: master Commit: e2784b5ea2a796455b62deb2f85b1547dce2ad67 URL: https://github.com/kamailio/kamailio/commit/e2784b5ea2a796455b62deb2f85b154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-25T02:20:14+01:00 kamctl: added acc command - list acc records fromd database --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/e2784b5ea2a796455b62deb2f85b154… Patch: https://github.com/kamailio/kamailio/commit/e2784b5ea2a796455b62deb2f85b154… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index d9d70a538e..012cf20a05 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2332,6 +2332,44 @@ $SD_SD_DOMAIN_COLUMN='$OSERDOMAIN'" esac } # end speed_dial() +# +##### ------------------------------------------------ ##### +### acc management +# +acc() { + if [ "$#" -lt 2 ] ; then + merr "acc - too few parameters" + usage_acc + exit 1 + fi + shift; + require_dbengine + case $1 in + showdb) + QUERY="select * FROM $ACC_TABLE ;" + $DBROCMD "$QUERY" + ;; + + recent) + TIMENOW=`date +"%s"` + if [ $# -eq 2 ] ; then + CLAUSE=" WHERE time>=$TIMENOW - $2 " + else + CLAUSE=" WHERE time>=$TIMENOW - 300 " + fi + QUERY="select * FROM $ACC_TABLE $CLAUSE ; " + $DBROCMD "$QUERY" + ;; + + + *) + usage_acc + exit 1 + ;; + esac +} # end acc() + + # ##### ================================================ ##### ### subscriber management @@ -3048,6 +3086,10 @@ case $1 in speeddial "$@" ;; + acc) + acc "$@" + ;; + tls) shift tls_ca "$@" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index b538cd70d1..ef94526d21 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -353,6 +353,11 @@ DIALPLAN_SUBST_EXP_COLUMN=subst_exp DIALPLAN_REPL_EXP_COLUMN=repl_exp DIALPLAN_ATTRS_COLUMN=attrs +# ACC table +if [ -z "$ACC_TABLE" ] ; then + ACC_TABLE=acc +fi + # ##### ------------------------------------------------ ##### ### usage functions @@ -567,6 +572,17 @@ EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_mtree" +usage_acc() { + echo + mecho " -- command 'acc' - manage accounding records" + echo +cat <<EOF + acc showdb .................. show content of acc table + recent [<secs>] ............. show most recent records in acc (default 300s) +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_acc" + ##### ----------------------------------------------- ##### #### Common functions

1 0

[kamailio/kamailio] Domain names longer than 70 (#1901)
by niallmcandrew 24 Mar '19

24 Mar '19

### Description Providing Kamailio with a domain name longer than 72 chars causes Kamailio to crash with an error in `fix_sock_str`. Looking at the code it appears that the `fix_sock_str` function only assumes it is being passed IP addresses so the buffer length is configured for the length of an IPv6 address represented as a string. It appears to include the portion of the string representing the port as can be seen in the two example config lines below. #### Reproduction The problem can be reproduced by adding the following line to the `kamailio.cfg` and running `kamailio` with the `-c` config check option. ``` listen=tcp:eth0:5060 advertise "example.example.example.example.example.example.example.example.exa":50 listen=tcp:eth0:5061 advertise "example.example.example.example.example.example.example.example.e":5060 ``` #### Debugging Data N/A #### Log Messages ``` 0(100) ERROR: <core> [core/socket_info.c:376]: socketinfo2str(): Destionation buffer too short 0(100) BUG: <core> [core/socket_info.c:443]: fix_sock_str(): fix_sock_str: Error in socket to str 0(100) ERROR: <core> [core/socket_info.c:1841]: fix_all_socket_lists(): fix_socket_list tcp failed failed to initialize list addresses ``` #### SIP Traffic N/A ### Possible Solutions Don't use listen addresses longer than 70 chars. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: Debian container running on Arch Linux host. ``` Debian GNU/Linux 9 (stretch) Linux 75dbf08c8303 5.0.3-arch1-1-ARCH #1 SMP PREEMPT Tue Mar 19 13:09:13 UTC 2019 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1901

2 3

git:master:65e7a23d: tm: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: 65e7a23d701ab195035f8b8d8ef01ac6cc03670b URL: https://github.com/kamailio/kamailio/commit/65e7a23d701ab195035f8b8d8ef01ac… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:20:55+01:00 tm: small spelling fix: lenght -> length --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/65e7a23d701ab195035f8b8d8ef01ac… Patch: https://github.com/kamailio/kamailio/commit/65e7a23d701ab195035f8b8d8ef01ac… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index aad14aa78f..a1c471a504 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1104,7 +1104,7 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, * into the same allocated chunk of memory (retr. buffer first, string * buffer follows).In this case, the 'len' param is used as in-out * parameter: 'in' to give the extra space needed by the retr. buffer, - * 'out' to return the lenght of the allocated string buffer. + * 'out' to return the length of the allocated string buffer. */ unsigned offset = *len; #endif

1 0

git:master:2ccbff12: stun: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: 2ccbff126753573308d98a973f3c29013dcd6529 URL: https://github.com/kamailio/kamailio/commit/2ccbff126753573308d98a973f3c290… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:20:42+01:00 stun: small spelling fix: lenght -> length --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/2ccbff126753573308d98a973f3c290… Patch: https://github.com/kamailio/kamailio/commit/2ccbff126753573308d98a973f3c290… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 62bd368589..9eb823068b 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -227,7 +227,7 @@ static int stun_parse_body( buf = &req->msg.buf.s[sizeof(struct stun_hdr)]; /* - * Mark the body lenght as unparsed. + * Mark the body length as unparsed. */ not_parsed = req->msg.buf.len - sizeof(struct stun_hdr);

1 0

git:master:920340ea: sctp: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: 920340ea6b69f43637186e58d6d934b413aeb2ab URL: https://github.com/kamailio/kamailio/commit/920340ea6b69f43637186e58d6d934b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:20:31+01:00 sctp: small spelling fix: lenght -> length --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/920340ea6b69f43637186e58d6d934b… Patch: https://github.com/kamailio/kamailio/commit/920340ea6b69f43637186e58d6d934b… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 66c71b7889..6690503973 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -2538,7 +2538,7 @@ int sctp_rcv_loop() /** low level sctp non-blocking send. * @param socket - sctp socket to send on. * @param buf - data. - * @param len - lenght of the data. + * @param len - length of the data. * @param to - destination in ser sockaddr_union format. * @param sndrcv_info - sctp_sndrcvinfo structure pointer, pre-filled. * @param flags - can have one of the following values (or'ed):

1 0

git:master:e59fa0c5: ndb_redis: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: e59fa0c52af3ea5ddea435ec0b48df737f6aa5aa URL: https://github.com/kamailio/kamailio/commit/e59fa0c52af3ea5ddea435ec0b48df7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:20:21+01:00 ndb_redis: small spelling fix: lenght -> length --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e59fa0c52af3ea5ddea435ec0b48df7… Patch: https://github.com/kamailio/kamailio/commit/e59fa0c52af3ea5ddea435ec0b48df7… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 7e3ddb0d8c..a4531801b4 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1019,12 +1019,12 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) /** * Executes a redis command. - * Command is coded using a vector of strings, and a vector of lenghts. + * Command is coded using a vector of strings, and a vector of lengths. * * @param rsrv Pointer to a redis_server_t structure. * @param argc number of elements in the command vector. * @param argv vector of zero terminated strings forming the command. - * @param argvlen vector of command string lenghts or NULL. + * @param argvlen vector of command string lengths or NULL. * @return redisReply structure or NULL if there was an error. */ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv,

1 0

git:master:a6e3b65b: ims_registrar_scscf: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: a6e3b65bebf90f1cbcaed2e2c559153951478c21 URL: https://github.com/kamailio/kamailio/commit/a6e3b65bebf90f1cbcaed2e2c559153… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:20:00+01:00 ims_registrar_scscf: small spelling fix: lenght -> length --- Modified: src/modules/ims_registrar_scscf/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a6e3b65bebf90f1cbcaed2e2c559153… Patch: https://github.com/kamailio/kamailio/commit/a6e3b65bebf90f1cbcaed2e2c559153… --- diff --git a/src/modules/ims_registrar_scscf/sip_msg.c b/src/modules/ims_registrar_scscf/sip_msg.c index 031dc759cd..e61a2204e4 100644 --- a/src/modules/ims_registrar_scscf/sip_msg.c +++ b/src/modules/ims_registrar_scscf/sip_msg.c @@ -210,7 +210,7 @@ int check_contacts(struct sip_msg* _m, int* _s) { rerrno = R_STAR_CONT; return 1; } - /* check also the lenght of all contacts */ + /* check also the length of all contacts */ for (c = ((contact_body_t*) p->parsed)->contacts; c; c = c->next) { if (c->uri.len > CONTACT_MAX_SIZE

1 0

git:master:d07ea5ef: dialog: small spelling fix: lenght -> length
by Henning Westerholt 24 Mar '19

24 Mar '19

Module: kamailio Branch: master Commit: d07ea5efce08576b75e0afc125d67650e76c03f3 URL: https://github.com/kamailio/kamailio/commit/d07ea5efce08576b75e0afc125d6765… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-24T19:19:50+01:00 dialog: small spelling fix: lenght -> length --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/d07ea5efce08576b75e0afc125d6765… Patch: https://github.com/kamailio/kamailio/commit/d07ea5efce08576b75e0afc125d6765… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index b97e8f7123..8986d0aaa6 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -323,7 +323,7 @@ int dlg_cseq_msg_received(sr_event_param_t *evp) LM_DBG("via cseq cookie [%.*s] val [%.*s]\n", vcseq.len, vcseq.s, vcseq.len-3, vcseq.s+3); if(vcseq.len-3>get_cseq(&msg)->number.len) { - /* higher lenght to update - wrong */ + /* higher length to update - wrong */ LM_DBG("cseq in message (%d) shorter than in via (%d)\n", get_cseq(&msg)->number.len, vcseq.len-3); goto done;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019