sr-dev

sr-dev@lists.kamailio.org

20 participants
45176 discussions

Maintenance work on kamailio.org server - Wed, July 8, 2020
by Daniel-Constantin Mierla 08 Jul '20

08 Jul '20

Hello, on Wednesday, July 8, 2020, there will be some work on Kamailio project infrastructure. Therefore there could be short intervals of downtime for online resources like the web server, wiki, documentation and downloads portals, mailing lists or the GIT repository mirror. Once the maintenance work is finished, we will post an update. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 2

git:master:317f7074: core: tcp - debug message when removing connection from list
by Daniel-Constantin Mierla 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: 317f707425a4cf0be144d2c874fcdf2ad8d7f992 URL: https://github.com/kamailio/kamailio/commit/317f707425a4cf0be144d2c874fcdf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-08T14:44:34+02:00 core: tcp - debug message when removing connection from list --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/317f707425a4cf0be144d2c874fcdf2… Patch: https://github.com/kamailio/kamailio/commit/317f707425a4cf0be144d2c874fcdf2… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index ed0a5753cb..655db7da7b 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1881,6 +1881,13 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); } if(tcp_conn_lst!=NULL) { + LM_DBG("removing from list %p id %d fd %d," + " state %d, flags %x, main fd %d, refcnt %d" + " ([%s]:%u -> [%s]:%u)\n", + con, con->id, con->fd, con->state, + con->flags, con->s, atomic_get(&con->refcnt), + ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, + ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); local_timer_del(&tcp_reader_ltimer, &con->timer); if (unlikely(resp!=CONN_EOF))

1 0

git:master:41bdb340: kamailio.cfg: set disable_sctp to yes
by Daniel-Constantin Mierla 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: 41bdb340952aa3c2c9b45ca2807e4366908c1b42 URL: https://github.com/kamailio/kamailio/commit/41bdb340952aa3c2c9b45ca2807e436… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-08T14:28:04+02:00 kamailio.cfg: set disable_sctp to yes - in auto mode a log message is printed about not having sctp module loaded, which is not done in the default config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/41bdb340952aa3c2c9b45ca2807e436… Patch: https://github.com/kamailio/kamailio/commit/41bdb340952aa3c2c9b45ca2807e436… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c0e618719b..ba0bccb6b7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -192,6 +192,10 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +#!ifdef WITH_JSONRPC +tcp_accept_no_cl=yes +#!endif + #!ifdef WITH_TLS enable_tls=yes @@ -199,9 +203,8 @@ enable_tls=yes tls_max_connections=2048 #!endif -#!ifdef WITH_JSONRPC -tcp_accept_no_cl=yes -#!endif +/* set it to yes to enable sctp and load sctp.so module */ +disable_sctp = yes ####### Custom Parameters #########

1 0

git:master:5aace32c: dlgs: tags operations and counting functions
by Daniel-Constantin Mierla 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: 5aace32c937f4885a19b204d13170a337e7c0ad8 URL: https://github.com/kamailio/kamailio/commit/5aace32c937f4885a19b204d13170a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-08T09:27:34+02:00 dlgs: tags operations and counting functions --- Modified: src/modules/dlgs/dlgs_mod.c Modified: src/modules/dlgs/dlgs_records.c Modified: src/modules/dlgs/dlgs_records.h --- Diff: https://github.com/kamailio/kamailio/commit/5aace32c937f4885a19b204d13170a3… Patch: https://github.com/kamailio/kamailio/commit/5aace32c937f4885a19b204d13170a3…

1 0

git:master:626c0dee: kamctl: skip tracing kamctl itself in pstrap
by Daniel-Constantin Mierla 07 Jul '20

07 Jul '20

Module: kamailio Branch: master Commit: 626c0dee863fa517e473148ca8010d737a8f7ffe URL: https://github.com/kamailio/kamailio/commit/626c0dee863fa517e473148ca8010d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-07T19:28:29+02:00 kamctl: skip tracing kamctl itself in pstrap --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/626c0dee863fa517e473148ca8010d7… Patch: https://github.com/kamailio/kamailio/commit/626c0dee863fa517e473148ca8010d7… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 1f3b1f38a2..5be26efbc4 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2947,11 +2947,11 @@ kamailio_pstrap() { DATE=`/bin/date +%Y%m%d_%H%M%S` LOG_FILE=/tmp/gdb_kamailio_${DATE}.txt minfo "Trap file: $LOG_FILE" - ps axw | grep kamailio | grep -v grep | sort > $LOG_FILE + ps axw | grep kamailio | grep -v grep | grep -v kamctl | sort > $LOG_FILE echo "" >> $LOG_FILE echo "" >> $LOG_FILE echo -n "Trapping Kamailio with gdb: " - PID_TIMESTAMP_VECTOR=`ps axw | grep kamailio | grep -v grep | sort | awk '{print $1}'` + PID_TIMESTAMP_VECTOR=`ps axw | grep kamailio | grep -v grep | grep -v kamctl | sort | awk '{print $1}'` for pid in $PID_TIMESTAMP_VECTOR do echo -n "."

1 0

git:master:904a1590: kamctl: print process details in pstrap output
by Daniel-Constantin Mierla 07 Jul '20

07 Jul '20

Module: kamailio Branch: master Commit: 904a1590dbcdbb0fda9f676b4768596f797e9e27 URL: https://github.com/kamailio/kamailio/commit/904a1590dbcdbb0fda9f676b4768596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-07T19:18:52+02:00 kamctl: print process details in pstrap output --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/904a1590dbcdbb0fda9f676b4768596… Patch: https://github.com/kamailio/kamailio/commit/904a1590dbcdbb0fda9f676b4768596… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a7a63c64a3..1f3b1f38a2 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2958,7 +2958,7 @@ kamailio_pstrap() { PID=`echo $pid | cut -d '-' -f 1` echo "" >> $LOG_FILE echo "---start $PID -----------------------------------------------------" >> $LOG_FILE - $GDB kamailio $PID -batch --eval-command="bt full" >> $LOG_FILE 2>&1 + $GDB kamailio $PID -batch --eval-command="p process_no" --eval-command="p pt[process_no]" --eval-command="bt full" >> $LOG_FILE 2>&1 echo "---end $PID -------------------------------------------------------" >> $LOG_FILE done echo "."

1 0

git:master:97ec8555: kamctl: added pstrap command
by Daniel-Constantin Mierla 07 Jul '20

07 Jul '20

Module: kamailio Branch: master Commit: 97ec85559f1e33405fff2320443dc86d2df13456 URL: https://github.com/kamailio/kamailio/commit/97ec85559f1e33405fff2320443dc86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-07T18:57:27+02:00 kamctl: added pstrap command - use ps to get list of PIDs for Kamailio instance, instead of RPC core.psx --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/97ec85559f1e33405fff2320443dc86… Patch: https://github.com/kamailio/kamailio/commit/97ec85559f1e33405fff2320443dc86… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 211e0cf042..a7a63c64a3 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2909,7 +2909,7 @@ extcmd() { } ##### ================================================ ##### -### trap with gdb kamailio processes +### trap with gdb kamailio processes using RPC core.psx # kamailio_trap() { @@ -2935,6 +2935,35 @@ kamailio_trap() { echo "." } +##### ================================================ ##### +### trap with gdb kamailio processes using ps command +# + +kamailio_pstrap() { + if [ -z "$GDB" ] ; then + merr "'gdb' tool not found: set GDB variable to correct tool path" + exit + fi + DATE=`/bin/date +%Y%m%d_%H%M%S` + LOG_FILE=/tmp/gdb_kamailio_${DATE}.txt + minfo "Trap file: $LOG_FILE" + ps axw | grep kamailio | grep -v grep | sort > $LOG_FILE + echo "" >> $LOG_FILE + echo "" >> $LOG_FILE + echo -n "Trapping Kamailio with gdb: " + PID_TIMESTAMP_VECTOR=`ps axw | grep kamailio | grep -v grep | sort | awk '{print $1}'` + for pid in $PID_TIMESTAMP_VECTOR + do + echo -n "." + PID=`echo $pid | cut -d '-' -f 1` + echo "" >> $LOG_FILE + echo "---start $PID -----------------------------------------------------" >> $LOG_FILE + $GDB kamailio $PID -batch --eval-command="bt full" >> $LOG_FILE 2>&1 + echo "---end $PID -------------------------------------------------------" >> $LOG_FILE + done + echo "." +} + # ##### ================================================ ##### ### main command switch @@ -3147,6 +3176,10 @@ case $1 in kamailio_trap ;; + pstrap) + kamailio_pstrap + ;; + start) kamailio_start ;; diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 6dd3686b39..bc8f212f7b 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -368,7 +368,8 @@ usage_base() { mecho " -- command 'start|stop|restart|trap'" echo cat <<EOF - trap ............................... trap with gdb Kamailio processes + trap ............................... trap with gdb Kamailio processes using RPC + pstrap ............................. trap with gdb Kamailio processes using ps restart ............................ restart Kamailio start .............................. start Kamailio stop ............................... stop Kamailio

1 0

git:master:cb58e78e: Revert "core: io wait - unhash in case delete operation fails because of EBADF"
by Daniel-Constantin Mierla 07 Jul '20

07 Jul '20

Module: kamailio Branch: master Commit: cb58e78eaac941cc042a71e049568b2dae611e4b URL: https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-07T17:36:22+02:00 Revert "core: io wait - unhash in case delete operation fails because of EBADF" This reverts commit 60119faef5282b135ef7c972d15e1017ca26815a. --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2… Patch: https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index ddc7e80324..251c65fdff 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -669,12 +669,6 @@ inline static int io_watch_del(io_wait_h* h, int fd, int idx, int flags) if (errno==EAGAIN) goto again_epoll; LM_ERR("removing fd %d from epoll list failed: %s [%d]\n", fd, strerror(errno), errno); - if (unlikely(errno==EBADF)) { - LM_ERR("unhashing of invalid fd - %d (epfd %d)\n", fd, - h->h->epfd); - unhash_fd_map(e); - h->fd_no--; - } goto error; } #ifdef EPOLL_NO_CLOSE_BUG

1 0

git:master:846cc5b9: core: io wait - unhash in case delete operation fails because of EBADF
by Daniel-Constantin Mierla 07 Jul '20

07 Jul '20

Module: kamailio Branch: master Commit: 846cc5b97a907b5314ccf03772776e0d23434042 URL: https://github.com/kamailio/kamailio/commit/846cc5b97a907b5314ccf03772776e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-07T17:37:00+02:00 core: io wait - unhash in case delete operation fails because of EBADF - EBADF: epfd or fd is not a valid file descriptor --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/846cc5b97a907b5314ccf03772776e0… Patch: https://github.com/kamailio/kamailio/commit/846cc5b97a907b5314ccf03772776e0… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 251c65fdff..04186c72ad 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -669,6 +669,13 @@ inline static int io_watch_del(io_wait_h* h, int fd, int idx, int flags) if (errno==EAGAIN) goto again_epoll; LM_ERR("removing fd %d from epoll list failed: %s [%d]\n", fd, strerror(errno), errno); + if (unlikely(errno==EBADF)) { + LM_ERR("unhashing of invalid fd - %d (epfd %d)\n", fd, + h->epfd); + unhash_fd_map(e); + h->fd_no--; + } + goto error; } #ifdef EPOLL_NO_CLOSE_BUG

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by Richard Fuchs 07 Jul '20

07 Jul '20

@miconda it happens on every delete. Our "table definitions" use Redis sets to simulate non-unique database indexes. For example if we have a key `entry:foobar` that is a hash and includes a key "test = blah" (so, `HMSET entry:foobar test blah`) and we use the "test" key as a non-unique index, then we'd have a set `index:test:blah` that includes `entry:foobar` as member (`SADD index:test:blah entry:foobar`). So when deleting `entry:foobar` we need to delete that from the `index:test:blah` set (`SREM ...`). This requires fetching the contents of the `entry:foobar` hash when deleting it. So with this commit, when `entry:foobar` is deleted directly by name, there will be no "manual keys" and so the HMGET is skipped and so the SREM fails. -- 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev