- sr-dev - kamailio.org

git:master:50f3250a: regex: docs - updated reference to blocklist
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 50f3250a8657a4185096f86eb59323b62a1e281f URL: https://github.com/kamailio/kamailio/commit/50f3250a8657a4185096f86eb59323b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:00:51+01:00 regex: docs - updated reference to blocklist --- Modified: src/modules/regex/doc/regex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50f3250a8657a4185096f86eb59323b… Patch: https://github.com/kamailio/kamailio/commit/50f3250a8657a4185096f86eb59323b… --- diff --git a/src/modules/regex/doc/regex_admin.xml b/src/modules/regex/doc/regex_admin.xml index 88e6ff19aa..361ea5b822 100644 --- a/src/modules/regex/doc/regex_admin.xml +++ b/src/modules/regex/doc/regex_admin.xml @@ -432,7 +432,7 @@ if (pcre_match_group("$ua", "$avp(i:10)")) { ^PJSUA -### Blacklisted source IP's +### Blocklisted source IP's [1] ^190\.232\.250\.226$

1 0

git:master:401b302f: misc: syntax/kamailio.vim - blocklist parameters
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 401b302f6210e283e41add668a566142786c4088 URL: https://github.com/kamailio/kamailio/commit/401b302f6210e283e41add668a56614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T13:55:33+01:00 misc: syntax/kamailio.vim - blocklist parameters --- Modified: misc/extra/vim/syntax/kamailio.vim --- Diff: https://github.com/kamailio/kamailio/commit/401b302f6210e283e41add668a56614… Patch: https://github.com/kamailio/kamailio/commit/401b302f6210e283e41add668a56614…

1 0

git:master:2c279c1a: doc: updated references to block lists
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 2c279c1ae02fd68f2b2546085134b96f8b604a05 URL: https://github.com/kamailio/kamailio/commit/2c279c1ae02fd68f2b2546085134b96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T13:55:33+01:00 doc: updated references to block lists --- Modified: doc/misc/README-MODULES Modified: doc/tutorials/cfg.txt Modified: doc/tutorials/cfg_list/cfg_core.txt Modified: doc/tutorials/cfg_list/cfg_tm.txt Modified: doc/tutorials/cfg_list/docbook/cfg_core.xml Modified: doc/tutorials/cfg_list/docbook/cfg_tm.xml Modified: doc/tutorials/dns.txt Modified: doc/tutorials/rpc_list/docbook/rpc_core.xml Modified: doc/tutorials/rpc_list/rpc_core.txt --- Diff: https://github.com/kamailio/kamailio/commit/2c279c1ae02fd68f2b2546085134b96… Patch: https://github.com/kamailio/kamailio/commit/2c279c1ae02fd68f2b2546085134b96…

1 0

git:master:66e1660a: misc: examples sip-router-oob.cfg updated to use blocklist paramters
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 66e1660ab52ad4dde1e6c1608c60bf555047058a URL: https://github.com/kamailio/kamailio/commit/66e1660ab52ad4dde1e6c1608c60bf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T13:55:33+01:00 misc: examples sip-router-oob.cfg updated to use blocklist paramters --- Modified: misc/examples/pkg/sip-router-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/66e1660ab52ad4dde1e6c1608c60bf5… Patch: https://github.com/kamailio/kamailio/commit/66e1660ab52ad4dde1e6c1608c60bf5… --- diff --git a/misc/examples/pkg/sip-router-oob.cfg b/misc/examples/pkg/sip-router-oob.cfg index 7071ac0bb1..34ee210480 100644 --- a/misc/examples/pkg/sip-router-oob.cfg +++ b/misc/examples/pkg/sip-router-oob.cfg @@ -243,13 +243,13 @@ dns_tls_pref=-1 # ignore / don't accept tls (for naptr) #!endif # dns_cache_delete_nonexpired=no -# ------------------- Blacklist Parameters ---------------------------------- -# (see doc/dst_blacklist.txt for more details) +# ------------------- Blocklist Parameters ---------------------------------- +# (see doc/dst_blocklist.txt for more details) # -use_dst_blacklist=on -dst_blacklist_mem=1024 # 1 MB -dst_blacklist_expire=300 # blacklist default time -dst_blacklist_gc_interval=150 # 2.5 min +use_dst_blocklist=on +dst_blocklist_mem=1024 # 1 MB +dst_blocklist_expire=300 # blocklist default time +dst_blocklist_gc_interval=150 # 2.5 min # for sip-router 2.1 to the above add tm blst_503* parameters and/or use the # blst module (see NEWS)

1 0

git:master:2a7d7440: modules: readme files regenerated - blst ... [skip ci]
by Kamailio Dev 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 2a7d7440b3da10a58f75d3d287c86513f83ee85a URL: https://github.com/kamailio/kamailio/commit/2a7d7440b3da10a58f75d3d287c8651… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-30T13:31:42+01:00 modules: readme files regenerated - blst ... [skip ci] --- Modified: src/modules/blst/README Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/2a7d7440b3da10a58f75d3d287c8651… Patch: https://github.com/kamailio/kamailio/commit/2a7d7440b3da10a58f75d3d287c8651…

1 0

git:master:eec63c13: doc/scripts: use blocklist defines
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: eec63c130125f3f5598dd4e604de92d1bb123434 URL: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:57:59+01:00 doc/scripts: use blocklist defines --- Modified: doc/scripts/cdefs2doc/dump_cfg_defs.pl Modified: doc/scripts/cdefs2doc/dump_counters.pl Modified: doc/scripts/cdefs2doc/dump_rpcs.pl Modified: doc/scripts/cdefs2doc/dump_selects.pl --- Diff: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d… Patch: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d…

1 0

git:master:f294b39f: test/misc: updated to use blocklist api
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: f294b39f5c49972df5af51af6a9d719e70e746c6 URL: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:58:21+01:00 test/misc: updated to use blocklist api --- Modified: test/misc/code/p_uri.c Modified: test/misc/code/parse_to_body.c --- Diff: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… Patch: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… --- diff --git a/test/misc/code/p_uri.c b/test/misc/code/p_uri.c index e59135ee3d..cf60f10cad 100644 --- a/test/misc/code/p_uri.c +++ b/test/misc/code/p_uri.c @@ -24,9 +24,9 @@ int my_pid() {return 0; }; struct cfg_group_core default_core_cfg = { L_DBG, /* print only msg. < L_WARN */ LOG_DAEMON, /* log_facility -- see syslog(3) */ -#ifdef USE_DST_BLACKLIST - /* blacklist */ - 0, /* dst blacklist is disabled by default */ +#ifdef USE_DST_BLOCKLIST + /* blocklist */ + 0, /* dst blocklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, #endif diff --git a/test/misc/code/parse_to_body.c b/test/misc/code/parse_to_body.c index c8f87206be..1599ed0d6c 100644 --- a/test/misc/code/parse_to_body.c +++ b/test/misc/code/parse_to_body.c @@ -24,9 +24,9 @@ int my_pid() {return 0; }; struct cfg_group_core default_core_cfg = { L_DBG, /* print only msg. < L_WARN */ LOG_DAEMON, /* log_facility -- see syslog(3) */ -#ifdef USE_DST_BLACKLIST - /* blacklist */ - 0, /* dst blacklist is disabled by default */ +#ifdef USE_DST_BLOCKLIST + /* blocklist */ + 0, /* dst blocklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, #endif

1 0

git:master:5523063c: doc/tutorials: use blocklist defines
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 5523063c4cb0b49298f4e1f972e58b1fd6519bbc URL: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:57:30+01:00 doc/tutorials: use blocklist defines --- Added: doc/tutorials/dst_blocklist.txt Modified: doc/tutorials/cfg_list/Makefile Modified: doc/tutorials/counter_list/Makefile Modified: doc/tutorials/rpc_list/Makefile Modified: doc/tutorials/select_list/Makefile Removed: doc/tutorials/dst_blacklist.txt --- Diff: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1… Patch: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1…

1 0

git:master:e4311a22: blst: : use blocklist structures and functions
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: e4311a22632e2f9317f3c33abfee8d29b2bf387c URL: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:39:09+01:00 blst: : use blocklist structures and functions --- Modified: src/modules/blst/blst.c Modified: src/modules/blst/doc/blst.xml Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2… Patch: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2…

1 0

git:master:09510269: sctp: use blocklist structures and functions
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 095102691e809600c35bc529afdc9799fc9eb8c2 URL: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:42:38+01:00 sctp: use blocklist structures and functions --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… Patch: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 6690503973..d58c96fad6 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -51,9 +51,9 @@ #include "../../core/mem/mem.h" #include "../../core/ip_addr.h" #include "../../core/cfg/cfg_struct.h" -#ifdef USE_DST_BLACKLIST -#include "../../core/dst_blacklist.h" -#endif /* USE_DST_BLACKLIST */ +#ifdef USE_DST_BLOCKLIST +#include "../../core/dst_blocklist.h" +#endif /* USE_DST_BLOCKLIST */ #include "../../core/timer_ticks.h" #include "../../core/clist.h" #include "../../core/error.h" @@ -2125,15 +2125,15 @@ static int sctp_handle_send_failed(struct socket_info *si, ret = sctp_msg_send_ext(&dst, data, data_len, &sinfo); } -#ifdef USE_DST_BLACKLIST +#ifdef USE_DST_BLOCKLIST else if(cfg_get(sctp, sctp_cfg, send_retries)) { - /* blacklist only if send_retries is on, if off we blacklist + /* blocklist only if send_retries is on, if off we blocklist from SCTP_ASSOC_CHANGE: SCTP_COMM_LOST/SCTP_CANT_STR_ASSOC which is better (because we can tell connect errors from send - errors and we blacklist a failed dst only once) */ - dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); + errors and we blocklist a failed dst only once) */ + dst_blocklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); } -#endif /* USE_DST_BLACKLIST */ +#endif /* USE_DST_BLOCKLIST */ return (ret > 0) ? 0 : ret; } @@ -2206,12 +2206,12 @@ static int sctp_handle_assoc_change(struct socket_info *si, break; case SCTP_COMM_LOST: SCTP_STATS_COMM_LOST(); -#ifdef USE_DST_BLACKLIST - /* blacklist only if send_retries is turned off (if on we don't +#ifdef USE_DST_BLOCKLIST + /* blocklist only if send_retries is turned off (if on we don't know here if we did retry or we are at the first error) */ if(cfg_get(sctp, sctp_cfg, send_retries) == 0) - dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); -#endif /* USE_DST_BLACKLIST */ + dst_blocklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); +#endif /* USE_DST_BLOCKLIST */ /* no break */ goto comm_lost_cont; /* do not increment counters for SCTP_SHUTDOWN_COMP */ @@ -2239,12 +2239,12 @@ static int sctp_handle_assoc_change(struct socket_info *si, /* do nothing when failing to start an assoc (in this case we never see SCTP_COMM_UP so we never track the assoc) */ -#ifdef USE_DST_BLACKLIST - /* blacklist only if send_retries is turned off (if on we don't +#ifdef USE_DST_BLOCKLIST + /* blocklist only if send_retries is turned off (if on we don't know here if we did retry or we are at the first error) */ if(cfg_get(sctp, sctp_cfg, send_retries) == 0) - dst_blacklist_su(BLST_ERR_CONNECT, PROTO_SCTP, su, 0, 0); -#endif /* USE_DST_BLACKLIST */ + dst_blocklist_su(BLST_ERR_CONNECT, PROTO_SCTP, su, 0, 0); +#endif /* USE_DST_BLOCKLIST */ break; default: break;

1 0

git:master:29758a66: core: switch to use blocklist structures and functions
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 29758a66396ae4633bdf85fd3be1ee7b4284072a URL: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:25:09+01:00 core: switch to use blocklist structures and functions --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/core_cmd.c Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h Modified: src/core/dst_blocklist.c Modified: src/core/dst_blocklist.h Modified: src/core/error.h Modified: src/core/forward.c Modified: src/core/globals.h Modified: src/core/ip_addr.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/core/ver_defs.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7… Patch: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7…

1 0

git:master:276059db: tm: use blocklist structures and functions
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 276059db3844434fbed0b162c4a360384b0fe6bb URL: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:33:08+01:00 tm: use blocklist structures and functions --- Modified: src/modules/tm/config.c Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603… Patch: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603…

1 0

git:master:456cae08: core: dns blacklist to blocklist
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 456cae084320ec4fafa75a77b89e16b57ad394cf URL: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T09:45:33+01:00 core: dns blacklist to blocklist --- Added: src/core/dst_blocklist.c Added: src/core/dst_blocklist.h Removed: src/core/dst_blacklist.c Removed: src/core/dst_blacklist.h --- Diff: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… Patch: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… --- diff --git a/src/core/dst_blacklist.c b/src/core/dst_blocklist.c similarity index 100% rename from src/core/dst_blacklist.c rename to src/core/dst_blocklist.c diff --git a/src/core/dst_blacklist.h b/src/core/dst_blocklist.h similarity index 100% rename from src/core/dst_blacklist.h rename to src/core/dst_blocklist.h

1 0

git:master:38b7183c: Makefile.defs: use blocklist defines
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: master Commit: 38b7183ccd78f58f0da8ed66baa55625d28daf05 URL: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:23:05+01:00 Makefile.defs: use blocklist defines --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… Patch: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dabf05e0bc..dd01923740 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -673,11 +673,11 @@ data_target = $(prefix)/$(data_dir) # -DUSE_DNS_FAILOVER # if the destination resolves to multiple ips, on send error fall back # to the others -# -DUSE_DST_BLACKLIST -# blacklist bad destination (timeout, failed to connect, error sending +# -DUSE_DST_BLOCKLIST +# blocklist bad destination (timeout, failed to connect, error sending # a.s.o) -# -DUSE_DST_BLACKLIST_STATS -# turns on blacklist bad destination measurements +# -DUSE_DST_BLOCKLIST_STATS +# turns on blocklist bad destination measurements # -DPROFILING # if enabled profiling will be enabled for child processes # Don't forget to set PROFILE (see below) @@ -724,11 +724,11 @@ C_DEFS+= -DSHM_MMAP \ -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE \ -DUSE_DNS_FAILOVER \ - -DUSE_DST_BLACKLIST \ + -DUSE_DST_BLOCKLIST \ -DUSE_NAPTR \ -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ - #-DUSE_DST_BLACKLIST_STATS \ + #-DUSE_DST_BLOCKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \ #-DLL_MALLOC \ #-DSF_MALLOC \

1 0

git:5.3:5a44ad2c: pkg/kamailio/deb: allow group write to RuntimeDirectory
by Henning Westerholt 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 5a44ad2cc57b435fbd7251c0ad078745621c81da URL: https://github.com/kamailio/kamailio/commit/5a44ad2cc57b435fbd7251c0ad07874… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-30T11:26:36Z pkg/kamailio/deb: allow group write to RuntimeDirectory (cherry picked from commit fe693cc1178a9301cdb0be3941d9c70d720920e5) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/5a44ad2cc57b435fbd7251c0ad07874… Patch: https://github.com/kamailio/kamailio/commit/5a44ad2cc57b435fbd7251c0ad07874… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index 5c697f635d..a411114db9 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -19,7 +19,7 @@ ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_M Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio -RuntimeDirectoryMode=0750 +RuntimeDirectoryMode=0770 [Install] WantedBy=multi-user.target

1 0

git:5.3:2a3b8d43: pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391)
by Henning Westerholt 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 2a3b8d43923fc49fa9095e20c6e3cfb6cf5516e1 URL: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-30T11:27:25Z pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391) - add CAP_CHOWN capability to Kamailio systemd service files to allow chown - needed e.g. for user and group setting from jsonrpcs and ctl modules - related to github issue #2391 (cherry picked from commit 8b72f462deb4b66fb55f754abc93bf7295278afa) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service Modified: pkg/kamailio/obs/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… Patch: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index c14d6cb2f2..56d8339939 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -13,6 +13,8 @@ Environment='PKG_MEMORY=4' EnvironmentFile=-/etc/sysconfig/kamailio ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target

1 0

git:5.4:f76216bb: pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391)
by Henning Westerholt 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.4 Commit: f76216bb1fab2dd39413915bc2db88d9c588a56e URL: https://github.com/kamailio/kamailio/commit/f76216bb1fab2dd39413915bc2db88d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-30T11:22:26Z pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391) - add CAP_CHOWN capability to Kamailio systemd service files to allow chown - needed e.g. for user and group setting from jsonrpcs and ctl modules - related to github issue #2391 (cherry picked from commit 8b72f462deb4b66fb55f754abc93bf7295278afa) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service Modified: pkg/kamailio/obs/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/f76216bb1fab2dd39413915bc2db88d… Patch: https://github.com/kamailio/kamailio/commit/f76216bb1fab2dd39413915bc2db88d…

1 0

www.kamailio.org maintenance on 29th October 2020, 10:00 CET
by Henning Westerholt 29 Oct '20

29 Oct '20

Hello, there will be a short planned maintenance on www.kamailio.org<http://www.kamailio.org> on 29th October 2020 at 10:00 CET. Relevant services including main homepage and documentation wiki will be unavailable for about 10-15 minutes. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

[kamailio/kamailio] ndb_redis: Fix leaks from PV parsing (#2536)
by weili-jiang 29 Oct '20

29 Oct '20

- Add missing pkg_free for the dynamic PV name created during PV parsing - Add missing pkg_free for any GPARAM_TYPE_PVS created during PV parsing #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We are using NDB_REDIS in anger, fetching data from changing hash structures. NDB_REDIS creates dynamic PVs, and in order to do so it has a custom parser that allocates a dynamic PV structure as well as potentially multiple nested parameter structures. We very quickly found that we were running out of package memory, and enabling Kamailio's own memory debug logging quickly revealed that every `$redis(...)` query was leaking. It appears that the allocated structures are only used within the subsequent handler to fetch the data. Therefore, to resolve the leak, the allocated structures are freed after the data for the PV in question has been fetched. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2536 -- Commit Summary -- * ndb_redis: Fix leaks from PV parsing -- File Changes -- M src/modules/ndb_redis/ndb_redis_mod.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2536.patch https://github.com/kamailio/kamailio/pull/2536.diff -- 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/pull/2536

2 9

[kamailio/kamailio] app_python3.so undefined symbol: PyExc_SystemExit on Ubuntu 20.04 (#2534)
by Dylan 28 Oct '20

28 Oct '20

# Description We installed kamailio from the ubuntu package manager along with several of the modules, including `kamailio-python3-modules`, which gives us the app_python3 module. We edited the default, provided config to add the lines ``` loadmodule "app_python3.so" ... modparam("app_python3", "load", "my_cool_python_file.py") ``` Restarted kamailio and found the log messages below. #### Log Messages ``` Oct 27 20:05:19 kamailio-stage-1 systemd[1]: Starting Kamailio SIP Server... Oct 27 20:05:19 kamailio-stage-1 kamailio[2243329]: 0(2243329) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so: undefined symbol: PyExc_SystemExit Oct 27 20:05:19 kamailio-stage-1 kamailio[2243329]: 0(2243329) CRITICAL: <core> [core/cfg.y:3536]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 266, column 12-27: failed to load module Oct 27 20:05:19 kamailio-stage-1 kamailio[2243329]: 0(2243329) ERROR: <core> [core/modparam.c:176]: set_mod_param_regex(): No module matching <app_python3> found Oct 27 20:05:19 kamailio-stage-1 kamailio[2243329]: 0(2243329) CRITICAL: <core> [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 496, column 64: Can't set module parameter ``` ### Additional Information ``` version: kamailio 5.3.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED 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 9.2.1 ``` * **Operating System**: ``` Linux kamailio-stage-1 5.4.0-1024-aws #24-Ubuntu SMP Sat Sep 5 06:19:55 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` `lsb_release -a` ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.1 LTS Release: 20.04 Codename: focal ``` -- 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/2534

2 4

git:5.3:5203503b: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.3 Commit: 5203503bad2f035012c47887bf35d6b3eeef1873 URL: https://github.com/kamailio/kamailio/commit/5203503bad2f035012c47887bf35d6b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-28T20:31:33+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/5203503bad2f035012c47887bf35d6b… Patch: https://github.com/kamailio/kamailio/commit/5203503bad2f035012c47887bf35d6b… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 7e21cccbb7..42eeabd542 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -776,8 +776,9 @@ failure_route[TRUNKAUTH] { if(t_check_status("401|407")) { $avp(auser) = "test"; $avp(apass) = "test"; - uac_auth(); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:master:fe195800: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: fe1958005feb2584d3d382ca2e7644ab388e4a8b URL: https://github.com/kamailio/kamailio/commit/fe1958005feb2584d3d382ca2e7644a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-28T20:31:10+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/fe1958005feb2584d3d382ca2e7644a… Patch: https://github.com/kamailio/kamailio/commit/fe1958005feb2584d3d382ca2e7644a… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 07ee88484b..52d98d3d65 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -809,6 +809,7 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; + # if (uac_auth("1")) { if (uac_auth()) { t_relay(); }

1 0

git:master:f4a2e75b: uac: add small commented out mode 1 back for uac_auth() function
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: f4a2e75b90e87dc86c638c77ff12414b9d3469dd URL: https://github.com/kamailio/kamailio/commit/f4a2e75b90e87dc86c638c77ff12414… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:20:23Z uac: add small commented out mode 1 back for uac_auth() function --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f4a2e75b90e87dc86c638c77ff12414… Patch: https://github.com/kamailio/kamailio/commit/f4a2e75b90e87dc86c638c77ff12414… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 02dd513d27..42fe2d9148 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -877,6 +877,7 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; + # if (uac_auth("1")) { if (uac_auth()) { t_relay(); }

1 0

git:5.3:a38403ca: uac: extend docs for uac_auth() example, only t_relay() on success
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.3 Commit: a38403ca6633b5944acebca245d5d64511a4cbca URL: https://github.com/kamailio/kamailio/commit/a38403ca6633b5944acebca245d5d64… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:17:37Z uac: extend docs for uac_auth() example, only t_relay() on success - extend docs for uac_auth() example, only t_relay() on success - otherwise you will get a 'no branches for forwarding' error from tm (cherry picked from commit 668402e77c19ba4b5b8fc5b6c869ffbf34ea622d) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a38403ca6633b5944acebca245d5d64… Patch: https://github.com/kamailio/kamailio/commit/a38403ca6633b5944acebca245d5d64… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index ba29c42022..de121a61b8 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -836,8 +836,9 @@ failure_route[TRUNKAUTH] { if(t_check_status("401|407")) { $avp(auser) = "test"; $avp(apass) = "test"; - uac_auth(); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:5.3:d23bbb59: uac: do not silently fail on realm lookup error, at least log with INFO
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.3 Commit: d23bbb5917fcd7ca51990e7dfe31dcf55d674247 URL: https://github.com/kamailio/kamailio/commit/d23bbb5917fcd7ca51990e7dfe31dcf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:13:12Z uac: do not silently fail on realm lookup error, at least log with INFO (cherry picked from commit b6c10c8181d670a81a7d1216c7e6ec81c0963e9c) --- Modified: src/modules/uac/auth.c --- Diff: https://github.com/kamailio/kamailio/commit/d23bbb5917fcd7ca51990e7dfe31dcf… Patch: https://github.com/kamailio/kamailio/commit/d23bbb5917fcd7ca51990e7dfe31dcf… --- diff --git a/src/modules/uac/auth.c b/src/modules/uac/auth.c index a412dae975..f68c1cafc9 100644 --- a/src/modules/uac/auth.c +++ b/src/modules/uac/auth.c @@ -446,7 +446,7 @@ int uac_auth(sip_msg_t *msg) /* found? */ if (crd==0) { - LM_DBG("no credential for realm \"%.*s\"\n", + LM_INFO("no credential for realm \"%.*s\"\n", auth.realm.len, auth.realm.s); goto error; }

1 0

git:5.4:62dff5b8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.4 Commit: 62dff5b8b157236cae7defe64291a6e4a8ae27b5 URL: https://github.com/kamailio/kamailio/commit/62dff5b8b157236cae7defe64291a6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-28T20:16:28+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/62dff5b8b157236cae7defe64291a6e… Patch: https://github.com/kamailio/kamailio/commit/62dff5b8b157236cae7defe64291a6e… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 17a0fb6869..b0210f2cfc 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -806,9 +806,9 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; - uac_auth(); - # uac_auth("1"); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:master:6ebc6cd4: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: 6ebc6cd4f958d94600ccb0590bd79b94c1708648 URL: https://github.com/kamailio/kamailio/commit/6ebc6cd4f958d94600ccb0590bd79b9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-28T20:16:13+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/6ebc6cd4f958d94600ccb0590bd79b9… Patch: https://github.com/kamailio/kamailio/commit/6ebc6cd4f958d94600ccb0590bd79b9… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index c9bfd8e1c6..07ee88484b 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -809,9 +809,9 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; - uac_auth(); - # uac_auth("1"); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:5.4:035e22e9: uac: do not silently fail on realm lookup error, at least log with INFO
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.4 Commit: 035e22e9d75949d066129b4056271ff772653500 URL: https://github.com/kamailio/kamailio/commit/035e22e9d75949d066129b4056271ff… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:12:46Z uac: do not silently fail on realm lookup error, at least log with INFO (cherry picked from commit b6c10c8181d670a81a7d1216c7e6ec81c0963e9c) --- Modified: src/modules/uac/auth.c --- Diff: https://github.com/kamailio/kamailio/commit/035e22e9d75949d066129b4056271ff… Patch: https://github.com/kamailio/kamailio/commit/035e22e9d75949d066129b4056271ff… --- diff --git a/src/modules/uac/auth.c b/src/modules/uac/auth.c index 5359300e59..22e096f647 100644 --- a/src/modules/uac/auth.c +++ b/src/modules/uac/auth.c @@ -447,7 +447,7 @@ int uac_auth_mode(sip_msg_t *msg, int mode) /* found? */ if (crd==0) { - LM_DBG("no credential for realm \"%.*s\"\n", + LM_INFO("no credential for realm \"%.*s\"\n", auth.realm.len, auth.realm.s); goto error; }

1 0

git:5.4:3deaec5e: uac: extend docs for uac_auth() example, only t_relay() on success
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.4 Commit: 3deaec5ec6eda850e4b5c53e860d91460c317837 URL: https://github.com/kamailio/kamailio/commit/3deaec5ec6eda850e4b5c53e860d914… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:12:52Z uac: extend docs for uac_auth() example, only t_relay() on success - extend docs for uac_auth() example, only t_relay() on success - otherwise you will get a 'no branches for forwarding' error from tm (cherry picked from commit 668402e77c19ba4b5b8fc5b6c869ffbf34ea622d) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3deaec5ec6eda850e4b5c53e860d914… Patch: https://github.com/kamailio/kamailio/commit/3deaec5ec6eda850e4b5c53e860d914… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index bbcc6ad53f..866566add3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -873,9 +873,9 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; - uac_auth(); - # uac_auth("1"); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:master:668402e7: uac: extend docs for uac_auth() example, only t_relay() on success
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: 668402e77c19ba4b5b8fc5b6c869ffbf34ea622d URL: https://github.com/kamailio/kamailio/commit/668402e77c19ba4b5b8fc5b6c869ffb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T19:02:33Z uac: extend docs for uac_auth() example, only t_relay() on success - extend docs for uac_auth() example, only t_relay() on success - otherwise you will get a 'no branches for forwarding' error from tm --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/668402e77c19ba4b5b8fc5b6c869ffb… Patch: https://github.com/kamailio/kamailio/commit/668402e77c19ba4b5b8fc5b6c869ffb… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index b132daa6a0..02dd513d27 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -877,9 +877,9 @@ failure_route[TRUNKAUTH] { $avp(auser) = "test"; $avp(apass) = "test"; # $avp(apass) = "36d0a02793542b4961e8348347236dbf"; - uac_auth(); - # uac_auth("1"); - t_relay(); + if (uac_auth()) { + t_relay(); + } exit; } }

1 0

git:master:b6c10c81: uac: do not silently fail on realm lookup error, at least log with INFO
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: b6c10c8181d670a81a7d1216c7e6ec81c0963e9c URL: https://github.com/kamailio/kamailio/commit/b6c10c8181d670a81a7d1216c7e6ec8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T18:08:59Z uac: do not silently fail on realm lookup error, at least log with INFO --- Modified: src/modules/uac/auth.c --- Diff: https://github.com/kamailio/kamailio/commit/b6c10c8181d670a81a7d1216c7e6ec8… Patch: https://github.com/kamailio/kamailio/commit/b6c10c8181d670a81a7d1216c7e6ec8… --- diff --git a/src/modules/uac/auth.c b/src/modules/uac/auth.c index 5359300e59..22e096f647 100644 --- a/src/modules/uac/auth.c +++ b/src/modules/uac/auth.c @@ -447,7 +447,7 @@ int uac_auth_mode(sip_msg_t *msg, int mode) /* found? */ if (crd==0) { - LM_DBG("no credential for realm \"%.*s\"\n", + LM_INFO("no credential for realm \"%.*s\"\n", auth.realm.len, auth.realm.s); goto error; }

1 0

git:5.3:f47e3f58: auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already.
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.3 Commit: f47e3f58fc3ac82497391f8c859d03aaaab7f8ac URL: https://github.com/kamailio/kamailio/commit/f47e3f58fc3ac82497391f8c859d03a… Author: Paris Stamatopoulos <paris(a)forin.gr> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T17:57:54Z auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already. (cherry picked from commit 9978e00405cac89cc65d2d8a863128dd2814d7fd) --- Modified: src/modules/misc_radius/radius.h --- Diff: https://github.com/kamailio/kamailio/commit/f47e3f58fc3ac82497391f8c859d03a… Patch: https://github.com/kamailio/kamailio/commit/f47e3f58fc3ac82497391f8c859d03a… --- diff --git a/src/modules/misc_radius/radius.h b/src/modules/misc_radius/radius.h index 120bb80caa..c5e9525715 100644 --- a/src/modules/misc_radius/radius.h +++ b/src/modules/misc_radius/radius.h @@ -42,6 +42,9 @@ #else #include <freeradius-client.h> #define DEFAULT_RADIUSCLIENT_CONF "" +#ifndef VENDOR +#define VENDOR(x) (((x) >> 16) & 0xffff) +#endif #endif

1 0

git:5.4:4f00ba42: auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already.
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: 5.4 Commit: 4f00ba425051718ecbf426591fdb14268ae92d94 URL: https://github.com/kamailio/kamailio/commit/4f00ba425051718ecbf426591fdb142… Author: Paris Stamatopoulos <paris(a)forin.gr> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T17:57:35Z auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already. (cherry picked from commit 9978e00405cac89cc65d2d8a863128dd2814d7fd) --- Modified: src/modules/misc_radius/radius.h --- Diff: https://github.com/kamailio/kamailio/commit/4f00ba425051718ecbf426591fdb142… Patch: https://github.com/kamailio/kamailio/commit/4f00ba425051718ecbf426591fdb142… --- diff --git a/src/modules/misc_radius/radius.h b/src/modules/misc_radius/radius.h index 120bb80caa..c5e9525715 100644 --- a/src/modules/misc_radius/radius.h +++ b/src/modules/misc_radius/radius.h @@ -42,6 +42,9 @@ #else #include <freeradius-client.h> #define DEFAULT_RADIUSCLIENT_CONF "" +#ifndef VENDOR +#define VENDOR(x) (((x) >> 16) & 0xffff) +#endif #endif

1 0

[kamailio/kamailio] auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one (#2530)
by Paris 28 Oct '20

28 Oct '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [X] Related to issue #2496 #### Description  freeradius-client removed the `VENDOR()` definition after commit https://github.com/FreeRADIUS/freeradius-client/commit/50d78bb53f4f341aa708…, since a new way was added in the library to separate vendor attributes. Currently `(((x) >> 8) & 0xffffff)` to determine vendor id works but is considered old-style. This PR adds the `VENDOR()` definition back if the freeradius-client library we are linking against is after 50d78b. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2530 -- Commit Summary -- * auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already. -- File Changes -- M src/modules/misc_radius/radius.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2530.patch https://github.com/kamailio/kamailio/pull/2530.diff -- 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/pull/2530

2 4

git:master:9978e004: auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already.
by Henning Westerholt 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: 9978e00405cac89cc65d2d8a863128dd2814d7fd URL: https://github.com/kamailio/kamailio/commit/9978e00405cac89cc65d2d8a863128d… Author: Paris Stamatopoulos <paris(a)forin.gr> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-28T18:55:07+01:00 auth_radius, misc_radius: Adds VENDOR() definition if the freeradius-client.h does not contain one already. --- Modified: src/modules/misc_radius/radius.h --- Diff: https://github.com/kamailio/kamailio/commit/9978e00405cac89cc65d2d8a863128d… Patch: https://github.com/kamailio/kamailio/commit/9978e00405cac89cc65d2d8a863128d… --- diff --git a/src/modules/misc_radius/radius.h b/src/modules/misc_radius/radius.h index 120bb80caa..c5e9525715 100644 --- a/src/modules/misc_radius/radius.h +++ b/src/modules/misc_radius/radius.h @@ -42,6 +42,9 @@ #else #include <freeradius-client.h> #define DEFAULT_RADIUSCLIENT_CONF "" +#ifndef VENDOR +#define VENDOR(x) (((x) >> 16) & 0xffff) +#endif #endif

1 0

git:master:98436c73: dialog: update internal_get_dlg() after 0bde3ca changes
by Daniel-Constantin Mierla 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: 98436c73e8519e96e3d167b7610cbb58b9939885 URL: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T10:32:50+01:00 dialog: update internal_get_dlg() after 0bde3ca changes - keep also direction value for no-totag dialog - reference and unlock only when returning, related to #2494 --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… Patch: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 93d35f553b..2714c439e5 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -857,7 +857,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) * \param ftag from tag * \param ttag to tag * \param dir direction - * \param mode let hash table slot locked or not + * \param mode let hash table slot locked or not, even when dlg is not found * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, @@ -867,33 +867,47 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, struct dlg_cell *dlg; struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; + unsigned int dir_no_totag = DLG_DIR_NONE; d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { - /* Check callid / fromtag / totag */ + /* check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { - ref_dlg_unsafe(dlg, 1); - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - - /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ - if (dlg->tag[1].len == 0) { - dlg_no_totag=dlg; - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + /* if to-tag is empty continue to search in case another dialog + * is found with a matching to-tag. */ + if (dlg->tag[DLG_CALLEE_LEG].len == 0) { + dlg_no_totag = dlg; + dir_no_totag = *dir; continue; } + + ref_dlg_unsafe(dlg, 1); + if(likely(mode==0)) { + dlg_unlock( d_table, d_entry); + } LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", - callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + callid->len, callid->s, h_entry, *dir, + dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); return dlg; } } - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - if (dlg_no_totag) return dlg_no_totag; + if (dlg_no_totag) { + ref_dlg_unsafe(dlg_no_totag, 1); + } + if(likely(mode==0)) { + dlg_unlock(d_table, d_entry); + } + if (dlg_no_totag) { + *dir = dir_no_totag; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d no-to-tag\n", + callid->len, callid->s, h_entry, *dir); + return dlg_no_totag; + } LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0;

1 0

git:master:ccbaf324: core: helper function to search a token before an end pointer
by Daniel-Constantin Mierla 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: ccbaf324cf5481288f505dce5c694ca077911a04 URL: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T08:26:06+01:00 core: helper function to search a token before an end pointer --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… Patch: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… --- diff --git a/src/core/ut.c b/src/core/ut.c index 0189b642ab..08edd2f24e 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -296,6 +296,29 @@ char *str_search(str *text, str *needle) return NULL; } +/** + * @brief search for occurence of needlez starting from vstart and before vend + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *stre_search_strz(char *vstart, char *vend, char *needlez) +{ + str text; + str needle; + + if(vend <= vstart) { + return NULL; + } + + text.s = vstart; + text.len = vend - vstart; + + needle.s = needlez; + needle.len = strlen(needlez); + + return str_search(&text, &needle); +} + /** * @brief case insensitive search for occurence of needle in text * @return pointer to start of needle in text or NULL if the needle diff --git a/src/core/ut.h b/src/core/ut.h index 5fcb245cd8..0251fb7ca2 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1057,6 +1057,8 @@ char* get_abs_pathname(str* base, str* file); */ char *str_search(str *text, str *needle); +char *stre_search_strz(char *vstart, char *vend, char *needlez); + char *str_casesearch(str *text, str *needle); char *strz_casesearch_strz(char *textz, char *needlez);

1 0

git:master:f6a1f96a: xcap_server: use new search function to avoid zero-ending swapping
by Daniel-Constantin Mierla 28 Oct '20

28 Oct '20

Module: kamailio Branch: master Commit: f6a1f96af518ec10b09c4395166943a39eea19dd URL: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T08:27:37+01:00 xcap_server: use new search function to avoid zero-ending swapping --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… Patch: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 5c1ca9004b..20bb585e3a 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -304,15 +304,14 @@ int xcaps_xpath_hack(str *buf, int type) { char *match; char *repl; - char c; char *p; char *start; + char *end; if(buf==NULL || buf->len <=10) return 0; - if(type==0) - { + if(type==0) { match = " xmlns="; repl = " x____="; } else { @@ -321,12 +320,11 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { + end = buf->s + buf->len - 10; + while((p = stre_search_strz(start, end, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; } - STR_ZTOV(buf->s[buf->len-1], c); return 0; }

1 0

Kamailio v5.4.2 Released
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Hello, Kamailio SIP Server v5.4.2 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.1. For more details about version 5.4.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/10/kamailio-v5-4-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:c3b91f7d: ChangeLog: content updated for v5.4.2
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Module: kamailio Branch: 5.4 Commit: c3b91f7ded0d16e76fe60b3f56237681d62d9290 URL: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T12:30:50+01:00 ChangeLog: content updated for v5.4.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768… Patch: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768…

1 0

git:5.4:44e95a77: Makefile.defs: version set to 5.4.2
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Module: kamailio Branch: 5.4 Commit: 44e95a7723aa71612050ad321a282c2bad04f2ea URL: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T12:06:12+01:00 Makefile.defs: version set to 5.4.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… Patch: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 05e47cdfa2..34df5d7295 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:c4186b78: pkg/kamailio/deb: version set 5.4.2
by Victor Seva 27 Oct '20

27 Oct '20

Module: kamailio Branch: 5.4 Commit: c4186b78463899b044dd18dfca6f023b763ea502 URL: https://github.com/kamailio/kamailio/commit/c4186b78463899b044dd18dfca6f023… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-10-27T11:45:17+01:00 pkg/kamailio/deb: version set 5.4.2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/c4186b78463899b044dd18dfca6f023… Patch: https://github.com/kamailio/kamailio/commit/c4186b78463899b044dd18dfca6f023…

1 0

git:5.4:c8d42b32: xcap_server: shorten a bit the search range for xcaps_xpath_hack()
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Module: kamailio Branch: 5.4 Commit: c8d42b328302e18c7b915b3760c5089910a1ad49 URL: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:53:40+01:00 xcap_server: shorten a bit the search range for xcaps_xpath_hack() - match on the buffer len min size, xmlns is expected to have a value, plus the ending of the xml tag (cherry picked from commit 3be41802c7c670cce0d3e08462e23ca3f3fbe2d4) --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… Patch: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 1556aa14b9..5c1ca9004b 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -322,7 +322,7 @@ int xcaps_xpath_hack(str *buf, int type) start = buf->s; STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { + while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; }

1 0

git:5.4:6114e2fc: pkg: version set to 5.4 for rpm and alpine specs
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Module: kamailio Branch: 5.4 Commit: 6114e2fc8bc00cc8875720322fbacd35312628c3 URL: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:55:02+01:00 pkg: version set to 5.4 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… Patch: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index d243876d82..8427721ea3 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.1 +pkgver=5.4.2 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 42a9c88db9..6b22aefa59 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.1 +%define ver 5.4.2 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:3be41802: xcap_server: shorten a bit the search range for xcaps_xpath_hack()
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Module: kamailio Branch: master Commit: 3be41802c7c670cce0d3e08462e23ca3f3fbe2d4 URL: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:36:38+01:00 xcap_server: shorten a bit the search range for xcaps_xpath_hack() - match on the buffer len min size, xmlns is expected to have a value, plus the ending of the xml tag --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… Patch: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 1556aa14b9..5c1ca9004b 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -322,7 +322,7 @@ int xcaps_xpath_hack(str *buf, int type) start = buf->s; STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { + while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; }

1 0

Releasing Kamailio v5.4.2
by Daniel-Constantin Mierla 27 Oct '20

27 Oct '20

Hello, I am considering to release Kamailio v5.4.2 sometime next week, likely on Tuesday, October 27, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

git:master:134c6b4b: rtpengine: fix wrong codec action strings being used
by Richard Fuchs 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 134c6b4b63f8fee3b94e3caed956b080477022d4 URL: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-26T14:19:09-04:00 rtpengine: fix wrong codec action strings being used --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… Patch: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c3e7e75601..7b2573b246 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2084,7 +2084,7 @@ static const char *transports[] = { }; static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val, - const char *cmp1, const char *cmp2, + const char *cmp1, const char *cmp2, const char *dictstr, bencode_item_t **dictp) { str s; @@ -2098,7 +2098,7 @@ static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, con if (!*dictp) { *dictp = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "transcode", + bencode_dictionary_add(ng_flags->codec, dictstr, *dictp); } bencode_list_add_str(*dictp, &s); @@ -2159,17 +2159,17 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu goto next; } - if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", &ng_flags->codec_transcode)) + if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", "transcode", &ng_flags->codec_transcode)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, &ng_flags->codec_strip)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, "strip", &ng_flags->codec_strip)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, &ng_flags->codec_offer)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, "offer", &ng_flags->codec_offer)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, &ng_flags->codec_mask)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, "mask", &ng_flags->codec_mask)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, &ng_flags->codec_set)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, "set", &ng_flags->codec_set)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, &ng_flags->codec_except)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, "except", &ng_flags->codec_except)) goto next; /* check for specially handled items */

1 0

[kamailio/kamailio] rms_bridge() doesn't send out B-leg: run_onsend(): required parameters are not available - ignoring (#2524)
by Anthony Messina 26 Oct '20

26 Oct '20

### Description  Testing out rtp_media_server module's `rms_bridge()` function with the intention of bridging A-leg to B-leg (an Asterisk conference server). The B-leg never gets sent out and after the call times out, this testing instance crashes. Config slightly modified from https://github.com/kamailio/kamailio/blob/master/src/modules/rtp_media_serv… ``` ... loadmodule "uac.so" event_route[rms:bridged] { xnotice("[rms:bridged] ...\n"); } route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("REGISTER")) { save("location"); exit; } xnotice("[$rm][$ci]\n"); if (is_method("INVITE") && !has_totag()) { fix_nated_contact(); if ($rU == "888") { $var(target) = "sip:conference@example.com:5080;"; if (!rms_bridge("$var(target)", "rms:bridged")) { send_reply("503", "server error"); xerr("rtp_media_server bridge error!\n"); } exit; } if (!rms_answer("rms:answered")) { t_reply("503", "server error"); xerr("rtp_media_server error!\n"); exit; } } if(rms_dialog_check()) rms_sip_request(); exit; } ``` ### Troubleshooting I added `loadmodule "uac.so"`, though I'm not sure it's required. #### Reproduction  #### Debugging Data  I can only do a stack trace at the moment running this test in a systemd-nspawn container ``` Stack trace of thread 589: #0 0x00007fb449848518 n/a (/usr/lib64/kamailio/modules/rtp_media_server.so + 0x2f518) #1 0x00007fb44982682b n/a (/usr/lib64/kamailio/modules/rtp_media_server.so + 0xd82b) #2 0x00000000005cca6b n/a (/usr/sbin/kamailio + 0x1cca6b) #3 0x000000000041cf90 n/a (/usr/sbin/kamailio + 0x1cf90) #4 0x000000000041e9ea n/a (/usr/sbin/kamailio + 0x1e9ea) #5 0x0000000000421c65 n/a (/usr/sbin/kamailio + 0x21c65) #6 0x000000000042c61c n/a (/usr/sbin/kamailio + 0x2c61c) #7 0x0000000000434cbd n/a (/usr/sbin/kamailio + 0x34cbd) #8 0x00007fb44a8b0042 __libc_start_main (libc.so.6 + 0x27042) #9 0x000000000041bbde n/a (/usr/sbin/kamailio + 0x1bbde) ``` #### Log Messages  ``` kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:254]: rms_dialog_action_check(): dialog action RMS_BRIDGING [0_3746724993@2001:db8::99] kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:583]: rms_bridging_call(): parsed[sip:conference@example.com:5080][0] kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:599]: rms_bridging_call(): si[0x7f83fddb78e0]call-id[0_3746724993@2001:db8::99]cseq[0]ruri[32|sip:conference@example.com:5080]remote_uri[<sip:conference@example.com:5080>]local_uri[<sip:888@example.com>] kamailio[275]: 10(275) DEBUG: tm [uac.c:450]: t_uac_prepare(): next_hop=<sip:conference@example.com:508> kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (example.com(12), 1), h=205 kamailio[275]: 10(275) DEBUG: <core> [core/resolve.c:985]: get_record(): skipping 2 NS (p=0x9a0e6e, end=0x9a0ef2) kamailio[275]: 10(275) DEBUG: <core> [core/resolve.c:998]: get_record(): parsing 4 ARs (p=0x9a0e9a, end=0x9a0ef2) kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7f83fddbb878 (example.com, 1), 1, *0x7f8406d319f0) (0) kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding example.com(12) 1 (flags=0) at 205 kamailio[275]: 10(275) DEBUG: tm [uac.c:158]: dlg2hash(): hashid 35754 kamailio[275]: 10(275) DEBUG: tm [uac.c:678]: send_prepared_request_impl(): uac: 0x7f83fddb9a10 branch: 0 to 10.77.79.3:508 kamailio[275]: 10(275) DEBUG: <core> [core/onsend.c:50]: run_onsend(): required parameters are not available - ignoring kamailio[275]: 10(275) ERROR: rtp_media_server [rtp_media_server.c:622]: rms_bridging_call(): tmb.t_request_within ok ``` #### SIP Traffic  There is no SIP traffic generated to `<sip:conference@example.com:5080>` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1-8.gitd43872c11e.fc32.1 (x86_64/linux) 09fd6a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED 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: 09fd6a compiled on 00:00:00 Oct 21 2020 with gcc 10.2.1 ``` * **Operating System**:  ``` Linux kamtest 5.8.16-200.fc32.x86_64 #1 SMP Mon Oct 19 14:17:16 UTC 2020 x86_64 x86_64 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/2524

3 16

[kamailio/kamailio] textops: fix append_hf function (#2526)
by Stefan Mititelu 26 Oct '20

26 Oct '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  append after last eader occurance You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2526 -- Commit Summary -- * textops: fix append_hf function -- File Changes -- M src/modules/textops/textops.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2526.patch https://github.com/kamailio/kamailio/pull/2526.diff -- 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/pull/2526

3 5

git:5.4:b51ea9f3: usrloc: safety check on len for user in db keepalive routine
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: b51ea9f361a81fe8117dcef51902e975f7a662d0 URL: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:06:15+01:00 usrloc: safety check on len for user in db keepalive routine (cherry picked from commit a1620fa1b4587239835db6ed5765ce04f927172d) --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… Patch: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 96a95fe3c9..44ce3c6376 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -236,7 +236,7 @@ int ul_ka_db_records(int partidx) continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AORBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE - 1) { LM_DBG("long username ->skipping\n"); continue; }

1 0

git:5.4:bd2204b7: regex: use var to store strlen() values
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: bd2204b7151261981bc6872928b7434e2ac7df2e URL: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:05:58+01:00 regex: use var to store strlen() values - avoid doing it again in a few cases (cherry picked from commit 5d490d616132067a5e914302a24b964b73b229a2) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… Patch: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 475c3542eb..2bc521040b 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -246,6 +246,7 @@ static int load_pcres(int action) int pcre_erroffset; int num_pcres_tmp = 0; pcre **pcres_tmp = NULL; + int llen; /* Get the lock */ lock_get(reload_lock); @@ -301,31 +302,37 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; + patterns[i][1] = '\0'; memset(line, 0, FILE_MAX_LINE); continue; } + llen = strlen(line); /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { + if (strlen(patterns[i]) + llen >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } /* Append ')' at the end of the line */ - if (line[strlen(line) - 1] == '\n') { - line[strlen(line)] = line[strlen(line) - 1]; - line[strlen(line) - 2] = ')'; + if (line[llen - 1] == '\n') { + line[llen - 1] = ')'; + line[llen] = '\n'; + line[llen + 1] = '\0'; } else { /* This is the last char in the file and it's not \n */ - line[strlen(line)] = ')'; + line[llen] = ')'; + line[llen + 1] = '\0'; } /* Append '(' at the beginning of the line */ - memcpy(patterns[i]+strlen(patterns[i]), "(", 1); + llen = strlen(patterns[i]); + memcpy(patterns[i]+llen, "(", 1); + llen++; - /* Append the line to the current pattern */ - memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); + /* Append the line to the current pattern (including the ending 0) */ + memcpy(patterns[i] + llen, line, strlen(line) + 1); memset(line, 0, FILE_MAX_LINE); }

1 0

git:5.4:e3cda7fa: core: parser rr - clean partially cloned fields in case of error
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: e3cda7fa4e873c110ee2641f6200fad52222586a URL: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:06:06+01:00 core: parser rr - clean partially cloned fields in case of error (cherry picked from commit e4f6c660bd75cdb9ff0855fcb511673cc8ec00c4) --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… Patch: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index a089b895fc..9557bffc9b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -296,7 +296,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) } else { PKG_MEM_ERROR; } - return -2; + ret = -2; + goto error; } memcpy(res, it, sizeof(rr_t)); @@ -313,7 +314,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) LM_ERR("Error while duplicating parameters\n"); if (_shm) shm_free(res); else pkg_free(res); - return -3; + ret = -3; + goto error; } xlate_pointers(it, res); @@ -327,6 +329,18 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) it = it->next; } return 0; + +error: + if(*_new != NULL) { + if (_shm) { + shm_free_rr(_new); + } else { + free_rr(_new); + } + *_new = NULL; + } + + return ret; }

1 0

git:master:a1620fa1: usrloc: safety check on len for user in db keepalive routine
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: a1620fa1b4587239835db6ed5765ce04f927172d URL: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:02:48+01:00 usrloc: safety check on len for user in db keepalive routine --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… Patch: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 96a95fe3c9..44ce3c6376 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -236,7 +236,7 @@ int ul_ka_db_records(int partidx) continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AORBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE - 1) { LM_DBG("long username ->skipping\n"); continue; }

1 0

git:master:e4f6c660: core: parser rr - clean partially cloned fields in case of error
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: e4f6c660bd75cdb9ff0855fcb511673cc8ec00c4 URL: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T13:36:36+01:00 core: parser rr - clean partially cloned fields in case of error --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… Patch: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index a089b895fc..9557bffc9b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -296,7 +296,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) } else { PKG_MEM_ERROR; } - return -2; + ret = -2; + goto error; } memcpy(res, it, sizeof(rr_t)); @@ -313,7 +314,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) LM_ERR("Error while duplicating parameters\n"); if (_shm) shm_free(res); else pkg_free(res); - return -3; + ret = -3; + goto error; } xlate_pointers(it, res); @@ -327,6 +329,18 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) it = it->next; } return 0; + +error: + if(*_new != NULL) { + if (_shm) { + shm_free_rr(_new); + } else { + free_rr(_new); + } + *_new = NULL; + } + + return ret; }

1 0

git:master:5d490d61: regex: use var to store strlen() values
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 5d490d616132067a5e914302a24b964b73b229a2 URL: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T13:06:53+01:00 regex: use var to store strlen() values - avoid doing it again in a few cases --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… Patch: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 475c3542eb..2bc521040b 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -246,6 +246,7 @@ static int load_pcres(int action) int pcre_erroffset; int num_pcres_tmp = 0; pcre **pcres_tmp = NULL; + int llen; /* Get the lock */ lock_get(reload_lock); @@ -301,31 +302,37 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; + patterns[i][1] = '\0'; memset(line, 0, FILE_MAX_LINE); continue; } + llen = strlen(line); /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { + if (strlen(patterns[i]) + llen >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } /* Append ')' at the end of the line */ - if (line[strlen(line) - 1] == '\n') { - line[strlen(line)] = line[strlen(line) - 1]; - line[strlen(line) - 2] = ')'; + if (line[llen - 1] == '\n') { + line[llen - 1] = ')'; + line[llen] = '\n'; + line[llen + 1] = '\0'; } else { /* This is the last char in the file and it's not \n */ - line[strlen(line)] = ')'; + line[llen] = ')'; + line[llen + 1] = '\0'; } /* Append '(' at the beginning of the line */ - memcpy(patterns[i]+strlen(patterns[i]), "(", 1); + llen = strlen(patterns[i]); + memcpy(patterns[i]+llen, "(", 1); + llen++; - /* Append the line to the current pattern */ - memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); + /* Append the line to the current pattern (including the ending 0) */ + memcpy(patterns[i] + llen, line, strlen(line) + 1); memset(line, 0, FILE_MAX_LINE); }

1 0

git:5.4:900a05c4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 900a05c4ba32513ebb61428ef53a4d1705f58443 URL: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-26T11:16:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… Patch: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index bd67b08983..74543b05d7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -741,10 +741,13 @@ if (has_body("multipart/mixed")) { 4.23. append_to_reply(txt) - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + Kamailio (e.g., via sl_send_reply(...)). Meaning of the parameters is as follows: - * txt - String which may contains pseudo-variables. + * txt - String which may contains pseudo-variables. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, ERROR_ROUTE. @@ -757,12 +760,14 @@ append_to_reply("Foo: $rm at $Ts\r\n"); 4.24. append_hf(txt[, hdr]) - Appends 'txt' as header after first header field or after last 'hdr' - header field. + Appends 'txt' as header at the end of the all headers, or after last + header named 'hdr' if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be appended. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name after which the 'txt' is appended. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -776,12 +781,14 @@ append_hf("From-username: $fU\r\n", "Call-ID"); 4.25. insert_hf(txt[, hdr]) - Inserts 'txt' as header before the first header field or before first - 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before first + header named 'hdr'if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be inserted. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name before which the 'txt' is inserted. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:5.4:7cd88cf0: textops: docs - some enhancements to basic header operations functions
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 7cd88cf05f25a5a5883d936285ac51f82911e9af URL: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:46+01:00 textops: docs - some enhancements to basic header operations functions (cherry picked from commit 374f0f05bdf27ddaf5d8652560738fbfb886c43c) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… Patch: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index a8685510a0..44540841d4 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -872,13 +872,15 @@ if (has_body("multipart/mixed")) { <function moreinfo="none">append_to_reply(txt)</function> </title> <para> - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + &kamailio; (e.g., via sl_send_reply(...)). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - String which may contains - pseudo-variables. + pseudo-variables. Note that the value has to be ended with "\r\n" + (end of header characters sequence). </para> </listitem> </itemizedlist> @@ -902,15 +904,16 @@ append_to_reply("Foo: $rm at $Ts\r\n"); <function moreinfo="none">append_hf(txt[, hdr])</function> </title> <para> - Appends 'txt' as header after first header field or after - last 'hdr' header field. + Appends 'txt' as header at the end of the all headers, or after + last header named 'hdr' if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be appended. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem> @@ -939,15 +942,16 @@ append_hf("From-username: $fU\r\n", "Call-ID"); <function moreinfo="none">insert_hf(txt[, hdr])</function> </title> <para> - Inserts 'txt' as header before the first header field or before - first 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before + first header named 'hdr'if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be inserted. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem>

1 0

git:5.4:aa0573d2: alias_db: clang format the code
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: aa0573d2afa3c1a0afa76b8fd1e0de952c487a01 URL: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:27+01:00 alias_db: clang format the code (cherry picked from commit 3dca5cd2c7f018189b6784a7e87807df1de7589e) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9… Patch: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9…

1 0

git:5.4:82ff4f40: pv_headers: free hash entry in case of error
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 82ff4f40455a910ef42dd3692af5c1c9dfb8d4c1 URL: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:36+01:00 pv_headers: free hash entry in case of error (cherry picked from commit 46c7a8c0bf2b4d5c00e22a751f95f13263686445) --- Modified: src/modules/pv_headers/pvh_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… Patch: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… --- diff --git a/src/modules/pv_headers/pvh_hash.c b/src/modules/pv_headers/pvh_hash.c index 89f93f77b8..80297bcaaf 100644 --- a/src/modules/pv_headers/pvh_hash.c +++ b/src/modules/pv_headers/pvh_hash.c @@ -85,6 +85,7 @@ int pvh_str_hash_add_key(struct str_hash_table *ht, str *key) err: pvh_str_free(&e->key); + pkg_free(e); return -1; }

1 0

git:5.4:83005d4f: alias_db: set ending zero in a single place
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 83005d4fafd5d055e4125a83c24d1c6cd0eed058 URL: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:01+01:00 alias_db: set ending zero in a single place (cherry picked from commit dc1bb5b1861de279b450ab550888dd748b77463f) --- Modified: src/modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… Patch: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… --- diff --git a/src/modules/alias_db/alookup.c b/src/modules/alias_db/alookup.c index 28dd916999..faa5f6739e 100644 --- a/src/modules/alias_db/alookup.c +++ b/src/modules/alias_db/alookup.c @@ -163,19 +163,18 @@ static int alias_db_query(struct sip_msg* _msg, str table, (char*)RES_ROWS(db_res)[i].values[1].val.str_val.s, RES_ROWS(db_res)[i].values[1].val.str_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.str_val.len; - useruri_buf[user_s.len] = '\0'; break; case DB1_BLOB: strncpy(user_s.s, (char*)RES_ROWS(db_res)[i].values[1].val.blob_val.s, RES_ROWS(db_res)[i].values[1].val.blob_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.blob_val.len; - useruri_buf[user_s.len] = '\0'; break; default: LM_ERR("unknown type of DB user column\n"); goto err_server; } + useruri_buf[user_s.len] = '\0'; user_s.s = useruri_buf; /* set the URI */ LM_DBG("new URI [%d] is [%.*s]\n", i, user_s.len ,user_s.s );

1 0

git:5.4:5114cc77: alias_db: removed history from top comments
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 5114cc77cb61744843ed8b535d9804fcdf61e635 URL: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:11+01:00 alias_db: removed history from top comments - missing copyright header (cherry picked from commit 7ae0caaffd3d6e523fd32501401213521a1881e5) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f… Patch: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f…

1 0

git:5.4:407586be: rtp_media_server: fix dialog_list_mutex
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: 407586bec91fac11311809d2693e521ad82394dc URL: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:59:35+01:00 rtp_media_server: fix dialog_list_mutex issue 2522 (cherry picked from commit 750cb7fc131afa254952536bdb200d55e2cc8955) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521… Patch: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521…

1 0

git:5.4:dfa7bf13: rtp_media_server: state transition improvement
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: dfa7bf13fb0e5513cd3b1558765ba32e9300a120 URL: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:59:47+01:00 rtp_media_server: state transition improvement - fix disconnection while in bridge, to keep thing simple for now the second leg is automaticaly disconnected. (cherry picked from commit e419bad759dc817ba673563ec4e79681f685dc28) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32… Patch: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32…

1 0

git:5.4:dc2336f5: tmx: Allow $T_branch(flags) in onreply_route
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: dc2336f541eb27d0a034f4c72a26c40270cfea70 URL: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:57:44+01:00 tmx: Allow $T_branch(flags) in onreply_route (cherry picked from commit d161d4523fc6b0619defe918bc204cc7a9cae073) --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… Patch: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

1 0

git:5.4:a5ee9476: rtp_media_server: fix issue 2524
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.4 Commit: a5ee9476c8f403c42a6bc80d2228b49a39a0ca5b URL: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:58:57+01:00 rtp_media_server: fix issue 2524 - fix completion without failure route - rms_bridge automaticaly append missing ';' is not present (cherry picked from commit 2ea4f685ea8b7dbca13b4fd521441088f8318d1f) --- Modified: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… Patch: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… --- diff --git a/src/modules/rtp_media_server/docker/rtp_media_server.sh b/src/modules/rtp_media_server/docker/rtp_media_server.sh index 02b842ad25..8f31f20623 100755 --- a/src/modules/rtp_media_server/docker/rtp_media_server.sh +++ b/src/modules/rtp_media_server/docker/rtp_media_server.sh @@ -4,7 +4,7 @@ CONTAINER=rtp_media_server IMAGE=rtp_media_server:latest docker stop ${CONTAINER} docker rm ${CONTAINER} -docker run -d --net=host --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" +docker run -d --net=host --privileged --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" echo "" echo "manual steps required to start Kamailio in the container:" @@ -13,3 +13,8 @@ echo " set the listen IP in /etc/kamailio.cfg" echo " docker exec -it rtp_media_server bash" echo " kamailio -m 64 -D -dd -f /etc/kamailio.cfg" echo "" + +# ulimit -c unlimited +# echo "/tmp/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern +# sysctl -w kernel.core_pattern=core +# apt-get update && apt-get install -i gdb diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 99eca96484..5913921752 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -489,6 +489,8 @@ static void bridge_cb(struct cell *ptrans, int ntype, struct tmcb_params *pcbp) return; } else if(ntype == TMCB_LOCAL_COMPLETED) { LM_NOTICE("COMPLETED [%d]\n", pcbp->code); + if (pcbp->code >= 300) + return; } else if(ntype == TMCB_LOCAL_RESPONSE_IN){ LM_NOTICE("RESPONSE [%d]\n", pcbp->code); if (pcbp->code != 180 && pcbp->code != 183) @@ -892,7 +894,13 @@ static int rms_bridge_f(struct sip_msg *msg, char *_target, char *_route) if(!rms_str_dup(&a->param, &target, 1)) { goto error; } - + if (a->param.s[a->param.len-1] != ';') { + a->param.s = shm_realloc(a->param.s, a->param.len + 2); + a->param.s[a->param.len]=';'; + a->param.len++; + a->param.s[a->param.len]= '\0'; + LM_NOTICE("remote >>> target[%.*s]\n", a->param.len, a->param.s); + } a->route.len = route.len; a->route.s = route.s;

1 0

git:master:34a675ba: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 34a675ba4987f202dfb3477114d6b86be5eeb2a1 URL: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-26T11:01:20+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… Patch: https://github.com/kamailio/kamailio/commit/34a675ba4987f202dfb3477114d6b86… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index bd67b08983..74543b05d7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -741,10 +741,13 @@ if (has_body("multipart/mixed")) { 4.23. append_to_reply(txt) - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + Kamailio (e.g., via sl_send_reply(...)). Meaning of the parameters is as follows: - * txt - String which may contains pseudo-variables. + * txt - String which may contains pseudo-variables. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, ERROR_ROUTE. @@ -757,12 +760,14 @@ append_to_reply("Foo: $rm at $Ts\r\n"); 4.24. append_hf(txt[, hdr]) - Appends 'txt' as header after first header field or after last 'hdr' - header field. + Appends 'txt' as header at the end of the all headers, or after last + header named 'hdr' if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be appended. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name after which the 'txt' is appended. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -776,12 +781,14 @@ append_hf("From-username: $fU\r\n", "Call-ID"); 4.25. insert_hf(txt[, hdr]) - Inserts 'txt' as header before the first header field or before first - 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before first + header named 'hdr'if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be inserted. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name before which the 'txt' is inserted. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:master:374f0f05: textops: docs - some enhancements to basic header operations functions
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 374f0f05bdf27ddaf5d8652560738fbfb886c43c URL: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:53:24+01:00 textops: docs - some enhancements to basic header operations functions --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… Patch: https://github.com/kamailio/kamailio/commit/374f0f05bdf27ddaf5d8652560738fb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index a8685510a0..44540841d4 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -872,13 +872,15 @@ if (has_body("multipart/mixed")) { <function moreinfo="none">append_to_reply(txt)</function> </title> <para> - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + &kamailio; (e.g., via sl_send_reply(...)). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - String which may contains - pseudo-variables. + pseudo-variables. Note that the value has to be ended with "\r\n" + (end of header characters sequence). </para> </listitem> </itemizedlist> @@ -902,15 +904,16 @@ append_to_reply("Foo: $rm at $Ts\r\n"); <function moreinfo="none">append_hf(txt[, hdr])</function> </title> <para> - Appends 'txt' as header after first header field or after - last 'hdr' header field. + Appends 'txt' as header at the end of the all headers, or after + last header named 'hdr' if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be appended. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem> @@ -939,15 +942,16 @@ append_hf("From-username: $fU\r\n", "Call-ID"); <function moreinfo="none">insert_hf(txt[, hdr])</function> </title> <para> - Inserts 'txt' as header before the first header field or before - first 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before + first header named 'hdr'if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be inserted. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem>

1 0

git:5.3:f641fe53: textops: fix append_hf function
by Stefan Mititelu 26 Oct '20

26 Oct '20

Module: kamailio Branch: 5.3 Commit: f641fe53fdbbd54db8ef136ec2425d7624e50173 URL: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-10-26T11:32:01+02:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance (cherry-picked from commit 4adea97a4f8a9b35273d4d28b0518964abb7f0d8) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… Patch: https://github.com/kamailio/kamailio/commit/f641fe53fdbbd54db8ef136ec2425d7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 0b7fd9e16e..580c850e71 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3229,7 +3229,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3240,6 +3240,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3252,20 +3253,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:master:46c7a8c0: pv_headers: free hash entry in case of error
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 46c7a8c0bf2b4d5c00e22a751f95f13263686445 URL: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T09:17:02+01:00 pv_headers: free hash entry in case of error --- Modified: src/modules/pv_headers/pvh_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… Patch: https://github.com/kamailio/kamailio/commit/46c7a8c0bf2b4d5c00e22a751f95f13… --- diff --git a/src/modules/pv_headers/pvh_hash.c b/src/modules/pv_headers/pvh_hash.c index 89f93f77b8..80297bcaaf 100644 --- a/src/modules/pv_headers/pvh_hash.c +++ b/src/modules/pv_headers/pvh_hash.c @@ -85,6 +85,7 @@ int pvh_str_hash_add_key(struct str_hash_table *ht, str *key) err: pvh_str_free(&e->key); + pkg_free(e); return -1; }

1 0

git:master:7ae0caaf: alias_db: removed history from top comments
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 7ae0caaffd3d6e523fd32501401213521a1881e5 URL: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T07:52:49+01:00 alias_db: removed history from top comments - missing copyright header --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135… Patch: https://github.com/kamailio/kamailio/commit/7ae0caaffd3d6e523fd325014012135…

1 0

git:master:3dca5cd2: alias_db: clang format the code
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: 3dca5cd2c7f018189b6784a7e87807df1de7589e URL: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T08:15:10+01:00 alias_db: clang format the code --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d… Patch: https://github.com/kamailio/kamailio/commit/3dca5cd2c7f018189b6784a7e87807d…

1 0

git:master:dc1bb5b1: alias_db: set ending zero in a single place
by Daniel-Constantin Mierla 26 Oct '20

26 Oct '20

Module: kamailio Branch: master Commit: dc1bb5b1861de279b450ab550888dd748b77463f URL: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T07:42:10+01:00 alias_db: set ending zero in a single place --- Modified: src/modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… Patch: https://github.com/kamailio/kamailio/commit/dc1bb5b1861de279b450ab550888dd7… --- diff --git a/src/modules/alias_db/alookup.c b/src/modules/alias_db/alookup.c index 28dd916999..faa5f6739e 100644 --- a/src/modules/alias_db/alookup.c +++ b/src/modules/alias_db/alookup.c @@ -163,19 +163,18 @@ static int alias_db_query(struct sip_msg* _msg, str table, (char*)RES_ROWS(db_res)[i].values[1].val.str_val.s, RES_ROWS(db_res)[i].values[1].val.str_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.str_val.len; - useruri_buf[user_s.len] = '\0'; break; case DB1_BLOB: strncpy(user_s.s, (char*)RES_ROWS(db_res)[i].values[1].val.blob_val.s, RES_ROWS(db_res)[i].values[1].val.blob_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.blob_val.len; - useruri_buf[user_s.len] = '\0'; break; default: LM_ERR("unknown type of DB user column\n"); goto err_server; } + useruri_buf[user_s.len] = '\0'; user_s.s = useruri_buf; /* set the URI */ LM_DBG("new URI [%d] is [%.*s]\n", i, user_s.len ,user_s.s );

1 0

[kamailio/kamailio] rtp_media_server: state transition improvement (#2532)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Type Of Change - [x] bug fix (non-breaking change which fixes an issue) - [x] refactoring - [x] Tested changes locally #### Description - Bridge disconnection was over complicated, to simplify things both legs will automatically be disconnected for now. - The "state machine" is only a POC at this point, I made sure it was easy to pinpoint problems. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2532 -- Commit Summary -- * rtp_media_server: state transition improvement -- File Changes -- M src/modules/rtp_media_server/rms_dialog_info.c (21) M src/modules/rtp_media_server/rms_dialog_info.h (4) M src/modules/rtp_media_server/rtp_media_server.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2532.patch https://github.com/kamailio/kamailio/pull/2532.diff -- 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/pull/2532

1 1

git:master:e419bad7: rtp_media_server: state transition improvement
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: e419bad759dc817ba673563ec4e79681f685dc28 URL: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-25T18:54:33Z rtp_media_server: state transition improvement - fix disconnection while in bridge, to keep thing simple for now the second leg is automaticaly disconnected. --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968… Patch: https://github.com/kamailio/kamailio/commit/e419bad759dc817ba673563ec4e7968…

1 0

[kamailio/kamailio] rtp_media_server: declare extern dialog_list_mutex and tmb in header file (#2522)
by Anthony Messina 25 Oct '20

25 Oct '20

Similar to #2235 ``` src/modules/rtp_media_server/rtp_media_server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index bf22660b1b..cd3a0109ce 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -ser_lock_t dialog_list_mutex; +extern ser_lock_t dialog_list_mutex; @@ -51,7 +51,7 @@ typedef struct rms char *local_ip; } rms_t; -struct tm_binds tmb; +extern struct tm_binds tmb; #endif ``` -- 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/2522

3 9

[kamailio/kamailio] rtp_media_server: fix dialog_list_mutex (#2529)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Description fix issue 2522 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2529 -- Commit Summary -- * rtp_media_server: fix dialog_list_mutex -- File Changes -- M src/modules/rtp_media_server/rms_dialog_info.c (27) M src/modules/rtp_media_server/rms_dialog_info.h (3) M src/modules/rtp_media_server/rtp_media_server.c (10) M src/modules/rtp_media_server/rtp_media_server.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2529.patch https://github.com/kamailio/kamailio/pull/2529.diff -- 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/pull/2529

1 3

git:master:750cb7fc: rtp_media_server: fix dialog_list_mutex
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: 750cb7fc131afa254952536bdb200d55e2cc8955 URL: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-24T22:15:50-07:00 rtp_media_server: fix dialog_list_mutex issue 2522 --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5… Patch: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5…

1 0

[kamailio/kamailio] Jchavanton/rtp media server 2524 (#2528)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Description fix issue #2524 2524 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2528 -- Commit Summary -- * rtp_media_server: update to mediastreamer4.4.0 * rtp_media_server: fix issue 2524 -- File Changes -- M src/modules/rtp_media_server/Makefile (2) M src/modules/rtp_media_server/docker/Dockerfile (26) M src/modules/rtp_media_server/docker/rtp_media_server.sh (6) M src/modules/rtp_media_server/rtp_media_server.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2528.patch https://github.com/kamailio/kamailio/pull/2528.diff -- 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/pull/2528

1 2

git:master:2ea4f685: rtp_media_server: fix issue 2524
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: 2ea4f685ea8b7dbca13b4fd521441088f8318d1f URL: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-24T22:13:42-07:00 rtp_media_server: fix issue 2524 - fix completion without failure route - rms_bridge automaticaly append missing ';' is not present --- Modified: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… Patch: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… --- diff --git a/src/modules/rtp_media_server/docker/rtp_media_server.sh b/src/modules/rtp_media_server/docker/rtp_media_server.sh index 02b842ad25..8f31f20623 100755 --- a/src/modules/rtp_media_server/docker/rtp_media_server.sh +++ b/src/modules/rtp_media_server/docker/rtp_media_server.sh @@ -4,7 +4,7 @@ CONTAINER=rtp_media_server IMAGE=rtp_media_server:latest docker stop ${CONTAINER} docker rm ${CONTAINER} -docker run -d --net=host --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" +docker run -d --net=host --privileged --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" echo "" echo "manual steps required to start Kamailio in the container:" @@ -13,3 +13,8 @@ echo " set the listen IP in /etc/kamailio.cfg" echo " docker exec -it rtp_media_server bash" echo " kamailio -m 64 -D -dd -f /etc/kamailio.cfg" echo "" + +# ulimit -c unlimited +# echo "/tmp/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern +# sysctl -w kernel.core_pattern=core +# apt-get update && apt-get install -i gdb diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 99eca96484..5913921752 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -489,6 +489,8 @@ static void bridge_cb(struct cell *ptrans, int ntype, struct tmcb_params *pcbp) return; } else if(ntype == TMCB_LOCAL_COMPLETED) { LM_NOTICE("COMPLETED [%d]\n", pcbp->code); + if (pcbp->code >= 300) + return; } else if(ntype == TMCB_LOCAL_RESPONSE_IN){ LM_NOTICE("RESPONSE [%d]\n", pcbp->code); if (pcbp->code != 180 && pcbp->code != 183) @@ -892,7 +894,13 @@ static int rms_bridge_f(struct sip_msg *msg, char *_target, char *_route) if(!rms_str_dup(&a->param, &target, 1)) { goto error; } - + if (a->param.s[a->param.len-1] != ';') { + a->param.s = shm_realloc(a->param.s, a->param.len + 2); + a->param.s[a->param.len]=';'; + a->param.len++; + a->param.s[a->param.len]= '\0'; + LM_NOTICE("remote >>> target[%.*s]\n", a->param.len, a->param.s); + } a->route.len = route.len; a->route.s = route.s;

1 0

git:master:76bb9bb7: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 76bb9bb7cbdcd900339afa7192eaefd71fc75790 URL: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T22:16:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… Patch: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 2d07fe7669..7f43b5c42b 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1091,7 +1091,7 @@ modparam("dispatcher", "reload_delta", 1) failing distribution will be changed to 33/67/0. Using this algorithm, you can also enable congestion control by setting the attibute 'cc=1', when 'cc' is enabled the - 'rweight' attribute will also be used to control congestion + 'weight' attribute will also be used to control congestion tolerance. When facing congestion the weight of a gateway is lowered by 1 for every ms of estimated congestion, a 'rweight' value of 50 is recommended. See the example "configuring load

1 0

[kamailio/kamailio] dispatcher: congestion control refactoring (#2521)
by Julien Chavanton 23 Oct '20

23 Oct '20

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) #### Type Of Change - [x] refactoring, and better handling of miss configuration #### Checklist:  - [] Tested changes locally #### Description - decouple latency update with congestion control further - decouple congestion control with weighted congestion control and make sure that miss-configuration (no positive weight and/or no cc attributes) are handle gracefully) - fix an error in the doc You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2521 -- Commit Summary -- * dispatcher: congestion control refactoring -- File Changes -- M src/modules/dispatcher/dispatch.c (72) M src/modules/dispatcher/doc/dispatcher_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2521.patch https://github.com/kamailio/kamailio/pull/2521.diff -- 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/pull/2521

2 9

git:master:b2cd7018: dispatcher: congestion control refactoring
by Julien Chavanton 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: b2cd7018d28569e38d8572d154a2ee1c5c973852 URL: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-23T13:00:18-07:00 dispatcher: congestion control refactoring - decouple latency update with congestion control further - decouple congestion control with weighted congestion control, make sure that miss-configuration (no positive weight and/or no cc attributes) are handle gracefully) - fix an error in the doc --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1… Patch: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1…

1 0

git:5.4:e93717fe: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: e93717fe95f39c5832e4bc380fe4a1d24a4e977b URL: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T11:17:14+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… Patch: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index f4f5ccae0d..7df142cb00 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -959,8 +959,9 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are - currently in the location database. On an error, an error message will - be sent with a short description in reason phrase. + currently in the location database. As a side effect, also branch flags + are stored in usrloc. On an error, an error message will be sent with a + short description in reason phrase. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used @@ -1008,7 +1009,8 @@ save("location", "0x00", "sip:test@kamailio.org"); no such contacts, -1 will be returned. If there are such contacts, Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message - (depending on append_branches parameter value). + (depending on append_branches parameter value). As a side effect, also + branch flags are restored from usrloc. If the method_filtering option is enabled and request is initial request without to-tag, the lookup function will return only the diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index f2a4bc98e9..a58d511078 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -133,7 +133,7 @@ modparam("secsipid", "timeout", 2) downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT body in the Identity header is also - checjed against the "expire" parameter. + checked against the "expire" parameter. The parameters can contain pseudo-variables.

1 0

git:5.4:48df37a2: janssonrpcc: cleanups (#2512)
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 48df37a27ae2e42498d1cb44bec8604827a5ed55 URL: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:58:09+02:00 janssonrpcc: cleanups (#2512) * janssonrpcc: Remove unused variable and redundant assignment * janssonrpc: No need for copying options The address stay valid until free_params is called. And before that happens, mod_jsonrpc_request() makes its own copy. (cherry picked from commit 61771b0595c126d884e8c1eb392a54b5786a8fa8) --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… Patch: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 93e62bd53d..70b3e9413e 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -44,7 +44,6 @@ int jsonrpc_request(struct sip_msg* _m, str params; str options; str route; - param_hooks_t phooks; param_t* pit=NULL; param_t* freeme=NULL; int retry; @@ -85,7 +84,7 @@ int jsonrpc_request(struct sip_msg* _m, options.len--; } - if (parse_params(&options, CLASS_ANY, &phooks, &pit)<0) { + if (parse_params(&options, CLASS_ANY, NULL, &pit)<0) { ERR("failed parsing params value\n"); return -1; } @@ -95,8 +94,7 @@ int jsonrpc_request(struct sip_msg* _m, for (; pit;pit=pit->next) { if PIT_MATCHES("route") { - pkg_str_dup(&route, &pit->body); - CHECK_MALLOC_GOTO(route.s, end); + route = pit->body; } else if PIT_MATCHES("timeout") { timeout = atoi(pit->body.s); @@ -123,8 +121,6 @@ int jsonrpc_request(struct sip_msg* _m, goto end; } - retval = 0; - retval = mod_jsonrpc_request( _m, /* sip_msg */ conn, /* connection group */ @@ -138,7 +134,6 @@ int jsonrpc_request(struct sip_msg* _m, end: if(freeme) free_params(freeme); - if(route.s) pkg_free(route.s); return retval; }

1 0

git:5.4:cbd9c3d2: tm: Fix faked_reply_prio by passing correct reply to get_prio
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: cbd9c3d2851ece3c8f08b0664b72fca18f6f4f77 URL: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:58:26+02:00 tm: Fix faked_reply_prio by passing correct reply to get_prio Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. (cherry picked from commit 5731cc0911ff65bf7efd433a83a25ffbf6073d10) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… Patch: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

1 0

git:5.4:eae86ff8: textops: fix append_hf function
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: eae86ff8bf327b6ed0bcb83ee25c663cb97a02fc URL: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:59+02:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance (cherry picked from commit 4adea97a4f8a9b35273d4d28b0518964abb7f0d8) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… Patch: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:5.4:39895a53: rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 39895a53b7df804573746585b5d0dd9d4a56f209 URL: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:32+02:00 rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef (cherry picked from commit 3a162187580880fa7210bd376621f57576e9d209) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… Patch: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index b8c51bada2..841e74a340 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -23,7 +23,7 @@ extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; -ser_lock_t dialog_list_mutex; +gen_lock_t dialog_list_mutex; static void rms_action_free(rms_dialog_info_t *si) { diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index cd3a0109ce..c23cf0df6e 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -extern ser_lock_t dialog_list_mutex; +extern gen_lock_t dialog_list_mutex;

1 0

git:5.4:071fe936: utils/pdbt: Relax permissions when creating files
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 071fe9366b3cc14f0cce1aa0373d20a0242182cb URL: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:43+02:00 utils/pdbt: Relax permissions when creating files (cherry picked from commit bb42ee28fc115e1e3373962c02162c9a8e6d41fc) --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… Patch: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 6521985b2b..5a52cf8c7a 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -297,7 +297,7 @@ int dt_write_tree(const struct dt_node_t *root, const char* filename) char number[25]; number[0] = '\0'; - fd = creat(filename, S_IRWXU); + fd = creat(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1; @@ -370,7 +370,7 @@ int save_mmap(struct dt_node_t *root, char *filename) { int fd; int n; - fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRWXU); + fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1;

1 0

git:5.4:0752f63d: core: Document that a str can be zero-terminated
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 0752f63d41a5c02bc1a5612a22797f186e291119 URL: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:11+02:00 core: Document that a str can be zero-terminated But by default it isn't. The functions shm_str_dup() and pkg_str_dup() will always create a zero-terminated copy (cherry picked from commit fcdfaf98acf8a66e84b9dccc767fb52c0cf0d460) --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… Patch: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… --- diff --git a/src/core/str.h b/src/core/str.h index 01b12ecb62..58d7d627f6 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -40,13 +40,16 @@ * need to make a zero-terminated copy of it. * * @section drawbacks Drawbacks - * Note well that the fact that string stored - * using this data structure are not zero terminated makes them a little - * incovenient to use with many standard libc string functions, because these - * usually expect the input to be zero-terminated. In this case you have to - * either make a zero-terminated copy or inject the terminating zero behind - * the actuall string (if possible). Note that injecting a zero terminating - * characters is considered to be dangerous. + * Note well that the fact that a string stored + * using this data structure are not guaranteed to be zero terminated (by + * default they're not) makes them a little incovenient to use with many + * standard libc string functions, because these usually expect the input + * to be zero-terminated. + * In this case you have to either make a zero-terminated copy or inject the + * terminating zero behind the actuall string (if possible). Note that + * injecting a zero terminating characters is considered to be dangerous. + * The functions shm_str_dup() and pkg_str_dup() will always create a + * zero-terminated copy. */ /** @file

1 0

git:5.4:9f2f517f: rtp_media_server: declare variables in .c files
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 9f2f517ffbc616d14567fcb9948147dae6507da0 URL: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:21+02:00 rtp_media_server: declare variables in .c files - extern in .h files, GH #2522 (cherry picked from commit 128ba4fe95f3c27474c9f839d34f8fb1fd75e064) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… Patch: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index 24fe0bb0c0..b8c51bada2 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -19,9 +19,12 @@ */ #include "rtp_media_server.h" + extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; +ser_lock_t dialog_list_mutex; + static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 8f2b2592aa..99eca96484 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -36,6 +36,8 @@ static char *rms_answer_default_route = "rms:start"; int in_rms_process; rms_t *rms; +struct tm_binds tmb; + static rms_dialog_info_t *rms_dialog_create_leg(rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no); diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index bf22660b1b..cd3a0109ce 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -ser_lock_t dialog_list_mutex; +extern ser_lock_t dialog_list_mutex; @@ -51,7 +51,7 @@ typedef struct rms char *local_ip; } rms_t; -struct tm_binds tmb; +extern struct tm_binds tmb; #endif

1 0

git:5.4:f050ce2d: registrar: added note about branch flags in save()/lookup() doc
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: f050ce2dc5f27a08bf5c5364e4002b646802eb81 URL: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:28+02:00 registrar: added note about branch flags in save()/lookup() doc (cherry picked from commit f2996bf733a0b5e00fe124440353b9a69a3532a2) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… Patch: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 461605f3d0..266f7b35e2 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1154,7 +1154,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in - the location database. On an error, an error message will be sent with a short + the location database. As a side effect, also branch flags are + stored in usrloc. On an error, an error message will be sent with a short description in reason phrase. </para> <para>Meaning of the parameters is as follows:</para> @@ -1255,6 +1256,7 @@ save("location", "0x00", "sip:test@kamailio.org"); Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message (depending on append_branches parameter value). + As a side effect, also branch flags are restored from usrloc. </para> <para> If the <varname>method_filtering</varname> option is enabled and

1 0

git:5.4:4e509306: core: Zero terminate str copies made with (pkg|shm)_str_dup()
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 4e50930695e288b0285370cc7fd26801cbf751de URL: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:55+02:00 core: Zero terminate str copies made with (pkg|shm)_str_dup() As discussed in #2512, zero-terminating all copies is preferred as most str usage is already with zero-terminated str.s. (cherry picked from commit 0ea69b16db298842f58a6fcaaab2c0ee1a137b94) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… Patch: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… --- diff --git a/src/core/ut.h b/src/core/ut.h index 56c1f9e157..51d14d9bb9 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

1 0

git:5.4:12ebd41d: permissions: exported allow_trusted() to kemi
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 12ebd41d0dae516f39933eeabcda1919cb10b71e URL: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:02+02:00 permissions: exported allow_trusted() to kemi - related to #2509 (cherry picked from commit 843b22b4efb0d343f13230d6e90d2484f370dbdb) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… Patch: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 18cf398f8f..be22963d81 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1058,6 +1058,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_trusted"), + SR_KEMIP_INT, ki_allow_trusted, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index eed1041581..2f9c7d42a4 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -507,7 +507,7 @@ int allow_trusted(struct sip_msg* msg, char *src_ip, int proto, char *from_uri) * Checks based on request's source address, protocol, and From URI * if request can be trusted without authentication. */ -int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +int ki_allow_trusted(sip_msg_t* _msg) { str furi; char furi_string[MAX_URI_SIZE+1]; @@ -530,6 +530,15 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) furi_string); } +/* + * Checks based on request's source address, protocol, and From URI + * if request can be trusted without authentication. + */ +int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +{ + return ki_allow_trusted(_msg); +} + /* * Checks based on source address and protocol given in pvar arguments and * provided uri, if request can be trusted without authentication. diff --git a/src/modules/permissions/trusted.h b/src/modules/permissions/trusted.h index 8a8ab2cc11..72da2d70e7 100644 --- a/src/modules/permissions/trusted.h +++ b/src/modules/permissions/trusted.h @@ -55,6 +55,10 @@ int reload_trusted_table(void); */ void clean_trusted(void); +/* + * Check if request comes from trusted ip address with matching from URI + */ +int ki_allow_trusted(sip_msg_t* _msg); /* * Check if request comes from trusted ip address with matching from URI

1 0

git:5.4:e93b62f2: secsipid: docs - small typo
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: e93b62f2f9a27943d68b1e2a8b2529f37a419292 URL: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:00+02:00 secsipid: docs - small typo (cherry picked from commit f74f1df842815e8a42d1b4f71b6f98287a625d41) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… Patch: https://github.com/kamailio/kamailio/commit/e93b62f2f9a27943d68b1e2a8b2529f… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index ac5884679f..510da9159d 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -110,7 +110,7 @@ modparam("secsipid", "timeout", 2) the function is downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT - body in the Identity header is also checjed against the "expire" + body in the Identity header is also checked against the "expire" parameter. </para> <para>

1 0

git:5.4:41b6be63: nsq: remove unused defs.h file
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 41b6be639eb56dbb9732e1961b75654a73ee2fa6 URL: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:37+02:00 nsq: remove unused defs.h file (cherry picked from commit 79db27575a48c5451b547ece68b5849456e245f9) --- Removed: src/modules/nsq/defs.h --- Diff: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654… Patch: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654…

1 0

git:5.4:550840b4: pipelimit: use unsigned to compute size and for iterator
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 550840b4b9ce8df9acdf875f907ce86533fea43e URL: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:52+02:00 pipelimit: use unsigned to compute size and for iterator (cherry picked from commit 23818fb34d09a487654ea89c9f29b880c0c75197) --- Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… Patch: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… --- diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index e1afa2ffb8..0c6c52d389 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -137,10 +137,12 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family struct socket_info *si; struct socket_info** list; - int num_ip_octets = family == AF_INET ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; - int numberOfSockets = 0; + unsigned int num_ip_octets = 0; + unsigned int numberOfSockets = 0; int currentRow = 0; + num_ip_octets = (family == AF_INET) ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; + /* I hate to use #ifdefs, but this is necessary because of the way * get_sock_info_list() is defined. */ #ifndef USE_TCP @@ -198,7 +200,7 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family /* Extract out the IP Addresses and ports. */ for(si=list?*list:0; si; si=si->next){ - int i; + unsigned int i; /* We currently only support IPV4. */ if (si->address.af != family) {

1 0

git:master:37820f70: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 37820f709cd437a63d8f655aec876aa8ee9d71f2 URL: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T10:46:37+02:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… Patch: https://github.com/kamailio/kamailio/commit/37820f709cd437a63d8f655aec876aa… --- diff --git a/src/modules/jansson/README b/src/modules/jansson/README index a68d7f43f0..92b455c56c 100644 --- a/src/modules/jansson/README +++ b/src/modules/jansson/README @@ -33,7 +33,9 @@ Carsten Bock 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) List of Examples @@ -42,7 +44,9 @@ Carsten Bock 1.3. jansson_append usage 1.4. jansson_array_size usage 1.5. array concatenation - 1.6. jansson_get_field usage + 1.6. jansson_xdecode usage + 1.7. jansson_xencode usage + 1.8. jansson_get_field usage Chapter 1. Admin Guide @@ -60,7 +64,9 @@ Chapter 1. Admin Guide 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) 1. Overview @@ -89,7 +95,9 @@ Chapter 1. Admin Guide 3.2. jansson_set(type, key/path, value, result) 3.3. jansson_append(type, key/path, value, result) 3.4. jansson_array_size(key/path, src, dst) - 3.5. jansson_get_field(src, field_name, dst) + 3.5. jansson_xdecode(json, xavp) + 3.6. jansson_xencode(xavp, pv) + 3.7. jansson_get_field(src, field_name, dst) 3.1. jansson_get(key/path, src, dst) @@ -223,7 +231,31 @@ while($var(count) < $var(appendme_size)) { } ... -3.5. jansson_get_field(src, field_name, dst) +3.5. jansson_xdecode(json, xavp) + + Parse a JSON string in 'json' and store the elements in xapv 'xavp'. + Top-level JSON must be an object or an array of objects. Nested arrays + and objects are not decoded but stored as string. + + Example 1.6. jansson_xdecode usage +... +jansson_xdecode('{"foo":"bar"}', "js"); +xlog("foo is $xavp(js=>foo)"); +... + +3.6. jansson_xencode(xavp, pv) + + Encode the items in the xavp 'xavp' as JSON and store the result in a + pv. Nested xavps's are not supported. + + Example 1.7. jansson_xencode usage +... +$xavp(a=>foo) = "bar"; +jansson_xencode("a", "$var(js)"); +# $var(js) = '{"foo":"bar"}' +... + +3.7. jansson_get_field(src, field_name, dst) Copy field 'field_name' from json object 'src' and store it in pvar 'dst'. @@ -232,7 +264,7 @@ while($var(count) < $var(appendme_size)) { now it is just a wrapper around jansson_get, and its functionality is the same. - Example 1.6. jansson_get_field usage + Example 1.8. jansson_get_field usage ... jansson_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)");

1 0

[kamailio/kamailio] tm: Fix faked_reply_prio by passing correct reply to get_prio (#2515)
by Alex Hermann 23 Oct '20

23 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2515 -- Commit Summary -- * tm: Fix faked_reply_prio by passing correct reply to get_prio -- File Changes -- M src/modules/tm/t_reply.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2515.patch https://github.com/kamailio/kamailio/pull/2515.diff -- 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/pull/2515

2 2

git:master:352830ca: Merge pull request #2515 from gaaf/fixes/tm-pick-branch
by GitHub 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 352830ca7c39032dfaecbcb1a6b1bb0865ee55d3 URL: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:35:44+02:00 Merge pull request #2515 from gaaf/fixes/tm-pick-branch tm: Fix faked_reply_prio by passing correct reply to get_prio --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… Patch: https://github.com/kamailio/kamailio/commit/352830ca7c39032dfaecbcb1a6b1bb0… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

1 0

git:master:5731cc09: tm: Fix faked_reply_prio by passing correct reply to get_prio
by Alex Hermann 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 5731cc0911ff65bf7efd433a83a25ffbf6073d10 URL: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:36:37+02:00 tm: Fix faked_reply_prio by passing correct reply to get_prio Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… Patch: https://github.com/kamailio/kamailio/commit/5731cc0911ff65bf7efd433a83a25ff… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

1 0

[kamailio/kamailio] tmx: Allow $T_branch(flags) in onreply_route (#2516)
by Alex Hermann 23 Oct '20

23 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Allow $T_branch(flags) in onreply_route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2516 -- Commit Summary -- * tmx: Allow $T_branch(flags) in onreply_route -- File Changes -- M src/modules/tmx/t_var.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2516.patch https://github.com/kamailio/kamailio/pull/2516.diff -- 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/pull/2516

2 2

git:master:78d680fb: Merge pull request #2516 from gaaf/features/tm-branch-flags-in-reply
by GitHub 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 78d680fbae05c40a0de7a8100e76be20b06b99e4 URL: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:33:57+02:00 Merge pull request #2516 from gaaf/features/tm-branch-flags-in-reply tmx: Allow $T_branch(flags) in onreply_route --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… Patch: https://github.com/kamailio/kamailio/commit/78d680fbae05c40a0de7a8100e76be2… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

1 0

git:master:d161d452: tmx: Allow $T_branch(flags) in onreply_route
by Alex Hermann 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: d161d4523fc6b0619defe918bc204cc7a9cae073 URL: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:46:37+02:00 tmx: Allow $T_branch(flags) in onreply_route --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… Patch: https://github.com/kamailio/kamailio/commit/d161d4523fc6b0619defe918bc204cc… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

1 0

[kamailio/kamailio] jansson: Add en-/decode to/from xavp (#2513)
by Alex Hermann 23 Oct '20

23 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add functions to encode and decode JSON from/to an xavp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2513 -- Commit Summary -- * jansson: Add en-/decode to/from xavp -- File Changes -- M src/modules/jansson/doc/jansson_admin.xml (38) M src/modules/jansson/jansson_funcs.c (191) M src/modules/jansson/jansson_funcs.h (2) M src/modules/jansson/jansson_mod.c (44) M src/modules/jansson/jansson_utils.c (51) M src/modules/jansson/jansson_utils.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2513.patch https://github.com/kamailio/kamailio/pull/2513.diff -- 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/pull/2513

4 5

git:master:554a0d44: Merge pull request #2513 from gaaf/features/jansson-xavp
by GitHub 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 554a0d4424fd0c4d3a4a562e175ae3ed1722d504 URL: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:33:12+02:00 Merge pull request #2513 from gaaf/features/jansson-xavp jansson: Add en-/decode to/from xavp --- Modified: src/modules/jansson/doc/jansson_admin.xml Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c Modified: src/modules/jansson/jansson_utils.c Modified: src/modules/jansson/jansson_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e… Patch: https://github.com/kamailio/kamailio/commit/554a0d4424fd0c4d3a4a562e175ae3e…

1 0

git:master:aea932ba: jansson: Add en-/decode to/from xavp
by Alex Hermann 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: aea932ba841416091b5ec93ef23011cd4257da68 URL: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:17:02+02:00 jansson: Add en-/decode to/from xavp Nested objects/arrays are not supported with the exception of decoding a root array with only objects as items to multiple xavps. --- Modified: src/modules/jansson/doc/jansson_admin.xml Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c Modified: src/modules/jansson/jansson_utils.c Modified: src/modules/jansson/jansson_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c… Patch: https://github.com/kamailio/kamailio/commit/aea932ba841416091b5ec93ef23011c…

1 0

[kamailio/kamailio] Fixes/janssonrpcc (#2512)
by Alex Hermann 23 Oct '20

23 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix invalid memory access (beyond the string). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2512 -- Commit Summary -- * janssonrpcc: Zero-terminate all string copies * janssonrpcc: Remove unused variable and redundant assignment -- File Changes -- M src/modules/janssonrpcc/janssonrpc.h (32) M src/modules/janssonrpcc/janssonrpc_funcs.c (15) M src/modules/janssonrpcc/janssonrpc_server.c (14) M src/modules/janssonrpcc/janssonrpc_srv.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2512.patch https://github.com/kamailio/kamailio/pull/2512.diff -- 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/pull/2512

3 6

git:master:61771b05: janssonrpcc: cleanups (#2512)
by GitHub 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 61771b0595c126d884e8c1eb392a54b5786a8fa8 URL: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… Author: Alex Hermann <alex(a)hexla.nl> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:32:02+02:00 janssonrpcc: cleanups (#2512) * janssonrpcc: Remove unused variable and redundant assignment * janssonrpc: No need for copying options The address stay valid until free_params is called. And before that happens, mod_jsonrpc_request() makes its own copy. --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… Patch: https://github.com/kamailio/kamailio/commit/61771b0595c126d884e8c1eb392a54b… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 93e62bd53d..70b3e9413e 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -44,7 +44,6 @@ int jsonrpc_request(struct sip_msg* _m, str params; str options; str route; - param_hooks_t phooks; param_t* pit=NULL; param_t* freeme=NULL; int retry; @@ -85,7 +84,7 @@ int jsonrpc_request(struct sip_msg* _m, options.len--; } - if (parse_params(&options, CLASS_ANY, &phooks, &pit)<0) { + if (parse_params(&options, CLASS_ANY, NULL, &pit)<0) { ERR("failed parsing params value\n"); return -1; } @@ -95,8 +94,7 @@ int jsonrpc_request(struct sip_msg* _m, for (; pit;pit=pit->next) { if PIT_MATCHES("route") { - pkg_str_dup(&route, &pit->body); - CHECK_MALLOC_GOTO(route.s, end); + route = pit->body; } else if PIT_MATCHES("timeout") { timeout = atoi(pit->body.s); @@ -123,8 +121,6 @@ int jsonrpc_request(struct sip_msg* _m, goto end; } - retval = 0; - retval = mod_jsonrpc_request( _m, /* sip_msg */ conn, /* connection group */ @@ -138,7 +134,6 @@ int jsonrpc_request(struct sip_msg* _m, end: if(freeme) free_params(freeme); - if(route.s) pkg_free(route.s); return retval; }

1 0

git:master:4adea97a: textops: fix append_hf function
by Stefan Mititelu 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 4adea97a4f8a9b35273d4d28b0518964abb7f0d8 URL: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-10-22T16:54:04+03:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… Patch: https://github.com/kamailio/kamailio/commit/4adea97a4f8a9b35273d4d28b051896… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:master:b09a0f12: Merge pull request #2526 from smititelu/master
by GitHub 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: b09a0f12a721a257fae8009d6c475a71c011ed52 URL: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-23T10:26:27+02:00 Merge pull request #2526 from smititelu/master textops: fix append_hf function --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… Patch: https://github.com/kamailio/kamailio/commit/b09a0f12a721a257fae8009d6c475a7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:master:432c7dd3: core: kemi - use parse_hname2_str() to avoid cloning header name
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 432c7dd30976d1e4be9db35de39d67cc0e1a5e95 URL: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T09:28:14+02:00 core: kemi - use parse_hname2_str() to avoid cloning header name --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… Patch: https://github.com/kamailio/kamailio/commit/432c7dd30976d1e4be9db35de39d67c… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index b69499dfb5..4060ad9d4d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2275,8 +2275,6 @@ static int sr_kemi_hdr_append_to_reply(sip_msg_t *msg, str *txt) static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, int rmode) { - char hbuf[256]; - str s; hdr_field_t shdr; hdr_field_t *ihdr; #define SR_KEMI_VHDR_SIZE 256 @@ -2296,23 +2294,12 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if(hname->len>=252) { - LM_ERR("header name too long\n"); + if (parse_hname2_str(hname, &shdr)==0) { + LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - memcpy(hbuf, hname->s, hname->len); - hbuf[hname->len] = ':'; - hbuf[hname->len+1] = '\0'; - s.s = hbuf; - s.len = hname->len + 1; - - if (parse_hname2_short(s.s, s.s + s.len, &shdr)==0) { - LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); - sr_kemi_xval_null(&_sr_kemi_xval, rmode); - return &_sr_kemi_xval; - } n = 0; for (ihdr=msg->headers; ihdr; ihdr=ihdr->next) { hmatch = 0;

1 0

git:master:8bf1935c: rtpengine: support new codec flags
by Richard Fuchs 22 Oct '20

22 Oct '20

Module: kamailio Branch: master Commit: 8bf1935c4e9cb0081784dbd8bd951148b8865381 URL: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-21T14:05:20-04:00 rtpengine: support new codec flags Adds explicit support for codec-set and codec-except. Also eliminates code redundancy. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… Patch: https://github.com/kamailio/kamailio/commit/8bf1935c4e9cb0081784dbd8bd95114… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 95726fa4a1..c3e7e75601 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -119,7 +119,8 @@ struct ng_flags_parse { int via, to, packetize, transport, directional; bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes, *t38, - *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask; + *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask, + *codec_set, *codec_except; str call_id, from_tag, to_tag; }; @@ -2082,6 +2083,29 @@ static const char *transports[] = { [0x06] = "UDP/TLS/RTP/SAVPF", }; +static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val, + const char *cmp1, const char *cmp2, + bencode_item_t **dictp) +{ + str s; + + if (!str_key_val_prefix(key, cmp1, val, &s)) { + if (!cmp2) + return 0; + if (!str_key_val_prefix(key, cmp2, val, &s)) + return 0; + } + + if (!*dictp) { + *dictp = bencode_list(ng_flags->dict->buffer); + bencode_dictionary_add(ng_flags->codec, "transcode", + *dictp); + } + bencode_list_add_str(*dictp, &s); + + return 1; +} + static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enum rtpe_operation *op, const char *flags_str) { @@ -2135,47 +2159,18 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu goto next; } - if (str_key_val_prefix(&key, "transcode", &val, &s) - || str_key_val_prefix(&key, "codec-transcode", &val, &s)) - { - if (!ng_flags->codec_transcode) { - ng_flags->codec_transcode = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "transcode", - ng_flags->codec_transcode); - } - bencode_list_add_str(ng_flags->codec_transcode, &s); + if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", &ng_flags->codec_transcode)) goto next; - } - - if (str_key_val_prefix(&key, "codec-strip", &val, &s)) { - if (!ng_flags->codec_strip) { - ng_flags->codec_strip = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "strip", - ng_flags->codec_strip); - } - bencode_list_add_str(ng_flags->codec_strip, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, &ng_flags->codec_strip)) goto next; - } - - if (str_key_val_prefix(&key, "codec-offer", &val, &s)) { - if (!ng_flags->codec_offer) { - ng_flags->codec_offer = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "offer", - ng_flags->codec_offer); - } - bencode_list_add_str(ng_flags->codec_offer, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, &ng_flags->codec_offer)) goto next; - } - - if (str_key_val_prefix(&key, "codec-mask", &val, &s)) { - if (!ng_flags->codec_mask) { - ng_flags->codec_mask = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "mask", - ng_flags->codec_mask); - } - bencode_list_add_str(ng_flags->codec_mask, &s); + if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, &ng_flags->codec_mask)) + goto next; + if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, &ng_flags->codec_set)) + goto next; + if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, &ng_flags->codec_except)) goto next; - } /* check for specially handled items */ switch (key.len) {

2 3

git:master:b999e086: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 22 Oct '20

22 Oct '20

Module: kamailio Branch: master Commit: b999e086d51202916a4cdfaf143150e3b8fa10cf URL: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-22T17:46:28+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… Patch: https://github.com/kamailio/kamailio/commit/b999e086d51202916a4cdfaf143150e… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 00e3746ffe..b72a92de2a 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2088,13 +2088,19 @@ rtpengine_offer(); engaged. Only codecs that are supported for both decoding and encoding can be added in this manner. More details about this are found in the rtpengine README. + + codec-set=... - set codec options (bitrate etc) for codecs + that are implicitly accepted for transcoding from the offering + side. + codec-strip=... - strips given codec from sdp + codec-offer=... - offer given codec from sdp. More details about this are found in the rtpengine README. + + codec-except=... - same as codec-offer but preserves original + order + codec-mask=... - Similar to strip except that codecs listed here will still be accepted and used for transcoding on the - offering side.Useful only in combination with codec-transcode. - all keyword can be used to mask all offered codecs + offering side. Useful only in combination with + codec-transcode. all keyword can be used to mask all offered + codecs + T.38=decode - If the offered SDP contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section over RTP. By default, PCMU and PCMA will be used

1 0

git:master:4de33ea9: rtpengine: update README for 8bf1935c
by Richard Fuchs 22 Oct '20

22 Oct '20

Module: kamailio Branch: master Commit: 4de33ea963b40a5150f34fac8f63d04c5992515e URL: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-22T11:40:47-04:00 rtpengine: update README for 8bf1935c --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… Patch: https://github.com/kamailio/kamailio/commit/4de33ea963b40a5150f34fac8f63d04… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 362fa58910..db7e7334b9 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2392,6 +2392,11 @@ rtpengine_offer(); this manner. More details about this are found in the rtpengine README. </para></listitem> + <listitem><para> + <emphasis>codec-set=...</emphasis> - set codec options (bitrate etc) for codecs that are implicitly + accepted for transcoding from the offering side. + </para></listitem> + <listitem><para> <emphasis>codec-strip=...</emphasis> - strips given codec from sdp </para></listitem> @@ -2401,9 +2406,13 @@ rtpengine_offer(); More details about this are found in the rtpengine README. </para></listitem> + <listitem><para> + <emphasis>codec-except=...</emphasis> - same as <emphasis>codec-offer</emphasis> but preserves original order + </para></listitem> + <listitem><para> <emphasis>codec-mask=...</emphasis> - Similar to strip except that codecs listed here will still be accepted - and used for transcoding on the offering side.Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword + and used for transcoding on the offering side. Useful only in combination with codec-transcode. <emphasis>all</emphasis> keyword can be used to mask all offered codecs </para></listitem> <listitem><para>

1 0

[kamailio/kamailio] Wrong callid in ACK for negative reply(hop by hop ACK) (#2525)
by korithi 22 Oct '20

22 Oct '20

Hello guys, My kamailio version is: version: kamailio 5.1.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. I am facing a strange bug with TM in case of negative replies. A party sends the invite B party connects the call B party after a few time sends in dialog invite with t38 media. A party rejects the in-dialog invite with 488 Kamailio send ACK to A party(since it is an ACK for negative replies it is build in each hop) The problem in this case is that the ACK sent by kamailio to A party has the callid of kamailio - B party. Since it has a different callid the A party does not recognize the ACK. How can I resolve this issue? Thanks and regards, Rafael -- 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/2525

2 4

[kamailio/kamailio] Can't install kamailio-sipcapture-daemon-config package due to missing dependency (#1861)
by pwakano 22 Oct '20

22 Oct '20

kamailio-sipcapture-daemon-config can't be installed because it depends on the kamailio-sipcapture package, which can't be found...  Use the http://download.opensuse.org/repositories/home:/kamailio:/v5.2.x-rpms/CentO… repo and try to install the kamailio-sipcapture-daemon-config. The dependency can't be resolved and so the package does not install. It is not clear if the dependency is missing or if it is not valid. ``` # yum install kamailio-sipcapture-daemon-config Loaded plugins: fastestmirror Loading mirror speeds from cached hostfile * base: mirror.optus.net * epel: mirror.optus.net * extras: mirror.intergrid.com.au * updates: mirror.intergrid.com.au Resolving Dependencies --> Running transaction check ---> Package kamailio-sipcapture-daemon-config.x86_64 0:5.2.1-1.el7.centos will be installed --> Processing Dependency: kamailio-sipcapture = 5.2.1 for package: kamailio-sipcapture-daemon-config-5.2.1-1.el7.centos.x86_64 --> Finished Dependency Resolution Error: Package: kamailio-sipcapture-daemon-config-5.2.1-1.el7.centos.x86_64 (home_kamailio_v5.2.x-rpms) Requires: kamailio-sipcapture = 5.2.1 You could try using --skip-broken to work around the problem You could try running: rpm -Va --nofiles --nodigest # yum deplist kamailio-sipcapture-daemon-config Loaded plugins: fastestmirror Loading mirror speeds from cached hostfile * base: mirror.optus.net * epel: mirror.optus.net * extras: mirror.intergrid.com.au * updates: mirror.intergrid.com.au package: kamailio-sipcapture-daemon-config.x86_64 5.2.1-1.el7.centos dependency: /bin/sh provider: bash.x86_64 4.2.46-31.el7 dependency: kamailio-sipcapture = 5.2.1 Unsatisfied dependency ```      * **Operating System**:  ``` # uname -a Linux voice-conn-kamailio-1 3.10.0-957.5.1.el7.x86_64 #1 SMP Fri Feb 1 14:54:57 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux # cat /etc/redhat-release CentOS Linux release 7.6.1810 (Core) ``` -- 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/1861

3 11

[kamailio/kamailio] utils/pdbt: Relax permissions when creating files (#2523)
by Kristian Høgh 21 Oct '20

21 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  pdbt created files with permissions 0700, it is changed to 0644 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2523 -- Commit Summary -- * utils/pdbt: Relax permissions when creating files -- File Changes -- M utils/pdbt/pdbt.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2523.patch https://github.com/kamailio/kamailio/pull/2523.diff -- 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/pull/2523

2 2

git:master:bb42ee28: utils/pdbt: Relax permissions when creating files
by Henning Westerholt 21 Oct '20

21 Oct '20

Module: kamailio Branch: master Commit: bb42ee28fc115e1e3373962c02162c9a8e6d41fc URL: https://github.com/kamailio/kamailio/commit/bb42ee28fc115e1e3373962c02162c9… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-21T15:05:09+02:00 utils/pdbt: Relax permissions when creating files --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/bb42ee28fc115e1e3373962c02162c9… Patch: https://github.com/kamailio/kamailio/commit/bb42ee28fc115e1e3373962c02162c9… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 6521985b2b..5a52cf8c7a 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -297,7 +297,7 @@ int dt_write_tree(const struct dt_node_t *root, const char* filename) char number[25]; number[0] = '\0'; - fd = creat(filename, S_IRWXU); + fd = creat(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1; @@ -370,7 +370,7 @@ int save_mmap(struct dt_node_t *root, char *filename) { int fd; int n; - fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRWXU); + fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1;

1 0

git:master:3a162187: rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef
by Daniel-Constantin Mierla 21 Oct '20

21 Oct '20

Module: kamailio Branch: master Commit: 3a162187580880fa7210bd376621f57576e9d209 URL: https://github.com/kamailio/kamailio/commit/3a162187580880fa7210bd376621f57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-21T08:29:21+02:00 rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/3a162187580880fa7210bd376621f57… Patch: https://github.com/kamailio/kamailio/commit/3a162187580880fa7210bd376621f57… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index b8c51bada2..841e74a340 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -23,7 +23,7 @@ extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; -ser_lock_t dialog_list_mutex; +gen_lock_t dialog_list_mutex; static void rms_action_free(rms_dialog_info_t *si) { diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index cd3a0109ce..c23cf0df6e 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -extern ser_lock_t dialog_list_mutex; +extern gen_lock_t dialog_list_mutex;

1 0

git:master:128ba4fe: rtp_media_server: declare variables in .c files
by Daniel-Constantin Mierla 21 Oct '20

21 Oct '20

Module: kamailio Branch: master Commit: 128ba4fe95f3c27474c9f839d34f8fb1fd75e064 URL: https://github.com/kamailio/kamailio/commit/128ba4fe95f3c27474c9f839d34f8fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-21T08:24:53+02:00 rtp_media_server: declare variables in .c files - extern in .h files, GH #2522 --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/128ba4fe95f3c27474c9f839d34f8fb… Patch: https://github.com/kamailio/kamailio/commit/128ba4fe95f3c27474c9f839d34f8fb… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index 24fe0bb0c0..b8c51bada2 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -19,9 +19,12 @@ */ #include "rtp_media_server.h" + extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; +ser_lock_t dialog_list_mutex; + static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 8f2b2592aa..99eca96484 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -36,6 +36,8 @@ static char *rms_answer_default_route = "rms:start"; int in_rms_process; rms_t *rms; +struct tm_binds tmb; + static rms_dialog_info_t *rms_dialog_create_leg(rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no); diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index bf22660b1b..cd3a0109ce 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -ser_lock_t dialog_list_mutex; +extern ser_lock_t dialog_list_mutex; @@ -51,7 +51,7 @@ typedef struct rms char *local_ip; } rms_t; -struct tm_binds tmb; +extern struct tm_binds tmb; #endif

1 0

[kamailio/kamailio] core: Document that a str can be zero-terminated (#2520)
by Alex Hermann 21 Oct '20

21 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2520 -- Commit Summary -- * core: Document that a str can be zero-terminated -- File Changes -- M src/core/str.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2520.patch https://github.com/kamailio/kamailio/pull/2520.diff -- 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/pull/2520

2 2

git:master:fcdfaf98: core: Document that a str can be zero-terminated
by Henning Westerholt 21 Oct '20

21 Oct '20

Module: kamailio Branch: master Commit: fcdfaf98acf8a66e84b9dccc767fb52c0cf0d460 URL: https://github.com/kamailio/kamailio/commit/fcdfaf98acf8a66e84b9dccc767fb52… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-21T07:40:24+02:00 core: Document that a str can be zero-terminated But by default it isn't. The functions shm_str_dup() and pkg_str_dup() will always create a zero-terminated copy --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/fcdfaf98acf8a66e84b9dccc767fb52… Patch: https://github.com/kamailio/kamailio/commit/fcdfaf98acf8a66e84b9dccc767fb52… --- diff --git a/src/core/str.h b/src/core/str.h index 01b12ecb62..58d7d627f6 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -40,13 +40,16 @@ * need to make a zero-terminated copy of it. * * @section drawbacks Drawbacks - * Note well that the fact that string stored - * using this data structure are not zero terminated makes them a little - * incovenient to use with many standard libc string functions, because these - * usually expect the input to be zero-terminated. In this case you have to - * either make a zero-terminated copy or inject the terminating zero behind - * the actuall string (if possible). Note that injecting a zero terminating - * characters is considered to be dangerous. + * Note well that the fact that a string stored + * using this data structure are not guaranteed to be zero terminated (by + * default they're not) makes them a little incovenient to use with many + * standard libc string functions, because these usually expect the input + * to be zero-terminated. + * In this case you have to either make a zero-terminated copy or inject the + * terminating zero behind the actuall string (if possible). Note that + * injecting a zero terminating characters is considered to be dangerous. + * The functions shm_str_dup() and pkg_str_dup() will always create a + * zero-terminated copy. */ /** @file

1 0

[kamailio/kamailio] core: Zero terminate str copies made with (pkg|shm)_str_dup() (#2519)
by Alex Hermann 20 Oct '20

20 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to PR #2512 #### Description  As discussed in #2512, zero-terminating all copies is preferred as most str usage is already with zero-terminated str.s. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2519 -- Commit Summary -- * core: Zero terminate str copies made with (pkg|shm)_str_dup() -- File Changes -- M src/core/ut.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2519.patch https://github.com/kamailio/kamailio/pull/2519.diff -- 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/pull/2519

3 6

git:master:d52f6017: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: d52f60173be34c5c1581c762444b5e26c57b097a URL: https://github.com/kamailio/kamailio/commit/d52f60173be34c5c1581c762444b5e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-20T14:01:14+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README --- Diff: https://github.com/kamailio/kamailio/commit/d52f60173be34c5c1581c762444b5e2… Patch: https://github.com/kamailio/kamailio/commit/d52f60173be34c5c1581c762444b5e2… --- diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index 9209bbcf43..c0ce6523f8 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -56,6 +56,7 @@ Julien Chavanton 6.1. mqueue.get_size 6.2. mqueue.fetch + 6.3. mqueue.get_sizes List of Examples @@ -67,6 +68,7 @@ Julien Chavanton 1.6. mq_size usage 1.7. mqueue.get_size usage 1.8. mqueue.fetch usage + 1.9. mqueue.get_sizes usage Chapter 1. Admin Guide @@ -95,6 +97,7 @@ Chapter 1. Admin Guide 6.1. mqueue.get_size 6.2. mqueue.fetch + 6.3. mqueue.get_sizes 1. Overview @@ -248,6 +251,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); 6.1. mqueue.get_size 6.2. mqueue.fetch + 6.3. mqueue.get_sizes 6.1. mqueue.get_size @@ -272,3 +276,14 @@ kamcmd mqueue.get_size xyz ... kamcmd mqueue.fetch xyz ... + +6.3. mqueue.get_sizes + + Get the size for all memory queues. + + Parameters: none + + Example 1.9. mqueue.get_sizes usage +... +kamcmd mqueue.get_sizes +...

1 0

[kamailio/kamailio] mqueue: RPC features (#2514)
by Alex Hermann 20 Oct '20

20 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - Add RPC to fetch all queue sizes at once (mqueue.sizes) - Proper HTTP response for client errors (4xx instead of 500) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2514 -- Commit Summary -- * mqueue: Use HTTP status codes for rpc * mqueue: Add rpc mqueue.sizes -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (18) M src/modules/mqueue/mqueue_api.c (3) M src/modules/mqueue/mqueue_api.h (1) M src/modules/mqueue/mqueue_mod.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2514.patch https://github.com/kamailio/kamailio/pull/2514.diff -- 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/pull/2514

2 2

git:master:e676498f: Merge pull request #2514 from gaaf/features/mqueue
by GitHub 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: e676498f4d0a46ae81e4e07e56ff64c97a075faf URL: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-20T13:52:13+02:00 Merge pull request #2514 from gaaf/features/mqueue mqueue: RPC features --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… Patch: https://github.com/kamailio/kamailio/commit/e676498f4d0a46ae81e4e07e56ff64c… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 5309098058..7d785ac90b 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -300,6 +300,24 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); ... &kamcmd; mqueue.fetch xyz ... +</programlisting> + </example> + </section> + + <section id="mqueue.r.get_sizes"> + <title>mqueue.get_sizes</title> + <para> + Get the size for all memory queues. + </para> + <para> + Parameters: none + </para> + <example> + <title><function>mqueue.get_sizes</function> usage</title> + <programlisting format="linespecific"> +... +&kamcmd; mqueue.get_sizes +... </programlisting> </example> </section> diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 93204bba3c..4dd61c3e72 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -173,6 +173,9 @@ mq_head_t *mq_head_get(str *name) mq_head_t *mh = NULL; mh = _mq_head_list; + if (!name) { + return mh; + } while(mh!=NULL) { if(name->len == mh->name.len diff --git a/src/modules/mqueue/mqueue_api.h b/src/modules/mqueue/mqueue_api.h index 843a7d7967..d60dfdf29a 100644 --- a/src/modules/mqueue/mqueue_api.h +++ b/src/modules/mqueue/mqueue_api.h @@ -77,6 +77,7 @@ int mq_head_add(str *name, int msize); int mq_head_fetch(str *name); void mq_pv_free(str *name); int mq_item_add(str *qname, str *key, str *val); +mq_head_t *mq_head_get(str *name); int _mq_get_csize(str *); int mq_set_dbmode(str *, int dbmode); diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 860014cca9..325c84b472 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -294,13 +294,13 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) int mqueue_sz = 0; if (rpc->scan(ctx, "S", &mqueue_name) < 1) { - rpc->fault(ctx, 500, "No queue name"); + rpc->fault(ctx, 400, "No queue name"); return; } if(mqueue_name.len <= 0 || mqueue_name.s == NULL) { LM_ERR("bad mqueue name\n"); - rpc->fault(ctx, 500, "Invalid queue name"); + rpc->fault(ctx, 400, "Invalid queue name"); return; } @@ -308,7 +308,7 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) if(mqueue_sz < 0) { LM_ERR("no such mqueue\n"); - rpc->fault(ctx, 500, "No such queue"); + rpc->fault(ctx, 404, "No such queue"); return; } @@ -327,6 +327,34 @@ static const char* mqueue_rpc_get_size_doc[2] = { 0 }; +static void mqueue_rpc_get_sizes(rpc_t* rpc, void* ctx) +{ + mq_head_t* mh = mq_head_get(NULL); + void* vh; + int size; + + while(mh!=NULL) + { + if (rpc->add(ctx, "{", &vh) < 0) { + rpc->fault(ctx, 500, "Server error"); + return; + } + lock_get(&mh->lock); + size = mh->csize; + lock_release(&mh->lock); + rpc->struct_add(vh, "Sd", + "name", &mh->name, + "size", size + ); + mh = mh->next; + } +} + +static const char* mqueue_rpc_get_sizes_doc[2] = { + "Get sizes of all mqueues.", + 0 +}; + static void mqueue_rpc_fetch(rpc_t* rpc, void* ctx) { str mqueue_name; @@ -392,6 +420,7 @@ static const char* mqueue_rpc_fetch_doc[2] = { rpc_export_t mqueue_rpc[] = { {"mqueue.get_size", mqueue_rpc_get_size, mqueue_rpc_get_size_doc, 0}, + {"mqueue.get_sizes", mqueue_rpc_get_sizes, mqueue_rpc_get_sizes_doc, RET_ARRAY}, {"mqueue.fetch", mqueue_rpc_fetch, mqueue_rpc_fetch_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:d8bd9825: mqueue: Add rpc mqueue.sizes
by Alex Hermann 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: d8bd9825fa401ad0a3489d246f29d05485b72831 URL: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:29:40+02:00 mqueue: Add rpc mqueue.sizes Return sizes for all queues --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… Patch: https://github.com/kamailio/kamailio/commit/d8bd9825fa401ad0a3489d246f29d05… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 5309098058..7d785ac90b 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -300,6 +300,24 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); ... &kamcmd; mqueue.fetch xyz ... +</programlisting> + </example> + </section> + + <section id="mqueue.r.get_sizes"> + <title>mqueue.get_sizes</title> + <para> + Get the size for all memory queues. + </para> + <para> + Parameters: none + </para> + <example> + <title><function>mqueue.get_sizes</function> usage</title> + <programlisting format="linespecific"> +... +&kamcmd; mqueue.get_sizes +... </programlisting> </example> </section> diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 93204bba3c..4dd61c3e72 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -173,6 +173,9 @@ mq_head_t *mq_head_get(str *name) mq_head_t *mh = NULL; mh = _mq_head_list; + if (!name) { + return mh; + } while(mh!=NULL) { if(name->len == mh->name.len diff --git a/src/modules/mqueue/mqueue_api.h b/src/modules/mqueue/mqueue_api.h index 843a7d7967..d60dfdf29a 100644 --- a/src/modules/mqueue/mqueue_api.h +++ b/src/modules/mqueue/mqueue_api.h @@ -77,6 +77,7 @@ int mq_head_add(str *name, int msize); int mq_head_fetch(str *name); void mq_pv_free(str *name); int mq_item_add(str *qname, str *key, str *val); +mq_head_t *mq_head_get(str *name); int _mq_get_csize(str *); int mq_set_dbmode(str *, int dbmode); diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index e3b984484e..325c84b472 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -327,6 +327,34 @@ static const char* mqueue_rpc_get_size_doc[2] = { 0 }; +static void mqueue_rpc_get_sizes(rpc_t* rpc, void* ctx) +{ + mq_head_t* mh = mq_head_get(NULL); + void* vh; + int size; + + while(mh!=NULL) + { + if (rpc->add(ctx, "{", &vh) < 0) { + rpc->fault(ctx, 500, "Server error"); + return; + } + lock_get(&mh->lock); + size = mh->csize; + lock_release(&mh->lock); + rpc->struct_add(vh, "Sd", + "name", &mh->name, + "size", size + ); + mh = mh->next; + } +} + +static const char* mqueue_rpc_get_sizes_doc[2] = { + "Get sizes of all mqueues.", + 0 +}; + static void mqueue_rpc_fetch(rpc_t* rpc, void* ctx) { str mqueue_name; @@ -392,6 +420,7 @@ static const char* mqueue_rpc_fetch_doc[2] = { rpc_export_t mqueue_rpc[] = { {"mqueue.get_size", mqueue_rpc_get_size, mqueue_rpc_get_size_doc, 0}, + {"mqueue.get_sizes", mqueue_rpc_get_sizes, mqueue_rpc_get_sizes_doc, RET_ARRAY}, {"mqueue.fetch", mqueue_rpc_fetch, mqueue_rpc_fetch_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:943f548d: mqueue: Use HTTP status codes for rpc
by Alex Hermann 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 943f548dc391dc0921ccb1cdc336f2fdfa4f3e0d URL: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-19T15:29:40+02:00 mqueue: Use HTTP status codes for rpc --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… Patch: https://github.com/kamailio/kamailio/commit/943f548dc391dc0921ccb1cdc336f2f… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 860014cca9..e3b984484e 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -294,13 +294,13 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) int mqueue_sz = 0; if (rpc->scan(ctx, "S", &mqueue_name) < 1) { - rpc->fault(ctx, 500, "No queue name"); + rpc->fault(ctx, 400, "No queue name"); return; } if(mqueue_name.len <= 0 || mqueue_name.s == NULL) { LM_ERR("bad mqueue name\n"); - rpc->fault(ctx, 500, "Invalid queue name"); + rpc->fault(ctx, 400, "Invalid queue name"); return; } @@ -308,7 +308,7 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) if(mqueue_sz < 0) { LM_ERR("no such mqueue\n"); - rpc->fault(ctx, 500, "No such queue"); + rpc->fault(ctx, 404, "No such queue"); return; }

1 0

git:master:305f884e: Merge pull request #2519 from gaaf/features/core-str-copy
by GitHub 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 305f884e0981b64eed9a96410d131d8f9a69eb3d URL: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-20T13:50:35+02:00 Merge pull request #2519 from gaaf/features/core-str-copy core: Zero terminate str copies made with (pkg|shm)_str_dup() --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… Patch: https://github.com/kamailio/kamailio/commit/305f884e0981b64eed9a96410d131d8… --- diff --git a/src/core/ut.h b/src/core/ut.h index 6ef2e079bc..5fcb245cd8 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

1 0

git:master:0ea69b16: core: Zero terminate str copies made with (pkg|shm)_str_dup()
by Alex Hermann 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 0ea69b16db298842f58a6fcaaab2c0ee1a137b94 URL: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2020-10-20T10:21:00+02:00 core: Zero terminate str copies made with (pkg|shm)_str_dup() As discussed in #2512, zero-terminating all copies is preferred as most str usage is already with zero-terminated str.s. --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… Patch: https://github.com/kamailio/kamailio/commit/0ea69b16db298842f58a6fcaaab2c0e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 6ef2e079bc..5fcb245cd8 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

1 0

git:master:449f9faf: tls: typedef'ed several structs, enums and unions
by Daniel-Constantin Mierla 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 449f9faf54238bcf1d6c1bf1b42738e79aad9bfd URL: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-20T12:40:06+02:00 tls: typedef'ed several structs, enums and unions --- Modified: src/modules/tls/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… Patch: https://github.com/kamailio/kamailio/commit/449f9faf54238bcf1d6c1bf1b42738e… --- diff --git a/src/modules/tls/tls_server.h b/src/modules/tls/tls_server.h index fb86bc277e..51ba176b46 100644 --- a/src/modules/tls/tls_server.h +++ b/src/modules/tls/tls_server.h @@ -34,25 +34,25 @@ #include "tls_domain.h" #include "tls_ct_wrq.h" -enum tls_conn_states { +typedef enum tls_conn_states { S_TLS_NONE = 0, S_TLS_ACCEPTING, S_TLS_CONNECTING, S_TLS_ESTABLISHED - }; + } tls_conn_states_t; -struct tls_rd_buf { +typedef struct tls_rd_buf { unsigned int pos; /* current position */ unsigned int size; /* total size (buf) */ unsigned char buf[1]; -}; +} tls_rd_buf_t; /* tls conn flags */ #define F_TLS_CON_WR_WANTS_RD 1 /* write wants read */ #define F_TLS_CON_HANDSHAKED 2 /* connection is handshaked */ #define F_TLS_CON_RENEGOTIATION 4 /* renegotiation by clinet */ -struct tls_extra_data { +typedef struct tls_extra_data { tls_domains_cfg_t* cfg; /* Configuration used for this connection */ SSL* ssl; /* SSL context used for the connection */ BIO* rwbio; /* bio used for read/write @@ -62,7 +62,7 @@ struct tls_extra_data { struct tls_rd_buf* enc_rd_buf; unsigned int flags; enum tls_conn_states state; -}; +} tls_extra_data_t; /* return true if write wants read */

1 0

git:master:44a21a8d: core: typedef'ed several structs, enums and unions
by Daniel-Constantin Mierla 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 44a21a8dc021e8ee5bbd27b2714e3da89694dec9 URL: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-20T12:36:55+02:00 core: typedef'ed several structs, enums and unions --- Modified: src/core/ip_addr.h Modified: src/core/tcp_conn.h Modified: src/core/tls_hooks.h --- Diff: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da… Patch: https://github.com/kamailio/kamailio/commit/44a21a8dc021e8ee5bbd27b2714e3da…

1 0

[kamailio/kamailio] Fixes/flags (#2511)
by Alex Hermann 20 Oct '20

20 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) - [x] Cleanup #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Redefine some flags as enum instead of separate define. This makes it easier to see what flags are accepted by functions and with the right compiler flags, the compiler will warn when the wrong flags are used. No functional changes are intended. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2511 -- Commit Summary -- * core/tcp: Convert RD_CONN_ flags to enum * core/ip_addr: Reformat and redefine si_flags as bitshifts * core/ip_addr: Convert SND_F_ flags to enum * core/tcp: Convert F_TCP_REQ_ flags to enum -- File Changes -- M src/core/ip_addr.h (18) M src/core/tcp_conn.h (43) M src/core/tcp_read.c (14) M src/core/tcp_read.h (14) M src/core/tls_hooks.h (3) M src/modules/tls/tls_server.c (2) M src/modules/tls/tls_server.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2511.patch https://github.com/kamailio/kamailio/pull/2511.diff -- 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/pull/2511

3 4

git:master:ecb9fada: core/tcp: Convert F_TCP_REQ_ flags to enum
by Henning Westerholt 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: ecb9fada5b7a07707ae64233948f94be2bca1e8c URL: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/tcp: Convert F_TCP_REQ_ flags to enum Easier to recognize the correct flags in the forest of flags. --- Modified: src/core/tcp_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… Patch: https://github.com/kamailio/kamailio/commit/ecb9fada5b7a07707ae64233948f94b… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index d9a69b6929..ded595fdcd 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -121,6 +121,27 @@ enum conn_cmds { /* CONN_RELEASE, EOF, ERROR, DESTROY can be used by "reader" processes * CONN_GET_FD, CONN_NEW*, CONN_QUEUED_WRITE only by writers */ +/* tcp_req flags */ +enum tcp_req_flags { + F_TCP_REQ_HAS_CLEN = (1<<0), + F_TCP_REQ_COMPLETE = (1<<1), +#ifdef READ_HTTP11 + F_TCP_REQ_BCHUNKED = (1<<2), +#endif +#ifdef READ_MSRP + F_TCP_REQ_MSRP_NO = (1<<3), + F_TCP_REQ_MSRP_FRAME = (1<<4), + F_TCP_REQ_MSRP_BODY = (1<<5), +#endif + F_TCP_REQ_HEP3 = (1<<6), +}; + +#define TCP_REQ_HAS_CLEN(tr) ((tr)->flags & F_TCP_REQ_HAS_CLEN) +#define TCP_REQ_COMPLETE(tr) ((tr)->flags & F_TCP_REQ_COMPLETE) +#ifdef READ_HTTP11 +#define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) +#endif + struct tcp_req{ struct tcp_req* next; /* sockaddr ? */ @@ -135,32 +156,12 @@ struct tcp_req{ #ifdef READ_HTTP11 int chunk_size; #endif - unsigned int flags; /* F_TCP_REQ_HAS_CLEN | F_TCP_REQ_COMPLETE */ + enum tcp_req_flags flags; /* F_TCP_REQ_HAS_CLEN | F_TCP_REQ_COMPLETE */ int bytes_to_go; /* how many bytes we have still to read from the body*/ enum tcp_req_errors error; enum tcp_req_states state; }; -/* tcp_req flags */ -#define F_TCP_REQ_HAS_CLEN 1 -#define F_TCP_REQ_COMPLETE 2 -#ifdef READ_HTTP11 -#define F_TCP_REQ_BCHUNKED 4 -#endif -#ifdef READ_MSRP -#define F_TCP_REQ_MSRP_NO 8 -#define F_TCP_REQ_MSRP_FRAME 16 -#define F_TCP_REQ_MSRP_BODY 32 -#endif -#define F_TCP_REQ_HEP3 64 - -#define TCP_REQ_HAS_CLEN(tr) ((tr)->flags & F_TCP_REQ_HAS_CLEN) -#define TCP_REQ_COMPLETE(tr) ((tr)->flags & F_TCP_REQ_COMPLETE) -#ifdef READ_HTTP11 -#define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) -#endif - - struct tcp_connection; /* tcp port alias structure */

1 0

git:master:b2aa704d: core/ip_addr: Reformat and redefine si_flags as bitshifts
by Henning Westerholt 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: b2aa704dab80d1683e34346ce2354b74dd306aff URL: https://github.com/kamailio/kamailio/commit/b2aa704dab80d1683e34346ce2354b7… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/ip_addr: Reformat and redefine si_flags as bitshifts Make it a bit easier to read --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/b2aa704dab80d1683e34346ce2354b7… Patch: https://github.com/kamailio/kamailio/commit/b2aa704dab80d1683e34346ce2354b7… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 2b67c214ec..b366586ca9 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -77,8 +77,14 @@ union sockaddr_union{ }; -enum si_flags { SI_NONE=0, SI_IS_IP=1, SI_IS_LO=2, SI_IS_MCAST=4, - SI_IS_ANY=8, SI_IS_MHOMED=16 }; +enum si_flags { + SI_NONE = 0, + SI_IS_IP = (1<<0), + SI_IS_LO = (1<<1), + SI_IS_MCAST = (1<<2), + SI_IS_ANY = (1<<3), + SI_IS_MHOMED = (1<<4), +}; typedef struct addr_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */

1 0

git:master:d09098cc: core/ip_addr: Convert SND_F_ flags to enum
by Henning Westerholt 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: d09098cc9cb3cd0059f8e4fbff6e33eae5b9c28a URL: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/ip_addr: Convert SND_F_ flags to enum Easier to recognize the correct flags in the forest of flags. --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… Patch: https://github.com/kamailio/kamailio/commit/d09098cc9cb3cd0059f8e4fbff6e33e… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index b366586ca9..8e712cc307 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -134,9 +134,11 @@ typedef struct socket_info { /* send flags */ -#define SND_F_FORCE_CON_REUSE 1 /* reuse an existing connection or fail */ -#define SND_F_CON_CLOSE 2 /* close the connection after sending */ -#define SND_F_FORCE_SOCKET 4 /* send socket in dst is forced */ +enum send_flags { + SND_F_FORCE_CON_REUSE = (1 << 0), /* reuse an existing connection or fail */ + SND_F_CON_CLOSE = (1 << 1), /* close the connection after sending */ + SND_F_FORCE_SOCKET = (1 << 2), /* send socket in dst is forced */ +}; typedef struct snd_flags { unsigned short f; /* snd flags */

1 0

git:master:5b5c5d8f: core/tcp: Convert RD_CONN_ flags to enum
by Henning Westerholt 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 5b5c5d8f190fa989bb3c25d2ba06e10e38a03893 URL: https://github.com/kamailio/kamailio/commit/5b5c5d8f190fa989bb3c25d2ba06e10… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-20T12:17:10+02:00 core/tcp: Convert RD_CONN_ flags to enum Easier to recognize the correct flags in the forest of flags. --- Modified: src/core/tcp_read.c Modified: src/core/tcp_read.h Modified: src/core/tls_hooks.h Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5b5c5d8f190fa989bb3c25d2ba06e10… Patch: https://github.com/kamailio/kamailio/commit/5b5c5d8f190fa989bb3c25d2ba06e10…

1 0

git:master:658cb496: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: 658cb4965ba108079116eb60c350d39b18f7e912 URL: https://github.com/kamailio/kamailio/commit/658cb4965ba108079116eb60c350d39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-20T10:16:27+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/658cb4965ba108079116eb60c350d39… Patch: https://github.com/kamailio/kamailio/commit/658cb4965ba108079116eb60c350d39… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 2f89366997..3298f6f41d 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -979,8 +979,9 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are - currently in the location database. On an error, an error message will - be sent with a short description in reason phrase. + currently in the location database. As a side effect, also branch flags + are stored in usrloc. On an error, an error message will be sent with a + short description in reason phrase. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used @@ -1028,7 +1029,8 @@ save("location", "0x00", "sip:test@kamailio.org"); no such contacts, -1 will be returned. If there are such contacts, Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message - (depending on append_branches parameter value). + (depending on append_branches parameter value). As a side effect, also + branch flags are restored from usrloc. If the method_filtering option is enabled and request is initial request without to-tag, the lookup function will return only the

1 0

git:master:f2996bf7: registrar: added note about branch flags in save()/lookup() doc
by Juha Heinanen 20 Oct '20

20 Oct '20

Module: kamailio Branch: master Commit: f2996bf733a0b5e00fe124440353b9a69a3532a2 URL: https://github.com/kamailio/kamailio/commit/f2996bf733a0b5e00fe124440353b9a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2020-10-20T11:04:58+03:00 registrar: added note about branch flags in save()/lookup() doc --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2996bf733a0b5e00fe124440353b9a… Patch: https://github.com/kamailio/kamailio/commit/f2996bf733a0b5e00fe124440353b9a… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 4fb1e8a5e8..94ce4b3a0b 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1180,7 +1180,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in - the location database. On an error, an error message will be sent with a short + the location database. As a side effect, also branch flags are + stored in usrloc. On an error, an error message will be sent with a short description in reason phrase. </para> <para>Meaning of the parameters is as follows:</para> @@ -1281,6 +1282,7 @@ save("location", "0x00", "sip:test@kamailio.org"); Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message (depending on append_branches parameter value). + As a side effect, also branch flags are restored from usrloc. </para> <para> If the <varname>method_filtering</varname> option is enabled and

1 0

[kamailio/kamailio] core: Remove redundant check from (shm|pkg)_str_dup() (#2518)
by Alex Hermann 20 Oct '20

20 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Check for src->s is also done before the memory allocation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2518 -- Commit Summary -- * core: Remove redundant check from (shm|pkg)_str_dup() -- File Changes -- M src/core/ut.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2518.patch https://github.com/kamailio/kamailio/pull/2518.diff -- 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/pull/2518

1 1

[kamailio/kamailio] alias_db_lookup is returning `-1` if result is not found. Documentation implies it should return false. (#2517)
by Ben Kaufman 19 Oct '20

19 Oct '20

### Description alias_db_lookup is returning `-1` if result is not found. The documentation says "The function returns TRUE if R-URI is alias and it was replaced by user's SIP uri." The implication is that it should return FALSE if that is not the case. Sample code: ``` $vn(init_ruri) = $ru; $vn(alias_found) = alias_db_lookup("DbAliases"); xlogl("L_NOTIFY", "$$vn(alias_found) is [$vn(alias_found)]\n"); if ( !$vn(alias_found) ) { xlogl("L_NOTIFY", "No alias found for [$vn(init_ruri)]\n"); return; } xlogl("L_NOTIFY", "Found alias [$ru] for [$vn(init_ruri)]\n"); ``` The value for $vn(alias_found) is -1 if there is no alias, and thus the condition never occurs. "Found alias" line always occurs, even if there is no record in the DB. I think this should probably be considered a documentation issue, but I'm not sure what the other possible values are for return and their meanings. Maybe there's a different value if an alias is found but not updated, etc? ### Troubleshooting Example above #### Reproduction Example above. #### Debugging Data Not applicable #### Log Messages N/A #### SIP Traffic N/A ### Possible Solutions Probably best to update documentation. The statement, "The function returns TRUE if R-URI is alias and it was replaced by user's SIP uri." implies that if that does not happen, then the return would be FALSE. ### Additional Information `5.4.1` * **Operating System**: Debian 10 -- 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/2517

3 6

info: changes to ip addr code
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Hello, to highlight it better, I am sending a short announcement to sr-dev to inform about changes done to ip_addr.{c,h} earlier today. First is about the use of inet_ntop() for converting IPv6 address to string representation, which does it conforming to rfc5952, this is happening when global parameter ipv6_hex_style="c" (this being the default now). According to manual page, inet_ntop() is conforming with POSIX 2001 and already used in core socket_info.c as well as a few modules such as rtpengine, thus I expect no problems with it, likely no older compilers will be used with kamailio. The benefit is the use a standard compliant function and output. Second: becaise ip_addr.h had a lot of static inline functions, several of them being quite consistent in size, I relocated many implementations to ip_addr.c, removing the static inline declarators. As I read on the net, the benefit of inline for performances can be invalidated if it is abused, because it can make CPU instructions cache less efficient. Moreover, because of their size, some of them were likely not inlined. Moreover, functions calling inside other functions seems not to be inlined, therefore I tried to relocate those that have a chain of functions executed inside. Overall, the performance gain of inline is really minimal, even when inlining is applied by compiler. The effect of the second change is that many static buffers used by the former static-inline functions are declared only once. It was well known that they used static buffer and the result was cloned after use of the functions, so it should be no regression introduced. Anyhow, if someone observes problems with ip addresses in master branch, just open a bug and it will be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 1

[kamailio/kamailio] rfc5952#section-4.2.1 conformance (#2510)
by sergey-safarov 19 Oct '20

19 Oct '20

### Description According [rfc5952#section-4.2.1](https://tools.ietf.org/html/rfc5952#section-4.2.1) > **4.2.1. Shorten as Much as Possible** The use of the symbol "::" MUST be used to its maximum capability. For example, 2001:db8:0:0:0:0:2:1 must be shortened to 2001:db8::2:1. The current Kamailio master does not use `::` inside IPv6 address representation. Example ``` INVITE user(a)example.com SIP/2.0 Record-Route: <sip:[2600:1f1c:6d5:aa02:0:0:0:4];transport=tcp;r2=on;lr=on;ftag=gK0c013f75> Record-Route: <sip:3.101.84.4;r2=on;lr=on;ftag=gK0c013f75> Via: SIP/2.0/TCP [2600:1f1c:6d5:aa02:0:0:0:4];branch=z9hG4bK66f8.35b78246c71e1583d2785ae652c42ed5.0 ``` ### Possible Solutions Port feature from another IPv6 address formatting functions with RFC5952 support. Example: function [`x_IPv6ToString`](https://www.ncbi.nlm.nih.gov/IEB/ToolBox/CPP_DOC/doxyhtml/ncbi__ipv6_8c_source.html), string 404 - 440. -- 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/2510

2 2

git:master:3d4f5fca: core: kemi - proper conditions for operators in sr_kemi_hdr_match_content()
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: 3d4f5fcafd4ecdee2ccdd0a81fe855dd8cea8549 URL: https://github.com/kamailio/kamailio/commit/3d4f5fcafd4ecdee2ccdd0a81fe855d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T12:59:15+02:00 core: kemi - proper conditions for operators in sr_kemi_hdr_match_content() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3d4f5fcafd4ecdee2ccdd0a81fe855d… Patch: https://github.com/kamailio/kamailio/commit/3d4f5fcafd4ecdee2ccdd0a81fe855d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 1072846290..b69499dfb5 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2441,13 +2441,13 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, if(op->len == 2) { if(strncasecmp(op->s, "eq", 2) == 0) { opval = 1; - } if(strncasecmp(op->s, "ne", 2) == 0) { + } else if(strncasecmp(op->s, "ne", 2) == 0) { opval = 2; - } if(strncasecmp(op->s, "sw", 2) == 0) { + } else if(strncasecmp(op->s, "sw", 2) == 0) { opval = 3; - } if(strncasecmp(op->s, "in", 2) == 0) { + } else if(strncasecmp(op->s, "in", 2) == 0) { opval = 4; - } if(strncasecmp(op->s, "re", 2) == 0) { + } else if(strncasecmp(op->s, "re", 2) == 0) { opval = 5; LM_ERR("operator not implemented: %.*s\n", op->len, op->s); return SR_KEMI_FALSE; @@ -2468,7 +2468,7 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, } else if(hidx->s[0]=='l' || hidx->s[0]=='L') { /* last */ hidxval = 2; - } else if(hidx->s[0]=='a' || hidx->s[0]=='a') { + } else if(hidx->s[0]=='a' || hidx->s[0]=='A') { /* all */ hidxval = 3; } else if(hidx->s[0]=='o' || hidx->s[0]=='O') {

1 0

git:master:2d1b442f: core: relocation and refactoring on ip addr handling code
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: 2d1b442fd8602003a794ebbdcf7f21a211b6b356 URL: https://github.com/kamailio/kamailio/commit/2d1b442fd8602003a794ebbdcf7f21a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T12:46:51+02:00 core: relocation and refactoring on ip addr handling code - many static inline functions moved from ip_addr.h to ip_addr.c, code size for some of them increased over the time - ipv6_hex_style can be set to "c" to have IPv6 addresses compacted and using lowercase hexdigits (rfc5952#section-4.2.1), GH #2510 - when ipv6_hex_style="c", ip6tosbuf() uses POSIX inet_ntop(), conforming with POSIX.1-2001, POSIX.1-2008 --- Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/2d1b442fd8602003a794ebbdcf7f21a… Patch: https://github.com/kamailio/kamailio/commit/2d1b442fd8602003a794ebbdcf7f21a…

1 0

git:master:d1947cd8: core: ipv6 hex digit style set to lowercase compacted format
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: d1947cd86a04b6bbdbc08fb3d8db086f347a6de7 URL: https://github.com/kamailio/kamailio/commit/d1947cd86a04b6bbdbc08fb3d8db086… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T12:46:51+02:00 core: ipv6 hex digit style set to lowercase compacted format - ipv6_hex_style set to "c" - be more conformant with rfc5952 --- Modified: src/core/ip_addr.c --- Diff: https://github.com/kamailio/kamailio/commit/d1947cd86a04b6bbdbc08fb3d8db086… Patch: https://github.com/kamailio/kamailio/commit/d1947cd86a04b6bbdbc08fb3d8db086… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 50c8d07c0b..cb07a3e60d 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -37,7 +37,13 @@ #include "resolve.h" #include "trim.h" -str ksr_ipv6_hex_style = str_init("A"); +/** + * ipv6 style for string representation + * - A: uppercase expanded format + * - a: lowercase expanded format + * - c: lowercase compacted format + */ +str ksr_ipv6_hex_style = str_init("c"); /* inits a struct sockaddr_union from a struct hostent, an address index in

1 0

git:master:0085e7a7: pkg/kamailio/deb: version set 5.5.0~dev3
by Victor Seva 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: 0085e7a7d88fb6deca24a34b4a5a80bb8756dfd3 URL: https://github.com/kamailio/kamailio/commit/0085e7a7d88fb6deca24a34b4a5a80b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-10-19T11:13:47+02:00 pkg/kamailio/deb: version set 5.5.0~dev3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0085e7a7d88fb6deca24a34b4a5a80b… Patch: https://github.com/kamailio/kamailio/commit/0085e7a7d88fb6deca24a34b4a5a80b…

1 0

[kamailio/kamailio] permissions: exported allow_trusted() to kemi (#2509)
by Arsen Semenov 19 Oct '20

19 Oct '20

#### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally #### Description permissions allow_trusted function is exported to kemi. function doesn't not accept any parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2509 -- Commit Summary -- * permissions: exported allow_trusted() to kemi -- File Changes -- M src/modules/permissions/permissions.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2509.patch https://github.com/kamailio/kamailio/pull/2509.diff -- 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/pull/2509

2 5

git:master:843b22b4: permissions: exported allow_trusted() to kemi
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: 843b22b4efb0d343f13230d6e90d2484f370dbdb URL: https://github.com/kamailio/kamailio/commit/843b22b4efb0d343f13230d6e90d248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T11:01:12+02:00 permissions: exported allow_trusted() to kemi - related to #2509 --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/843b22b4efb0d343f13230d6e90d248… Patch: https://github.com/kamailio/kamailio/commit/843b22b4efb0d343f13230d6e90d248… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 18cf398f8f..be22963d81 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1058,6 +1058,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_trusted"), + SR_KEMIP_INT, ki_allow_trusted, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index eed1041581..2f9c7d42a4 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -507,7 +507,7 @@ int allow_trusted(struct sip_msg* msg, char *src_ip, int proto, char *from_uri) * Checks based on request's source address, protocol, and From URI * if request can be trusted without authentication. */ -int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +int ki_allow_trusted(sip_msg_t* _msg) { str furi; char furi_string[MAX_URI_SIZE+1]; @@ -530,6 +530,15 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) furi_string); } +/* + * Checks based on request's source address, protocol, and From URI + * if request can be trusted without authentication. + */ +int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +{ + return ki_allow_trusted(_msg); +} + /* * Checks based on source address and protocol given in pvar arguments and * provided uri, if request can be trusted without authentication. diff --git a/src/modules/permissions/trusted.h b/src/modules/permissions/trusted.h index 8a8ab2cc11..72da2d70e7 100644 --- a/src/modules/permissions/trusted.h +++ b/src/modules/permissions/trusted.h @@ -55,6 +55,10 @@ int reload_trusted_table(void); */ void clean_trusted(void); +/* + * Check if request comes from trusted ip address with matching from URI + */ +int ki_allow_trusted(sip_msg_t* _msg); /* * Check if request comes from trusted ip address with matching from URI

1 0

git:master:23818fb3: pipelimit: use unsigned to compute size and for iterator
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: 23818fb34d09a487654ea89c9f29b880c0c75197 URL: https://github.com/kamailio/kamailio/commit/23818fb34d09a487654ea89c9f29b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T10:09:59+02:00 pipelimit: use unsigned to compute size and for iterator --- Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/23818fb34d09a487654ea89c9f29b88… Patch: https://github.com/kamailio/kamailio/commit/23818fb34d09a487654ea89c9f29b88… --- diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index e1afa2ffb8..0c6c52d389 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -137,10 +137,12 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family struct socket_info *si; struct socket_info** list; - int num_ip_octets = family == AF_INET ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; - int numberOfSockets = 0; + unsigned int num_ip_octets = 0; + unsigned int numberOfSockets = 0; int currentRow = 0; + num_ip_octets = (family == AF_INET) ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; + /* I hate to use #ifdefs, but this is necessary because of the way * get_sock_info_list() is defined. */ #ifndef USE_TCP @@ -198,7 +200,7 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family /* Extract out the IP Addresses and ports. */ for(si=list?*list:0; si; si=si->next){ - int i; + unsigned int i; /* We currently only support IPV4. */ if (si->address.af != family) {

1 0

git:master:b385a0d8: Makefile.defs: version set to 5.5.0-dev3
by Daniel-Constantin Mierla 19 Oct '20

19 Oct '20

Module: kamailio Branch: master Commit: b385a0d8461f6f5203e6dc4052ebd4409e21b4b0 URL: https://github.com/kamailio/kamailio/commit/b385a0d8461f6f5203e6dc4052ebd44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-19T09:58:25+02:00 Makefile.defs: version set to 5.5.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b385a0d8461f6f5203e6dc4052ebd44… Patch: https://github.com/kamailio/kamailio/commit/b385a0d8461f6f5203e6dc4052ebd44… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e5dbbba525..dabf05e0bc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] permissions: export allow_trusted() to kemi (#2506)
by Arsen Semenov 16 Oct '20

16 Oct '20

#### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally #### Description permissions allow_trusted function is exported to kemi. function doesn't not accept any parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2506 -- Commit Summary -- * nathelper: fix_nated_sdp added support for a=rtcp param RFC3605 * Merge branch 'master' of https://github.com/kamailio/kamailio * nathelper: docs - updated notes for fix_nated_sdp. few typos fixed [skip ci] * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge branch 'master' of https://github.com/kamailio/kamailio * permissions: exported allow_trusted() to kemi -- File Changes -- M src/modules/permissions/permissions.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2506.patch https://github.com/kamailio/kamailio/pull/2506.diff -- 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/pull/2506

2 2

[kamailio/kamailio] nsq: remove unused defs.h file (#2508)
by Emmanuel Schmidbauer 16 Oct '20

16 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description removes `defs.h` which is an artifact from module's former behavior You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2508 -- Commit Summary -- * nsq: remove unused defs.h file -- File Changes -- D src/modules/nsq/defs.h (130) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2508.patch https://github.com/kamailio/kamailio/pull/2508.diff -- 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/pull/2508

2 2

git:master:79db2757: nsq: remove unused defs.h file
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: 79db27575a48c5451b547ece68b5849456e245f9 URL: https://github.com/kamailio/kamailio/commit/79db27575a48c5451b547ece68b5849… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T15:25:08+02:00 nsq: remove unused defs.h file --- Removed: src/modules/nsq/defs.h --- Diff: https://github.com/kamailio/kamailio/commit/79db27575a48c5451b547ece68b5849… Patch: https://github.com/kamailio/kamailio/commit/79db27575a48c5451b547ece68b5849…

1 0

git:5.3:c0d6a041: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.3 Commit: c0d6a0412828fa6cb054a0a38b054b88b7176f79 URL: https://github.com/kamailio/kamailio/commit/c0d6a0412828fa6cb054a0a38b054b8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-16T14:16:59+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c0d6a0412828fa6cb054a0a38b054b8… Patch: https://github.com/kamailio/kamailio/commit/c0d6a0412828fa6cb054a0a38b054b8… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 97b373eff3..ade396802f 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -521,12 +521,12 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; * flags - the value may be a bitwise OR of the following flags: + 0x01 - adds “a=direction:active” SDP line; + 0x02 - rewrite media IP address (c=) with source address of - the message or the provided IP address. (a=rtpc) param will be + the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). + 0x04 - adds “a=nortpproxy:yes” SDP line; + 0x08 - rewrite IP from origin description (o=) with source - address of the message or the provided IP address. (a=rtpc) + address of the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). * ip_address - IP to be used for rewriting SDP. If not specified, the diff --git a/src/modules/uac/README b/src/modules/uac/README index a65774af85..7e21cccbb7 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -86,6 +86,7 @@ Ramona-Elena Modroiu 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -135,7 +136,8 @@ Ramona-Elena Modroiu 1.42. uac.reg_refresh usage 1.43. uac.reg_active usage 1.44. uac.reg_add usage - 1.45. lookup remote registrations usage + 1.45. uac.reg_remove usage + 1.46. lookup remote registrations usage Chapter 1. Admin Guide @@ -204,6 +206,7 @@ Chapter 1. Admin Guide 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -958,6 +961,7 @@ event_route[uac:reply] { 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 8.1. uac.reg_dump @@ -1082,6 +1086,15 @@ event_route[uac:reply] { kamcmd uac.reg_add ... ... +8.9. uac.reg_remove + + Remove a UAC remote registration record by l_uuid. + + Example 1.45. uac.reg_remove usage +... + kamcmd uac.reg_remove my_l_uuid +... + 9. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -1128,7 +1141,7 @@ event_route[uac:reply] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.45. lookup remote registrations usage + Example 1.46. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n");

1 0

git:5.4:d43872c1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.4 Commit: d43872c11edacf972c2ae72c746517dcf56e2777 URL: https://github.com/kamailio/kamailio/commit/d43872c11edacf972c2ae72c746517d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-16T14:16:41+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/d43872c11edacf972c2ae72c746517d… Patch: https://github.com/kamailio/kamailio/commit/d43872c11edacf972c2ae72c746517d… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 79e43b73a7..0fa395da20 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -525,12 +525,12 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; * flags - the value may be a bitwise OR of the following flags: + 0x01 - adds “a=direction:active” SDP line; + 0x02 - rewrite media IP address (c=) with source address of - the message or the provided IP address. (a=rtpc) param will be + the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). + 0x04 - adds “a=nortpproxy:yes” SDP line; + 0x08 - rewrite IP from origin description (o=) with source - address of the message or the provided IP address. (a=rtpc) + address of the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). * ip_address - IP to be used for rewriting SDP. If not specified, the diff --git a/src/modules/uac/README b/src/modules/uac/README index a018d29a16..17a0fb6869 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -87,6 +87,7 @@ Ramona-Elena Modroiu 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -137,7 +138,8 @@ Ramona-Elena Modroiu 1.43. uac.reg_refresh usage 1.44. uac.reg_active usage 1.45. uac.reg_add usage - 1.46. lookup remote registrations usage + 1.46. uac.reg_remove usage + 1.47. lookup remote registrations usage Chapter 1. Admin Guide @@ -207,6 +209,7 @@ Chapter 1. Admin Guide 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -995,6 +998,7 @@ event_route[uac:reply] { 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 8.1. uac.reg_dump @@ -1119,6 +1123,15 @@ event_route[uac:reply] { kamcmd uac.reg_add ... ... +8.9. uac.reg_remove + + Remove a UAC remote registration record by l_uuid. + + Example 1.46. uac.reg_remove usage +... + kamcmd uac.reg_remove my_l_uuid +... + 9. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -1165,7 +1178,7 @@ event_route[uac:reply] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.46. lookup remote registrations usage + Example 1.47. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n");

1 0

git:master:b8e4cc2e: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: b8e4cc2e1457d14addda06187160a5c55bb89cf3 URL: https://github.com/kamailio/kamailio/commit/b8e4cc2e1457d14addda06187160a5c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-16T14:16:21+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/b8e4cc2e1457d14addda06187160a5c… Patch: https://github.com/kamailio/kamailio/commit/b8e4cc2e1457d14addda06187160a5c… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 79e43b73a7..0fa395da20 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -525,12 +525,12 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; * flags - the value may be a bitwise OR of the following flags: + 0x01 - adds “a=direction:active” SDP line; + 0x02 - rewrite media IP address (c=) with source address of - the message or the provided IP address. (a=rtpc) param will be + the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). + 0x04 - adds “a=nortpproxy:yes” SDP line; + 0x08 - rewrite IP from origin description (o=) with source - address of the message or the provided IP address. (a=rtpc) + address of the message or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address). * ip_address - IP to be used for rewriting SDP. If not specified, the diff --git a/src/modules/uac/README b/src/modules/uac/README index ae8376ab15..c9bfd8e1c6 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -87,6 +87,7 @@ Ramona-Elena Modroiu 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -137,7 +138,8 @@ Ramona-Elena Modroiu 1.43. uac.reg_refresh usage 1.44. uac.reg_active usage 1.45. uac.reg_add usage - 1.46. lookup remote registrations usage + 1.46. uac.reg_remove usage + 1.47. lookup remote registrations usage Chapter 1. Admin Guide @@ -207,6 +209,7 @@ Chapter 1. Admin Guide 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 9. Remote Registration @@ -998,6 +1001,7 @@ event_route[uac:reply] { 8.6. uac.reg_refresh 8.7. uac.reg_active 8.8. uac.reg_add + 8.9. uac.reg_remove 8.1. uac.reg_dump @@ -1124,6 +1128,15 @@ event_route[uac:reply] { kamcmd uac.reg_add ... ... +8.9. uac.reg_remove + + Remove a UAC remote registration record by l_uuid. + + Example 1.46. uac.reg_remove usage +... + kamcmd uac.reg_remove my_l_uuid +... + 9. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -1175,7 +1188,7 @@ event_route[uac:reply] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.46. lookup remote registrations usage + Example 1.47. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n");

1 0

[kamailio/kamailio] Minor fixes (#2507)
by Bastian Triller 16 Oct '20

16 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2507 -- Commit Summary -- * core: fix typo in comment * uac: docs - fix missing uac.reg_remove method -- File Changes -- M src/core/socket_info.c (4) M src/modules/uac/doc/uac_admin.xml (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2507.patch https://github.com/kamailio/kamailio/pull/2507.diff -- 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/pull/2507

2 3

git:5.4:ef7a0789: nathelper: docs - fixed typos
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.4 Commit: ef7a0789a52a9b741ce679145f8fadb5c6b97755 URL: https://github.com/kamailio/kamailio/commit/ef7a0789a52a9b741ce679145f8fadb… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:13:06Z nathelper: docs - fixed typos --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef7a0789a52a9b741ce679145f8fadb… Patch: https://github.com/kamailio/kamailio/commit/ef7a0789a52a9b741ce679145f8fadb… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 6bf4783337..5096a676d4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -562,7 +562,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x02</emphasis> - rewrite media &ip; address (c=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> <listitem> @@ -572,7 +572,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x08</emphasis> - rewrite IP from origin description (o=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> </itemizedlist> @@ -582,7 +582,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; If not specified, the received signalling IP will be used. The parameter allows pseudo-variables usage. NOTE: For the IP to be used, you need to use 0x02 or 0x08 flags, otherwise it will have - no effect. Must be IPv4 address family. + no effect. Must be IPv4 address family. </para> </listitem> </itemizedlist>

1 0

git:5.4:80c834d1: core: fix typo in comment
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.4 Commit: 80c834d1eea1e1917f185d9d1110c7d07bb27bd6 URL: https://github.com/kamailio/kamailio/commit/80c834d1eea1e1917f185d9d1110c7d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:13:05Z core: fix typo in comment --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/80c834d1eea1e1917f185d9d1110c7d… Patch: https://github.com/kamailio/kamailio/commit/80c834d1eea1e1917f185d9d1110c7d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index d2e1149356..a46aba24ad 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2142,7 +2142,7 @@ void init_proto_order() /** - * parse '[port:]host[:port]' string to a broken down structure + * parse '[proto:]host[:port]' string to a broken down structure */ int parse_protohostport(str* ins, sr_phostp_t *r) { @@ -2230,7 +2230,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) } /** - * lookup a local socket by '[port:]host[:port]' string + * lookup a local socket by '[proto:]host[:port]' string */ struct socket_info* lookup_local_socket(str *phostp) {

1 0

git:5.4:b8576f0f: uac: docs - fix missing uac.reg_remove method
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.4 Commit: b8576f0f34d373173ff223f00c6b6b2ce8daa85a URL: https://github.com/kamailio/kamailio/commit/b8576f0f34d373173ff223f00c6b6b2… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:13:06Z uac: docs - fix missing uac.reg_remove method --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8576f0f34d373173ff223f00c6b6b2… Patch: https://github.com/kamailio/kamailio/commit/b8576f0f34d373173ff223f00c6b6b2… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 7029449ac3..bbcc6ad53f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1370,7 +1370,25 @@ event_route[uac:reply] { ... </programlisting> </example> - </section> + </section> + + <section id="uac.r.uac.reg_remove"> + <title> + <function moreinfo="none">uac.reg_remove</function> + </title> + <para> + Remove a UAC remote registration record by l_uuid. + </para> + + <example> + <title><function>uac.reg_remove</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_remove my_l_uuid +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:5.3:4d14557e: nathelper: docs - fixed typos
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.3 Commit: 4d14557ec31d398cab86fb67ffa14761c08bb5da URL: https://github.com/kamailio/kamailio/commit/4d14557ec31d398cab86fb67ffa1476… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:12:44Z nathelper: docs - fixed typos --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d14557ec31d398cab86fb67ffa1476… Patch: https://github.com/kamailio/kamailio/commit/4d14557ec31d398cab86fb67ffa1476… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index ee94853beb..7f0674e0d2 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -562,7 +562,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x02</emphasis> - rewrite media &ip; address (c=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> <listitem> @@ -572,7 +572,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x08</emphasis> - rewrite IP from origin description (o=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> </itemizedlist> @@ -582,7 +582,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; If not specified, the received signalling IP will be used. The parameter allows pseudo-variables usage. NOTE: For the IP to be used, you need to use 0x02 or 0x08 flags, otherwise it will have - no effect. Must be IPv4 address family. + no effect. Must be IPv4 address family. </para> </listitem> </itemizedlist>

1 0

git:5.3:cf059807: uac: docs - fix missing uac.reg_remove method
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.3 Commit: cf059807071d4ecfe9bd1d288d81c96c67e4bab3 URL: https://github.com/kamailio/kamailio/commit/cf059807071d4ecfe9bd1d288d81c96… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:12:44Z uac: docs - fix missing uac.reg_remove method --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf059807071d4ecfe9bd1d288d81c96… Patch: https://github.com/kamailio/kamailio/commit/cf059807071d4ecfe9bd1d288d81c96… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e84501a9d8..ba29c42022 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1317,7 +1317,25 @@ event_route[uac:reply] { ... </programlisting> </example> - </section> + </section> + + <section id="uac.r.uac.reg_remove"> + <title> + <function moreinfo="none">uac.reg_remove</function> + </title> + <para> + Remove a UAC remote registration record by l_uuid. + </para> + + <example> + <title><function>uac.reg_remove</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_remove my_l_uuid +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:5.3:dbaeb966: core: fix typo in comment
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: 5.3 Commit: dbaeb966f46587e5d1e04683cddcc644c20027f2 URL: https://github.com/kamailio/kamailio/commit/dbaeb966f46587e5d1e04683cddcc64… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T12:12:44Z core: fix typo in comment --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/dbaeb966f46587e5d1e04683cddcc64… Patch: https://github.com/kamailio/kamailio/commit/dbaeb966f46587e5d1e04683cddcc64… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 07b4a1e32a..25885695f8 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2064,7 +2064,7 @@ void init_proto_order() /** - * parse '[port:]host[:port]' string to a broken down structure + * parse '[proto:]host[:port]' string to a broken down structure */ int parse_protohostport(str* ins, sr_phostp_t *r) { @@ -2152,7 +2152,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) } /** - * lookup a local socket by '[port:]host[:port]' string + * lookup a local socket by '[proto:]host[:port]' string */ struct socket_info* lookup_local_socket(str *phostp) {

1 0

git:master:8633455e: nathelper: docs - fixed typos
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: 8633455e5867b30840d44c73cb2e6367fed17bbd URL: https://github.com/kamailio/kamailio/commit/8633455e5867b30840d44c73cb2e636… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T14:10:45+02:00 nathelper: docs - fixed typos --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8633455e5867b30840d44c73cb2e636… Patch: https://github.com/kamailio/kamailio/commit/8633455e5867b30840d44c73cb2e636… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 6bf4783337..5096a676d4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -562,7 +562,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x02</emphasis> - rewrite media &ip; address (c=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> <listitem> @@ -572,7 +572,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; <listitem> <para><emphasis>0x08</emphasis> - rewrite IP from origin description (o=) with source address of the message - or the provided IP address. (a=rtpc) param will be rewritten if exists. (the provided IP address take + or the provided IP address. (a=rtcp) param will be rewritten if exists. (the provided IP address take precedence over the source address).</para> </listitem> </itemizedlist> @@ -582,7 +582,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; If not specified, the received signalling IP will be used. The parameter allows pseudo-variables usage. NOTE: For the IP to be used, you need to use 0x02 or 0x08 flags, otherwise it will have - no effect. Must be IPv4 address family. + no effect. Must be IPv4 address family. </para> </listitem> </itemizedlist>

1 0

git:master:de65e460: uac: docs - fix missing uac.reg_remove method
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: de65e4606c4126dd7db5f7ee5ea804f9b27b5fb6 URL: https://github.com/kamailio/kamailio/commit/de65e4606c4126dd7db5f7ee5ea804f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T14:10:45+02:00 uac: docs - fix missing uac.reg_remove method --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de65e4606c4126dd7db5f7ee5ea804f… Patch: https://github.com/kamailio/kamailio/commit/de65e4606c4126dd7db5f7ee5ea804f… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index d43b8afa0c..b132daa6a0 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1376,7 +1376,25 @@ event_route[uac:reply] { ... </programlisting> </example> - </section> + </section> + + <section id="uac.r.uac.reg_remove"> + <title> + <function moreinfo="none">uac.reg_remove</function> + </title> + <para> + Remove a UAC remote registration record by l_uuid. + </para> + + <example> + <title><function>uac.reg_remove</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_remove my_l_uuid +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:d5a31413: core: fix typo in comment
by Henning Westerholt 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: d5a31413b4afdb8104c2c7a603f8ed14cdcfb828 URL: https://github.com/kamailio/kamailio/commit/d5a31413b4afdb8104c2c7a603f8ed1… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-16T14:10:45+02:00 core: fix typo in comment --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d5a31413b4afdb8104c2c7a603f8ed1… Patch: https://github.com/kamailio/kamailio/commit/d5a31413b4afdb8104c2c7a603f8ed1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index d2e1149356..a46aba24ad 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2142,7 +2142,7 @@ void init_proto_order() /** - * parse '[port:]host[:port]' string to a broken down structure + * parse '[proto:]host[:port]' string to a broken down structure */ int parse_protohostport(str* ins, sr_phostp_t *r) { @@ -2230,7 +2230,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r) } /** - * lookup a local socket by '[port:]host[:port]' string + * lookup a local socket by '[proto:]host[:port]' string */ struct socket_info* lookup_local_socket(str *phostp) {

1 0

git:master:313f5d85: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: 313f5d85faff333adf8ecece6d23bf6db8443164 URL: https://github.com/kamailio/kamailio/commit/313f5d85faff333adf8ecece6d23bf6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-16T12:01:21+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/313f5d85faff333adf8ecece6d23bf6… Patch: https://github.com/kamailio/kamailio/commit/313f5d85faff333adf8ecece6d23bf6… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index 1dfc46d86c..ad924c1ca2 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -214,10 +214,10 @@ Chapter 1. Admin Guide 1. Overview - A module which provides routing, balancing and blacklisting + A module which provides routing, balancing and blocklisting capabilities. - The module provides routing, balancing and blacklisting capabilities. + The module provides routing, balancing and blocklisting capabilities. It reads routing entries from a database source or from a config file at Kamailio startup. It can uses one routing tree (for one carrier), or if needed for every user a different routing tree (unique for each @@ -1182,7 +1182,7 @@ modparam("carrierroute", "carrierroute_strip_col", "strip") Name of column contains the rewrite prefixes. Here you can define a rewrite prefix for the localpart of the SIP URI. An empty field - represents a blacklist entry, anything else is put as domain part into + represents a blocklist entry, anything else is put as domain part into the Request URI of the SIP message. Example 2.11. Set carrierroute_rewrite_host_col parameter

1 0

git:master:134bf80b: carrierroute: terminology changes
by Lucian Balaceanu 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: 134bf80ba553f6855b39bdb957edfb489e4b1d39 URL: https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb4… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-10-16T12:48:25+03:00 carrierroute: terminology changes --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_func.c Modified: src/modules/carrierroute/doc/carrierroute_admin.xml Modified: src/modules/carrierroute/doc/carrierroute_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb4… Patch: https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb4… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index 79f8f2e2dc..74705caa25 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -27,7 +27,7 @@ /*! * \defgroup carrierroute CARRIERROUTE :: The Kamailio carrierroute Module - * The module provides routing, balancing and blacklisting capabilities. + * The module provides routing, balancing and blocklisting capabilities. * It reads routing entries from a database source or from a config file * at Kamailio startup. It can uses one routing tree (for one carrier), * or if needed for every user a different routing tree (unique for each carrier) diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index c4ce4d52a0..46c6902684 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -402,7 +402,7 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, memcpy(p, AT_SIGN.s, AT_SIGN.len); p += AT_SIGN.len; } - /* this could be an error, or a blacklisted destination */ + /* this could be an error, or a blocklisted destination */ if (rs->host.len == 0) { *p = '\0'; return -1; diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index dee8d006f5..3b883d7515 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -13,9 +13,9 @@ <section> <title>Overview</title> - <para>A module which provides routing, balancing and blacklisting capabilities.</para> + <para>A module which provides routing, balancing and blocklisting capabilities.</para> <para> - The module provides routing, balancing and blacklisting capabilities. + The module provides routing, balancing and blocklisting capabilities. It reads routing entries from a database source or from a config file at &kamailio; startup. It can uses one routing tree (for one carrier), or if needed for every user a different routing tree (unique for each carrier) for number prefix based routing. diff --git a/src/modules/carrierroute/doc/carrierroute_db.xml b/src/modules/carrierroute/doc/carrierroute_db.xml index f755d08a40..fdc0ddfc45 100644 --- a/src/modules/carrierroute/doc/carrierroute_db.xml +++ b/src/modules/carrierroute/doc/carrierroute_db.xml @@ -168,7 +168,7 @@ modparam("carrierroute", "carrierroute_strip_col", "strip") <section> <title><varname>carrierroute_rewrite_host_col</varname> (string)</title> <para>Name of column contains the rewrite prefixes. Here you can define a rewrite prefix - for the localpart of the SIP URI. An empty field represents a blacklist entry, anything else + for the localpart of the SIP URI. An empty field represents a blocklist entry, anything else is put as domain part into the Request URI of the SIP message.</para> <example> <title>Set <varname>carrierroute_rewrite_host_col</varname> parameter</title>

1 0

[kamailio/kamailio] The kamailio 5.2.1 crashs (#2468)
by pkv12 16 Oct '20

16 Oct '20

### Description The kamailio 5.2.1 crashed ### Troubleshooting pbx server sending INVITE to kamailio and kamailio prepare SIP packet for send to VOIP operator by domain kamailio tries to resolv the domain and in this time pbx server send to kamailio the CANCEL. kamailio canceling this dialog and after a while, it gives an error that the domain cannot be resolved and prepeare 478 answer for pbx server. But data for send is apsent and kamailio is segfailt kamailio is started with option use_dns_cache=no #### Reproduction if the resolv of the domain direction occurs later than the cancel message for the current dialog #### Debugging Data ``` GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-100.el7_4.1 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... [New LWP 11633] Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. Missing separate debuginfo for /usr/lib64/libcom_err.so.2 Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/a3/832734347dca522438308c9f08f45524c65c9b Missing separate debuginfo for Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/22/8adfe0d8c0852bf24f80b24803da9e25f5b21e [Thread debugging using libthread_db enabled] Using host libthread_db library "/usr/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.'. Program terminated with signal 11, Segmentation fault. #0 0x00007f47ff3bfbdf in _reply (trans=0x7f47016be920, p_msg=0x0, code=478, reason=0x7fffc8309960, lock=1) at t_reply.c:649 649 if (code>=180 && p_msg->to (gdb) set print pretty on (gdb) set print elements 0 (gdb) set height 0 (gdb) bt full #0 0x00007f47ff3bfbdf in _reply (trans=0x7f47016be920, p_msg=0x0, code=478, reason=0x7fffc8309960, lock=1) at t_reply.c:649 len = 135 buf = 0x80f7aa <__FUNCTION__.6461> "get_hdr_field" dset = 0x7f4800730ca8 "\001" bm = { to_tag_val = { s = 0x7fffc83099a0 "\001", len = 7009219 } } dset_len = 0 #1 0x00007f47ff3c7ae3 in t_reply (t=0x7f47016be920, p_msg=0x0, code=478, text=0x7fffc83099c0 "Unresolvable destination (478/TM)") at t_reply.c:1609 reason = { s = 0x7fffc83099c0 "Unresolvable destination (478/TM)", len = 33 } #2 0x00007f47ff40752f in kill_transaction (trans=0x7f47016be920, error=-478) at t_funcs.c:176 err_buffer = "Unresolvable destination (478/TM)\000\000\000\006\000\000\000\300\333+\371F\177\000\000\000\000\000\000\000\000\000\000.\001\000\000\000\240\232\060\310\377\177\000\000\324P#\371F\177\000\000\220ŀ\000\000\000\000\000R\270n\000\000\000\000\000`\232\060\310\377\177\000\000\210\037.\000H\177\000\000\211զ\000\000\000\000\000\rӦ\000\000\000\000" sip_err = 478 reply_ret = 5771 ret = 33 __FUNCTION__ = "kill_transaction" #3 0x00007f47ff380ed5 in t_unref (p_msg=0x7f48002e24f0) at t_lookup.c:1488 kr = REQ_ERR_DELAYED __FUNCTION__ = "t_unref" #4 0x00007f47ff41ccbc in w_t_unref (foo=0x7f48002e24f0, flags=2147483649, bar=0x0) at tm.c:684 No locals. #5 0x000000000055034d in exec_post_script_cb (msg=0x7f48002e24f0, type=REQUEST_CB_TYPE) at core/script_cb.c:182 cb = 0x7f4800289210 flags = 2147483649 __FUNCTION__ = "exec_post_script_cb" #6 0x00000000005cc77b in receive_msg ( buf=0xa6d1a0 <buf.6868> "INVITE sip:0972678971@y.y.y.y:5060 SIP/2.0\r\nVia: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451\r\nFrom: \"380674606869\" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c\r\nTo: <sip:0972678971@y.y.y.y>\r\nContact: <sip:asterisk@x.x.x.x:5062>\r\nCall-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705\r\nCSeq: 20737 INVITE\r\nAllow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, PRACK, REGISTER, REFER, MESSAGE\r\nSupported: 100rel, timer, replaces, norefersub\r\nSession-Expires: 1800\r\nMin-SE: 90\r\nX-SEND-TO-TRUNK: ukrteltrunk\r\nMax-Forwards: 69\r\nUser-Agent: Asterisk PBX 13.26.0\r\nContent-Type: application/sdp\r\nContent-Length: 284\r\n\r\nv=0\r\no=- 812296846 812296846 IN IP4 x.x.x.x\r\ns=Asterisk\r\nc=IN IP4 x.x.x.x\r\nt=0 0\r\nm=audio 16438 RTP/AVP 8 0 3 101\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n", len=1001, rcv_info=0x7fffc830a120) at core/receive.c:362 msg = 0x7f48002e24f0 ctx = { rec_lev = 0, run_flags = 0, last_retcode = 1, jmp_env = {{ __jmpbuf = {783203822, 2071767658820475464, 4295072, 140736552019552, 0, 0, 2071767658933721672, -2071667646532085176}, __mask_was_saved = 0, __saved_mask = { __val = {0, 0, 0, 0, 0, 0, 0, 0, 0, 167503724544, 10998176, 140736552018216, 0, 55834574851, 783203822, 4295072} } }} } bctx = 0x0 ret = 0 stats_on = 0 tvb = { tv_sec = 0, tv_usec = 0 } tve = { tv_sec = 0, tv_usec = 0 } tz = { tz_minuteswest = 0, tz_dsttime = 0 } diff = 0 inb = { s = 0xa6d1a0 <buf.6868> "INVITE sip:0972678971@y.y.y.y:5060 SIP/2.0\r\nVia: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451\r\nFrom: \"380674606869\" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c\r\nTo: <sip:0972678971@y.y.y.y>\r\nContact: <sip:asterisk@x.x.x.x:5062>\r\nCall-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705\r\nCSeq: 20737 INVITE\r\nAllow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, PRACK, REGISTER, REFER, MESSAGE\r\nSupported: 100rel, timer, replaces, norefersub\r\nSession-Expires: 1800\r\nMin-SE: 90\r\nX-SEND-TO-TRUNK: ukrteltrunk\r\nMax-Forwards: 69\r\nUser-Agent: Asterisk PBX 13.26.0\r\nContent-Type: application/sdp\r\nContent-Length: 284\r\n\r\nv=0\r\no=- 812296846 812296846 IN IP4 x.x.x.x\r\ns=Asterisk\r\nc=IN IP4 x.x.x.x\r\nt=0 0\r\nm=audio 16438 RTP/AVP 8 0 3 101\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n", len = 1001 } netinfo = { data = { s = 0xa6d1a0 <buf.6868> "INVITE sip:0972678971@y.y.y.y:5060 SIP/2.0\r\nVia: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451\r\nFrom: \"380674606869\" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c\r\nTo: <sip:0972678971@y.y.y.y>\r\nContact: <sip:asterisk@x.x.x.x:5062>\r\nCall-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705\r\nCSeq: 20737 INVITE\r\nAllow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, PRACK, REGISTER, REFER, MESSAGE\r\nSupported: 100rel, timer, replaces, norefersub\r\nSession-Expires: 1800\r\nMin-SE: 90\r\nX-SEND-TO-TRUNK: ukrteltrunk\r\nMax-Forwards: 69\r\nUser-Agent: Asterisk PBX 13.26.0\r\nContent-Type: application/sdp\r\nContent-Length: 284\r\n\r\nv=0\r\no=- 812296846 812296846 IN IP4 x.x.x.x\r\ns=Asterisk\r\nc=IN IP4 x.x.x.x\r\nt=0 0\r\nm=audio 16438 RTP/AVP 8 0 3 101\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n", len = 1001 }, rcv = 0x7fffc830a120, dst = 0x0 } keng = 0x0 evp = { data = 0x7fffc8309ca0, rcv = 0x7fffc830a120, dst = 0x0 } cidlockidx = 0 cidlockset = 0 errsipmsg = 0 __FUNCTION__ = "receive_msg" #7 0x00000000004c8ad7 in udp_rcv_loop () at core/udp_server.c:541 len = 1001 buf = "INVITE sip:0972678971@y.y.y.y:5060 SIP/2.0\r\nVia: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451\r\nFrom: \"380674606869\" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c\r\nTo: <sip:0972678971@y.y.y.y>\r\nContact: <sip:asterisk@x.x.x.x:5062>\r\nCall-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705\r\nCSeq: 20737 INVITE\r\nAllow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, PRACK, REGISTER, REFER, MESSAGE\r\nSupported: 100rel, timer, replaces, norefersub\r\nSession-Expires: 1800\r\nMin-SE: 90\r\nX-SEND-TO-TRUNK: ukrteltrunk\r\nMax-Forwards: 69\r\nUser-Agent: Asterisk PBX 13.26.0\r\nContent-Type: application/sdp\r\nContent-Length: 284\r\n\r\nv=0\r\no=- 812296846 812296846 IN IP4 x.x.x.x\r\ns=Asterisk\r\nc=IN IP4 x.x.x.x\r\nt=0 0\r\nm=audio 16438 RTP/AVP 8 0 3 101\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n\000\070\060\060\060\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n\000AVP 8 0 3 101\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:3 GSM/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\na=maxptime:150\r\na=sendrecv\r\n\000yes\r\na=rtpmap:98 telephone-event/8000\r\na=fmtp:98 0-15\r\na=ptime:20\r\na=sendrecv\r\n\000\n\000vent/8000\r\na=fmtp:98 0-15\r\na=ptime:20\r\na=sendrecv\r\n\000\r\na=ptime:20\r\na=sendrecv\r\n", '\000' <repeats 64080 times> tmp = 0xa7d1a0 <buff.5595> "188.163.212.3" from = 0x7f47ffb77c20 fromlen = 16 ri = { src_ip = { af = 2, len = 4, u = { addrl = {870309723, 140736552018432}, addr32 = {870309723, 0, 3358630400, 32767}, addr16 = {57179, 13279, 0, 0, 41472, 51248, 32767, 0}, addr = "[\337\337\063\000\000\000\000\000\242\060\310\377\177\000" } }, dst_ip = { af = 2, len = 4, u = { addrl = {1510032313, 0}, addr32 = {1510032313, 0, 0, 0}, addr16 = {17337, 23041, 0, 0, 0, 0, 0, 0}, addr = "\271C\001Z", '\000' <repeats 11 times> } }, src_port = 5062, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = { s = { sa_family = 2, sa_data = "\023\306[\337\337\063\000\000\000\000\000\000\000" }, sin = { sin_family = 2, sin_port = 50707, sin_addr = { s_addr = 870309723 }, sin_zero = "\000\000\000\000\000\000\000" }, sin6 = { sin6_family = 2, sin6_port = 50707, sin6_flowinfo = 870309723, sin6_addr = { __in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0} } }, sin6_scope_id = 0 } }, bind_address = 0x7f47ffb76bb0, proto = 1 '\001' } evp = { data = 0x0, rcv = 0x0, dst = 0x0 } printbuf = '\000' <repeats 17 times>, "\273}\000\000\000\000\000\326\301b\312|\000\000\000\344\034~\000\000\000\000\000V\274}\000\000\000\000\000\060\000\000\000\000\000\000\000\020`\255\377G\177\000\000\000\000\000\000\024\000\000\000\240Qx", '\000' <repeats 13 times>, "\264Qx\000\000\000\000\000.\000\000\000\000\240\211A\000\000\000\000\000\240\237\060\310\377\177\000\000\354\315c\000\000\000\000\000Xw\267\377G\177\000\000\220\241\262", '\000' <repeats 17 times>, "\004\000\000\000@\240\060\310\377\177\000\000P\326c\000\000\000\000\000\177", '\000' <repeats 15 times>, "\002", '\000' <repeats 19 times>, "\024\000\000\000\240Qx", '\000' <repeats 13 times>, "\200\241\262\000\n\000\000\000\240Qx\000\000\000\000\000\200\241\262\000\000\000\000\000@\240\060\310\377\177\000\000Xw\267\377G\177\000\000\000\000\000\000\000\000\000\000.\000\000\000\000\240\211A\000\000\000\000\000`\246\060\310\377\177", '\000' <repeats 18 times>, "p\240\060\310\377\177\000\000d\341c\000\000\000\000\000\240Qx\000\000\000\000\000\200\241\262", '\000' <repeats 13 times>, "\024\000\000\000\n\000\000\000\000\242\060\310\377\177\000\000H}J\000\000\000\000\000\240\211A\000\000\000\000\000`\246\060\310\377\177", '\000' <repeats 19 times>, "\241\060\310\377\177\000\000\\yq\000\001\000\000\000\240Qx\000\000\000\000\000\024\000\000\000G\177\000\000\000\000\000\000\000\000\000\000$B\262\000\000\000\000\000$F\262\000\000\000\000\000\\\022\001\377F\177\000\000\240\211A\000\000\000\000\000`\246\060\310\377\177", '\000' <repeats 17 times> i = 10 j = 4776853 l = 1178866774 __FUNCTION__ = "udp_rcv_loop" #8 0x0000000000424e5c in main_loop () at main.c:1645 i = 0 pid = 0 si = 0x7f47ffb76bb0 si_desc = "udp receiver child=0 sock=y.y.y.y:5060\000\000H\177\000\000\260\242\060\310\377\177\000\000\371\233h\000\000\000\000\000\240\211A\000\000\000\000\000\310F\264\376F\177", '\000' <repeats 14 times>, "\001\000\000\000\000\243\060\310\377\177\000\000(&\001\377F\177\000\000\310\064\020\367F\177\000\000\260Z\374\377G\177\000" nrprocs = 8 woneinit = 0 __FUNCTION__ = "main_loop" #9 0x000000000042c4e9 in main (argc=13, argv=0x7fffc830a668) at main.c:2675 cfg_stream = 0xdce010 c = -1 r = 0 tmp = 0x7fffc830af30 "" tmp_len = 0 port = 0 proto = 0 options = 0x7697a0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 995796597 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = { st_dev = 19, st_ino = 54007, st_nlink = 2, st_mode = 16832, st_uid = 989, st_gid = 987, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1558706870, tv_nsec = 104275123 }, st_mtim = { tv_sec = 1598532057, tv_nsec = 575105503 }, st_ctim = { tv_sec = 1598532057, tv_nsec = 575105503 }, __unused = {0, 0, 0} } __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0xdce010 c = -1 r = 0 tmp = 0x7fffc830af30 "" tmp_len = 0 port = 0 proto = 0 options = 0x7697a0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 995796597 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = { st_dev = 19, st_ino = 54007, st_nlink = 2, st_mode = 16832, st_uid = 989, st_gid = 987, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1558706870, tv_nsec = 104275123 }, st_mtim = { tv_sec = 1598532057, tv_nsec = 575105503 }, st_ctim = { tv_sec = 1598532057, tv_nsec = 575105503 }, __unused = {0, 0, 0} } __FUNCTION__ = "main" (gdb) list 644 if (dset) { 645 add_lump_rpl(p_msg, dset, dset_len, LUMP_RPL_HDR); 646 } 647 } 648 649 if (code>=180 && p_msg->to 650 && (get_to(p_msg)->tag_value.s==0 651 || get_to(p_msg)->tag_value.len==0)) { 652 calc_crc_suffix( p_msg, tm_tag_suffix ); 653 buf = build_res_buf_from_sip_req(code, reason, &tm_tag, p_msg, (gdb) frame 0 #0 0x00007f47ff3bfbdf in _reply (trans=0x7f47016be920, p_msg=0x0, code=478, reason=0x7fffc8309960, lock=1) at t_reply.c:649 649 if (code>=180 && p_msg->to (gdb) info locals len = 135 buf = 0x80f7aa <__FUNCTION__.6461> "get_hdr_field" dset = 0x7f4800730ca8 "\001" bm = { to_tag_val = { s = 0x7fffc83099a0 "\001", len = 7009219 } } dset_len = 0 (gdb) p p_msg $1 = (struct sip_msg *) 0x0 (gdb) p p_msg->to Cannot access memory at address 0xa0 ``` #### Log Messages ``` Aug 28 14:09:45 ua1api [11633]: NOTICE: d03a799f-bb2a-4dc1-864a-b80d82d38705 -=> INCOMING REQUEST: method:INVITE si:x.x.x.x sp:5062 fU:380674606869 => rU:0972678971 proto:udp fu:sip:380674606869@x.x.x.x => ru:sip:0972678971@1 85.67.1.90:5060 ... Aug 28 14:09:51 ua1api [11654]: NOTICE: d03a799f-bb2a-4dc1-864a-b80d82d38705 -=> INCOMING REQUEST: method:CANCEL si:x.x.x.x sp:5062 fU:380674606869 => rU:0972678971 proto:udp fu:sip:380674606869@x.x.x.x => ru:sip:0972678971@y.y.y.y:5060 ... Aug 28 14:10:05 ua1api [11633]: ERROR: <core> [core/resolve.c:1685]: sip_hostport2su(): could not resolve hostname: "sip-trunk.ukrtelecom.ua" Aug 28 14:10:05 ua1api [11633]: ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "sip-trunk.ukrtelecom.ua" Aug 28 14:10:05 ua1api [11633]: ERROR: tm [t_fwd.c:1735]: t_forward_nonack(): failure to add branches Aug 28 14:10:05 ua1api [11633]: NOTICE: d03a799f-bb2a-4dc1-864a-b80d82d38705 -=> T_RELAY: result: -478 Aug 28 14:13:25 ua1api [11680]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 15 Aug 28 14:13:25 ua1api [11605]: ALERT: <core> [main.c:756]: handle_sigs(): child process 11633 exited by a signal 11 Aug 28 14:13:25 ua1api [11605]: ALERT: <core> [main.c:759]: handle_sigs(): core was generated ``` #### SIP Traffic ``` <--- size: 1100 -- SIP from: UDP:x.x.x.x:5062 => to: UDP:y.y.y.y:5060 ---> INVITE sip:0972678971@y.y.y.y:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451 From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y> Contact: <sip:asterisk@x.x.x.x:5062> Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 INVITE Allow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, PRACK, REGISTER, REFER, MESSAGE Supported: 100rel, timer, replaces, norefersub Session-Expires: 1800 Min-SE: 90 X-SEND-TO-TRUNK: ukrteltrunk Max-Forwards: 70 User-Agent: Asterisk PBX 13.26.0 Content-Type: application/sdp Content-Length: 284 v=0 o=- 812296846 812296846 IN IP4 x.x.x.x s=Asterisk c=IN IP4 x.x.x.x t=0 0 m=audio 16438 RTP/AVP 8 0 3 101 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 a=maxptime:150 a=sendrecv <--- size: 493 -- SIP from: UDP:y.y.y.y:5060 => to: UDP:x.x.x.x:5062 ---> SIP/2.0 100 Trying -- your call is important to us Via: SIP/2.0/UDP x.x.x.x:5062;rport=5062;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451;received=x.x.x.x From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y> Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 INVITE Content-Length: 0 <--- size: 537 -- SIP from: UDP:x.x.x.x:5062 => to: UDP:y.y.y.y:5060 ---> CANCEL sip:0972678971@y.y.y.y:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451 From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y> Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 CANCEL Reason: Q.850;cause=0 Max-Forwards: 70 User-Agent: Asterisk PBX 13.26.0 Content-Length: 0 <--- size: 404 -- SIP from: UDP:y.y.y.y:5060 => to: UDP:x.x.x.x:5062 ---> SIP/2.0 487 Request canceled Via: SIP/2.0/UDP x.x.x.x:5062;rport=5062;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451;received=x.x.x.x From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y>;tag=29c79435251d3407255ea131eaa41394-e324 Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 INVITE Content-Length: 0 <--- size: 418 -- SIP from: UDP:y.y.y.y:5060 => to: UDP:x.x.x.x:5062 ---> SIP/2.0 200 ok -- no more pending branches Via: SIP/2.0/UDP x.x.x.x:5062;rport=5062;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451;received=x.x.x.x From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y>;tag=29c79435251d3407255ea131eaa41394-e324 Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 CANCEL Content-Length: 0 <--- size: 550 -- SIP from: UDP:x.x.x.x:5062 => to: UDP:y.y.y.y:5060 ---> ACK sip:0972678971@y.y.y.y:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5062;rport;branch=z9hG4bKPjcf4a2178-296c-40ac-99e1-0e038f278451 From: "380674606869" <sip:380674606869@x.x.x.x>;tag=238ff2c1-ef95-4064-8541-c6e413343f3c To: <sip:0972678971@y.y.y.y>;tag=29c79435251d3407255ea131eaa41394-e324 Call-ID: d03a799f-bb2a-4dc1-864a-b80d82d38705 CSeq: 20737 ACK Max-Forwards: 70 User-Agent: Asterisk PBX 13.26.0 Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (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: compiled on 11:49:01 Jan 30 2019 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.4.1708 (Core) Linux ua1api.ringostat.net 3.10.0-693.21.1.el7.x86_64 #1 SMP Wed Mar 7 19:03:37 UTC 2018 x86_64 x86_64 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/2468

3 7

git:master:9d672afb: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: 9d672afb4559c4d847de31e1280ab2418d802de6 URL: https://github.com/kamailio/kamailio/commit/9d672afb4559c4d847de31e1280ab24… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-16T09:01:20+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/9d672afb4559c4d847de31e1280ab24… Patch: https://github.com/kamailio/kamailio/commit/9d672afb4559c4d847de31e1280ab24… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index f2a4bc98e9..a58d511078 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -133,7 +133,7 @@ modparam("secsipid", "timeout", 2) downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT body in the Identity header is also - checjed against the "expire" parameter. + checked against the "expire" parameter. The parameters can contain pseudo-variables.

1 0

git:master:f74f1df8: secsipid: docs - small typo
by Daniel-Constantin Mierla 16 Oct '20

16 Oct '20

Module: kamailio Branch: master Commit: f74f1df842815e8a42d1b4f71b6f98287a625d41 URL: https://github.com/kamailio/kamailio/commit/f74f1df842815e8a42d1b4f71b6f982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-16T08:49:12+02:00 secsipid: docs - small typo --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f74f1df842815e8a42d1b4f71b6f982… Patch: https://github.com/kamailio/kamailio/commit/f74f1df842815e8a42d1b4f71b6f982… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index ac5884679f..510da9159d 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -110,7 +110,7 @@ modparam("secsipid", "timeout", 2) the function is downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT - body in the Identity header is also checjed against the "expire" + body in the Identity header is also checked against the "expire" parameter. </para> <para>

1 0

git:master:dd090db6: core: parser - check it is sip protocol for hdr parsing constraints
by Daniel-Constantin Mierla 15 Oct '20

15 Oct '20

Module: kamailio Branch: master Commit: dd090db63ea8db968575b8a44298eb2083cd8d89 URL: https://github.com/kamailio/kamailio/commit/dd090db63ea8db968575b8a44298eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-15T10:24:00+02:00 core: parser - check it is sip protocol for hdr parsing constraints --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/dd090db63ea8db968575b8a44298eb2… Patch: https://github.com/kamailio/kamailio/commit/dd090db63ea8db968575b8a44298eb2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 682b71cd7c..4efb875d85 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -359,10 +359,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->callid==0) { msg->callid=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - LOG(cfg_get(core, core_cfg, sip_parser_log), - "duplicate Call-ID header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Call-ID header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_CALLID_F; break; @@ -374,10 +376,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->to==0) { msg->to=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - LOG(cfg_get(core, core_cfg, sip_parser_log), - "duplicate To header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate To header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_TO_F; break; @@ -385,9 +389,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->cseq==0) { msg->cseq=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - ERR("duplicate CSeq header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate CSeq header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_CSEQ_F; break; @@ -395,9 +402,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->from==0) { msg->from=hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - ERR("duplicate From header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate From header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_FROM_F; break; @@ -409,10 +419,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if(msg->maxforwards==0) { msg->maxforwards=hf; } else { - LOG(cfg_get(core, core_cfg, sip_parser_log), - "duplicate Max-Forwards header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Max-Forwards header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_MAXFORWARDS_F; break; @@ -432,10 +444,12 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (msg->content_length==0) { msg->content_length = hf; } else if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { - LOG(cfg_get(core, core_cfg, sip_parser_log), - "duplicate Content-Length header field [%.*s]\n", - (end-tmp>100)?100:(int)(end-tmp), tmp); - goto error; + if(IS_SIP(msg)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "duplicate Content-Length header field [%.*s]\n", + (end-tmp>100)?100:(int)(end-tmp), tmp); + goto error; + } } msg->parsed_flag|=HDR_CONTENTLENGTH_F; break;

1 0

git:master:90eb0a75: core: receive - use sip_parser_log for a few logs related to parsing errors
by Daniel-Constantin Mierla 15 Oct '20

15 Oct '20

Module: kamailio Branch: master Commit: 90eb0a759f3a9b7d8c0ca25b6581863ffa9221ed URL: https://github.com/kamailio/kamailio/commit/90eb0a759f3a9b7d8c0ca25b6581863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-15T11:02:59+02:00 core: receive - use sip_parser_log for a few logs related to parsing errors --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/90eb0a759f3a9b7d8c0ca25b6581863… Patch: https://github.com/kamailio/kamailio/commit/90eb0a759f3a9b7d8c0ca25b6581863… --- diff --git a/src/core/receive.c b/src/core/receive.c index 6fe79f8e84..5ae4ecb0fc 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -314,7 +314,8 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) if(unlikely(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) < 0)) { - LM_WARN("parsing relevant headers failed\n"); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "parsing relevant headers failed\n"); } LM_DBG("--- received sip message - %s - call-id: [%.*s] - cseq: [%.*s]\n", (msg->first_line.type == SIP_REQUEST) ? "request" : "reply", @@ -353,7 +354,8 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) /* sanity checks */ if(unlikely((msg->via1 == 0) || (msg->via1->error != PARSE_OK))) { /* no via, send back error ? */ - LM_ERR("no via found in request\n"); + LOG(cfg_get(core, core_cfg, sip_parser_log), + "no via found in request\n"); STATS_BAD_MSG(); goto error02; }

1 0

event_route [xhttp:request] is not run
by Juha Heinanen 14 Oct '20

14 Oct '20

With current master, event_route [xhttp:request] is not run. Instead error message shows up: Oct 14 20:00:48 lohi /usr/bin/sip-proxy[8820]: ERROR: <core> [core/receive.c:356]: receive_msg(): no via found in request After spending one hour in trying to figure out, what is wrong in my config, I build K using 5.4 instead of master and the problem disappeared. So I suspect something is broken in master. -- Juha

2 6

git:master:9a3b5d8c: core: fixed use of flags-based protocol detection
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 9a3b5d8c017f4de6a647184b0a1c464de9671b74 URL: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T20:18:39+02:00 core: fixed use of flags-based protocol detection - wrong field was used due to c&p --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… Patch: https://github.com/kamailio/kamailio/commit/9a3b5d8c017f4de6a647184b0a1c464… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 1abc042e28..61d9ac6185 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -145,22 +145,22 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ /* sip request */ #define IS_SIP(req) \ (((req)->first_line.type == SIP_REQUEST) && \ - ((req)->first_line.type & FLINE_FLAG_PROTO_SIP)) + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) /* sip reply */ #define IS_SIP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ - ((rpl)->first_line.type & FLINE_FLAG_PROTO_SIP)) + ((rpl)->first_line.flags & FLINE_FLAG_PROTO_SIP)) /* http request */ #define IS_HTTP(req) \ (((req)->first_line.type == SIP_REQUEST) && \ - ((req)->first_line.type & FLINE_FLAG_PROTO_HTTP)) + ((req)->first_line.flags & FLINE_FLAG_PROTO_HTTP)) /* http reply */ #define IS_HTTP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ - ((rpl)->first_line.type & FLINE_FLAG_PROTO_HTTP)) + ((rpl)->first_line.flags & FLINE_FLAG_PROTO_HTTP)) /*! \brief * Return a URI to which the message should be really sent (not what should

1 0

git:master:573a5667: pv: new function xavp_slist_explode("slist", "sep", "mode", "xname")
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 573a56676ac11671468903a83efdfbbe6fb0dff0 URL: https://github.com/kamailio/kamailio/commit/573a56676ac11671468903a83efdfbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T15:45:08+02:00 pv: new function xavp_slist_explode("slist", "sep", "mode", "xname") - break a string in tokens by separators, storing them in xavp --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/573a56676ac11671468903a83efdfbb… Patch: https://github.com/kamailio/kamailio/commit/573a56676ac11671468903a83efdfbb…

2 2

git:master:e3e6471b: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: e3e6471b114b2358c20cbc9a60ee745ac1bce162 URL: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T16:16:29+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… Patch: https://github.com/kamailio/kamailio/commit/e3e6471b114b2358c20cbc9a60ee745… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 0af232eeda..a6702afa12 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -475,7 +475,8 @@ xavp_params_implode("x", "$var(out)"); the tokens, the supported mode right now is 't', which trims the white spaces around the value. - The fourth parameter is the name of the xavp to hold the tokens. + The fourth parameter is the name of the root xavp to hold the tokens in + fields named 'v' and indexed from 0. The values are stored as string type. @@ -485,10 +486,10 @@ xavp_params_implode("x", "$var(out)"); ... xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); # results in: -# $xavp(x[0]) = "a"; -# $xavp(x[1]) = "b"; -# $xavp(x[2]) = "c"; -# $xavp(x[3]) = "d"; +# $xavp(x[0]=>v[0]) = "a"; +# $xavp(x[0]=>v[1]) = "b"; +# $xavp(x[0]=>v[2]) = "c"; +# $xavp(x[0]=>v[3]) = "d"; ... 4.11. xavp_child_seti(rname, cname, ival)

1 0

git:master:695448dc: pv: exported xavp_slist_explode() to kemi
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 695448dc49812225c743e385edf846405c94b3e2 URL: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:15:09+02:00 pv: exported xavp_slist_explode() to kemi --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… Patch: https://github.com/kamailio/kamailio/commit/695448dc49812225c743e385edf8464… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index b60cfb56f8..9367103bfe 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -2739,6 +2739,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_slist_explode"), + SR_KEMIP_INT, ki_xavp_slist_explode, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_seti"), SR_KEMIP_INT, ki_xavp_seti, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,

1 0

git:master:2b4ec1cf: pv: xavp_slist_explode() stores tockes in xavp fields
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 2b4ec1cf1d30f5520ef68f9e7e653100fa8ce68e URL: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:13:19+02:00 pv: xavp_slist_explode() stores tockes in xavp fields - no longer in root xavp list, but a sublist with tokes having name 'v' --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… Patch: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e65310… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 0f7652218d..ae2c6ce048 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -586,8 +586,10 @@ int pv_xavi_print(sip_msg_t* msg, char* s1, char *s2) int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) { str s; + sr_xavp_t *xavp_list=NULL; sr_xavp_t *xavp=NULL; sr_xval_t xval; + str itname = str_init("v"); int i; int j; int sfound; @@ -620,7 +622,22 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } } s.s = slist->s + i + 1; } @@ -637,7 +654,31 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } + } + + /* add main xavp in root list */ + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = xavp_list; + if(xavp_add_value(xname, &xval, NULL)==NULL) { + xavp_destroy_list(&xavp); + return -1; } return 0;

1 0

git:master:d2c444c5: pv: docs - reflect use of xavp fields for tokens by xavp_slist_explode()
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: d2c444c58b8f6f084f27e0129dc0cf02dfb6f7ba URL: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T16:13:19+02:00 pv: docs - reflect use of xavp fields for tokens by xavp_slist_explode() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… Patch: https://github.com/kamailio/kamailio/commit/d2c444c58b8f6f084f27e0129dc0cf0… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 3967b38234..61df878c3a 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -438,7 +438,8 @@ xavp_params_implode("x", "$var(out)"); the white spaces around the value. </para> <para> - The fourth parameter is the name of the xavp to hold the tokens. + The fourth parameter is the name of the root xavp to hold the tokens + in fields named 'v' and indexed from 0. </para> <para> The values are stored as string type. @@ -452,10 +453,10 @@ xavp_params_implode("x", "$var(out)"); ... xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); # results in: -# $xavp(x[0]) = "a"; -# $xavp(x[1]) = "b"; -# $xavp(x[2]) = "c"; -# $xavp(x[3]) = "d"; +# $xavp(x[0]=>v[0]) = "a"; +# $xavp(x[0]=>v[1]) = "b"; +# $xavp(x[0]=>v[2]) = "c"; +# $xavp(x[0]=>v[3]) = "d"; ... </programlisting> </example>

1 0

git:master:75d4082e: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 75d4082e510948f88f7254e22c05a02118260041 URL: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T16:01:13+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02… Patch: https://github.com/kamailio/kamailio/commit/75d4082e510948f88f7254e22c05a02…

1 0

git:master:df63402a: pv: docs for xvp_slist_explode()
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: df63402a57a7ef6da0d2eb3f88ee68c116c38549 URL: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T15:55:29+02:00 pv: docs for xvp_slist_explode() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… Patch: https://github.com/kamailio/kamailio/commit/df63402a57a7ef6da0d2eb3f88ee68c… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 8b4b0aa309..3967b38234 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -413,6 +413,49 @@ $xavp(x[0]=>c) = "d"; $xavp(x[0]=>a) = "b"; xavp_params_implode("x", "$var(out)"); # results in: $var(out) is "a=b;c=d;e=f;" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_slist_explode"> + <title> + <function moreinfo="none">xavp_slist_explode(slist, sep, mode, xname)</function> + </title> + <para> + Breaks a string list in tokens by separators and stores them + in XAVPs. Note that is not storing empty values. + </para> + <para> + The first parameter has to be a string (static or with variables). + </para> + <para> + The second parameter has to contain separator characters (they + can be many). + </para> + <para> + The third parameter is mode, controlling the behaviour of extracting + the tokens, the supported mode right now is 't', which trims + the white spaces around the value. + </para> + <para> + The fourth parameter is the name of the xavp to hold the tokens. + </para> + <para> + The values are stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_slist_explode</function> usage</title> + <programlisting format="linespecific"> +... +xavp_slist_explode("a=b; c=d;", "=;", "t", "x"); +# results in: +# $xavp(x[0]) = "a"; +# $xavp(x[1]) = "b"; +# $xavp(x[2]) = "c"; +# $xavp(x[3]) = "d"; ... </programlisting> </example>

1 0

pstn_route add_route(): route name <IP> not defined error
by sai Sudheer 14 Oct '20

14 Oct '20

Hii,I am trying to use pstn_route module for the first time, and i want to route the invite to specific pstn server based on its prefix.I have loaded the module & setup the DB, and it's giving error saying route name (from DB) is not defined after adding the a prefix into DB table., and there were no errors when DB table is empty.Not sure how to defined it, or i dont know what did i miss. Please help. #### CONFIG ##########loadmodule "prefix_route.so"modparam("prefix_route", "db_url", "mysql://xxxxx:xxxxx@localhost/kamailioDB")modparam("prefix_route", "db_table", "new_prefix_route") #PSTN Routing table contains if (!prefix_route("+44")) { xlog("L_INFO", "+44 prefix didnt match with prefix_route DB\n"); } ########## DB####MariaDB [kamailio]> select * from new_prefix_route;Empty set (0.00 sec) MariaDB [kamailio]> exit;########## Kamailio looks good untill here, no errors.. # Now i have added a prefix into sql DBINSERT INTO new_prefix_route VALUES ("+44", "10.10.1.1:5060", "route for this prefix");###########Error log after adding a prefix into new_prefix_route table & restart of kamailio 0(5802) CRITICAL: prefix_route [prefix_route.c:72]: add_route(): route name '10.10.1.1:5060' is not defined 0(5802) NOTICE: prefix_route [prefix_route.c:170]: pr_db_load(): Total prefix routes loaded: 1 0(5802) ERROR: prefix_route [prefix_route.c:174]: pr_db_load(): error flushing tree 0(5802) CRITICAL: prefix_route [prefix_route.c:212]: mod_init(): db load failed I have tried a "name" instead of IP (though i dont know how to convert that "name" into a IP:Port), But i am still getting same error using "name" instead of IP:port @ route field in DB. Please help.

1 0

git:master:b0b2ab6d: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: b0b2ab6d2ebdabb64a054b47ee68a3276de71185 URL: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T11:46:17+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… Patch: https://github.com/kamailio/kamailio/commit/b0b2ab6d2ebdabb64a054b47ee68a32… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 43a662763e..2f89366997 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -62,7 +62,7 @@ Bogdan-Andre Iancu 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -131,7 +131,7 @@ Bogdan-Andre Iancu 1.14. Set retry_after parameter 1.15. Set sock_flag parameter 1.16. Set sock_hdr_name parameter - 1.17. Set use_advertised_address parameter + 1.17. Set sock_mode parameter 1.18. Set method_filtering parameter 1.19. Set use_path parameter 1.20. Set path_mode parameter @@ -194,7 +194,7 @@ Chapter 1. Admin Guide 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -325,7 +325,7 @@ Chapter 1. Admin Guide 3.15. retry_after (integer) 3.16. sock_flag (integer) 3.17. sock_hdr_name (string) - 3.18. use_advertised_address (integer) + 3.18. sock_mode (integer) 3.19. method_filtering (integer) 3.20. use_path (integer) 3.21. path_mode (integer) @@ -604,21 +604,20 @@ modparam("registrar", "sock_flag", 18) modparam("registrar", "sock_hdr_name", "Sock-Info") ... -3.18. use_advertised_address (integer) +3.18. sock_mode (integer) - This parameter can be used to override value written into socket field - when contact is saved. If set to 1, advertised address will be written - instead local listen socket. + If set to 1, the server stores the advertised address in socket field, + instead of bind address. This could be useful when kamailio is installed behind NAT and it is necessary to store its public IP instead socket on which the register request was received. - Default value is 0 (disabled). + Default value is 0 (store bind address). - Example 1.17. Set use_advertised_address parameter + Example 1.17. Set sock_mode parameter ... -modparam("registrar", "use_advertised_address", 1) +modparam("registrar", "sock_mode", 1) ... 3.19. method_filtering (integer)

1 0

[kamailio/kamailio] registrar: added new parameter sock_addr (#2498)
by Konstantin 14 Oct '20

14 Oct '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This feature was made half year ago. We would like to have inside location record address of the host where kamailio is installed. However when we installed it behind NAT we got private address in this field. This feature introduces possibility to set a socket string which will be written into location record. It could be public address instead address on which the register request was received. The default value is NULL and it works as usual. The feature was installed on our production servers in April and since that time it works well. I would like to propose this feature to others, because it could be useful. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2498 -- Commit Summary -- * registrar: added new parameter sock_addr -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (25) M src/modules/registrar/registrar.c (2) M src/modules/registrar/registrar.h (1) M src/modules/registrar/save.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2498.patch https://github.com/kamailio/kamailio/pull/2498.diff -- 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/pull/2498

2 14

git:master:32bf022a: registrar: renamed parameter to use advertise addr for socket
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 32bf022ad48ff1d7ac02ce2201373e8b684d4f6f URL: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:31:52+02:00 registrar: renamed parameter to use advertise addr for socket - becomes sock_mode, when set to 0 (default) use bind address, if set to 1, then use advertised address if specified --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… Patch: https://github.com/kamailio/kamailio/commit/32bf022ad48ff1d7ac02ce2201373e8… --- diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 7dae9b6ccb..923fde39d9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -132,7 +132,7 @@ int reg_use_domain = 0; int sock_flag = -1; str sock_hdr_name = {0,0}; -int sock_advertise_enabled = 0; +int reg_sock_mode = 0; /* where to go for event route ("usrloc:contact-expired") */ int reg_expire_event_rt = -1; /* default disabled */ @@ -232,6 +232,7 @@ static param_export_t params[] = { {"received_avp", PARAM_STRING, &rcv_avp_param }, {"max_contacts", INT_PARAM, &default_registrar_cfg.max_contacts }, {"retry_after", INT_PARAM, &default_registrar_cfg.retry_after }, + {"sock_mode", PARAM_INT, &reg_sock_mode }, {"sock_flag", INT_PARAM, &sock_flag }, {"sock_hdr_name", PARAM_STR, &sock_hdr_name }, {"method_filtering", INT_PARAM, &method_filtering }, @@ -251,7 +252,6 @@ static param_export_t params[] = { {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {"min_expires_mode", PARAM_INT, &reg_min_expires_mode }, {"use_expired_contacts", INT_PARAM, &default_registrar_cfg.use_expired_contacts }, - {"use_advertised_address", PARAM_INT, &sock_advertise_enabled }, {0, 0, 0} }; diff --git a/src/modules/registrar/registrar.h b/src/modules/registrar/registrar.h index 0fbdbd5bd4..fcf565a6fd 100644 --- a/src/modules/registrar/registrar.h +++ b/src/modules/registrar/registrar.h @@ -99,7 +99,7 @@ extern int reg_flow_timer; extern str sock_hdr_name; extern int sock_flag; -extern int sock_advertise_enabled; +extern int reg_sock_mode; extern str reg_xavp_cfg; extern str reg_xavp_rcd; diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 702499cfdd..4302127814 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -62,6 +62,8 @@ #include "save.h" #include "config.h" +#define REG_SOCK_USE_ADVERTISED 1 /* 1<<0 */ + static int mem_only = 0; extern sruid_t _reg_sruid; @@ -255,14 +257,17 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, /* set received socket */ if (_m->flags&sock_flag) { ci.sock = get_sock_val(_m); - if (ci.sock==0) + } + if (ci.sock==NULL) { + if ((reg_sock_mode & REG_SOCK_USE_ADVERTISED) + && _m->rcv.bind_address != NULL + && _m->rcv.bind_address->useinfo.sock_str.len > 0) { + memset(&si, 0, sizeof(struct socket_info)); + si.sock_str = _m->rcv.bind_address->useinfo.sock_str; + ci.sock = &si; + } else { ci.sock = _m->rcv.bind_address; - } else if (sock_advertise_enabled && _m->rcv.bind_address && _m->rcv.bind_address->useinfo.sock_str.len > 0) { - memset(&si, 0, sizeof(struct socket_info)); - si.sock_str = _m->rcv.bind_address->useinfo.sock_str; - ci.sock = &si; - } else { - ci.sock = _m->rcv.bind_address; + } } /* set tcp connection id */

1 0

git:master:b495a00c: registrar: docs updated to reflect sock_mode parameter
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: b495a00c9a6fb2e073e7bd2a2b394facc9d76ea5 URL: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:34:03+02:00 registrar: docs updated to reflect sock_mode parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… Patch: https://github.com/kamailio/kamailio/commit/b495a00c9a6fb2e073e7bd2a2b394fa… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 52559a638f..4fb1e8a5e8 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -535,26 +535,27 @@ modparam("registrar", "sock_hdr_name", "Sock-Info") </example> </section> - <section id="registrar.p.use_advertised_address"> - <title><varname>use_advertised_address</varname> (integer)</title> + <section id="registrar.p.sock_mode"> + <title><varname>sock_mode</varname> (integer)</title> <para> - This parameter can be used to override value written into socket field when contact is saved. - If set to 1, advertised address will be written instead local listen socket. + If set to 1, the server stores the advertised address in socket field, + instead of bind address. </para> <para> - This could be useful when kamailio is installed behind NAT and it is necessary to store its public IP - instead socket on which the register request was received. + This could be useful when kamailio is installed behind NAT and it is + necessary to store its public IP instead socket on which the register + request was received. </para> <para> <emphasis> - Default value is 0 (disabled). + Default value is 0 (store bind address). </emphasis> </para> <example> - <title>Set <varname>use_advertised_address</varname> parameter</title> + <title>Set <varname>sock_mode</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("registrar", "use_advertised_address", 1) +modparam("registrar", "sock_mode", 1) ... </programlisting> </example>

1 0

git:master:28e69c4c: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 28e69c4cf214cbedb17ddccbf88a4acf8456adeb URL: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-14T11:31:20+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac… Patch: https://github.com/kamailio/kamailio/commit/28e69c4cf214cbedb17ddccbf88a4ac…

1 0

git:master:e3ec71b4: registrar: added option to store advertised address in socket field (#2498)
by GitHub 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: e3ec71b45181c2413b4aba4e2ea5e1b371a6da56 URL: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b… Author: Konstantin <piligrim_pk(a)mail.ru> Committer: GitHub <noreply(a)github.com> Date: 2020-10-14T11:22:20+02:00 registrar: added option to store advertised address in socket field (#2498) * registrar: added new parameter sock_addr - override socket address on which the register request was received - default is NULL - store local socket address - usefull when kamailio is behind NAT and it is necessary to store public instead private address * registrar: replaced dynamically allocated var with static var Made refactoring of proposed solution. * registrar: socket field in location db will be initialized by advertise address from listen parameter According to code review recommendations I changed my solution - removed new config file parameter and use advertise address from listen parameter to initialized received socket which is written to location db inside registration record. * registrar: added additional check socket bind_address for null * registrar: introduced config parameter to enable/disable socket advertised address feature --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b… Patch: https://github.com/kamailio/kamailio/commit/e3ec71b45181c2413b4aba4e2ea5e1b…

1 0

[kamailio/kamailio] crypto: add crypto_hmac_sha256() function (#2505)
by vitalikvoip 14 Oct '20

14 Oct '20

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [*] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [*] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds crypto_hmac_sha256() function that can be used for JWT (JSON Web Token) authentication. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2505 -- Commit Summary -- * crypto: add crypto_hmac_sha256() function -- File Changes -- M src/modules/crypto/crypto_mod.c (115) M src/modules/crypto/doc/crypto_admin.xml (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2505.patch https://github.com/kamailio/kamailio/pull/2505.diff -- 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/pull/2505

2 3

git:master:e7fe760e: Merge pull request #2505 from vitalikvoip/master
by GitHub 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: e7fe760e6a4a0f0c5eaedd0eb3530c5b3e1c7d05 URL: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-14T11:16:44+02:00 Merge pull request #2505 from vitalikvoip/master crypto: add crypto_hmac_sha256() function --- Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5… Patch: https://github.com/kamailio/kamailio/commit/e7fe760e6a4a0f0c5eaedd0eb3530c5…

1 0

git:master:31d2e205: crypto: add crypto_hmac_sha256() function
by Vitalii Aleksandrov 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 31d2e205cb4c17631abe8458a8a3b80323910637 URL: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80… Author: Vitalii Aleksandrov <valeksandrov(a)avistar.com> Committer: Vitalii Aleksandrov <valeksandrov(a)avistar.com> Date: 2020-10-13T15:07:16+03:00 crypto: add crypto_hmac_sha256() function --- Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80… Patch: https://github.com/kamailio/kamailio/commit/31d2e205cb4c17631abe8458a8a3b80…

1 0

[kamailio/kamailio] Make the FLAGS declaration slightly clearer (#2500)
by Andrew Webster 14 Oct '20

14 Oct '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2500 -- Commit Summary -- * Make the FLAGS declaration slightly clearer -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2500.patch https://github.com/kamailio/kamailio/pull/2500.diff -- 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/pull/2500

2 5

git:master:59b4a820: etc: kamailio.cfg - relocated comment related to branch flags
by Daniel-Constantin Mierla 14 Oct '20

14 Oct '20

Module: kamailio Branch: master Commit: 59b4a820aba7487552e98c8b082e7abd56fa8e81 URL: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-14T11:13:01+02:00 etc: kamailio.cfg - relocated comment related to branch flags --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… Patch: https://github.com/kamailio/kamailio/commit/59b4a820aba7487552e98c8b082e7ab… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index e31d112839..29af152df7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -150,12 +150,12 @@ import_file "kamailio-local.cfg" # - flags # FLT_ - per transaction (message) flags -# FLB_ - per branch flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 +# FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7

1 0

git:master:531eaea4: modules: readme files regenerated - pike ... [skip ci]
by Kamailio Dev 13 Oct '20

13 Oct '20

Module: kamailio Branch: master Commit: 531eaea43e9a086aa7d1797ce3fa710691c1880b URL: https://github.com/kamailio/kamailio/commit/531eaea43e9a086aa7d1797ce3fa710… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-13T15:46:25+02:00 modules: readme files regenerated - pike ... [skip ci] --- Modified: src/modules/pike/README --- Diff: https://github.com/kamailio/kamailio/commit/531eaea43e9a086aa7d1797ce3fa710… Patch: https://github.com/kamailio/kamailio/commit/531eaea43e9a086aa7d1797ce3fa710… --- diff --git a/src/modules/pike/README b/src/modules/pike/README index beea746f45..761ae10822 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -31,6 +31,7 @@ Bogdan-Andrei Iancu 4. Functions 4.1. pike_check_req() + 4.2. pike_check_ip(ipaddr) 5. RPC Commands @@ -50,6 +51,7 @@ Bogdan-Andrei Iancu 1.3. Set remove_latency parameter 1.4. Set pike_log_level parameter 1.5. pike_check_req usage + 1.6. pike_check_ip usage 2.1. Using pike.top 3.1. Tree of IP addresses @@ -73,6 +75,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. pike_check_req() + 4.2. pike_check_ip(ipaddr) 5. RPC Commands @@ -175,6 +178,7 @@ modparam("pike", "pike_log_level", -1) 4. Functions 4.1. pike_check_req() + 4.2. pike_check_ip(ipaddr) 4.1. pike_check_req() @@ -191,13 +195,30 @@ Warning * -2 (false) - IP is detected as a new source of flooding - first time detection - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE|ONREPLY_ROUTE. Example 1.5. pike_check_req usage ... if (!pike_check_req()) { exit; }; ... +4.2. pike_check_ip(ipaddr) + + Process the IP address parameter and return false if it was exceeding + the blocking limit. The return codes are the same from + pike_check_req(). + + The parameter can contain variables. + + This function can be used from REQUEST_ROUTE|ONREPLY_ROUTE. + + Example 1.6. pike_check_ip usage +... +if (!pike_check_ip("1.2.3.4")) { exit; }; +... +if (!pike_check_ip("$si")) { exit; }; +... + 5. RPC Commands 5.1. pike.top

1 0

source addr param to pike_check_req()
by Juha Heinanen 13 Oct '20

13 Oct '20

How about adding source addr param to pike_check_req()? Motivation is that main proxy may be front-ended by another proxy that passes the real source addr to the main proxy in a header. -- Juha

2 3

git:master:2ce1a324: pike: new function pike_check_ip(ipaddr)
by Daniel-Constantin Mierla 13 Oct '20

13 Oct '20

Module: kamailio Branch: master Commit: 2ce1a3247fd5a05e0f32c7a591d5377f0e52bdd1 URL: https://github.com/kamailio/kamailio/commit/2ce1a3247fd5a05e0f32c7a591d5377… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-13T15:28:40+02:00 pike: new function pike_check_ip(ipaddr) - check the parameter ipaddr in the pike tree - old pike_check_req() is same as pike_check_ip("$si") --- Modified: src/modules/pike/pike.c Modified: src/modules/pike/pike_funcs.c Modified: src/modules/pike/pike_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/2ce1a3247fd5a05e0f32c7a591d5377… Patch: https://github.com/kamailio/kamailio/commit/2ce1a3247fd5a05e0f32c7a591d5377… --- diff --git a/src/modules/pike/pike.c b/src/modules/pike/pike.c index 7a85d826d9..33dcfd6420 100644 --- a/src/modules/pike/pike.c +++ b/src/modules/pike/pike.c @@ -36,6 +36,7 @@ #include "../../core/timer.h" #include "../../core/locking.h" #include "../../core/kemi.h" +#include "../../core/mod_fix.h" #include "ip_tree.h" #include "timer.h" #include "pike_funcs.h" @@ -63,7 +64,10 @@ pike_list_link_t *pike_timer = 0; static cmd_export_t cmds[]={ - {"pike_check_req", (cmd_function)w_pike_check_req, 0, 0, 0, REQUEST_ROUTE}, + {"pike_check_req", (cmd_function)w_pike_check_req, 0, + 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"pike_check_ip", (cmd_function)w_pike_check_ip, 1, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {0,0,0,0,0,0} }; @@ -177,6 +181,11 @@ static sr_kemi_t sr_kemi_pike_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pike"), str_init("pike_check_ip"), + SR_KEMIP_INT, pike_check_ip, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 804ebb6ec0..42fc5172e4 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -32,6 +32,7 @@ #include "../../core/ip_addr.h" #include "../../core/resolve.h" #include "../../core/counters.h" +#include "../../core/mod_fix.h" #include "ip_tree.h" #include "pike_funcs.h" #include "timer.h" @@ -53,28 +54,11 @@ void pike_counter_init() -int pike_check_req(sip_msg_t *msg) +int pike_check_ipaddr(sip_msg_t *msg, ip_addr_t* ip) { pike_ip_node_t *node; pike_ip_node_t *father; unsigned char flags; - struct ip_addr* ip; - - -#ifdef _test - /* get the ip address from second via */ - if (parse_headers(msg, HDR_VIA1_F, 0)!=0 ) - return -1; - if (msg->via1==0 ) - return -1; - /* convert from string to ip_addr */ - ip = str2ip( &msg->via1->host ); - if (ip==0) - return -1; -#else - ip = &(msg->rcv.src_ip); -#endif - /* first lock the proper tree branch and mark the IP with one more hit*/ lock_tree_branch( ip->u.addr[0] ); @@ -159,11 +143,61 @@ int pike_check_req(sip_msg_t *msg) } -int w_pike_check_req(struct sip_msg *msg, char *foo, char *bar) +int pike_check_req(sip_msg_t *msg) +{ + ip_addr_t* ip; + + +#ifdef _test + /* get the ip address from second via */ + if (parse_headers(msg, HDR_VIA1_F, 0)!=0 ) + return -1; + if (msg->via1==0 ) + return -1; + /* convert from string to ip_addr */ + ip = str2ip( &msg->via1->host ); + if (ip==0) + return -1; +#else + ip = &(msg->rcv.src_ip); +#endif + + return pike_check_ipaddr(msg, ip); +} + +int w_pike_check_req(sip_msg_t *msg, char *foo, char *bar) { return pike_check_req(msg); } +int pike_check_ip(sip_msg_t *msg, str *strip) +{ + ip_addr_t* ip; + + if(strip==NULL || strip->len<=0) { + return -1; + } + + ip = str2ip(strip); + if (ip==0) { + LM_ERR("failed to parse ip address: %.*s\n", strip->len, strip->s); + return -1; + } + + return pike_check_ipaddr(msg, ip); +} + +int w_pike_check_ip(sip_msg_t *msg, char *pip, char *bar) +{ + str strip; + + if(fixup_get_svalue(msg, (gparam_t*)pip, &strip)<0) { + LM_ERR("failed to get the ip parameter\n"); + return -1; + } + return pike_check_ip(msg, &strip); +} + void clean_routine(unsigned int ticks , void *param) { static unsigned char mask[32]; /* 256 positions mask */ diff --git a/src/modules/pike/pike_funcs.h b/src/modules/pike/pike_funcs.h index c41aa7b3f0..5e83c2381b 100644 --- a/src/modules/pike/pike_funcs.h +++ b/src/modules/pike/pike_funcs.h @@ -28,7 +28,9 @@ void pike_counter_init(void); int pike_check_req(sip_msg_t *msg); +int pike_check_ip(sip_msg_t *msg, str *strip); int w_pike_check_req(sip_msg_t *msg, char *foo, char *bar); +int w_pike_check_ip(sip_msg_t *msg, char *pip, char *bar); void clean_routine(unsigned int, void*); void swap_routine(unsigned int, void*);

1 0

git:master:8a0c8f1b: pike: docs for pike_check_ip()
by Daniel-Constantin Mierla 13 Oct '20

13 Oct '20

Module: kamailio Branch: master Commit: 8a0c8f1b4c6da364d527fd8e1bc305332825b50e URL: https://github.com/kamailio/kamailio/commit/8a0c8f1b4c6da364d527fd8e1bc3053… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-13T15:34:42+02:00 pike: docs for pike_check_ip() --- Modified: src/modules/pike/doc/pike_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a0c8f1b4c6da364d527fd8e1bc3053… Patch: https://github.com/kamailio/kamailio/commit/8a0c8f1b4c6da364d527fd8e1bc3053… --- diff --git a/src/modules/pike/doc/pike_admin.xml b/src/modules/pike/doc/pike_admin.xml index 1963373d9d..612765843f 100644 --- a/src/modules/pike/doc/pike_admin.xml +++ b/src/modules/pike/doc/pike_admin.xml @@ -193,7 +193,7 @@ modparam("pike", "pike_log_level", -1) </itemizedlist> </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE|ONREPLY_ROUTE. </para> <example> <title><function>pike_check_req</function> usage</title> @@ -204,6 +204,32 @@ if (!pike_check_req()) { exit; }; </programlisting> </example> </section> + <section id="pike.f.pike_check_ip"> + <title> + <function moreinfo="none">pike_check_ip(ipaddr)</function> + </title> + <para> + Process the IP address parameter and return false if it was exceeding + the blocking limit. The return codes are the same from pike_check_req(). + </para> + <para> + The parameter can contain variables. + </para> + <para> + This function can be used from REQUEST_ROUTE|ONREPLY_ROUTE. + </para> + <example> + <title><function>pike_check_ip</function> usage</title> + <programlisting format="linespecific"> +... +if (!pike_check_ip("1.2.3.4")) { exit; }; +... +if (!pike_check_ip("$si")) { exit; }; +... +</programlisting> + </example> + </section> + </section> <section>

1 0

how to get a value from SIP INVITE Header
by sai sudheer 13 Oct '20

13 Oct '20

Hii Please help me to get the a value from SIP INVITE header reached to kamailio like INVITE sip:+341930203454@sub.domain.com;myid=+34@sub.domain.com SIP/2.0 and i want to save the myid value +34 into a variable, without the domain name. $var(uri) = $sel(ruri); xavp_params_explode("$(var(uri){s.unbracket})", "uri"); xlog("L_INFO", "$var(uri) Received converted to $xavp(uri=>myid[0])\n"); I tried above and it prints +34(a)sub.domain.com But i want to just save +34 into a variable to further check the prefix based routing from the database. 1) Could you please help how to get it or If there is any alternate/single line approach to get this value? 2) $var & $xavp are process-local variables, and they cant be shared with other calls? Right 3) What is the best module to route calls based their prefix ? pstn_route or dynamic routing or any suggestions? Please help, thanks in advance.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev