sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:b505a4df: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b505a4df46c241f8676f663ddcdddba935c0b3e4 URL: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-29T17:31:14+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… Patch: https://github.com/kamailio/kamailio/commit/b505a4df46c241f8676f663ddcdddba… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 5ec1281c47..ac3a6b7bb6 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1166,9 +1166,9 @@ modparam("usrloc", "ka_filter", 1) 3.55. ka_loglevel (int) The level to print the log message when the keepalive response is - received. It should be a value between LOG_ALERT + received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). - Default value is “kamailio.org”. + Default value is “255” (disabled). Example 1.55. ka_loglevel parameter usage ... @@ -1185,11 +1185,11 @@ modparam("usrloc", "ka_loglevel", 1) The value of this parameter can contain script variables that are evaluated with the SIP response. - Default value is “ to-uri: [$tu] src-uri: [$su]”. + Default value is “ to-uri: [$tu] remote-addr: [$sas]”. Example 1.56. ka_logmsg parameter usage ... -modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ... 4. RPC Commands

4 years, 9 months

git:master:c3a8a97d: usrloc: docs - updates for ka_loglevel and ka_logmsg params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3a8a97d235b2399994c191a7b289bd943ce6388 URL: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T17:30:03+02:00 usrloc: docs - updates for ka_loglevel and ka_logmsg params --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… Patch: https://github.com/kamailio/kamailio/commit/c3a8a97d235b2399994c191a7b289bd… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index a6d9654d51..396d89828d 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1428,10 +1428,10 @@ modparam("usrloc", "ka_filter", 1) <title><varname>ka_loglevel</varname> (int)</title> <para> The level to print the log message when the keepalive response is - received. It should be a value between LOG_ALERT + received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). </para> <para> - Default value is <quote>kamailio.org</quote>. + Default value is <quote>255</quote> (disabled). </para> <example> <title><varname>ka_loglevel</varname> parameter usage</title> @@ -1456,13 +1456,13 @@ modparam("usrloc", "ka_loglevel", 1) evaluated with the SIP response. </para> <para> - Default value is <quote> to-uri: [$tu] src-uri: [$su]</quote>. + Default value is <quote> to-uri: [$tu] remote-addr: [$sas]</quote>. </para> <example> <title><varname>ka_logmsg</varname> parameter usage</title> <programlisting format="linespecific"> ... -modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ... </programlisting> </example>

4 years, 9 months

git:master:8525a26f: usrloc: default keepalive log message prints remote address in socket format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8525a26fa60c70035df22495ecf309d01019d093 URL: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T17:25:28+02:00 usrloc: default keepalive log message prints remote address in socket format - more compact than sip uri format --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… Patch: https://github.com/kamailio/kamailio/commit/8525a26fa60c70035df22495ecf309d… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 8d3cfffdbf..dfc0bc5141 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -124,7 +124,7 @@ str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; int ul_ka_loglevel = 255; -str ul_ka_logmsg = str_init(" to-uri: [$tu] src-uri: [$su]"); +str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; /* sruid to get internal uid for mi/rpc commands */

4 years, 9 months

[kamailio/kamailio] Kamailio breaks RFC's 'Contact Header' (#2266)

by ObakeFilter

### Description I'm running Kamailio 5.2.0, whenever I relay an invite via Kamailio, my original contact header is changed from the original: <sip:+XXXXXXXXX@YYY.YYY.YYY.YYYY:5060;transport=udp;gw=netvision> To <sip:YYY.YYY.YYY.YYY;line=sr-.n274i0TMfsHMcCAlVyAMV5IlgCXvV8n4edQlgIUlgKQ4Vk74gI1LmZ69NM79FZAR3JC.cDNLfHUj3Wnp3MP9nd*>. Even when I set it correctly on my route, using: remove_hf("Contact"); append_hf("Contact: <sip:$tU@YYY.YYY.YYY.YYY:5060;transport=udp;gw=netvision>\r\n", "Contact"); It still ends up being modified. What can I do to keep the contact header as it is?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` U YYY.YYY.YYY.YYY:5060 -> 81.24.193.248:5060 INVITE sip:+442033202609@81.24.193.248:5060 SIP/2.0. Record-Route: <sip:YYY.YYY.YYY.YYY;r2=on;lr=on;ftag=mp0S9yH11vryH;vsf=AAAAAAAAAAAAAAAAAAAAAAADCAEACRgPGB8AAy4xNjM->. Record-Route: <sip:2YYY.YYY.YYY.YYY;line=sr-.n274V8TlidQMVyUlg87vV8nlfDXlVHB9VD0.VHB9VDoLGtNRbH7ltlTEkyQl3jXEky1LNMoRkt5ukt5ukt5ukt5ukt5ukt5ukt5ukt5W8M5WktckoLuWAsduktTMm64pCAD>. Via: SIP/2.0/UDP YYY.YYY.YYY.YYY;branch=z9hG4bK53e9.308596b23ed683368534c9d609dce0f6.0. Via: SIP/2.0/UDP YYY.YYY.YYY.YYY;branch=z9hG4bKsr-kA2uvfsUlerJWtIylgCXvV8n4edQlgIUlgKQ4Vk74gI1.oJVjb2njburlgCXvV8n4edQlgIUlgKQ4HWsRbWPLVDX.GrXLcAHlcC74nZXKbTVpcHh4b6mMGZvJgLsLcJTkgtGu2PGgy**. Max-Forwards: 67. From: +18702935016 <sip:+18702935016@YYY.YYY.YYY.YYY>;tag=mp0S9yH11vryH. To: <sip:+442033202609@81.24.193.248>. Call-ID: !!:jbkfMgyHjbsDjblfjqAQlVldvgyHKolDlcIHlcknKVIdjcIT. CSeq: 18182498 INVITE. Contact: <sip:YYY.YYY.YYY.YYY;line=sr-.n274i0TMfsHMcCAlVyAMV5IlgCXvV8n4edQlgIUlgKQ4Vk74gI1LmZ69NM79FZAR3JC.cDNLfHUj3Wnp3MP9nd*>. User-Agent: FreeSWITCH-mod_sofia/1.9.0+git~20180706T160334Z~de3df8dc0e~64bit. Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY. Supported: timer, path, replaces. Allow-Events: talk, hold, conference, refer. Content-Type: application/sdp. Content-Disposition: session. Content-Length: 224. Remote-Party-ID: "+18702935016" <sip:+18702935016@YYY.YYY.YYY.YYY>;party=calling;screen=yes;privacy=off. .. v=0. o=FreeSWITCH 1585439298 1585439299 IN IP4 ZZZ.ZZZ.ZZZ.ZZZ. s=FreeSWITCH. c=IN IP4 ZZZ.ZZZ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0-dev6 (x86_64/linux) c4daee 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: c4daee compiled on 15:59:42 Aug 22 2018 with gcc 5.4.0 ``` * **Operating System**:  ``` Linux version 4.4.0-98-generic (buildd@lcy01-03) (gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4) ) #121-Ubuntu SMP Tue Oct 10 14:24:03 UTC 2017 Linux kamaillioegress 4.4.0-98-generic #121-Ubuntu SMP Tue Oct 10 14:24:03 UTC 2017 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/2266

4 years, 9 months

master xml warnings

by Juha Heinanen

version.xml:14: namespace error : Namespace prefix db on para is not defined <db:para> ^

4 years, 9 months

git:master:367a865e: lib/srdb1/schema: removed kamailio-extensions.xml file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 367a865e7f0c9cd67fda9176add1ca3c0dad2d46 URL: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T14:17:19+02:00 lib/srdb1/schema: removed kamailio-extensions.xml file - file didn't have any content itself, tried to include an inexistent extra.xml, which generated an warning for 'make dbschema' --- Removed: src/lib/srdb1/schema/kamailio-extensions.xml --- Diff: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… Patch: https://github.com/kamailio/kamailio/commit/367a865e7f0c9cd67fda9176add1ca3… --- diff --git a/src/lib/srdb1/schema/kamailio-extensions.xml b/src/lib/srdb1/schema/kamailio-extensions.xml deleted file mode 100644 index f4a0aec097..0000000000 --- a/src/lib/srdb1/schema/kamailio-extensions.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ - - <!ENTITY % entities SYSTEM "entities.xml"> - %entities; -]> - - - -<database xmlns:xi="http://www.w3.org/2001/XInclude"> - <name>CUSTOM Extensions</name> -  - <xi:include href="extra.xml"> - <xi:fallback/> - </xi:include> -  -  -</database>

4 years, 9 months

master compiler warnings

by Juha Heinanen

CC (gcc) [M usrloc.so] ul_keepalive.o ul_keepalive.c: In function 'ul_ka_urecord': ul_keepalive.c:61:18: warning: format '%x' expects argument of type 'unsigned int', but argument 26 has type '__suseconds_t' {aka 'long int'} [-Wformat=] #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ ^~~~~~~~~~~~~~~~~~~~~~~ ul_keepalive.c:193:50: note: in expansion of macro 'ULKA_MSG' kabuf_len = snprintf(kabuf, ULKA_BUF_SIZE - 1, ULKA_MSG, ^~~~~~~~ ul_keepalive.c:64:34: note: format string is defined here "From: <%.*s>;tag=%.*s-%x-%lx-%x-%x.%x\r\n" \ ~^ %lx In file included from ul_keepalive.c:30: ul_keepalive.c: In function 'ul_ka_reply_received': ../../core/dprint.h:316:24: warning: format '%u' expects argument of type 'unsigned int', but argument 11 has type '__suseconds_t' {aka 'long int'} [-Wformat=] fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:4: note: in expansion of macro 'LOG_FX' LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) ^~~~~~ ../../core/dprint.h:346:4: note: in expansion of macro 'LOG_FL' LOG_FL(facility, level, NULL, prefix, fmt, ## args) ^~~~~~ ../../core/dprint.h:349:4: note: in expansion of macro 'LOG_FP' LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) ^~~~~~ ../../core/dprint.h:396:32: note: in expansion of macro 'LOG' # define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) ^~~ ../../core/dprint.h:400:30: note: in expansion of macro 'DBG' # define DEBUG(fmt, args...) DBG(fmt , ## args) ^~~ ../../core/dprint.h:417:16: note: in expansion of macro 'DEBUG' #define LM_DBG DEBUG ^~~~~ ul_keepalive.c:366:2: note: in expansion of macro 'LM_DBG' LM_DBG("tv usec is [%u]\n", tvm.tv_usec); ^~~~~~ ul_keepalive.c:366:23: note: format string is defined here LM_DBG("tv usec is [%u]\n", tvm.tv_usec); ~^ %lu

4 years, 9 months

git:master:ea2d21c2: usrloc: cast to get rid of warnings for different OSes in keepalive printing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ea2d21c2bb53ffa54d4fedcdd1d582707c654da6 URL: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-29T12:41:32+02:00 usrloc: cast to get rid of warnings for different OSes in keepalive printing --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… Patch: https://github.com/kamailio/kamailio/commit/ea2d21c2bb53ffa54d4fedcdd1d5827… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 0addb21a42..6038a6002a 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -61,7 +61,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ "%.*s%.*s" \ - "From: <%.*s>;tag=%.*s-%x-%lx-%x-%x.%x\r\n" \ + "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ "CSeq: 80 %.*s\r\n" \ @@ -203,7 +203,8 @@ int ul_ka_urecord(urecord_t *ur) (uc->path.len>0)?"\r\n":"", ul_ka_from.len, ul_ka_from.s, uc->ruid.len, uc->ruid.s, ur->aorhash, - tv.tv_sec, tv.tv_usec, _ul_ka_counter, bcnt, + (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, + _ul_ka_counter, bcnt, ur->aor.len, ur->aor.s, (aortype==1)?"":"@", (aortype==1)?0:ul_ka_domain.len, (aortype==1)?"":ul_ka_domain.s, @@ -363,7 +364,7 @@ int ul_ka_reply_received(sip_msg_t *msg) LM_DBG("invalid tv usec value\n"); return 1; } - LM_DBG("tv usec is [%u]\n", tvm.tv_usec); + LM_DBG("tv usec is [%lu]\n", (unsigned long)tvm.tv_usec); /* tv_sec hash */ tok.len = p - fb->tag_value.s; @@ -385,7 +386,7 @@ int ul_ka_reply_received(sip_msg_t *msg) LM_DBG("invalid tv sec value\n"); return 1; } - LM_DBG("tv sec is [%lu]\n", tvm.tv_sec); + LM_DBG("tv sec is [%lu]\n", (unsigned long)tvm.tv_sec); /* aor hash */ tok.len = p - fb->tag_value.s;

4 years, 9 months

git:5.2:ad4bd72a: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: ad4bd72a29c9b3805152970f5eb9761dfc7e7a4d URL: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:42:04+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date (cherry picked from commit 446dc8006240050a1e0c13c7094e9f9739cc16c8) --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… Patch: https://github.com/kamailio/kamailio/commit/ad4bd72a29c9b3805152970f5eb9761… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

4 years, 9 months

git:5.3:cf28e401: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: cf28e401122daa6cd880af58e51519c2c7a43fda URL: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:41:42+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date (cherry picked from commit 446dc8006240050a1e0c13c7094e9f9739cc16c8) --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… Patch: https://github.com/kamailio/kamailio/commit/cf28e401122daa6cd880af58e51519c… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

4 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020