sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

[kamailio/kamailio] misc: examples; ims: Update kamailio.cfg example to function out of the box on current releases (#2203)
by Nick 05 Feb '20

05 Feb '20

Changes to example files for PCSCF in misc/examples/ims to make funcitional with current stable version.  #### 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 Changes to example files for PCSCF in misc/examples/ims to make funcitional with current stable version. Changes: - Loading IPsec module prior to IMS Usrloc PCSCF (Now required) - removed modparam("ims_usrloc_pcscf", "hashing_type", 2) from example (This parameter was removed some time ago) - Fix to formatting of single MySQL connection to work in current version - Bind to any IP by default - Dispatcher parameters only loaded if required You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2203 -- Commit Summary -- * misc: examples: IMS PCSCF kamailio.cfg update * misc: examples: IMS PCSCF pcscf.cfg update -- File Changes -- M misc/examples/ims/pcscf/kamailio.cfg (6) M misc/examples/ims/pcscf/pcscf.cfg.sample (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2203.patch https://github.com/kamailio/kamailio/pull/2203.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/2203

2 2

git:master:d74157a3: Merge pull request #2203 from nickvsnetworking/IMS_examples_refresh
by GitHub 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: d74157a3a2d97a50dc5de98a0e5fc1c8aa75c09b URL: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-02-05T18:00:20+01:00 Merge pull request #2203 from nickvsnetworking/IMS_examples_refresh misc: examples; ims: Update kamailio.cfg example to function out of the box on current releases --- Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample --- Diff: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… Patch: https://github.com/kamailio/kamailio/commit/d74157a3a2d97a50dc5de98a0e5fc1c… --- diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index 3ffa779eaf..b2660f134b 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -161,10 +161,11 @@ loadmodule "statistics" loadmodule "ims_dialog" loadmodule "ims_usrloc_pcscf" -loadmodule "ims_registrar_pcscf" #!ifdef WITH_IPSEC loadmodule "ims_ipsec_pcscf" #!endif +loadmodule "ims_registrar_pcscf" + #!ifdef WITH_XMLRPC loadmodule "xmlrpc" @@ -329,6 +330,7 @@ modparam("ctl", "binrpc", "unix:/run/kamailio_pcscf/kamailio_ctl") # ----------------- Settings for Dispatcher --------------- modparam("dispatcher", "list_file", "/etc/kamailio_pcscf/dispatcher.list") +#!ifdef WITH_SBC # Dispatcher: Enable Failover-Support modparam("dispatcher", "flags", 2) # Dispatcher: Overwrite Destination address, if required. @@ -343,6 +345,7 @@ modparam("dispatcher", "sock_avp", "$avp(DISPATCHER_SOCK_AVP)") modparam("dispatcher", "ds_ping_interval", 15) # Actively query the gateways: modparam("dispatcher", "ds_probing_mode", 1) +#!endif # -- usrloc params -- #!ifdef DB_URL @@ -353,7 +356,6 @@ modparam("ims_usrloc_pcscf", "db_url", DB_URL) #!endif modparam("ims_usrloc_pcscf", "db_mode", 1) #!endif -modparam("ims_usrloc_pcscf", "hashing_type", 2) modparam("ims_usrloc_pcscf", "enable_debug_file", 0) modparam("ims_usrloc_pcscf", "match_contact_host_port", 1) modparam("ims_registrar_pcscf", "is_registered_fallback2ip", 1) diff --git a/misc/examples/ims/pcscf/pcscf.cfg.sample b/misc/examples/ims/pcscf/pcscf.cfg.sample index 6b7a7231ca..4d26357764 100644 --- a/misc/examples/ims/pcscf/pcscf.cfg.sample +++ b/misc/examples/ims/pcscf/pcscf.cfg.sample @@ -1,14 +1,14 @@ # IP-Adress for incoming SIP-Traffic, in the following format: # SIP / UDP -listen=udp:11.22.33.44:5060 +listen=udp:0.0.0.0:5060 # SIP / TCP -#listen=tcp:11.22.33.44:5060 +#listen=tcp:0.0.0.0:5060 # SIP / TCP/TLS -#listen=tls:11.22.33.44:5061 +#listen=tls:0.0.0.0:5061 # IPSEC / UDP -#!define IPSEC_LISTEN_ADDR "11.22.33.44" +#!define IPSEC_LISTEN_ADDR "0.0.0.0" #!define IPSEC_CLIENT_PORT 5062 #!define IPSEC_SERVER_PORT 5063 @@ -33,7 +33,7 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define XMLRPC_WHITELIST_3 "127.0.0.1" # Databases: -#!define DB_URL "con1=>mysql://pcscf:heslo@127.0.0.1/pcscf" +#!define DB_URL "mysql://pcscf:heslo@127.0.0.1/pcscf" ##!define DB_URL2 "con2=>mysql://pcscf:heslo@127.0.0.1/pcscf" #!define SQLOPS_DBURL "pcscf=>mysql://pcscf:heslo@127.0.0.1/pcscf" @@ -109,4 +109,4 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define WITH_REGINFO ##!define WITH_RTPPING ##!define WITH_WEBSOCKET -##!define WITH_IPSEC +#!define WITH_IPSEC

1 0

git:master:decd1848: misc: examples: IMS PCSCF pcscf.cfg update
by GitHub 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: decd1848e8c3c8a68553dba48abb4147195b5bf5 URL: https://github.com/kamailio/kamailio/commit/decd1848e8c3c8a68553dba48abb414… Author: Nick <nick(a)nickvsnetworking.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-25T11:38:19+11:00 misc: examples: IMS PCSCF pcscf.cfg update Minor changes to make the example functional in the current stable release and higher. - Load WITH_IPSEC by default (IPsec module is required for IMS Usrloc to load) - Bind to any IP in example - Removed con=> prefix on MySQL Connection (not used in single instance / if not clustered) --- Modified: misc/examples/ims/pcscf/pcscf.cfg.sample --- Diff: https://github.com/kamailio/kamailio/commit/decd1848e8c3c8a68553dba48abb414… Patch: https://github.com/kamailio/kamailio/commit/decd1848e8c3c8a68553dba48abb414… --- diff --git a/misc/examples/ims/pcscf/pcscf.cfg.sample b/misc/examples/ims/pcscf/pcscf.cfg.sample index 6b7a7231ca..4d26357764 100644 --- a/misc/examples/ims/pcscf/pcscf.cfg.sample +++ b/misc/examples/ims/pcscf/pcscf.cfg.sample @@ -1,14 +1,14 @@ # IP-Adress for incoming SIP-Traffic, in the following format: # SIP / UDP -listen=udp:11.22.33.44:5060 +listen=udp:0.0.0.0:5060 # SIP / TCP -#listen=tcp:11.22.33.44:5060 +#listen=tcp:0.0.0.0:5060 # SIP / TCP/TLS -#listen=tls:11.22.33.44:5061 +#listen=tls:0.0.0.0:5061 # IPSEC / UDP -#!define IPSEC_LISTEN_ADDR "11.22.33.44" +#!define IPSEC_LISTEN_ADDR "0.0.0.0" #!define IPSEC_CLIENT_PORT 5062 #!define IPSEC_SERVER_PORT 5063 @@ -33,7 +33,7 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define XMLRPC_WHITELIST_3 "127.0.0.1" # Databases: -#!define DB_URL "con1=>mysql://pcscf:heslo@127.0.0.1/pcscf" +#!define DB_URL "mysql://pcscf:heslo@127.0.0.1/pcscf" ##!define DB_URL2 "con2=>mysql://pcscf:heslo@127.0.0.1/pcscf" #!define SQLOPS_DBURL "pcscf=>mysql://pcscf:heslo@127.0.0.1/pcscf" @@ -109,4 +109,4 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define WITH_REGINFO ##!define WITH_RTPPING ##!define WITH_WEBSOCKET -##!define WITH_IPSEC +#!define WITH_IPSEC

1 0

git:master:74e6daa7: misc: examples: IMS PCSCF kamailio.cfg update
by GitHub 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: 74e6daa71bf7dde64b907b7a1b9b3ebf925fad2b URL: https://github.com/kamailio/kamailio/commit/74e6daa71bf7dde64b907b7a1b9b3eb… Author: Nick <nick(a)nickvsnetworking.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-25T11:34:39+11:00 misc: examples: IMS PCSCF kamailio.cfg update Minor changes to make the example functional in the current stable release and higher. - removed modparam("ims_usrloc_pcscf", "hashing_type", 2) This parameter was removed under a466c7bf1f1908461b8ab9dbf10ab4c90b65e52a https://github.com/kamailio/kamailio/commit/a466c7bf1f1908461b8ab9dbf10ab4c… - Dispatcher parameters only loaded if #!WITH_SBC defined - Load IPsec IMS Module by default (IPsec module is required for IMS Usrloc to load) --- Modified: misc/examples/ims/pcscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/74e6daa71bf7dde64b907b7a1b9b3eb… Patch: https://github.com/kamailio/kamailio/commit/74e6daa71bf7dde64b907b7a1b9b3eb… --- diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index 3ffa779eaf..b2660f134b 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -161,10 +161,11 @@ loadmodule "statistics" loadmodule "ims_dialog" loadmodule "ims_usrloc_pcscf" -loadmodule "ims_registrar_pcscf" #!ifdef WITH_IPSEC loadmodule "ims_ipsec_pcscf" #!endif +loadmodule "ims_registrar_pcscf" + #!ifdef WITH_XMLRPC loadmodule "xmlrpc" @@ -329,6 +330,7 @@ modparam("ctl", "binrpc", "unix:/run/kamailio_pcscf/kamailio_ctl") # ----------------- Settings for Dispatcher --------------- modparam("dispatcher", "list_file", "/etc/kamailio_pcscf/dispatcher.list") +#!ifdef WITH_SBC # Dispatcher: Enable Failover-Support modparam("dispatcher", "flags", 2) # Dispatcher: Overwrite Destination address, if required. @@ -343,6 +345,7 @@ modparam("dispatcher", "sock_avp", "$avp(DISPATCHER_SOCK_AVP)") modparam("dispatcher", "ds_ping_interval", 15) # Actively query the gateways: modparam("dispatcher", "ds_probing_mode", 1) +#!endif # -- usrloc params -- #!ifdef DB_URL @@ -353,7 +356,6 @@ modparam("ims_usrloc_pcscf", "db_url", DB_URL) #!endif modparam("ims_usrloc_pcscf", "db_mode", 1) #!endif -modparam("ims_usrloc_pcscf", "hashing_type", 2) modparam("ims_usrloc_pcscf", "enable_debug_file", 0) modparam("ims_usrloc_pcscf", "match_contact_host_port", 1) modparam("ims_registrar_pcscf", "is_registered_fallback2ip", 1)

1 0

git:master:a4d78bb0: core: tcp - allow plain connections when tcp_accept_haproxy=yes
by Daniel-Constantin Mierla 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: a4d78bb01149c4c6bd8adc679e3547af270001a1 URL: https://github.com/kamailio/kamailio/commit/a4d78bb01149c4c6bd8adc679e3547a… Author: iurri <iurri(a)messagebird.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-05T17:56:44+01:00 core: tcp - allow plain connections when tcp_accept_haproxy=yes - PR #2206 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/a4d78bb01149c4c6bd8adc679e3547a… Patch: https://github.com/kamailio/kamailio/commit/a4d78bb01149c4c6bd8adc679e3547a… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index a9fdf8445a..e0a66be619 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1107,10 +1107,9 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { } } else if (bytes == 0) { return 1; /* EOF? Return "no IP change" in any case */ - } - else { - /* Wrong protocol */ - return -1; + } else { + /* not haproxy protocol */ + return 2; } done: @@ -1167,6 +1166,8 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, goto error; } else if (ret == 1) { LM_DBG("PROXY protocol did not override IP addresses\n"); + } else if (ret == 2) { + LM_DBG("PROXY protocol header not found\n"); } } print_ip("tcpconn_new: new tcp connection: ", &c->rcv.src_ip, "\n");

1 0

git:master:787e2f97: core: dprint - option to print callid as attribute in structure json logging
by Daniel-Constantin Mierla 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: 787e2f978876b62aa0899b72b920952917af6ffb URL: https://github.com/kamailio/kamailio/commit/787e2f978876b62aa0899b72b920952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-05T16:18:00+01:00 core: dprint - option to print callid as attribute in structure json logging - flag 'c' for --log-engine parameter --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/787e2f978876b62aa0899b72b920952… Patch: https://github.com/kamailio/kamailio/commit/787e2f978876b62aa0899b72b920952…

1 0

git:5.3:970708ec: Makefile.groups: add missing kemix to basic group
by Victor Seva 05 Feb '20

05 Feb '20

Module: kamailio Branch: 5.3 Commit: 970708ec637e47822cb39110bf970f3041ce0f11 URL: https://github.com/kamailio/kamailio/commit/970708ec637e47822cb39110bf970f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-05T14:23:54+01:00 Makefile.groups: add missing kemix to basic group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/970708ec637e47822cb39110bf970f3… Patch: https://github.com/kamailio/kamailio/commit/970708ec637e47822cb39110bf970f3… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 22fa6db0ed..fe65f55fca 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -15,7 +15,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ nat_traversal nathelper path pike pv ratelimit rr rtimer \ rtpproxy sanity sdpops siputils sl statistics textops \ textopsx tm tmx topoh xlog rtpengine stun sipt tcpops \ - auth_xkeys smsops tsilo cfgt statsc topos sipdump + auth_xkeys smsops tsilo cfgt statsc topos sipdump kemix # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \

1 0

git:master:7d355f79: Makefile.groups: add missing kemix to basic group
by Victor Seva 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: 7d355f796b37c944928c41f19892221155e34ee4 URL: https://github.com/kamailio/kamailio/commit/7d355f796b37c944928c41f19892221… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-05T14:22:54+01:00 Makefile.groups: add missing kemix to basic group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/7d355f796b37c944928c41f19892221… Patch: https://github.com/kamailio/kamailio/commit/7d355f796b37c944928c41f19892221… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 1d1798aae0..fe74c7ef2c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -15,7 +15,8 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ nat_traversal nathelper path pike pv ratelimit rr rtimer \ rtpproxy sanity sdpops siputils sl statistics textops \ textopsx tm tmx topoh xlog rtpengine stun sipt tcpops \ - auth_xkeys smsops tsilo cfgt statsc topos sipdump pv_headers + auth_xkeys smsops tsilo cfgt statsc topos sipdump pv_headers \ + kemix # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \

1 0

some missing kemi module functions
by David Escartin 05 Feb '20

05 Feb '20

hello all we are trying to rewrite our code to lua kemi, and we have found some issues/questions until we would like to share with you. -module call_obj not exported, we have tested a patch for the module to export the functions to kemi, which seems works fine -KSR.xlog.xinfo seems not able to select a facility as we currently can like xlog("LOG_LOCAL7", "L_NOTICE", "$var(xxxx)"); -module sipt not exported yet, must use ksr.x.modf ? will be exported for a future version? -on 5.3.0-dev5 we don't see the KSR.dialog.var_sets() and KSR.dialog.var_get/e/w() functions in the code, so we do use KSR.pv functions to set and retrieve those dialog vars. However i see them on master branch. Which kamailio release would have them? -sdpops function sdp_with_codecs_by_name seems to not me exported, is it on a todo list? -textops module, missing remove_hf and append_hf functions exported. We already did a patch for the remove_hf, despite we could work with textopsx remove_hf_value function to get the almost the same functionality. However, with append_hf i'm having some more issues. We cannot use modf to exec those funtions, we get something like For ---> KSR.x.modf("append_hf", "User-Agent: test", "To"); I get something like ----> Jun 27 07:19:16 proxy-1 /usr/local/kamailio/sbin/kamailio[5525]: ERROR: app_lua [app_lua_sr.c:188]: lua_sr_modf(): function 'append_hf' has fixup - cannot be used I could append a new header and not only at the end of the message by replacing a header called the same way, by doing something like KSR.textopsx.insert_hf_value("header", "value"); KSR.textopsx.remove_hf_value("header[-1]"); but i'm not able to insert a header after another different one like we can do with append_hf("header:value", "To") for instance. Is it expected to have it on a next commit those append_hf and remove_hf exported. Would we do a pull request with the ki_remove_hf we already have and the call_obj functions too? We can check to export append_hf too if it's not planned to be done thanks a lot and regards david

2 4

git:master:9f8645a1: app_lua: regenerated mapping table functions
by Daniel-Constantin Mierla 05 Feb '20

05 Feb '20

Module: kamailio Branch: master Commit: 9f8645a1b48e9f38d2b13a37b3fbcdfa645d88e0 URL: https://github.com/kamailio/kamailio/commit/9f8645a1b48e9f38d2b13a37b3fbcdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-05T09:51:03+01:00 app_lua: regenerated mapping table functions --- Modified: src/modules/app_lua/app_lua_kemi_export.c Modified: src/modules/app_lua/app_lua_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/9f8645a1b48e9f38d2b13a37b3fbcdf… Patch: https://github.com/kamailio/kamailio/commit/9f8645a1b48e9f38d2b13a37b3fbcdf…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020