- sr-dev - kamailio.org

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,precise,slave #1198
by jenkins＠sipwise.com 27 Sep '18

27 Sep '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 490.22 KB...] CC (gcc) [M rls.so] subscribe.o CC (gcc) [M rls.so] utils.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M rls.so] rls.so CC (gcc) [M xcap_client.so] xcap_callbacks.o CC (gcc) [M xcap_client.so] xcap_client.o CC (gcc) [M xcap_client.so] xcap_functions.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_client.so] xcap_client.so CC (gcc) [M xcap_server.so] xcap_misc.o CC (gcc) [M xcap_server.so] xcap_server.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_server.so] xcap_server.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kldap" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[4]: `libsrdb2.so.1.0' is up to date. LD (gcc) [M db2_ldap.so] db2_ldap.so CC (gcc) [M h350.so] h350_exp_fn.o CC (gcc) [M h350.so] h350_mod.o LD (gcc) [M h350.so] h350.so CC (gcc) [M ldap.so] iniparser.o CC (gcc) [M ldap.so] ld_session.o CC (gcc) [M ldap.so] ldap_api_fn.o CC (gcc) [M ldap.so] ldap_connect.o CC (gcc) [M ldap.so] ldap_escape.o CC (gcc) [M ldap.so] ldap_exp_fn.o CC (gcc) [M ldap.so] ldap_mod.o LD (gcc) [M ldap.so] ldap.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kxml" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M xhttp_pi.so] http_db_handler.o CC (gcc) [M xhttp_pi.so] xhttp_pi.o CC (gcc) [M xhttp_pi.so] xhttp_pi_fnc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xhttp_pi.so] xhttp_pi.so CC (gcc) [M xmlrpc.so] http.o CC (gcc) [M xmlrpc.so] xmlrpc.o LD (gcc) [M xmlrpc.so] xmlrpc.so CC (gcc) [M xmlops.so] pv_xml.o CC (gcc) [M xmlops.so] xmlops_mod.o LD (gcc) [M xmlops.so] xmlops.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kperl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M app_perl.so] app_perl_mod.o CC (gcc) [M app_perl.so] perlfunc.o xsubpp -typemap `perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap -typemap typemap kamailioxs.xs > kamailioxs.c CC (gcc) [M app_perl.so] kamailioxs.o LD (gcc) [M app_perl.so] app_perl.so CC (gcc) [M db_perlvdb.so] db_perlvdb.o CC (gcc) [M db_perlvdb.so] perlvdb_conv.o CC (gcc) [M db_perlvdb.so] perlvdb_oohelpers.o CC (gcc) [M db_perlvdb.so] perlvdbfunc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_perlvdb.so] db_perlvdb.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kutils" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M utils.so] conf.o CC (gcc) [M utils.so] pidf.o CC (gcc) [M utils.so] utils.o CC (gcc) [M utils.so] xcap_auth.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M utils.so] utils.so CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] functions.o CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[2]: Nothing to be done for `every-module'. make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' CC (gcc) [M db_redis.so] db_redis_mod.o In file included from redis_table.h:27:0, from db_redis_mod.c:30: redis_connection.h:26:21: fatal error: hiredis.h: No such file or directory compilation terminated. make[3]: *** [db_redis_mod.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010423.1213+precise' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.30368/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.30368/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_KPhyNW filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.30368 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/precise-amd64.building.27554 + '[' -r /var/run/lock/precise-amd64.update.27554 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.nNoZqUdzkA ']' + rm -rf /tmp/tmp.nNoZqUdzkA + '[' -n /tmp/apt-jdg_KPhyNW ']' + sudo rm -rf /tmp/apt-jdg_KPhyNW + '[' -n 4589 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=247 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:35:37 UTC 2018 [running 247 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:35:37 UTC 2018 [running 247 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,trusty,slave #1198
by jenkins＠sipwise.com 27 Sep '18

27 Sep '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 506.45 KB...] make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M rls.so] rls.so CC (gcc) [M xcap_client.so] xcap_callbacks.o CC (gcc) [M xcap_client.so] xcap_client.o CC (gcc) [M xcap_client.so] xcap_functions.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_client.so] xcap_client.so CC (gcc) [M xcap_server.so] xcap_misc.o CC (gcc) [M xcap_server.so] xcap_server.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_server.so] xcap_server.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kldap" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[4]: `libsrdb2.so.1.0' is up to date. LD (gcc) [M db2_ldap.so] db2_ldap.so CC (gcc) [M h350.so] h350_exp_fn.o CC (gcc) [M h350.so] h350_mod.o LD (gcc) [M h350.so] h350.so CC (gcc) [M ldap.so] iniparser.o CC (gcc) [M ldap.so] ld_session.o CC (gcc) [M ldap.so] ldap_api_fn.o CC (gcc) [M ldap.so] ldap_connect.o CC (gcc) [M ldap.so] ldap_escape.o CC (gcc) [M ldap.so] ldap_exp_fn.o CC (gcc) [M ldap.so] ldap_mod.o LD (gcc) [M ldap.so] ldap.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kxml" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M xhttp_pi.so] http_db_handler.o CC (gcc) [M xhttp_pi.so] xhttp_pi.o CC (gcc) [M xhttp_pi.so] xhttp_pi_fnc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xhttp_pi.so] xhttp_pi.so CC (gcc) [M xmlrpc.so] http.o CC (gcc) [M xmlrpc.so] xmlrpc.o LD (gcc) [M xmlrpc.so] xmlrpc.so CC (gcc) [M xmlops.so] pv_xml.o CC (gcc) [M xmlops.so] xmlops_mod.o LD (gcc) [M xmlops.so] xmlops.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kperl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M app_perl.so] app_perl_mod.o CC (gcc) [M app_perl.so] perlfunc.o xsubpp -typemap `perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap -typemap typemap kamailioxs.xs > kamailioxs.c CC (gcc) [M app_perl.so] kamailioxs.o LD (gcc) [M app_perl.so] app_perl.so CC (gcc) [M db_perlvdb.so] db_perlvdb.o CC (gcc) [M db_perlvdb.so] perlvdb_conv.o CC (gcc) [M db_perlvdb.so] perlvdb_oohelpers.o CC (gcc) [M db_perlvdb.so] perlvdbfunc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_perlvdb.so] db_perlvdb.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kutils" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M utils.so] conf.o CC (gcc) [M utils.so] pidf.o CC (gcc) [M utils.so] utils.o CC (gcc) [M utils.so] xcap_auth.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M utils.so] utils.so CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] functions.o CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[2]: Nothing to be done for `every-module'. make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M db_redis.so] db_redis_mod.o In file included from redis_table.h:27:0, from db_redis_mod.c:30: redis_connection.h:26:21: fatal error: hiredis.h: No such file or directory #include <hiredis.h> ^ compilation terminated. make[3]: *** [db_redis_mod.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.9643/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.9643/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_NfWJCn filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.9643 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/trusty-i386.building.8115 + '[' -r /var/run/lock/trusty-i386.update.8115 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.PkVlUrt18l ']' + rm -rf /tmp/tmp.PkVlUrt18l + '[' -n /tmp/apt-jdg_NfWJCn ']' + sudo rm -rf /tmp/apt-jdg_NfWJCn + '[' -n 3218 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=273 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:13:11 UTC 2018 [running 273 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:13:11 UTC 2018 [running 273 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,trusty,slave #1198
by jenkins＠sipwise.com 27 Sep '18

27 Sep '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 505.31 KB...] make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M rls.so] rls.so CC (gcc) [M xcap_client.so] xcap_callbacks.o CC (gcc) [M xcap_client.so] xcap_client.o CC (gcc) [M xcap_client.so] xcap_functions.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_client.so] xcap_client.so CC (gcc) [M xcap_server.so] xcap_misc.o CC (gcc) [M xcap_server.so] xcap_server.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_server.so] xcap_server.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kldap" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[4]: `libsrdb2.so.1.0' is up to date. LD (gcc) [M db2_ldap.so] db2_ldap.so CC (gcc) [M h350.so] h350_exp_fn.o CC (gcc) [M h350.so] h350_mod.o LD (gcc) [M h350.so] h350.so CC (gcc) [M ldap.so] iniparser.o CC (gcc) [M ldap.so] ld_session.o CC (gcc) [M ldap.so] ldap_api_fn.o CC (gcc) [M ldap.so] ldap_connect.o CC (gcc) [M ldap.so] ldap_escape.o CC (gcc) [M ldap.so] ldap_exp_fn.o CC (gcc) [M ldap.so] ldap_mod.o LD (gcc) [M ldap.so] ldap.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kxml" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M xhttp_pi.so] http_db_handler.o CC (gcc) [M xhttp_pi.so] xhttp_pi.o CC (gcc) [M xhttp_pi.so] xhttp_pi_fnc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M xhttp_pi.so] xhttp_pi.so CC (gcc) [M xmlrpc.so] http.o CC (gcc) [M xmlrpc.so] xmlrpc.o LD (gcc) [M xmlrpc.so] xmlrpc.so CC (gcc) [M xmlops.so] pv_xml.o CC (gcc) [M xmlops.so] xmlops_mod.o LD (gcc) [M xmlops.so] xmlops.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kperl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M app_perl.so] app_perl_mod.o CC (gcc) [M app_perl.so] perlfunc.o xsubpp -typemap `perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap -typemap typemap kamailioxs.xs > kamailioxs.c CC (gcc) [M app_perl.so] kamailioxs.o LD (gcc) [M app_perl.so] app_perl.so CC (gcc) [M db_perlvdb.so] db_perlvdb.o CC (gcc) [M db_perlvdb.so] perlvdb_conv.o CC (gcc) [M db_perlvdb.so] perlvdb_oohelpers.o CC (gcc) [M db_perlvdb.so] perlvdbfunc.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_perlvdb.so] db_perlvdb.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kutils" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M utils.so] conf.o CC (gcc) [M utils.so] pidf.o CC (gcc) [M utils.so] utils.o CC (gcc) [M utils.so] xcap_auth.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M utils.so] utils.so CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] functions.o CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[2]: Nothing to be done for `every-module'. make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' CC (gcc) [M db_redis.so] db_redis_mod.o In file included from redis_table.h:27:0, from db_redis_mod.c:30: redis_connection.h:26:21: fatal error: hiredis.h: No such file or directory #include <hiredis.h> ^ compilation terminated. make[3]: *** [db_redis_mod.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev7+0~20180925010929.1213+trusty' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.20517/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.20517/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_hNrm0q filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.20517 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/trusty-amd64.building.19481 + '[' -r /var/run/lock/trusty-amd64.update.19481 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.zBOPqaHbBw ']' + rm -rf /tmp/tmp.zBOPqaHbBw + '[' -n /tmp/apt-jdg_hNrm0q ']' + sudo rm -rf /tmp/apt-jdg_hNrm0q + '[' -n 2937 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=270 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:08:27 UTC 2018 [running 270 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Sep 25 02:08:27 UTC 2018 [running 270 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

git:master:133917db: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 133917db7a033218e54931b6cf532552d274af6c URL: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-26T20:16:30+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255… Patch: https://github.com/kamailio/kamailio/commit/133917db7a033218e54931b6cf53255…

1 0

git:master:ee956751: db_redis: use SHARE_DIR define for default value of schema path param
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: ee95675177466a7ae5f9575db300df32e42661f2 URL: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: use SHARE_DIR define for default value of schema path param - point to the folder where the schema files are deployed by make install --- Modified: src/modules/db_redis/db_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… Patch: https://github.com/kamailio/kamailio/commit/ee95675177466a7ae5f9575db300df3… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 60547eeee1..a360327c28 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -32,7 +32,7 @@ MODULE_VERSION str redis_keys = str_init(""); -str redis_schema_path = str_init("/usr/share/kamailio/db_redis/kamailio"); +str redis_schema_path = str_init(SHARE_DIR "db_redis/kamailio"); int db_redis_verbosity = 1; static int db_redis_bind_api(db_func_t *dbb);

1 0

git:master:41c4391f: Makefile.defs: propagate share dir target via -DSHARE_DIR compile switch
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 41c4391f5d98b1f5128774b81b4923e66cb9cc0d URL: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 Makefile.defs: propagate share dir target via -DSHARE_DIR compile switch --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… Patch: https://github.com/kamailio/kamailio/commit/41c4391f5d98b1f5128774b81b4923e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c29ae8bf9d..dd12e6e60b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -495,6 +495,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) +share_target = $(share_prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -655,6 +656,7 @@ C_DEFS= $(extra_defs) \ -D__CPU_$(ARCH) $(os_defs) \ -DVERSIONVAL=$(VERSIONVAL) \ -DCFG_DIR='"$(cfg_target)"'\ + -DSHARE_DIR='"$(share_target)"'\ -DRUN_DIR='"$(run_target)"' ifneq ($(MEMPKG), sys)

1 0

git:master:2bf7b941: db_redis: control printing all db tables via parameter verbosity
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 2bf7b94146971ad3cbefe167c52036a18c8566c0 URL: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: control printing all db tables via parameter verbosity - the list can be long and the output can make waching logs harder for rpc commands that connect/disconnect each time --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… Patch: https://github.com/kamailio/kamailio/commit/2bf7b94146971ad3cbefe167c52036a… --- diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c index 2b3b07fead..60547eeee1 100644 --- a/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c @@ -33,6 +33,7 @@ MODULE_VERSION str redis_keys = str_init(""); str redis_schema_path = str_init("/usr/share/kamailio/db_redis/kamailio"); +int db_redis_verbosity = 1; static int db_redis_bind_api(db_func_t *dbb); static int mod_init(void); @@ -51,6 +52,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"keys", PARAM_STRING|USE_FUNC_PARAM, (void*)keys_param}, {"schema_path", PARAM_STR, &redis_schema_path }, + {"verbosity", PARAM_INT, &db_redis_verbosity }, {0, 0, 0} }; diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 69bb099800..2720c2753d 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -24,6 +24,8 @@ #include "redis_connection.h" #include "redis_table.h" +extern int db_redis_verbosity; + static void print_query(redis_key_t *query) { redis_key_t *k; @@ -217,7 +219,7 @@ km_redis_con_t* db_redis_new_connection(const struct db_id* id) { goto err; } - db_redis_print_all_tables(ptr); + if(db_redis_verbosity > 0) db_redis_print_all_tables(ptr); ptr->ref = 1; ptr->append_counter = 0;

1 0

git:master:c583fa74: db_redis: docs for verbosity param, default values for other params
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: c583fa740083b4b246c39bcf8e55622d1d66cb2c URL: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T20:07:20+02:00 db_redis: docs for verbosity param, default values for other params - bits of formatting --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622… Patch: https://github.com/kamailio/kamailio/commit/c583fa740083b4b246c39bcf8e55622…

1 0

git:master:616689bf: db_redis: detect if pkg config for hiredis gives lib name in path
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 616689bf8b76d64e4b0eadd5a108fbcfa7e726a7 URL: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T14:51:58+02:00 db_redis: detect if pkg config for hiredis gives lib name in path - try to cope with inconsistency of output for pkg-config --cflags in older and newer debian/ubuntu distros --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… Patch: https://github.com/kamailio/kamailio/commit/616689bf8b76d64e4b0eadd5a108fbc… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index bf3b66e8fb..90770df35c 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -16,9 +16,13 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) +ifeq (,$(findstring hiredis,$(HIREDISDEFS))) + DEFS+=-DWITH_HIREDIS_PATH +endif + ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include HIREDISLIBS = -L/opt/local/lib -lhiredis diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 11cadf5500..7b6a836b5e 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -23,7 +23,11 @@ #ifndef _REDIS_CONNECTION_H_ #define _REDIS_CONNECTION_H_ +#ifdef WITH_HIREDIS_PATH +#include <hiredis/hiredis.h> +#else #include <hiredis.h> +#endif #include "db_redis_mod.h"

1 0

git:master:08d001bb: ndb_redis: detect if pkg config for hiredis gives lib name in path
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 08d001bb8e0ac336dc84e0541a9cf0104f6d9ee3 URL: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T14:41:14+02:00 ndb_redis: detect if pkg config for hiredis gives lib name in path - try to cope with inconsistency of output for pkg-config --cflags in older and newer debian/ubuntu distros --- Modified: src/modules/ndb_redis/Makefile Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… Patch: https://github.com/kamailio/kamailio/commit/08d001bb8e0ac336dc84e0541a9cf01… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 58a476ecd5..f6c78dee7e 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -16,9 +16,13 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) +ifeq (,$(findstring hiredis,$(HIREDISDEFS))) + DEFS+=-DWITH_HIREDIS_PATH +endif + ifeq ($(HIREDISLIBS),-L -lhiredis) HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include HIREDISLIBS = -L/opt/local/lib -lhiredis diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index c9e3d80424..0249b1eef4 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -28,7 +28,11 @@ #ifndef _REDIS_CLIENT_H_ #define _REDIS_CLIENT_H_ +#ifdef WITH_HIREDIS_PATH +#include <hiredis/hiredis.h> +#else #include <hiredis.h> +#endif #include "../../core/str.h" #include "../../core/parser/parse_param.h"

1 0

git:master:dc6057be: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: dc6057be7baafa5b4d1d385a0af4031fe3a05e73 URL: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-26T13:31:57+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… Patch: https://github.com/kamailio/kamailio/commit/dc6057be7baafa5b4d1d385a0af4031… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 182eb32a3f..de8b9ddd12 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -452,7 +452,7 @@ modparam("http_client", "tlsversion", 6) Example 1.14. Set authmethod parameter ... # Use the best of BASIC and Digest authentication. -modparam("http_client", "authmetod", 3) +modparam("http_client", "authmethod", 3) ... 3.15. keep_connections (int)

1 0

[kamailio/kamailio] Fix Typeo: authmetod -> authmethod (#1651)
by Barry Flanagan 26 Sep '18

26 Sep '18

Exported parameter for authmethod was mis-spelled as authmetod.   #### 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  Exported parameter for authmethod was mis-spelled as authmetod. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1651 -- Commit Summary -- * Fix Typeo: authmetod -> authmethod -- File Changes -- M src/modules/http_client/doc/http_client_admin.xml (2) M src/modules/http_client/http_client.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1651.patch https://github.com/kamailio/kamailio/pull/1651.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/1651

3 7

git:master:9c6ec4a8: Fix Typeo: authmetod -> authmethod
by Daniel-Constantin Mierla 26 Sep '18

26 Sep '18

Module: kamailio Branch: master Commit: 9c6ec4a85b23d4e2795800b632ac9855f2028fec URL: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… Author: Barry flanagan <barry(a)flanagan.ie> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-26T13:25:23+02:00 Fix Typeo: authmetod -> authmethod Exported parameter for authmethod was mis-spelled as authmetod. --- Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… Patch: https://github.com/kamailio/kamailio/commit/9c6ec4a85b23d4e2795800b632ac985… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index cafa86574b..6e772aa9f5 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -404,7 +404,7 @@ modparam("http_client", "tlsversion", 6) <programlisting format="linespecific"> ... # Use the best of BASIC and Digest authentication. -modparam("http_client", "authmetod", 3) +modparam("http_client", "authmethod", 3) ... </programlisting> </example> diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 9b8abc984d..e243953367 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -186,7 +186,7 @@ static param_export_t params[] = { {"maxdatasize", PARAM_INT, &default_maxdatasize }, {"config_file", PARAM_STR, &http_client_config_file }, {"httpcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, - {"authmetod", PARAM_INT, &default_authmethod }, + {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, {0, 0, 0} };

1 0

[kamailio/kamailio] dispatcher algorithm 11 with congestion control memory corruption problem (#1649)
by Julien Chavanton 25 Sep '18

25 Sep '18

### Description Segfault , suspected cause, writing out of bound of an array ### Troubleshooting In progress #### Reproduction Hard #### Debugging Data ``` /* code reference */ typedef struct _ds_set { int id; /*!< id of dst set */ int nr; /*!< number of items in dst set */ int last; /*!< last used item in dst set (round robin) */ int wlast; /*!< last used item in dst set (by weight) */ int rwlast; /*!< last used item in dst set (by relative weight) */ ds_dest_t *dlist; unsigned int wlist[100]; unsigned int rwlist[100]; struct _ds_set *next[2]; int longer; gen_lock_t lock; } ds_set_t; Here we can see that next is having invalid value (in fact it should have been 0/NULL in this case) : 20000000220000000220 2964>->-->--ds_ping_set(node->next[i]); (gdb) bt #0 0x00007f3b1cfde6c7 in ds_ping_set (node=0x200000002) at dispatch.c:2964 #1 0x00007f3b1cfde6d3 in ds_ping_set (node=0x7f3a99a09fc8) at dispatch.c:2964 #2 0x00007f3b1cfde6d3 in ds_ping_set (node=0x7f3a99a09828) at dispatch.c:2964 #3 0x00007f3b1cfdf9ad in ds_check_timer (ticks=9987101, param=0x0) at dispatch.c:3022 #4 0x00005644376a3652 in sr_wtimer_exec (ticks=9987101, param=0x0) at core/timer_proc.c:390 #5 0x00005644376a276d in fork_sync_timer (child_id=-1, desc=0x5644378904c1 "secondary timer", make_sock=1, f=0x5644376a330c <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:224 #6 0x00005644376a39ca in sr_wtimer_start () at core/timer_proc.c:416 #7 0x00005644374d2d59 in main_loop () at main.c:1702 #8 0x00005644374da171 in main (argc=12, argv=0x7ffe7c214ac8) at main.c:2650 (gdb) p (ds_set_t) *0x7f3a99a09828 $1 = {id = 2, nr = 2, last = 0, wlast = 0, rwlast = 0, dlist = 0x7f3a99a0aab8, wlist = {0 <repeats 100 times>}, rwlist = {0 <repeats 100 times>}, next = {0x7f3a99a09fc8, 0x0}, longer = 0, lock = {val = 0}} (gdb) p (ds_set_t) *0x0x7f3a99a09fc8 Invalid number "0x0x7f3a99a09fc8". (gdb) p (ds_set_t) *0x7f3a99a09fc8 $2 = {id = 1, nr = 3, last = 0, wlast = 0, rwlast = 0, dlist = 0x7f3a99a0a7f8, wlist = {1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1,~ 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1}, rwlist = {1, 1, 2, 2, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 1, 2, 1, 0, 0, 0, 0, 2, 1, 0, 2, 1, 2, 1, 1, 0, 2, 1, 2, 2, 2, 0, 0,~ 2, 0, 2, 2, 0, 2, 2, 0, 1, 2, 1, 1, 2, 1, 1, 0, 1, 1, 0, 1, 0, 2, 2, 2, 2, 2, 0, 0, 2, 0, 1, 0, 2, 1, 1, 2, 0, 2, 1, 2, 1, 1, 0, 2, 1, 2, 2, 1, 2, 1, 1, 0}, next = {0x200000002, 0x200000002}, longer = 2, lock = {val = 0}} (gdb) ``` ### Possible Solutions Further analysis of the relevant source code around dp_init_relative_weights() and the way it was reused with congestion control. -- 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/1649

2 8

git:master:2bfef639: dispatcher: test pkg malloc return in relative weights function
by Daniel-Constantin Mierla 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: 2bfef63949f2577a7b7ff80bbcc97250884dd26f URL: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T13:08:18+02:00 dispatcher: test pkg malloc return in relative weights function - declare vars at the beginning --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… Patch: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 70dc2d4919..b5677af058 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -532,17 +532,32 @@ int dp_init_relative_weights(ds_set_t *dset) int j; int k; int t; + int *ds_dests_flags = NULL; + int *ds_dests_rweights = NULL; + int current_slice; + int rw_sum; + unsigned int last_insert; if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; /* local copy to avoid syncronization problems */ - int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); - int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + if(ds_dests_flags == NULL) { + LM_ERR("no more pkg\n"); + return -1; + } + ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + if(ds_dests_rweights == NULL) { + LM_ERR("no more pkg\n"); + pkg_free(ds_dests_flags); + return -1; + } + /* needed to sync the rwlist access */ lock_get(&dset->lock); - int rw_sum = 0; + rw_sum = 0; /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { ds_dests_flags[j] = dset->dlist[j].flags; @@ -561,8 +576,8 @@ int dp_init_relative_weights(ds_set_t *dset) if(ds_skip_dst(ds_dests_flags[j])) continue; - int current_slice = - ds_dests_rweights[j] * 100 / rw_sum; //truncate here; + current_slice = + ds_dests_rweights[j] * 100 / rw_sum; /* truncate here */ LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -572,8 +587,7 @@ int dp_init_relative_weights(ds_set_t *dset) /* if the array was not completely filled (i.e., the sum of rweights is * less than 100 due to truncated), then use last address to fill the rest */ - unsigned int last_insert = - t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); + last_insert = t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); for(j = t; j < 100; j++) dset->rwlist[j] = last_insert;

1 0

[kamailio/kamailio] dispatcher: fix syncronization problem with (#1650)
by Julien Chavanton 25 Sep '18

25 Sep '18

relative weight based load distribution, issue #1649 #### 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 - [x] Related to issue #1649 #### Description synchronization problem in dispatcher relative weight based distribution You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1650 -- Commit Summary -- * dispatcher: fix syncronization problem with -- File Changes -- M src/modules/dispatcher/dispatch.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1650.patch https://github.com/kamailio/kamailio/pull/1650.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/1650

2 1

git:master:b0e12c7e: Merge pull request #1650 from jchavanton/issue_1649
by GitHub 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: b0e12c7ede93a47cc3912285a5ee4eef647f0b69 URL: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-25T13:04:23+02:00 Merge pull request #1650 from jchavanton/issue_1649 dispatcher: fix syncronization problem with --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… Patch: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 20077f1506..70dc2d4919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -533,31 +533,36 @@ int dp_init_relative_weights(ds_set_t *dset) int k; int t; - if(dset == NULL || dset->dlist == NULL) + if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; + /* local copy to avoid syncronization problems */ + int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + + /* needed to sync the rwlist access */ lock_get(&dset->lock); int rw_sum = 0; - /* find the sum of relative weights*/ + /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + ds_dests_flags[j] = dset->dlist[j].flags; + ds_dests_rweights[j] = dset->dlist[j].attrs.rweight; + if(ds_skip_dst(ds_dests_flags[j])) continue; - rw_sum += dset->dlist[j].attrs.rweight; + rw_sum += ds_dests_rweights[j]; } - if(rw_sum == 0) { - lock_release(&dset->lock); - return 0; - } + if(rw_sum == 0) + goto ret; /* fill the array based on the relative weight of each destination */ t = 0; for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + if(ds_skip_dst(ds_dests_flags[j])) continue; int current_slice = - dset->dlist[j].attrs.rweight * 100 / rw_sum; //truncate here; + ds_dests_rweights[j] * 100 / rw_sum; //truncate here; LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -577,7 +582,12 @@ int dp_init_relative_weights(ds_set_t *dset) * sending first 20 calls to it, but ensure that within a 100 calls, * 20 go to first address */ shuffle_uint100array(dset->rwlist); + goto ret; + +ret: lock_release(&dset->lock); + pkg_free(ds_dests_flags); + pkg_free(ds_dests_rweights); return 0; }

1 0

git:master:fe35aab4: dispatcher: fix syncronization problem with
by Julien Chavanton 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: fe35aab46536e7ccc709ea8556049b675bcc8d2b URL: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-09-24T08:56:26-07:00 dispatcher: fix syncronization problem with relative weight based load distribution, issue #1649 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… Patch: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 20077f1506..70dc2d4919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -533,31 +533,36 @@ int dp_init_relative_weights(ds_set_t *dset) int k; int t; - if(dset == NULL || dset->dlist == NULL) + if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; + /* local copy to avoid syncronization problems */ + int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + + /* needed to sync the rwlist access */ lock_get(&dset->lock); int rw_sum = 0; - /* find the sum of relative weights*/ + /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + ds_dests_flags[j] = dset->dlist[j].flags; + ds_dests_rweights[j] = dset->dlist[j].attrs.rweight; + if(ds_skip_dst(ds_dests_flags[j])) continue; - rw_sum += dset->dlist[j].attrs.rweight; + rw_sum += ds_dests_rweights[j]; } - if(rw_sum == 0) { - lock_release(&dset->lock); - return 0; - } + if(rw_sum == 0) + goto ret; /* fill the array based on the relative weight of each destination */ t = 0; for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + if(ds_skip_dst(ds_dests_flags[j])) continue; int current_slice = - dset->dlist[j].attrs.rweight * 100 / rw_sum; //truncate here; + ds_dests_rweights[j] * 100 / rw_sum; //truncate here; LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -577,7 +582,12 @@ int dp_init_relative_weights(ds_set_t *dset) * sending first 20 calls to it, but ensure that within a 100 calls, * 20 go to first address */ shuffle_uint100array(dset->rwlist); + goto ret; + +ret: lock_release(&dset->lock); + pkg_free(ds_dests_flags); + pkg_free(ds_dests_rweights); return 0; }

1 0

git:master:b4b358f1: db_redis: Makefile - added -I/usr/include/hiredis for old distro
by Daniel-Constantin Mierla 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: b4b358f1fe79362babe637921666b3d6001407b4 URL: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T10:09:15+02:00 db_redis: Makefile - added -I/usr/include/hiredis for old distro --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… Patch: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 8e7ad1f74b..bf3b66e8fb 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -16,7 +16,7 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) ifeq ($(HIREDISLIBS),-L -lhiredis)

1 0

git:master:806bf49b: ndb_redis: Makefile - added -I/usr/include/hiredis for old distro
by Daniel-Constantin Mierla 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: 806bf49bc9142c80f991d8441c84d7ba5316c0c3 URL: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T10:06:41+02:00 ndb_redis: Makefile - added -I/usr/include/hiredis for old distro --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… Patch: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index e426088489..58a476ecd5 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -16,7 +16,7 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) ifeq ($(HIREDISLIBS),-L -lhiredis)

1 0

git:master:c8daa313: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: c8daa313031a9560670f829c4bdd482058f3d303 URL: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-25T09:01:59+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… Patch: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 90f51516e6..2ca2c52c58 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -355,6 +355,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) The first value[n] references the element in the first array, while the next key references an element of the referenced array. + The result type can be compared with $redisd(key) variable to test its + value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, + rpl_nil. + Example 1.10. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) {

1 0

git:master:4b5ad867: ndb_redis: note about $redisd(key) variable
by Daniel-Constantin Mierla 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: 4b5ad86748a4f53ec1ca3d0043984cfdcef0ae75 URL: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T08:47:08+02:00 ndb_redis: note about $redisd(key) variable --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… Patch: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 8a4646cc39..e71ce806a1 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -362,6 +362,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) the above keys, after a value[n] key. The first value[n] references the element in the first array, while the next key references an element of the referenced array. </para> + <para> + The result type can be compared with $redisd(key) variable to test + its value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, rpl_nil. + </para> <example> <title><function>redis_cmd</function> usage</title> <programlisting format="linespecific"> @@ -413,23 +417,23 @@ if (redis_cmd("srvN", "EXEC", "r")) { <function moreinfo="none">redis_pipe_cmd(srvname, command, ..., replyid)</function> </title> <para> - Add a command to be sent to REDIS server identified by srvname. - All the commands will be stored in a buffer until a call to - redis_execute is made. When calling redis_execute the stored commands + Add a command to be sent to REDIS server identified by srvname. + All the commands will be stored in a buffer until a call to + redis_execute is made. When calling redis_execute the stored commands are sent using the pipelining functionality of redis. The replies - will be stored in local containers identified by the replyid of each + will be stored in local containers identified by the replyid of each added command. All the parameters can be strings with pseudo-variables that are evaluated at runtime. </para> <para> - This command is similar in syntax with redis_cmd, the only difference + This command is similar in syntax with redis_cmd, the only difference is that it does not send the command but instead appends it to a buffer. </para> <para> See examples from redis_execute. </para> <para> - Note: Pipelining feature is incompatible with the clustering feature. + Note: Pipelining feature is incompatible with the clustering feature. If cluster parameter is set to 1, this function will log an error and do nothing. </para> </section> @@ -438,20 +442,20 @@ if (redis_cmd("srvN", "EXEC", "r")) { <function moreinfo="none">redis_execute(srvname)</function> </title> <para> - Sends commands to REDIS server identified by srvname. Commands are added + Sends commands to REDIS server identified by srvname. Commands are added with redis_pipe_cmd function, and will be stored for an existing REDIS server. When this function is called all the commands will be sent in a single message to the REDIS server. </para> <para> - When using redis_cmd together with redis_pipe_cmd it is recommended that a call to + When using redis_cmd together with redis_pipe_cmd it is recommended that a call to redis_execute is made before calling redis_cmd in case there are pipelined commands, otherwise when calling redis_cmd, if pipelined messages exist, a call to redis_execute - is made automatically and a warning message is logged. + is made automatically and a warning message is logged. </para> <para> - Note: Pipelining feature is incompatible with the clustering feature. + Note: Pipelining feature is incompatible with the clustering feature. If cluster parameter is set to 1, this function will log an error and do nothing. </para> <example> @@ -475,7 +479,7 @@ Using both redis_cmd and redis_pipe_cmd: redis_pipe_cmd("srvA", "SET ruri $ru", "r2"); - redis_execute("srvA"); //send commands to srvA and wait for reply. Store replies in r1 and r2 + redis_execute("srvA"); //send commands to srvA and wait for reply. Store replies in r1 and r2 redis_cmd("srvA", "GET foo", "r3"); //send command, wait for reply and store it in r3

1 0

git:master:52a08a73: ndb_redis: $redisd(...) - pv that exports defined values by redis lib
by Daniel-Constantin Mierla 25 Sep '18

25 Sep '18

Module: kamailio Branch: master Commit: 52a08a7375a86966b9f179b8e416eea1e06f7973 URL: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T08:23:33+02:00 ndb_redis: $redisd(...) - pv that exports defined values by redis lib --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… Patch: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index c95d3b0342..ffb18a9eeb 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -83,10 +83,15 @@ int bind_ndb_redis(ndb_redis_api_t *api); static int pv_get_redisc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_redisc_name(pv_spec_p sp, str *in); +static int pv_get_rediscd(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +static int pv_parse_rediscd_name(pv_spec_p sp, str *in); static pv_export_t mod_pvs[] = { { {"redis", sizeof("redis")-1}, PVT_OTHER, pv_get_redisc, 0, pv_parse_redisc_name, 0, 0, 0 }, + { {"redisd", sizeof("redisd")-1}, PVT_OTHER, pv_get_rediscd, 0, + pv_parse_rediscd_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -915,6 +920,71 @@ static int pv_get_redisc(struct sip_msg *msg, pv_param_t *param, } } +/** + * + */ +int pv_parse_rediscd_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 7: + if(strncmp(in->s, "rpl_str", 7)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "rpl_arr", 7)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "rpl_int", 7)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "rpl_nil", 7)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "rpl_sts", 7)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "rpl_err", 7)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown redisd name %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_rediscd(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(param==NULL) + return -1; + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_uintval(msg, param, res, REDIS_REPLY_STRING); + case 1: + return pv_get_uintval(msg, param, res, REDIS_REPLY_ARRAY); + case 2: + return pv_get_uintval(msg, param, res, REDIS_REPLY_INTEGER); + case 3: + return pv_get_uintval(msg, param, res, REDIS_REPLY_NIL); + case 4: + return pv_get_uintval(msg, param, res, REDIS_REPLY_STATUS); + case 5: + return pv_get_uintval(msg, param, res, REDIS_REPLY_ERROR); + default: + return pv_get_uintval(msg, param, res, 0); + } +} + /** * @brief bind functions to NDB_REDIS API structure */

1 0

git:master:6794815c: db_redis: fixed compile warning on testing array address
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 6794815cf9b1f4dae0a4a7791d16e56fe7dcceb6 URL: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T20:05:26+02:00 db_redis: fixed compile warning on testing array address --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… Patch: https://github.com/kamailio/kamailio/commit/6794815cf9b1f4dae0a4a7791d16e56… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 62c63f0530..69bb099800 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -405,9 +405,9 @@ void db_redis_consume_replies(km_redis_con_t *con) { } const char *db_redis_get_error(km_redis_con_t *con) { - if (con && con->con && con->con->errstr) { + if (con && con->con && con->con->errstr[0]) { return con->con->errstr; } else { return "<broken redis connection>"; } -} \ No newline at end of file +}

1 0

git:master:510cfca6: db_redis: updated include paths for pkg-config usage
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 510cfca61d2df1dcc2baa492c9f1f2f3b129ceb7 URL: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:59:23+02:00 db_redis: updated include paths for pkg-config usage --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… Patch: https://github.com/kamailio/kamailio/commit/510cfca61d2df1dcc2baa492c9f1f2f… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index c4aa0d0731..8e7ad1f74b 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -13,7 +13,7 @@ HIREDIS_BUILDER = $(shell \ endif ifeq ($(HIREDIS_BUILDER),) - HIREDISDEFS=-I$(LOCALBASE)/include + HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index 8261e2bf96..11cadf5500 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -23,7 +23,7 @@ #ifndef _REDIS_CONNECTION_H_ #define _REDIS_CONNECTION_H_ -#include <hiredis/hiredis.h> +#include <hiredis.h> #include "db_redis_mod.h" @@ -79,4 +79,4 @@ void db_redis_consume_replies(km_redis_con_t *con); void db_redis_free_reply(redisReply **reply); const char *db_redis_get_error(km_redis_con_t *con); -#endif /* _REDIS_CONNECTION_H_ */ \ No newline at end of file +#endif /* _REDIS_CONNECTION_H_ */

1 0

git:master:bfcb600e: ndb_redis: replaced printf with dbg, formatted sentinel code and long lines
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: bfcb600ed7bc94898f86d4ce1225c36a972b5916 URL: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:49:38+02:00 ndb_redis: replaced printf with dbg, formatted sentinel code and long lines --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36… Patch: https://github.com/kamailio/kamailio/commit/bfcb600ed7bc94898f86d4ce1225c36…

1 0

git:master:3f0ca2f8: ndb_redis: updated include paths for pkg-config usage
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 3f0ca2f88afbd0819df2e4fecf603b72f757b3f4 URL: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T19:55:34+02:00 ndb_redis: updated include paths for pkg-config usage --- Modified: src/modules/ndb_redis/Makefile Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… Patch: https://github.com/kamailio/kamailio/commit/3f0ca2f88afbd0819df2e4fecf603b7… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index 939a5cc680..e426088489 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -13,7 +13,7 @@ HIREDIS_BUILDER = $(shell \ endif ifeq ($(HIREDIS_BUILDER),) - HIREDISDEFS=-I$(LOCALBASE)/include + HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index c1d907042f..c9e3d80424 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -28,7 +28,7 @@ #ifndef _REDIS_CLIENT_H_ #define _REDIS_CLIENT_H_ -#include <hiredis/hiredis.h> +#include <hiredis.h> #include "../../core/str.h" #include "../../core/parser/parse_param.h"

1 0

git:master:c11f9d52: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: c11f9d5284dbc2eaefeb6569d3af0caabb28d4d1 URL: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T16:01:32+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca… Patch: https://github.com/kamailio/kamailio/commit/c11f9d5284dbc2eaefeb6569d3af0ca…

1 0

git:master:5c71f593: db_redis: fixed typos from previous commit
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 5c71f59324cd0ced6f73577acd56e234337dfd30 URL: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:56:10+02:00 db_redis: fixed typos from previous commit --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… Patch: https://github.com/kamailio/kamailio/commit/5c71f59324cd0ced6f73577acd56e23… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 12d054712a..50271ac735 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -220,7 +220,7 @@ HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" </example> <para> Note that is some cases, the optional values in database tables can be - ommitted. For 'address' table, the 'tag' value may be ommitted. To avoid + omitted. For 'address' table, the 'tag' value may be omitted. To avoid any issues, set unused fields to their default values as defined by database schema. When definition allows 'NULL', that field can be unset. </para>

1 0

git:master:76b1f3bf: rtpengine: add block_media and unblock_media function calls
by Richard Fuchs 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 76b1f3bfae32490547c5b1500ab7356bcf463e9e URL: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-24T09:47:25-04:00 rtpengine: add block_media and unblock_media function calls --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356… Patch: https://github.com/kamailio/kamailio/commit/76b1f3bfae32490547c5b1500ab7356…

1 0

git:master:cc2714a8: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: cc2714a8df27c4e4a5e179bc0443600ec673ff63 URL: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T15:46:28+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… Patch: https://github.com/kamailio/kamailio/commit/cc2714a8df27c4e4a5e179bc0443600… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index 8378057da5..4f6d8150be 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -45,6 +45,7 @@ Alex Balashov 1.1. Setting schema_path module parameter 1.2. Setting keys module parameter 1.3. Usage + 1.4. Usage Chapter 1. Admin Guide @@ -121,6 +122,15 @@ nce/string,server_id/int,connection_id/int,keepalive/int,partition/int module also write mappings besides the actual records for billing systems to correlate start and stop records faster). + The key is always prefixed with 'tablename:entry::'. For example the + record in 'subscriber' table for user 'alice(a)sip.com' has the key: + 'subscriber:entry::alice:sip.com'. If all the records are just loaded + at startup (or all reloaded at runtime), the key can just be made + unique using whatever values added after 'tablename:entry::' prefix. + For example, keys for 'address' table records can be: + 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' + modparam of 'db_redis' for 'address' table needs to be defined. + The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -182,7 +192,7 @@ m:username,domain&timer:partition,keepalive") 6. Usage Load the module and set the "db_url" modparam for specific modules to: - redis://[username]@host:port/database. Username is optional. The + 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. Example 1.3. Usage @@ -192,16 +202,39 @@ loadmodule "db_redis.so" #!define DBURL_USRLOC "redis://127.0.0.1:6379/5" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" +#!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +... modparam("usrloc", "db_url", DBURL_USRLOC) +... modparam("acc_db", "db_url", DBURL_ACC) +... modparam("auth_db", "db_url", DBURL_AUTH) ... +modparam("permissions", "db_url", DBURL_PERM) +... + + Samples adding records for address table using 'redis-cli': + + Example 1.4. Usage +... +SELECT 8 +HMSET address:entry::1 id 1 grp 1 ip_addr "127.0.0.1" mask 32 port 0 +HMSET address:entry::2 id 2 grp 1 ip_addr "127.0.0.2" mask 32 port 0 +HMSET address:entry::3 id 3 grp 2 ip_addr "127.0.0.3" mask 32 port 0 +HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" +... + + Note that is some cases, the optional values in database tables can be + ommitted. For 'address' table, the 'tag' value may be ommitted. To + avoid any issues, set unused fields to their default values as defined + by database schema. When definition allows 'NULL', that field can be + unset. 7. Module specific considerations

1 0

git:master:d4cd7711: db_redis: docs about keys format and sample records
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: d4cd77119b55478a6bd35b76a9e7c196c0a71698 URL: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:39:27+02:00 db_redis: docs about keys format and sample records --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… Patch: https://github.com/kamailio/kamailio/commit/d4cd77119b55478a6bd35b76a9e7c19… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index f57fa8064e..12d054712a 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -67,6 +67,15 @@ username/string,domain/string,contact/string,received/string,path/string,expires also write mappings besides the actual records for billing systems to correlate start and stop records faster). </para> + <para> + The key is always prefixed with 'tablename:entry::'. For example the record in + 'subscriber' table for user 'alice(a)sip.com' has the key: + 'subscriber:entry::alice:sip.com'. If all the records are just loaded at + startup (or all reloaded at runtime), the key can just be made unique using whatever + values added after 'tablename:entry::' prefix. For example, keys for 'address' table + records can be: 'address:entry::1', address:entry::2', address:entry::3', ... No + 'keys' modparam of 'db_redis' for 'address' table needs to be defined. + </para> <para> The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -165,7 +174,7 @@ modparam("db_redis", "keys", "version=entry:table_name;location=entry:ruid&u <title>Usage</title> <para> Load the module and set the "db_url" modparam for specific modules to: - redis://[username]@host:port/database. Username is optional. + 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. </para> <example> @@ -177,17 +186,44 @@ loadmodule "db_redis.so" #!define DBURL_USRLOC "redis://127.0.0.1:6379/5" #!define DBURL_ACC "redis://127.0.0.1:6379/6" #!define DBURL_AUTH "redis://127.0.0.1:6379/7" +#!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain") +... modparam("usrloc", "db_url", DBURL_USRLOC) +... modparam("acc_db", "db_url", DBURL_ACC) +... modparam("auth_db", "db_url", DBURL_AUTH) +... +modparam("permissions", "db_url", DBURL_PERM) ... </programlisting> </example> + <para> + Samples adding records for address table using 'redis-cli': + </para> + <example> + <title>Usage</title> + <programlisting format="linespecific"> +... +SELECT 8 +HMSET address:entry::1 id 1 grp 1 ip_addr "127.0.0.1" mask 32 port 0 +HMSET address:entry::2 id 2 grp 1 ip_addr "127.0.0.2" mask 32 port 0 +HMSET address:entry::3 id 3 grp 2 ip_addr "127.0.0.3" mask 32 port 0 +HMSET address:entry::4 id 4 grp 2 ip_addr "127.0.0.4" mask 32 port 0 tag "test" +... + </programlisting> + </example> + <para> + Note that is some cases, the optional values in database tables can be + ommitted. For 'address' table, the 'tag' value may be ommitted. To avoid + any issues, set unused fields to their default values as defined by database + schema. When definition allows 'NULL', that field can be unset. + </para> </section> <section>

1 0

git:master:1d24e36d: tm: warn message on unexpected fcount value
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 1d24e36d95b97e41bc76949bdd8ba2a24babdffe URL: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T15:01:57+02:00 tm: warn message on unexpected fcount value --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… Patch: https://github.com/kamailio/kamailio/commit/1d24e36d95b97e41bc76949bdd8ba2a… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 998bdfad8e..1ec5747207 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -146,6 +146,9 @@ void free_cell_helper( release_cell_lock(dead_cell); /* does nothing */ dead_cell->fcount++; + if(dead_cell->fcount!=1) { + LM_WARN("unexpected fcount value: %d\n", dead_cell->fcount); + } if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0);

1 0

git:master:43451895: mem: f_malloc - better log message on ignoring double free
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 434518953c507b41b80adaf1a39b7b8f1e9a3048 URL: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T14:27:23+02:00 mem: f_malloc - better log message on ignoring double free --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… Patch: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 9deaa5b512..a157f03172 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -623,12 +623,17 @@ void fm_free(void* qmp, void* p) } #ifdef DBG_F_MALLOC if (p>(void*)qm->last_frag || p<(void*)qm->first_frag){ - LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," " called from %s: %s(%d) - aborting\n", p, qm, file, func, line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," + " called from %s: %s(%d) - ignoring\n", p, qm, + file, func, line); + return; + } } #endif f=(struct fm_frag*) ((char*)p-sizeof(struct fm_frag));

1 0

git:master:2cd82d39: mem: q_malloc - better log message on ignoring double free
by Daniel-Constantin Mierla 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 2cd82d39fe0fccf3237eb9947fd16b0be15c2270 URL: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T14:22:12+02:00 mem: q_malloc - better log message on ignoring double free --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… Patch: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 0c3528544d..52d2ef722c 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -486,11 +486,15 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC if (p>(void*)qm->last_frag_end || p<(void*)qm->first_frag){ - LM_CRIT("BUG: bad pointer %p (out of memory block!)" + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: bad pointer %p (out of memory block!)" " called from %s: %s(%d) - aborting\n", p, file, func, line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: bad pointer %p (out of memory block!)" + " called from %s: %s(%d) - ignoring\n", p, file, func, line); + return; + } } #endif @@ -499,12 +503,17 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); if (f->u.is_free){ - LM_CRIT("BUG: freeing already freed pointer (%p)," + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", p, file, func, line, f->file, f->func, f->line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: freeing already freed pointer (%p)," + " called from %s: %s(%d), first free %s: %s(%ld) - ignoring\n", + p, file, func, line, f->file, f->func, f->line); + return; + } } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line);

1 0

git:master:7385c1dc: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 7385c1dcfe8c7a31047a2b44c650874b49624b71 URL: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T10:46:34+02:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… Patch: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index db105862b0..0da60f08ad 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -196,12 +196,12 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") 4.4. acc_function (string) - Specifies the accounting function to be used. Just be defining this + Specifies the accounting function to be used. Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters set_accept_filter() scripting function. - Its values my be: + Its values may be: * acc_log_request * acc_db_request * acc_rad_request @@ -217,7 +217,7 @@ modparam("uac_redirect","acc_function","acc_db_request") 4.5. acc_db_table (string) Specifies the accounting table to be used if DB accounting was chosen - (acc_function was set to “acc_db_request”). Just be defining this + (acc_function was set to “acc_db_request”). Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters set_accept_filter() scripting function.

1 0

git:master:37fb1b68: core: fix comment typo
by Mikko Lehto 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 37fb1b68675c637c4d9bbfbc27572b2c748ad673 URL: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 core: fix comment typo --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… Patch: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 6929b22e0f..487215c655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2859,7 +2859,7 @@ char* via_builder( unsigned int *len, return line_buf; } -/* creates a via header honoring the protocol of the incomming socket +/* creates a via header honoring the protocol of the incoming socket * msg is an optional parameter */ char* create_via_hf( unsigned int *len, struct sip_msg *msg, diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index b6360ce3ff..1300cb5742 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -111,7 +111,7 @@ char* via_builder( unsigned int *len, struct dest_info* send_info, str *branch, str* extra_params, struct hostport *hp ); -/* creates a via header honoring the protocol of the incomming socket +/* creates a via header honoring the protocol of the incoming socket * msg is an optional parameter */ char* create_via_hf( unsigned int *len, struct sip_msg *msg,

1 0

git:master:f7887665: uac_redirect: fix documentation typo
by Mikko Lehto 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: f788766522cb0f9bb8bca42954337889198462ee URL: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 uac_redirect: fix documentation typo --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… Patch: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index e983c0d8c6..7e80126482 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,14 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just be defining + Specifies the accounting function to be used. Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters <function moreinfo="none">set_accept_filter()</function> scripting function. </para> <para> - Its values my be: + Its values may be: </para> <itemizedlist> <listitem> @@ -253,7 +253,7 @@ modparam("uac_redirect","acc_function","acc_db_request") <para> Specifies the accounting table to be used if DB accounting was chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just be defining + <quote>acc_db_request</quote>). Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters <function moreinfo="none">set_accept_filter()</function>

1 0

git:master:62790cc2: src: Fix misspelled Kamailio
by Mikko Lehto 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 62790cc279550fef9ce3f7a6c0ee8dcc055f9625 URL: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 src: Fix misspelled Kamailio --- Modified: src/core/sr_module.h Modified: src/modules/erlang/cnode.c Modified: src/modules/erlang/erlang_mod.c Modified: src/modules/xcap_server/xcap_misc.h --- Diff: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… Patch: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 4dd6523f3b..5571a76c44 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -218,7 +218,7 @@ struct ser_cmd_export_ { }; -/** kamailo/openser version */ +/** kamailio/openser version */ struct kam_cmd_export_ { char* name; /**< null terminated command name */ cmd_function function; /**< pointer to the corresponding function */ diff --git a/src/modules/erlang/cnode.c b/src/modules/erlang/cnode.c index ce24c1dff4..b3e7892899 100644 --- a/src/modules/erlang/cnode.c +++ b/src/modules/erlang/cnode.c @@ -49,7 +49,7 @@ csockfd_handler_t *csocket_handler = NULL; erlang_pid *cnode_reply_to_pid = NULL; /** - * @brief Initialize Kamailo as C node by active connect as client. + * @brief Initialize Kamailio as C node by active connect as client. */ int cnode_connect_to(cnode_handler_t *phandler, ei_cnode *ec, const str *nodename ) { diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 83d007aa68..5bf7633283 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -164,7 +164,7 @@ static pv_export_t pvs[] = { /* exported parameters */ static param_export_t parameters[] = { - /* Kamailo C node parameters */ + /* Kamailio C node parameters */ { "no_cnodes", PARAM_INT, &no_cnodes }, { "cnode_alivename", PARAM_STR, &cnode_alivename }, { "cnode_host", PARAM_STR, &cnode_host }, diff --git a/src/modules/xcap_server/xcap_misc.h b/src/modules/xcap_server/xcap_misc.h index 4873da2bda..0f461744f9 100644 --- a/src/modules/xcap_server/xcap_misc.h +++ b/src/modules/xcap_server/xcap_misc.h @@ -7,12 +7,12 @@ * * This file is part of kamailio, a free SIP server. * - * Kamailo is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * Kamailo is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details.

1 0

git:master:f7ac556e: rtpproxy: fix comment typo
by Mikko Lehto 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: f7ac556e699d323e816c14a554122c87d38b3a83 URL: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 rtpproxy: fix comment typo --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… Patch: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index b0b7a67fcf..b2c9f5c0b6 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -2641,7 +2641,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, LM_DBG("alter port body1='%.*s'\n", body1.len, body1.s); #endif /* do not do it if old port was 0 (means media disable) - * - check if actually should be better done in rtpptoxy, + * - check if actually should be better done in rtpproxy, * by returning also 0 * - or by not sending to rtpproxy the old port if 0 */

1 0

[kamailio/kamailio] kex: Extend kamailio rcv_replies statistics (#1646)
by rromrrom 24 Sep '18

24 Sep '18

- ability to count reply groups for each SIP method added. - statistics for 2xx and 4xx replies on invite added   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1646 -- Commit Summary -- * kex: Extend kamailio rcv_replies statistics -- File Changes -- M src/modules/kex/core_stats.c (57) M src/modules/kex/core_stats.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1646.patch https://github.com/kamailio/kamailio/pull/1646.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/1646

2 2

git:master:9113defb: Merge pull request #1646 from rromrrom/stats_by_method
by GitHub 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: 9113defb29b152cf41a961f7e82b1630d30464bd URL: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-24T09:29:38+02:00 Merge pull request #1646 from rromrrom/stats_by_method kex: Extend kamailio rcv_replies statistics --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Patch: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ad8f42964d..5d2bcc13a1 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -82,6 +82,29 @@ stat_var* rcv_rpls_486; stat_var* rcv_rpls_5xx; stat_var* rcv_rpls_6xx; +#define VAR_NAME(method) rcv_rpls_ ## method + +#define STAT_NAME(method, group) "rcv_replies_" #group "xx_" #method + +#define DECLARE_STAT_VARS(method) stat_var* VAR_NAME(method)[6]; + +#define DECLARE_STATS(method) \ + { STAT_NAME(method, 1), 0, &VAR_NAME(method)[0] }, \ + { STAT_NAME(method, 2), 0, &VAR_NAME(method)[1] }, \ + { STAT_NAME(method, 3), 0, &VAR_NAME(method)[2] }, \ + { STAT_NAME(method, 4), 0, &VAR_NAME(method)[3] }, \ + { STAT_NAME(method, 5), 0, &VAR_NAME(method)[4] }, \ + { STAT_NAME(method, 6), 0, &VAR_NAME(method)[5] } + +DECLARE_STAT_VARS(invite); +DECLARE_STAT_VARS(cancel); +DECLARE_STAT_VARS(bye); +DECLARE_STAT_VARS(reg); +DECLARE_STAT_VARS(message); +DECLARE_STAT_VARS(prack); +DECLARE_STAT_VARS(update); +DECLARE_STAT_VARS(refer); + /*! exported core statistics */ stat_export_t core_stats[] = { {"rcv_requests" , 0, &rcv_reqs }, @@ -121,6 +144,14 @@ stat_export_t core_stats[] = { {"bad_URIs_rcvd", 0, &bad_URIs }, {"unsupported_methods", 0, &unsupported_methods }, {"bad_msg_hdr", 0, &bad_msg_hdr }, + DECLARE_STATS(invite), + DECLARE_STATS(cancel), + DECLARE_STATS(bye), + DECLARE_STATS(reg), + DECLARE_STATS(message), + DECLARE_STATS(prack), + DECLARE_STATS(update), + DECLARE_STATS(refer), {0,0,0} }; @@ -200,6 +231,28 @@ static int km_cb_req_stats(struct sip_msg *msg, return 1; } +static int km_cb_rpl_stats_by_method(struct sip_msg *msg, + unsigned int flags, void *param) +{ + int method = get_cseq(msg)->method_id; + int group = msg->first_line.u.reply.statuscode / 100 - 1; + + if (group >= 1 && group <= 6) { + switch(method) { + case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; + case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break; + case METHOD_BYE: update_stat( VAR_NAME(bye)[group], 1); break; + case METHOD_REGISTER: update_stat( VAR_NAME(reg)[group], 1); break; + case METHOD_MESSAGE: update_stat( VAR_NAME(message)[group], 1); break; + case METHOD_PRACK: update_stat( VAR_NAME(prack)[group], 1); break; + case METHOD_UPDATE: update_stat( VAR_NAME(update)[group], 1); break; + case METHOD_REFER: update_stat( VAR_NAME(refer)[group], 1); break; + } + } + + return 1; +} + static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { @@ -321,6 +374,10 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + if (register_script_cb(km_cb_rpl_stats_by_method, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + LM_ERR("failed to register PRE request callback\n"); + return -1; + } if (stats_proc_stats_init_rpc()<0) return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index ae59e9463f..72a5f5becc 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -69,6 +69,8 @@ extern stat_var* rcv_rpls_480; extern stat_var* rcv_rpls_486; extern stat_var* rcv_rpls_5xx; extern stat_var* rcv_rpls_6xx; +extern stat_var* rcv_rpls_2xx_invite; +extern stat_var* rcv_rpls_4xx_invite; /*! \brief forwarded requests */ extern stat_var* fwd_reqs;

1 0

git:master:e7ff1a13: kex: Extend kamailio rcv_replies statistics
by Roman Romanchenko 24 Sep '18

24 Sep '18

Module: kamailio Branch: master Commit: e7ff1a13a244eb4b034a53774a00eeec0895e1d9 URL: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-09-17T16:43:01+03:00 kex: Extend kamailio rcv_replies statistics - ability to count reply groups for each SIP method added. - statistics for 2xx and 4xx replies on invite added --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… Patch: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ad8f42964d..5d2bcc13a1 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -82,6 +82,29 @@ stat_var* rcv_rpls_486; stat_var* rcv_rpls_5xx; stat_var* rcv_rpls_6xx; +#define VAR_NAME(method) rcv_rpls_ ## method + +#define STAT_NAME(method, group) "rcv_replies_" #group "xx_" #method + +#define DECLARE_STAT_VARS(method) stat_var* VAR_NAME(method)[6]; + +#define DECLARE_STATS(method) \ + { STAT_NAME(method, 1), 0, &VAR_NAME(method)[0] }, \ + { STAT_NAME(method, 2), 0, &VAR_NAME(method)[1] }, \ + { STAT_NAME(method, 3), 0, &VAR_NAME(method)[2] }, \ + { STAT_NAME(method, 4), 0, &VAR_NAME(method)[3] }, \ + { STAT_NAME(method, 5), 0, &VAR_NAME(method)[4] }, \ + { STAT_NAME(method, 6), 0, &VAR_NAME(method)[5] } + +DECLARE_STAT_VARS(invite); +DECLARE_STAT_VARS(cancel); +DECLARE_STAT_VARS(bye); +DECLARE_STAT_VARS(reg); +DECLARE_STAT_VARS(message); +DECLARE_STAT_VARS(prack); +DECLARE_STAT_VARS(update); +DECLARE_STAT_VARS(refer); + /*! exported core statistics */ stat_export_t core_stats[] = { {"rcv_requests" , 0, &rcv_reqs }, @@ -121,6 +144,14 @@ stat_export_t core_stats[] = { {"bad_URIs_rcvd", 0, &bad_URIs }, {"unsupported_methods", 0, &unsupported_methods }, {"bad_msg_hdr", 0, &bad_msg_hdr }, + DECLARE_STATS(invite), + DECLARE_STATS(cancel), + DECLARE_STATS(bye), + DECLARE_STATS(reg), + DECLARE_STATS(message), + DECLARE_STATS(prack), + DECLARE_STATS(update), + DECLARE_STATS(refer), {0,0,0} }; @@ -200,6 +231,28 @@ static int km_cb_req_stats(struct sip_msg *msg, return 1; } +static int km_cb_rpl_stats_by_method(struct sip_msg *msg, + unsigned int flags, void *param) +{ + int method = get_cseq(msg)->method_id; + int group = msg->first_line.u.reply.statuscode / 100 - 1; + + if (group >= 1 && group <= 6) { + switch(method) { + case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; + case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break; + case METHOD_BYE: update_stat( VAR_NAME(bye)[group], 1); break; + case METHOD_REGISTER: update_stat( VAR_NAME(reg)[group], 1); break; + case METHOD_MESSAGE: update_stat( VAR_NAME(message)[group], 1); break; + case METHOD_PRACK: update_stat( VAR_NAME(prack)[group], 1); break; + case METHOD_UPDATE: update_stat( VAR_NAME(update)[group], 1); break; + case METHOD_REFER: update_stat( VAR_NAME(refer)[group], 1); break; + } + } + + return 1; +} + static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { @@ -321,6 +374,10 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + if (register_script_cb(km_cb_rpl_stats_by_method, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + LM_ERR("failed to register PRE request callback\n"); + return -1; + } if (stats_proc_stats_init_rpc()<0) return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index ae59e9463f..72a5f5becc 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -69,6 +69,8 @@ extern stat_var* rcv_rpls_480; extern stat_var* rcv_rpls_486; extern stat_var* rcv_rpls_5xx; extern stat_var* rcv_rpls_6xx; +extern stat_var* rcv_rpls_2xx_invite; +extern stat_var* rcv_rpls_4xx_invite; /*! \brief forwarded requests */ extern stat_var* fwd_reqs;

1 0

ASN-HI2Operations module in Kamailio
by Mojtaba 24 Sep '18

24 Sep '18

Hello, I am Mojtaba Esfandiai. I am going to implement new module in Kamailio, In this module i wanna to implement HI2Operations,ver18 for Lawful Interception (ETSI TS 101 671 V3.15.1). My idea is when the request is received by Kamailio was "subject of target", a module's function is executed. In cmd_functions. we should check type of IRIContent and related data. Then we encapsulated all data and encode in in BER file and save in in favourite path. Do you have any idea for this module? Thanks With Regards. -- --Mojtaba Esfandiari.S

2 1

git:master:491e19eb: tls: update to default session id value to reflect major version
by Daniel-Constantin Mierla 21 Sep '18

21 Sep '18

Module: kamailio Branch: master Commit: 491e19eb47384162cba64fd9f043e77574ce5017 URL: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-21T12:51:08+02:00 tls: update to default session id value to reflect major version --- Modified: src/modules/tls/tls_cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… Patch: https://github.com/kamailio/kamailio/commit/491e19eb47384162cba64fd9f043e77… --- diff --git a/src/modules/tls/tls_cfg.c b/src/modules/tls/tls_cfg.c index 7bfa75a685..d133a2da98 100644 --- a/src/modules/tls/tls_cfg.c +++ b/src/modules/tls/tls_cfg.c @@ -47,7 +47,7 @@ struct cfg_group_tls default_tls_cfg = { STR_NULL, /* certificate (default value set in fix_tls_cfg) */ STR_NULL, /* cipher_list (default value set in fix_tls_cfg) */ 0, /* session_cache */ - STR_STATIC_INIT("kamailio-tls-4.x.y"), /* session_id */ + STR_STATIC_INIT("kamailio-tls-5.x.y"), /* session_id */ STR_NULL, /* config_file */ 3, /* log (L_DBG)*/ 3, /* debug (L_DBG) */

1 0

git:master:55575264: core: use parentesis to surround condtion on raw_ipip header size
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Module: kamailio Branch: master Commit: 55575264332e07611c269873c9ce0b5a63c35454 URL: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:45:48+02:00 core: use parentesis to surround condtion on raw_ipip header size --- Modified: src/core/raw_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… Patch: https://github.com/kamailio/kamailio/commit/55575264332e07611c269873c9ce0b5… --- diff --git a/src/core/raw_sock.c b/src/core/raw_sock.c index 9dd65d2340..6b9e3f9f90 100644 --- a/src/core/raw_sock.c +++ b/src/core/raw_sock.c @@ -314,13 +314,14 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, if (unlikely(n<0)) goto error; end=*buf+n; - if (unlikely(n<((sizeof(struct ip) * raw_ipip ? 2 : 1)+sizeof(struct udphdr)))) { + if (unlikely(n<((sizeof(struct ip) * (raw_ipip ? 2 : 1))+sizeof(struct udphdr)))) { n=-3; goto error; } - if(raw_ipip) - *buf = *buf + sizeof(struct ip); + if(raw_ipip) { + *buf = *buf + sizeof(struct ip); + } /* FIXME: if initial buffer is aligned, one could skip the memcpy and directly cast ip and udphdr pointer to the memory */

1 0

git:master:9e13c951: core: use memcpy() instead of strncpy()
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Module: kamailio Branch: master Commit: 9e13c9512b48ab9522f508465c6031e7b4a96086 URL: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:56:04+02:00 core: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul --- Modified: src/core/dset.c Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… Patch: https://github.com/kamailio/kamailio/commit/9e13c9512b48ab9522f508465c6031e… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1a10f2af9a..ff40c192ad 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -877,18 +877,18 @@ int uri_restore_rcv_alias(str *uri, str *nuri, str *suri) nuri->len = p - nuri->s; p = suri->s; - strncpy(p, "sip:", 4); + memcpy(p, "sip:", 4); p += 4; - strncpy(p, ip.s, ip.len); + memcpy(p, ip.s, ip.len); p += ip.len; *p++ = ':'; - strncpy(p, port.s, port.len); + memcpy(p, port.s, port.len); p += port.len; proto_type_to_str((unsigned short)proto, &sproto); if(sproto.len>0 && proto!=PROTO_UDP) { - strncpy(p, ";transport=", 11); + memcpy(p, ";transport=", 11); p += 11; - strncpy(p, sproto.s, sproto.len); + memcpy(p, sproto.s, sproto.len); p += sproto.len; } suri->len = p - suri->s; diff --git a/src/core/select_core.c b/src/core/select_core.c index 112dee489e..c96db61104 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -827,7 +827,7 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) { char* p; int size; - + if (select_uri_p == NULL) { if (parse_uri(res->s, res->len, &uri)<0) return -1; @@ -836,27 +836,27 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) if (!select_uri_p->host.len) return -1; - + if (select_uri_p->port.len) { res->s=select_uri_p->host.s; res->len=select_uri_p->host.len+select_uri_p->port.len+1; return 0; } - + size=select_uri_p->host.len+5; if (!(p = get_static_buffer(size))) return -1; - - strncpy(p, select_uri_p->host.s, select_uri_p->host.len); + + memcpy(p, select_uri_p->host.s, select_uri_p->host.len); switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: - strncpy(p+select_uri_p->host.len, ":5061", 5); + memcpy(p+select_uri_p->host.len, ":5061", 5); break; case SIP_URI_T: case TEL_URI_T: case URN_URI_T: - strncpy(p+select_uri_p->host.len, ":5060", 5); + memcpy(p+select_uri_p->host.len, ":5060", 5); break; case ERROR_URI_T: return -1;

1 0

git:master:daad89a5: path: use memcpy() instead of strncpy()
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Module: kamailio Branch: master Commit: daad89a516f1f298ef8f71505d7ab93b35fe76db URL: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:37:15+02:00 path: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… Patch: https://github.com/kamailio/kamailio/commit/daad89a516f1f298ef8f71505d7ab93… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 5b29a33527..f95d68ab70 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -406,8 +406,8 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) } } else { /* received=ip~port~proto */ - strncpy(dst_uri_buf, "sip:", 4); - strncpy(dst_uri_buf+4, hooks.contact.received->body.s, + memcpy(dst_uri_buf, "sip:", 4); + memcpy(dst_uri_buf+4, hooks.contact.received->body.s, hooks.contact.received->body.len); dst_uri_buf[4+hooks.contact.received->body.len] = '\0'; p = dst_uri_buf + 4; @@ -433,7 +433,7 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) LM_ERR("unknown proto in received param\n"); goto done; } - strncpy(p, "transport=", 10); + memcpy(p, "transport=", 10); p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len;

1 0

git:master:4be1c60b: dispatcher: use memcpy() instead of strncpy()
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Module: kamailio Branch: master Commit: 4be1c60bb67d191f8a2715253a7cbcb2ea412d85 URL: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T16:32:09+02:00 dispatcher: use memcpy() instead of strncpy() - avoid gcc 8.2 warning: âstrncpyâ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… Patch: https://github.com/kamailio/kamailio/commit/4be1c60bb67d191f8a2715253a7cbcb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0422cd6b20..20077f1506 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -330,8 +330,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) /* check uri */ if(parse_uri(uri.s, uri.len, &puri) != 0) { if(iuri.len>4 && strncmp(iuri.s, "sip:", 4)!=0 && iuri.len<500) { - strncpy(ub, "sip:", 4); - strncpy(ub+4, iuri.s, iuri.len); + memcpy(ub, "sip:", 4); + memcpy(ub+4, iuri.s, iuri.len); ub[iuri.len+4] = '\0'; uri.s = ub; uri.len = iuri.len+4;

1 0

git:master:c4ce16fc: kamailio.cfg: added via1 sanity check in default config
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Module: kamailio Branch: master Commit: c4ce16fce6da24e6dc7e732117419cf3ce788d56 URL: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-20T13:07:00+02:00 kamailio.cfg: added via1 sanity check in default config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… Patch: https://github.com/kamailio/kamailio/commit/c4ce16fce6da24e6dc7e732117419cf… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 13bef88de1..d17c719eaf 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -577,7 +577,7 @@ route[REQINIT] { exit; } - if(!sanity_check("1511", "7")) { + if(!sanity_check("17895", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; }

1 0

Kamailio On Tap – Social Event In Dusseldorf, Sep 27, 2018
by Daniel-Constantin Mierla 20 Sep '18

20 Sep '18

Hello, we are organizing an open social networking event in the evening of Sep 27, 2018, in Dusseldorf, at the end of the first day of Kamailio Developers meeting. Anyone in the area that wants to enjoy beer, pizza and chat about Kamailio, VoIP/RTC is welcome to join us. More details at: * https://www.kamailio.org/w/2018/09/kamailio-on-tap-social-event-in-dusseldo… Note that participation is free, but you have to announce your participation until Sep 26 in order to plan properly the event. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

[kamailio/kamailio] can't generate 487 reply when a final 408 was sent out (#1648)
by Prabhat Kumar 19 Sep '18

19 Sep '18

kamailio verison is 4.0 Operating System : Ubuntu 16.04 Everyhting seems fine. Sip user is recieving the call but i am not getting any voice from that side. I dont know whether there is NAT issue or something else. I get this error in my log "tm [t_reply.c:479]: _reply_light(): can't generate 487 reply when a final 408 was sent out" I have used dispatcher and wss connection. -- 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/1648

3 3

git:master:0d14ce8b: nathelper: exported fix_nated_sdp() variants to KEMI framework
by Daniel-Constantin Mierla 19 Sep '18

19 Sep '18

Module: kamailio Branch: master Commit: 0d14ce8bf45ada579f7ec85793d358a5fa32e4b7 URL: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T09:03:10+02:00 nathelper: exported fix_nated_sdp() variants to KEMI framework --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… Patch: https://github.com/kamailio/kamailio/commit/0d14ce8bf45ada579f7ec85793d358a… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index b9d9d622b3..44badb90fb 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1548,25 +1548,15 @@ static inline int replace_sdp_ip( return count; } -static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) +static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) { str body; - str ip; - int level, rest_len; + int rest_len; char *buf, *m_start, *m_end; struct lump *anchor; int ret; int count = 0; - if(fixup_get_ivalue(msg, (gparam_t *)str1, &level) != 0) { - LM_ERR("failed to get value for first parameter\n"); - return -1; - } - if(str2 && fixup_get_svalue(msg, (gparam_t *)str2, &ip) != 0) { - LM_ERR("failed to get value for second parameter\n"); - return -1; - } - if(extract_body(msg, &body) == -1) { LM_ERR("cannot extract body from msg!\n"); return -1; @@ -1631,7 +1621,7 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", str2 ? &ip : 0); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0); if(ret == -1) return -1; count += ret; @@ -1639,7 +1629,7 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", str2 ? &ip : 0); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0); if(ret == -1) return -1; count += ret; @@ -1648,6 +1638,28 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) return count > 0 ? 1 : 2; } +static int ki_fix_nated_sdp(sip_msg_t *msg, int level) +{ + return ki_fix_nated_sdp_ip(msg, level, NULL); +} + +static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) +{ + int level; + str ip; + + if(fixup_get_ivalue(msg, (gparam_t *)str1, &level) != 0) { + LM_ERR("failed to get value for first parameter\n"); + return -1; + } + if(str2 && fixup_get_svalue(msg, (gparam_t *)str2, &ip) != 0) { + LM_ERR("failed to get value for second parameter\n"); + return -1; + } + + return ki_fix_nated_sdp_ip(msg, level, &ip); +} + static int extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; @@ -2432,6 +2444,16 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("nathelper"), str_init("fix_nated_sdp"), + SR_KEMIP_INT, ki_fix_nated_sdp, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("nathelper"), str_init("fix_nated_sdp_ip"), + SR_KEMIP_INT, ki_fix_nated_sdp_ip, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:fd30ccf4: usrloc: use sruid_next_safe()
by Daniel-Constantin Mierla 19 Sep '18

19 Sep '18

Module: kamailio Branch: master Commit: fd30ccf4473d43d98cfb0d896c47d4824c089bce URL: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T08:11:36+02:00 usrloc: use sruid_next_safe() --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… Patch: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 39d8aa2776..53031799ac 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -660,7 +660,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) return; } - if(sruid_next(&_ul_sruid)<0) + if(sruid_next_safe(&_ul_sruid)<0) { rpc->fault(ctx, 500, "Can't obtain next uid"); return;

1 0

git:master:89676b97: registrar: use sruid_next_safe()
by Daniel-Constantin Mierla 19 Sep '18

19 Sep '18

Module: kamailio Branch: master Commit: 89676b9774ecc0f72272b7027821a9531dc1a6ea URL: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T08:33:14+02:00 registrar: use sruid_next_safe() --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… Patch: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 1432efed64..2b39444a29 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -404,7 +404,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, goto error; } } - if(sruid_next(&_reg_sruid)<0) + if(sruid_next_safe(&_reg_sruid)<0) goto error; ci.ruid = _reg_sruid.uid; LM_DBG("generated ruid is: %.*s\n", ci.ruid.len, ci.ruid.s);

1 0

git:master:06de5083: htable: proper parameter type for sht_setxs() kemi export
by Daniel-Constantin Mierla 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: 06de508301a9dff63c671991d47944ef91cf91d2 URL: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-18T14:19:33+02:00 htable: proper parameter type for sht_setxs() kemi export --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… Patch: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 8305947641..bd323ac37a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1687,7 +1687,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { }, { str_init("htable"), str_init("sht_setxs"), SR_KEMIP_INT, ki_ht_setxs, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:b3614e8b: ims_charging: In case of tel: URI => type MSISDN, skip the "tel:" from the URI
by Carsten Bock 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: b3614e8b9e4192722a4577a59f071ec93f29664a URL: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-09-18T10:31:57+02:00 ims_charging: In case of tel: URI => type MSISDN, skip the "tel:" from the URI --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… Patch: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 4e67813362..cd3ae215ae 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1105,6 +1105,8 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, int reservat //getting subscription id type if (strncasecmp(subscription_id.s, "tel:", 4) == 0) { subscription_id_type = Subscription_Type_MSISDN; + subscription_id.s += 4; + subscription_id.len -= 4; } else { subscription_id_type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

1 0

git:master:25cf75d6: ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647
by Carsten Bock 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: 25cf75d6a7cc040883ada7bb7988aad0b6dde663 URL: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-09-18T10:30:05+02:00 ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647 --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… Patch: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 5489440208..0e7b06cf60 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -75,7 +75,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { LM_ERR("NULL message!!!\n"); return -1; } - + switch (ue_type_c[0]) { case '3': LM_DBG("looking for 3gpp terminals\n"); @@ -91,8 +91,23 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) aor = _m->new_uri; - else aor = _m->first_line.u.request.uri; + if (_m->new_uri.s) { + aor.s = pkg_malloc(_m->new_uri.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); + aor.len = _m->new_uri.len; + } else { + aor.s = pkg_malloc(_m->first_line.u.request.uri.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); + aor.len = _m->first_line.u.request.uri.len; + } for (i = 4; i < aor.len; i++) if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { @@ -108,6 +123,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { res = ul.get_impurecord(_d, &aor, &r); if (res != 0) { LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + pkg_free(aor.s); ul.unlock_udomain(_d, &aor); return -1; } @@ -206,6 +222,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { } done: + pkg_free(aor.s); ul.unlock_udomain(_d, &aor); return ret; }

1 0

git:5.1:53bc3a93: core: backported commit f088d2afe4153b9e440a4293211c78f5a25af691 manually
by Juha Heinanen 17 Sep '18

17 Sep '18

Module: kamailio Branch: 5.1 Commit: 53bc3a936d43d0eb23c61b0d1f089c63b437b0e9 URL: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-09-17T18:17:36+03:00 core: backported commit f088d2afe4153b9e440a4293211c78f5a25af691 manually --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… Patch: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… --- diff --git a/src/core/receive.c b/src/core/receive.c index cd92ef8cad..fe7bb6eed9 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -137,6 +137,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) sr_net_info_t netinfo; sr_kemi_eng_t *keng = NULL; sr_event_param_t evp = {0}; + int errsipmsg = 0; if(sr_event_enabled(SREV_NET_DATA_RECV)) { if(sip_check_fline(buf, len) == 0) { @@ -182,15 +183,22 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) msg_set_time(msg); if(parse_msg(buf, len, msg) != 0) { + errsipmsg = 1; evp.data = (void *)msg; if((ret = sr_event_exec(SREV_RCV_NOSIP, &evp)) < NONSIP_MSG_DROP) { - LOG(cfg_get(core, core_cfg, corelog), - "core parsing of SIP message failed (%s:%d/%d)\n", - ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, - (int)msg->rcv.proto); - sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); - } else if(ret == NONSIP_MSG_DROP) + LM_DBG("attempt of nonsip message processing failed\n"); + } else if(ret == NONSIP_MSG_DROP) { + LM_DBG("nonsip message processing completed\n"); goto error02; + } + } + if(errsipmsg==1) { + LOG(cfg_get(core, core_cfg, corelog), + "core parsing of SIP message failed (%s:%d/%d)\n", + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, + (int)msg->rcv.proto); + sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); + goto error02; } if(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0)

1 0

git:master:f088d2af: core: if nosip msg hooks skip handling the packet, stop sip routing processing
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: f088d2afe4153b9e440a4293211c78f5a25af691 URL: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T16:18:58+02:00 core: if nosip msg hooks skip handling the packet, stop sip routing processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… Patch: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… --- diff --git a/src/core/receive.c b/src/core/receive.c index df8db65ca6..b14ebf8fb9 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -169,6 +169,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) sr_event_param_t evp = {0}; unsigned int cidlockidx = 0; unsigned int cidlockset = 0; + int errsipmsg = 0; if(sr_event_enabled(SREV_NET_DATA_RECV)) { if(sip_check_fline(buf, len) == 0) { @@ -214,15 +215,22 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) msg_set_time(msg); if(parse_msg(buf, len, msg) != 0) { + errsipmsg = 1; evp.data = (void *)msg; if((ret = sr_event_exec(SREV_RCV_NOSIP, &evp)) < NONSIP_MSG_DROP) { - LOG(cfg_get(core, core_cfg, corelog), - "core parsing of SIP message failed (%s:%d/%d)\n", - ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, - (int)msg->rcv.proto); - sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); - } else if(ret == NONSIP_MSG_DROP) + LM_DBG("attempt of nonsip message processing failed\n"); + } else if(ret == NONSIP_MSG_DROP) { + LM_DBG("nonsip message processing completed\n"); goto error02; + } + } + if(errsipmsg==1) { + LOG(cfg_get(core, core_cfg, corelog), + "core parsing of SIP message failed (%s:%d/%d)\n", + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, + (int)msg->rcv.proto); + sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); + goto error02; } if(unlikely(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0)

1 0

git:master:9f8e2d43: pkg/kamailio/deb: set version 5.2.0-dev7
by Victor Seva 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 9f8e2d43b748a9e78f18f748aba6b5965be01808 URL: https://github.com/kamailio/kamailio/commit/9f8e2d43b748a9e78f18f748aba6b59… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-17T12:13:23+02:00 pkg/kamailio/deb: set version 5.2.0-dev7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/9f8e2d43b748a9e78f18f748aba6b59… Patch: https://github.com/kamailio/kamailio/commit/9f8e2d43b748a9e78f18f748aba6b59…

1 0

git:master:13bb3732: htable: use proper variable to set the expire along with the value
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 13bb3732aff23abbb1ba1114f1697095c09d584c URL: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:45:15+02:00 htable: use proper variable to set the expire along with the value --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… Patch: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 7f4298c10b..1c82e9c7ea 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -597,8 +597,7 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, } /* add */ cell = ht_cell_new(name, type, val, hid); - if(cell == NULL) - { + if(cell == NULL) { LM_ERR("cannot create new cell.\n"); if(mode) ht_slot_unlock(ht, idx); return -1; @@ -606,12 +605,10 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, if(exv<=0) { cell->expire = now + ht->htexpire; } else { - it->expire = now + exv; + cell->expire = now + exv; } - if(prev==NULL) - { - if(ht->entries[idx].first!=NULL) - { + if(prev==NULL) { + if(ht->entries[idx].first!=NULL) { cell->next = ht->entries[idx].first; ht->entries[idx].first->prev = cell; }

1 0

git:master:6e3e86c2: htable: better handling of unsupported matching operator
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 6e3e86c2bae81232f73b391d0cd47b5e4415a0b8 URL: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:48:37+02:00 htable: better handling of unsupported matching operator --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… Patch: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1c82e9c7ea..f129c5d48f 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1398,7 +1398,9 @@ int ht_has_cell_op_str(str *sre, ht_t *ht, int mode, int op) } break; default: - goto notmatched; + ht_slot_unlock(ht, i); + LM_ERR("unsupported matching operator: %d\n", op); + return -1; } } it = it->next; @@ -1416,13 +1418,6 @@ int ht_has_cell_op_str(str *sre, ht_t *ht, int mode, int op) regfree(&re); } return 1; - -notmatched: - ht_slot_unlock(ht, i); - if(op==HT_RM_OP_RE) { - regfree(&re); - } - return -1; } int ht_reset_content(ht_t *ht)

1 0

git:master:891202ec: app_ruby: print type of result in case of execution failure
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 891202ec3cb477a802309eee9f18563ff8bf91d4 URL: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:14:27+02:00 app_ruby: print type of result in case of execution failure --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… Patch: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 06d8cf2ce7..88fbee00f3 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -164,12 +164,12 @@ int app_ruby_kemi_reload_script(void) } /** - * + * */ int ruby_sr_init_child(void) { int state = 0; - VALUE result; + VALUE rbres; /* construct the VM */ ruby_init(); @@ -177,12 +177,12 @@ int ruby_sr_init_child(void) ruby_script(_sr_ruby_load_file.s); /* Ruby goes here */ - result = rb_eval_string_protect("puts 'Hello " NAME "!'", &state); + rbres = rb_eval_string_protect("puts 'Hello " NAME "!'", &state); if (state) { /* handle exception */ app_ruby_print_last_exception(); - LM_ERR("test execution with error\n"); + LM_ERR("test execution with error (res type: %d)\n", TYPE(rbres)); return -1; } else { LM_DBG("test execution without error\n"); @@ -1032,7 +1032,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, } /** - * + * */ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, char *p3, int emode) @@ -1075,7 +1075,8 @@ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, if (rberr) { app_ruby_print_last_exception(); - LM_ERR("ruby exception (%d) on callback for: %s\n", rberr, func); + LM_ERR("ruby exception (%d) on callback for: %s (res type: %d)\n", + rberr, func, TYPE(rbres)); return -1; } @@ -1083,7 +1084,7 @@ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } /** - * + * */ int app_ruby_run(sip_msg_t *msg, char *func, char *p1, char *p2, char *p3)

1 0

git:master:3311bc10: Makefile.defs: version set to 5.2.0-dev7
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 3311bc10c69cbb8f1a8ea6834bec4cbfd76da7cd URL: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T10:37:53+02:00 Makefile.defs: version set to 5.2.0-dev7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… Patch: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a114c8ae0f..c29ae8bf9d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] Feature request: http_async_query response route to resume execution from memory (#1642)
by alexsosic 17 Sep '18

17 Sep '18

>From the official kamailio documentation of the function `http_async_query(url, route_name)` ``` Sends HTTP(S) request asynchronously to the URL given in “url” parameter, which is a string that may contain pseudo variables. Parameter “route_name” defines the route to be executed upon reception of HTTP reply, on error or on timeout. If a transaction exists before calling http_async_query(), it will be paused and resumed in this route, while the routing script execution will be stopped. If executed in a transactionless context, or if $http_req(suspend) is used not to suspend the transaction, the routing script execution will continue and the query result will be available in “route_name”. ``` Because the routing script execution `will be stopped` it's quite difficult for some advanced usages to restore the previous variables and logic and to continue with the execution. The problem of resuming the work is delegated to the user and not Kamailio itself. I think Kamailio should freeze the execution and store all needed data in memory to resume execution after the http response like for a normal http sync query. So the `stopping` will become `pausing/resuming`. -- 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/1642

3 3

[kamailio/kamailio] Restrict app_python to Python2 enabling builds on systems where Python3 is the default (#1645)
by Anthony Messina 16 Sep '18

16 Sep '18

The following change enables app_python (which only works with Python2 anyway) to build on systems where Python3 is the default (Fedora 29). ``` diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e..c9ad254c3 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"} ``` -- 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/1645

3 10

git:5.0:4a88ee66: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: 5.0 Commit: 4a88ee66cc4735b655ac4a2b710217a5b6f1ecd8 URL: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T15:00:14+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available (cherry picked from commit a52e7cb1eec84a20432cb959a29a24ee1a8993dd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… Patch: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:5.1:b6e849c9: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: 5.1 Commit: b6e849c9f4463657534d823f5c8cfb1d85f6bdaa URL: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T15:00:20+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available (cherry picked from commit a52e7cb1eec84a20432cb959a29a24ee1a8993dd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… Patch: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:master:1e04e9c6: htable: exported KSR.htable.sht_setxs(htname, itname, sval, exval)
by Daniel-Constantin Mierla 16 Sep '18

16 Sep '18

Module: kamailio Branch: master Commit: 1e04e9c65906e51d2747a3c9e9ca44d911a3365f URL: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-16T11:36:07+02:00 htable: exported KSR.htable.sht_setxs(htname, itname, sval, exval) - renamed KSR.htable.sht_setiex() to KSR.htable.sht_setxi() --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… Patch: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 270db053d8..8305947641 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -935,7 +935,7 @@ static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) } if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { - LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1; } @@ -968,8 +968,6 @@ static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); - LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, - itname->len, itname->s); return -1; } @@ -1006,13 +1004,56 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return -1; } - return 0; + return 1; } /** * */ -static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, +static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, + int exval) +{ + int_str isval; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + LM_DBG("set value and expire for sht: %.*s key: %.*s val: %.*s exp: %d\n", + htname->len, htname->s, itname->len, itname->s, + (itval->len>100)?100:itval->len, itval->s, exval); + + if (ht->dmqreplicate>0) { + isval.s = *itval; + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, AVP_VAL_STR, &isval, 1)!=0) { + LM_ERR("dmq set value replication failed\n"); + } else { + isval.n = exval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, + itname, 0, &isval, 0)!=0) { + LM_ERR("dmq set expire relication failed\n"); + } + } + } + isval.s = *itval; + if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int ki_ht_setxi(sip_msg_t *msg, str *htname, str *itname, int itval, int exval) { int_str isval; @@ -1037,7 +1078,7 @@ static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, isval.n = exval; if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, itname, 0, &isval, 0)!=0) { - LM_ERR("dmq set expire relication failed\n"); + LM_ERR("dmq set expire replication failed\n"); } } } @@ -1639,8 +1680,13 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("htable"), str_init("sht_setiex"), - SR_KEMIP_INT, ki_ht_setiex, + { str_init("htable"), str_init("sht_setxi"), + SR_KEMIP_INT, ki_ht_setxi, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_setxs"), + SR_KEMIP_INT, ki_ht_setxs, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:9d3a126c: htable: exported KSR.htable.sht_setiex(htname, itname, ival, exval)
by Daniel-Constantin Mierla 16 Sep '18

16 Sep '18

Module: kamailio Branch: master Commit: 9d3a126cecbb051393dd79f7ae4d6c7ac6b9880b URL: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-16T11:36:07+02:00 htable: exported KSR.htable.sht_setiex(htname, itname, ival, exval) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… Patch: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 64a8bb6511..270db053d8 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -991,11 +991,10 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return -1; } - isval.n = itval; - - LM_DBG("set expire value for sht: %.*s key: %.*s exp: %d\n", htname->len, + LM_DBG("set expire value for sht: %.*s key: %.*s exp: %d\n", htname->len, htname->s, itname->len, itname->s, itval); + isval.n = itval; if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, itname, 0, &isval, 0)!=0) { @@ -1010,6 +1009,49 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return 0; } +/** + * + */ +static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, + int exval) +{ + int_str isval; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + LM_DBG("set value and expire for sht: %.*s key: %.*s val: %d exp: %d\n", + htname->len, htname->s, itname->len, itname->s, itval, exval); + + if (ht->dmqreplicate>0) { + isval.n = itval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, 0, &isval, 1)!=0) { + LM_ERR("dmq set value relication failed\n"); + } else { + isval.n = exval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, + itname, 0, &isval, 0)!=0) { + LM_ERR("dmq set expire relication failed\n"); + } + } + } + isval.n = itval; + + if(ht_set_cell_ex(ht, itname, 0, &isval, 1, exval)!=0) { + LM_ERR("cannot set value and expire for sht: %.*s key: %.*s\n", + htname->len, htname->s, itname->len, itname->s); + return -1; + } + + return 0; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1597,6 +1639,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_setiex"), + SR_KEMIP_INT, ki_ht_setiex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:a52e7cb1: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: master Commit: a52e7cb1eec84a20432cb959a29a24ee1a8993dd URL: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T11:09:12+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… Patch: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:5.1:efb843e1: app_python: fix python call in Makefile (python -> python2), reported by GH #1645
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: 5.1 Commit: efb843e1de19b01b36363d4f0a5b345520cf166c URL: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T10:33:32+02:00 app_python: fix python call in Makefile (python -> python2), reported by GH #1645 (cherry picked from commit 31498ca574c931f1a7e12619e725c8b151a3e7bd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… Patch: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e4..c9ad254c3b 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:5.0:22f1109f: app_python: fix python call in Makefile (python -> python2), reported by GH #1645
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: 5.0 Commit: 22f1109fccc8fc39181d5938ec425386aa62fb9f URL: https://github.com/kamailio/kamailio/commit/22f1109fccc8fc39181d5938ec42538… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T10:33:16+02:00 app_python: fix python call in Makefile (python -> python2), reported by GH #1645 (cherry picked from commit 31498ca574c931f1a7e12619e725c8b151a3e7bd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/22f1109fccc8fc39181d5938ec42538… Patch: https://github.com/kamailio/kamailio/commit/22f1109fccc8fc39181d5938ec42538… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e4..c9ad254c3b 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:master:31498ca5: app_python: fix python call in Makefile (python -> python2), reported by GH #1645
by Henning Westerholt 16 Sep '18

16 Sep '18

Module: kamailio Branch: master Commit: 31498ca574c931f1a7e12619e725c8b151a3e7bd URL: https://github.com/kamailio/kamailio/commit/31498ca574c931f1a7e12619e725c8b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T10:26:58+02:00 app_python: fix python call in Makefile (python -> python2), reported by GH #1645 --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/31498ca574c931f1a7e12619e725c8b… Patch: https://github.com/kamailio/kamailio/commit/31498ca574c931f1a7e12619e725c8b… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e4..c9ad254c3b 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 0

git:master:7a024611: htable: internal function to update item expire along with the value
by Daniel-Constantin Mierla 14 Sep '18

14 Sep '18

Module: kamailio Branch: master Commit: 7a02461169418f5ca4f6ea61494a0bb979eb47fd URL: https://github.com/kamailio/kamailio/commit/7a02461169418f5ca4f6ea61494a0bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-14T14:09:40+02:00 htable: internal function to update item expire along with the value --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/7a02461169418f5ca4f6ea61494a0bb… Patch: https://github.com/kamailio/kamailio/commit/7a02461169418f5ca4f6ea61494a0bb…

1 0

[kamailio/kamailio] no config routing engine registered (#1619)
by kachallah 14 Sep '18

14 Sep '18

Hi everyone, I want to set up a network core with kamailio ims using the external HSS but when I try to connect with the user bob, I get this problem: <no config routing engine registered>. Thank you for supporting me -- 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/1619

5 11

git:master:fba9ea88: htable: exported sht_setex(...) to kemi framework
by Daniel-Constantin Mierla 14 Sep '18

14 Sep '18

Module: kamailio Branch: master Commit: fba9ea8823bf9beb009c5d857d674fa7bc665a37 URL: https://github.com/kamailio/kamailio/commit/fba9ea8823bf9beb009c5d857d674fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-14T10:54:56+02:00 htable: exported sht_setex(...) to kemi framework - API function to set expires value for an item: --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/fba9ea8823bf9beb009c5d857d674fa… Patch: https://github.com/kamailio/kamailio/commit/fba9ea8823bf9beb009c5d857d674fa… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 61b9e8896a..64a8bb6511 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -976,6 +976,40 @@ static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) return 1; } +/** + * + */ +static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) +{ + int_str isval; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isval.n = itval; + + LM_DBG("set expire value for sht: %.*s key: %.*s exp: %d\n", htname->len, + htname->s, itname->len, itname->s, itval); + + if (ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, + itname, 0, &isval, 0)!=0) { + LM_ERR("dmq relication failed\n"); + } + if(ht_set_cell_expire(ht, itname, 0, &isval)!=0) { + LM_ERR("cannot set expire for sht: %.*s key: %.*s\n", htname->len, + htname->s, itname->len, itname->s); + return -1; + } + + return 0; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1558,6 +1592,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_setex"), + SR_KEMIP_INT, ki_ht_setex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:317701dc: core: more info in log message when sendto() fails
by Daniel-Constantin Mierla 14 Sep '18

14 Sep '18

Module: kamailio Branch: master Commit: 317701dc3d1ddb27395ded873a3055af2d029a5a URL: https://github.com/kamailio/kamailio/commit/317701dc3d1ddb27395ded873a3055a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-14T08:51:47+02:00 core: more info in log message when sendto() fails --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/317701dc3d1ddb27395ded873a3055a… Patch: https://github.com/kamailio/kamailio/commit/317701dc3d1ddb27395ded873a3055a… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 862bed174d..1a1d200ab0 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -591,7 +591,8 @@ int udp_send(struct dest_info* dst, char *buf, unsigned len) #endif if (unlikely(n==-1)){ su2ip_addr(&ip, &dst->to); - LM_ERR("sendto(sock,%p,%u,0,%s:%d,%d): %s(%d)\n", + LM_ERR("sendto(sock, buf: %p, len: %u, 0, dst: (%s:%d), tolen: %d)" + " - err: %s (%d)\n", buf,len, ip_addr2a(&ip), su_getport(&dst->to), tolen, strerror(errno), errno); if (errno==EINTR) goto again;

1 0

[kamailio/kamailio] How to config kamailio as pcscf with out RTP engine? like openimscore pcscf? (#1643)
by leechul 14 Sep '18

14 Sep '18

### Description How to config kamailio as pcscf with out RTP engine? like openimscore pcscf?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1643

2 2

[kamailio/kamailio] ERROR: cnxcc terminate_call(): Error executing dlg_end_dlg command. Return code was [404] (#1051)
by Dipen Patel 13 Sep '18

13 Sep '18

### Description  #### Log Messages ``` terminate_call(): Error executing dlg_end_dlg command. Return code was [404] Apr 1 06:49:56 sip /usr/sbin/kamailio[1316]: ALERT: cnxcc [cnxcc_check.c:81]: check_calls_by_money(): [S2N5rn7nlu] call has exhausted its credit. Breaking the loop ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamctl -v /usr/sbin/kamctl 4.2.0 ``` * **Operating System**: ``` Centos 6 64bit ``` -- 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/1051

3 5

git:5.1:ee8cfdd3: auth: allow challenge from failure/onreply routes
by Luis Azedo 13 Sep '18

13 Sep '18

Module: kamailio Branch: 5.1 Commit: ee8cfdd3c7cbf241f70407f8813efd5d5d4f5af2 URL: https://github.com/kamailio/kamailio/commit/ee8cfdd3c7cbf241f70407f8813efd5… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-09-13T13:20:07+01:00 auth: allow challenge from failure/onreply routes (cherry picked from commit fc968236cf76ea6e67dcd74211b0e39e81b65d21) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee8cfdd3c7cbf241f70407f8813efd5… Patch: https://github.com/kamailio/kamailio/commit/ee8cfdd3c7cbf241f70407f8813efd5… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index eb7a7126c4..2dc9c7c1fc 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -154,11 +154,11 @@ static cmd_export_t cmds[] = { {"consume_credentials", w_consume_credentials, 0, 0, REQUEST_ROUTE}, {"www_challenge", (cmd_function)www_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"proxy_challenge", (cmd_function)proxy_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"auth_challenge", (cmd_function)w_auth_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"pv_www_authorize", (cmd_function)pv_www_authenticate, 3, fixup_pv_auth, REQUEST_ROUTE}, {"pv_www_authenticate", (cmd_function)pv_www_authenticate, 3,

1 0

git:master:fc968236: auth: allow challenge from failure/onreply routes
by lazedo 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: fc968236cf76ea6e67dcd74211b0e39e81b65d21 URL: https://github.com/kamailio/kamailio/commit/fc968236cf76ea6e67dcd74211b0e39… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-09-13T13:17:01+01:00 auth: allow challenge from failure/onreply routes --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc968236cf76ea6e67dcd74211b0e39… Patch: https://github.com/kamailio/kamailio/commit/fc968236cf76ea6e67dcd74211b0e39… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index eb7a7126c4..2dc9c7c1fc 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -154,11 +154,11 @@ static cmd_export_t cmds[] = { {"consume_credentials", w_consume_credentials, 0, 0, REQUEST_ROUTE}, {"www_challenge", (cmd_function)www_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"proxy_challenge", (cmd_function)proxy_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"auth_challenge", (cmd_function)w_auth_challenge, 2, - fixup_auth_challenge, REQUEST_ROUTE}, + fixup_auth_challenge, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"pv_www_authorize", (cmd_function)pv_www_authenticate, 3, fixup_pv_auth, REQUEST_ROUTE}, {"pv_www_authenticate", (cmd_function)pv_www_authenticate, 3,

1 0

[kamailio/kamailio] auth: allow challenge from failure/onreply routes (#1641)
by lazedo 13 Sep '18

13 Sep '18

#### 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) - [X] 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  when handling registration requests we create a transaction for async process and need to use t_on_failure / t_on_failure. when the async processes returns we want to call auth_challenge without the need to create `fake` routes ``` onreply_route[KZ_AUTHORIZATION_OK] { $var(password) = $(kzR{kz.json,Auth-Password}); $var(nonce) = $adn; if( $(kzR{kz.json,Event-Name}) == "authn_err" ) { ==>> auth_challenge("$fd", "0"); xlog("L_INFO", "$ci|end|issued auth challenge from async registrar for $Au $si:$sp\n"); exit; } else { xlog("L_INFO", "$ci|log|authenticated $Au via registrar async process\n"); route(SAVE_AUTHORIZATION); } } failure_route[KZ_AUTHORIZATION_ERROR] { xlog("L_INFO", "$ci|log|registrar process failed with $T_reply_code for $Au $si:$sp\n"); ==>> auth_challenge("$fd", "0"); exit; } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1641 -- Commit Summary -- * auth: allow challenge from failure/onreply routes -- File Changes -- M src/modules/auth/auth_mod.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1641.patch https://github.com/kamailio/kamailio/pull/1641.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/1641

2 2

git:master:18fa51b8: sanity: reset sanity reply info before starting the checks
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: 18fa51b8121e34e76c9a9935ed8e168aa9a70ebc URL: https://github.com/kamailio/kamailio/commit/18fa51b8121e34e76c9a9935ed8e168… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T12:39:58+02:00 sanity: reset sanity reply info before starting the checks --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18fa51b8121e34e76c9a9935ed8e168… Patch: https://github.com/kamailio/kamailio/commit/18fa51b8121e34e76c9a9935ed8e168… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index d57854639e..fc79663ba2 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -135,6 +135,10 @@ int sanity_check(struct sip_msg* _msg, int msg_checks, int uri_checks) { int ret; + if(ksr_sanity_noreply!=0) { + ksr_sanity_info_init(); + } + ret = SANITY_CHECK_PASSED; if (SANITY_RURI_SIP_VERSION & msg_checks && (ret = check_ruri_sip_version(_msg)) != SANITY_CHECK_PASSED) {

1 0

git:master:c3258c2c: modules: readme files regenerated - sanity ... [skip ci]
by Kamailio Dev 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: c3258c2c7d3ce64a1ecb1c187b440b48e1544af3 URL: https://github.com/kamailio/kamailio/commit/c3258c2c7d3ce64a1ecb1c187b440b4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-13T12:31:33+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/c3258c2c7d3ce64a1ecb1c187b440b4… Patch: https://github.com/kamailio/kamailio/commit/c3258c2c7d3ce64a1ecb1c187b440b4… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index 027725f150..4493c7f3cd 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -19,10 +19,12 @@ Nils Ohlmeier 3.2. uri_checks (integer) 3.3. proxy_require (string) 3.4. autodrop (integer) + 3.5. noreply (int) 4. Functions 4.1. sanity_check([msg_checks [, uri_checks]]) + 4.2. sanity_reply() List of Examples @@ -30,9 +32,11 @@ Nils Ohlmeier 1.2. Set uri_checks parameter 1.3. Set proxy_require parameter 1.4. Set autodrop parameter - 1.5. sanity_check usage - 1.6. sanity_check usage with parameter - 1.7. sanity_check usage with two parameters + 1.5. Set noreply parameter + 1.6. sanity_check usage + 1.7. sanity_check usage with parameter + 1.8. sanity_check usage with two parameters + 1.9. sanity_reply usage Chapter 1. Admin Guide @@ -46,10 +50,12 @@ Chapter 1. Admin Guide 3.2. uri_checks (integer) 3.3. proxy_require (string) 3.4. autodrop (integer) + 3.5. noreply (int) 4. Functions 4.1. sanity_check([msg_checks [, uri_checks]]) + 4.2. sanity_reply() 1. Overview @@ -111,6 +117,7 @@ Chapter 1. Admin Guide 3.2. uri_checks (integer) 3.3. proxy_require (string) 3.4. autodrop (integer) + 3.5. noreply (int) 3.1. default_checks (integer) @@ -169,9 +176,24 @@ modparam("sanity", "proxy_require", "foo, bar") modparam("sanity", "autodrop", 1) ... +3.5. noreply (int) + + If set to 1, then the module does not send a SIP reply internally in + case there is an error detected when performing the sanity checks. + There is the option to send the reply from config file with functions + from sl or tm module as well as sanity_reply() from this module. + + Default value: 0. + + Example 1.5. Set noreply parameter +... +modparam("sanity", "noreply", 1) +... + 4. Functions 4.1. sanity_check([msg_checks [, uri_checks]]) + 4.2. sanity_reply() 4.1. sanity_check([msg_checks [, uri_checks]]) @@ -186,7 +208,7 @@ modparam("sanity", "autodrop", 1) The parameters can be static integers or variables holding integer values. - Example 1.5. sanity_check usage + Example 1.6. sanity_check usage ... if (!sanity_check()) { exit; @@ -199,7 +221,7 @@ if (!sanity_check()) { of the checks (like for the module parameter) which should be executed at this function call. - Example 1.6. sanity_check usage with parameter + Example 1.7. sanity_check usage with parameter ... if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a @@ -212,7 +234,7 @@ if (method=="REGISTER" && !sanity_check("256")) { overwrites the global module parameter uri_checks and thus determines which URIs will be checked if the parse uri test will be executed. - Example 1.7. sanity_check usage with two parameters + Example 1.8. sanity_check usage with two parameters ... if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with @@ -220,3 +242,18 @@ a 400 */ exit; } ... + +4.2. sanity_reply() + + Send a SIP reply using the code and reason text set internally by the + module when detecting errors while performing the sanity checks. It is + done only when parameter noreply is set to 1. + + Example 1.9. sanity_reply usage +... +if(!sanity_check("1024", "6")) { + xdbg("sanity checks failed\n"); + sanity_reply(); + exit; +} +...

1 0

[kamailio/kamailio] sanity: Doesn't sent reply when some checks are failed. (#1543)
by Konstantin 13 Sep '18

13 Sep '18

### Description According the documentation the module will send reply if one of the checks is failed. However it doesn't send reply if digest credentials, duplicated To/From tags or authorization header checks are failed. I would like to propose to add a new parameter which will enable or disable auto sending of reply. #### Reproduction Send to kamailio request with empty nonce in Authorization header. ### Possible Solutions Set autodrop to 0 and send the reply from configuration file. But in some cases this reply will be sent twice from module and from config. ### Additional Information kamailio version 4.4.7 and the latest 5.x -- 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/1543

3 8

git:master:af7e6e55: sanity: send 500 reply if sanity info is not set for the current request
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: af7e6e55182da0bf44a159e21df8948556bf71ae URL: https://github.com/kamailio/kamailio/commit/af7e6e55182da0bf44a159e21df8948… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T12:24:53+02:00 sanity: send 500 reply if sanity info is not set for the current request --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/af7e6e55182da0bf44a159e21df8948… Patch: https://github.com/kamailio/kamailio/commit/af7e6e55182da0bf44a159e21df8948… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 8cde4729c2..d00eab5d6d 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -76,10 +76,14 @@ int ki_sanity_reply(sip_msg_t *msg) } if(!(msg->msg_flags&FL_MSG_NOREPLY)) { - if(msg->id != _ksr_sanity_info.msgid + if(_ksr_sanity_info.code==0 || _ksr_sanity_info.reason[0]=='\0' + || msg->id != _ksr_sanity_info.msgid || msg->pid != _ksr_sanity_info.msgpid) { - LM_INFO("reply sending invoked for a different sip request\n"); - return -1; + LM_INFO("no sanity reply info set - sending 500\n"); + if(slb.zreply(msg, 500, "Server Sanity Failure") < 0) { + return -1; + } + return 1; } if(slb.zreply(msg, _ksr_sanity_info.code, _ksr_sanity_info.reason) < 0) { return -1;

1 0

git:master:aa7c4bea: sanity: docs for noreply param and sanity_reply() function
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: aa7c4beafbfee054872a4fa05a7d2a2f105e431e URL: https://github.com/kamailio/kamailio/commit/aa7c4beafbfee054872a4fa05a7d2a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T12:17:19+02:00 sanity: docs for noreply param and sanity_reply() function --- Modified: src/modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aa7c4beafbfee054872a4fa05a7d2a2… Patch: https://github.com/kamailio/kamailio/commit/aa7c4beafbfee054872a4fa05a7d2a2… --- diff --git a/src/modules/sanity/doc/sanity_admin.xml b/src/modules/sanity/doc/sanity_admin.xml index f9f63071a0..a8a57d88d9 100644 --- a/src/modules/sanity/doc/sanity_admin.xml +++ b/src/modules/sanity/doc/sanity_admin.xml @@ -225,6 +225,27 @@ modparam("sanity", "proxy_require", "foo, bar") <programlisting> ... modparam("sanity", "autodrop", 1) +... + </programlisting> + </example> + </section> + + <section id="sanity.p.noreply"> + <title><varname>noreply</varname> (int)</title> + <para> + If set to 1, then the module does not send a SIP reply internally in + case there is an error detected when performing the sanity checks. + There is the option to send the reply from config file with functions + from sl or tm module as well as sanity_reply() from this module. + </para> + <para> + Default value: 0. + </para> + <example> + <title>Set <varname>noreply</varname> parameter</title> + <programlisting> +... +modparam("sanity", "noreply", 1) ... </programlisting> </example> @@ -302,6 +323,28 @@ if (method=="INVITE" && !sanity_check("1024", "6")) { ]]> </programlisting> </example> - </section> + </section> + <section id="sanity.f.sanity_reply"> + <title> + <function>sanity_reply()</function> + </title> + <para> + Send a SIP reply using the code and reason text set internally by the module + when detecting errors while performing the sanity checks. It is done only + when parameter noreply is set to 1. + </para> + <example> + <title><function>sanity_reply</function> usage</title> + <programlisting> +... +if(!sanity_check("1024", "6")) { + xdbg("sanity checks failed\n"); + sanity_reply(); + exit; +} +... + </programlisting> + </example> + </section> </section> </chapter>

1 0

git:master:83789bed: sanity: option to skip sending the reply internally
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: 83789bed83388f8b53339b6b93abc33e4d9d62c1 URL: https://github.com/kamailio/kamailio/commit/83789bed83388f8b53339b6b93abc33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T11:04:06+02:00 sanity: option to skip sending the reply internally - new mod param 'noreply' - if set to 1, no reply is sent internally; default is 0 - new function - sanity_reply() that can be used in config to send a reply with a code and reason set by the module when detecting a problem inside sip message --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/83789bed83388f8b53339b6b93abc33… Patch: https://github.com/kamailio/kamailio/commit/83789bed83388f8b53339b6b93abc33…

1 0

git:master:8a8fcc25: modules: readme files regenerated - sanity ... [skip ci]
by Kamailio Dev 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: 8a8fcc25a2e8faa8ef4d7b69207ac66fabc22827 URL: https://github.com/kamailio/kamailio/commit/8a8fcc25a2e8faa8ef4d7b69207ac66… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-13T10:01:52+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/8a8fcc25a2e8faa8ef4d7b69207ac66… Patch: https://github.com/kamailio/kamailio/commit/8a8fcc25a2e8faa8ef4d7b69207ac66… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index 588f53deae..027725f150 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -72,10 +72,8 @@ Chapter 1. Admin Guide supported (sip[s]|tel[s]) by Kamailio * required headers - (4) -checks if the minimum set of required headers to, from, cseq, callid and via is present in the request. - * via sip version - (8) - not working because parser fails already - when another version then 2.0 is present. - * via protocol - (16) - not working because parser fails already if - an unsupported transport is present. + * via sip version - (8) - disabled. + * via protocol - (16) - disabled. * Cseq method - (32) - checks if the method from the Cseq header is equal to the request method. * Cseq value - (64) - checks if the number in the Cseq header is a @@ -99,6 +97,8 @@ Chapter 1. Admin Guide * authorization header (8192) - checks if the Authorization is valid if the scheme is "digest" (see "digest credentials" above), always returns success for other schemes. + * first via header (16384) - checks if the first Via header is + available, can be parsed and has an address value. 2. Dependencies

1 0

git:master:5572b37a: sanity: updates to the checks that can be done
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: 5572b37a7a83074c9c3b9d5a07640d040b3fe51f URL: https://github.com/kamailio/kamailio/commit/5572b37a7a83074c9c3b9d5a07640d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T09:47:14+02:00 sanity: updates to the checks that can be done --- Modified: src/modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5572b37a7a83074c9c3b9d5a07640d0… Patch: https://github.com/kamailio/kamailio/commit/5572b37a7a83074c9c3b9d5a07640d0… --- diff --git a/src/modules/sanity/doc/sanity_admin.xml b/src/modules/sanity/doc/sanity_admin.xml index dec9d79a86..f9f63071a0 100644 --- a/src/modules/sanity/doc/sanity_admin.xml +++ b/src/modules/sanity/doc/sanity_admin.xml @@ -49,14 +49,12 @@ </listitem> <listitem> <para> - via sip version - (8) - not working because parser fails already - when another version then 2.0 is present. + via sip version - (8) - disabled. </para> </listitem> <listitem> <para> - via protocol - (16) - not working because parser fails already if an - unsupported transport is present. + via protocol - (16) - disabled. </para> </listitem> <listitem> @@ -86,7 +84,7 @@ <listitem> <para> proxy require - (512) - checks if all items of the proxy require header - are present in the list of the extensions from the module + are present in the list of the extensions from the module parameter proxy_require. </para> </listitem> @@ -118,6 +116,12 @@ returns success for other schemes. </para> </listitem> + <listitem> + <para> + first via header (16384) - checks if the first Via header is + available, can be parsed and has an address value. + </para> + </listitem> </itemizedlist> </para> </section>

1 0

git:master:e5481726: sanity: check for top Via header
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: e548172654b17140489f7432c34411b39c74471d URL: https://github.com/kamailio/kamailio/commit/e548172654b17140489f7432c34411b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T09:41:26+02:00 sanity: check for top Via header - existing ones for Via are disabled/useless --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h Modified: src/modules/sanity/sanity_mod.c Modified: src/modules/sanity/sanity_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/e548172654b17140489f7432c34411b… Patch: https://github.com/kamailio/kamailio/commit/e548172654b17140489f7432c34411b… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index af90893e58..67ed61ef29 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -249,6 +249,25 @@ int check_required_headers(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } +/* check if the SIP version in the Via header is 2.0 */ +int check_via1_header(sip_msg_t* msg) +{ + LM_DBG("check via1 header\n"); + if (parse_headers(msg, HDR_VIA1_F, 0) != 0) { + LM_WARN("failed to parse the Via1 header\n"); + msg->msg_flags |= FL_MSG_NOREPLY; + return SANITY_CHECK_FAILED; + } + + if (msg->via1->host.s==NULL || msg->via1->host.len<0) { + LM_WARN("failed to parse the Via1 host\n"); + msg->msg_flags |= FL_MSG_NOREPLY; + return SANITY_CHECK_FAILED; + } + + return SANITY_CHECK_PASSED; +} + /* check if the SIP version in the Via header is 2.0 */ int check_via_sip_version(sip_msg_t* msg) { diff --git a/src/modules/sanity/sanity.h b/src/modules/sanity/sanity.h index 2bf50c71f9..735425b7e6 100644 --- a/src/modules/sanity/sanity.h +++ b/src/modules/sanity/sanity.h @@ -36,6 +36,9 @@ int str2valid_uint(str* _number, unsigned int* _result); /* parses the given comma seperated string into a string list */ strl* parse_str_list(str* _string); +/* check top Via header */ +int check_via1_header(sip_msg_t* msg); + /* compare the protocol string in the Via header with the transport */ int check_via_protocol(struct sip_msg* _msg); diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 6d8de764bc..c9c88678fb 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -141,6 +141,10 @@ int sanity_check(struct sip_msg* _msg, int msg_checks, int uri_checks) (ret = check_required_headers(_msg)) != SANITY_CHECK_PASSED) { goto done; } + if (SANITY_VIA1_HEADER & msg_checks && + (ret = check_via1_header(_msg)) != SANITY_CHECK_PASSED) { + goto done; + } if (SANITY_VIA_SIP_VERSION & msg_checks && (ret = check_via_sip_version(_msg)) != SANITY_CHECK_PASSED) { goto done; diff --git a/src/modules/sanity/sanity_mod.h b/src/modules/sanity/sanity_mod.h index e0e30eed28..3a7f89a05e 100644 --- a/src/modules/sanity/sanity_mod.h +++ b/src/modules/sanity/sanity_mod.h @@ -42,7 +42,8 @@ #define SANITY_CHECK_DIGEST (1<<11) #define SANITY_CHECK_DUPTAGS (1<<12) #define SANITY_CHECK_AUTHORIZATION (1<<13) -#define SANITY_MAX_CHECKS (1<<14) /* Make sure this is the highest value */ +#define SANITY_VIA1_HEADER (1<<14) +#define SANITY_MAX_CHECKS (1<<15) /* Make sure this is the highest value */ /* VIA_SIP_VERSION and VIA_PROTOCOL do not work yet * and PARSE_URIS is very expensive */

1 0

git:master:e59ff0c2: sanity: do not send reply if mandatory headers are missing
by Daniel-Constantin Mierla 13 Sep '18

13 Sep '18

Module: kamailio Branch: master Commit: e59ff0c2c9895e9232923d0fe4d644b825ad20fd URL: https://github.com/kamailio/kamailio/commit/e59ff0c2c9895e9232923d0fe4d644b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-13T08:55:54+02:00 sanity: do not send reply if mandatory headers are missing - reply cannot be constructed properly - send replies in case of failures for digest checks (GH #1543) - coherent use of msg vs _msg --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/e59ff0c2c9895e9232923d0fe4d644b… Patch: https://github.com/kamailio/kamailio/commit/e59ff0c2c9895e9232923d0fe4d644b…

1 0

[kamailio/kamailio] ERROR searching pvar "uac_req" in sample kamailio.cfg config file for PCSCF (#1123)
by vhuertas 13 Sep '18

13 Sep '18

### Description I have configured a kamailio as PCSCF taking the configuration sample files (kamailio.cfg and pcscf.cfg) in https://github.com/kamailio/kamailio/tree/master/misc/examples/pcscf The version of kamailio installed is the 5.1. When I perform "service pcscf start" the services doesn't restart giving a parsing error for a pseudo variable called $uac_req. The error is found in this section: route[NATPING] { route(preload_pcscf); sht_iterator_start("nat_iterator", "natping"); while(sht_iterator_next("nat_iterator")) { xlog("OPTIONS to $shtitval(nat_iterator) via $shtitkey(nat_iterator)...\n"); $uac_req(method) = "OPTIONS"; $uac_req(ruri) = $shtitval(nat_iterator); $uac_req(furi) = PCSCF_URL; $uac_req(turi) = $shtitval(nat_iterator); $uac_req(ouri) = $shtitkey(nat_iterator); $uac_req(evroute) = 1; uac_req_send(); } sht_iterator_end("nat_iterator"); } I have checked that I have only one "uac.so" file in /usr/lib64/kamailio/modules/ and the date of the file is April 15th. So I guess that the file is updated. ### Troubleshooting #### Reproduction  #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ERROR: <core> [core/pvapi.c:828]: pv_parse_spec2(): error searching pvar "uac_req" 0(2271) ERROR: <core> [core/pvapi.c:1032]: pv_parse_spec2(): wrong char [m/109] in [$uac_req(method)] at [9 (5)] 0(2271) CRITICAL: <core> [core/cfg.y:3414]: yyerror_at(): parse error in config file /etc/kamailio/pcscf/kamailio.cfg, line 906, column 3-18: Can't get from cache: $uac_req(method) ERROR: bad config file (1 errors) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.1.0-dev2 (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. id: unknown compiled with gcc 4.7.2 * **Operating System**:  Debian 8 -- 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/1123

3 3

git:master:56c8a21d: sanity: do no try to send reply on missing From/To body
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 56c8a21d3ab00014ade59f4c721228ff327b1625 URL: https://github.com/kamailio/kamailio/commit/56c8a21d3ab00014ade59f4c721228f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T15:35:34+02:00 sanity: do no try to send reply on missing From/To body - removed redundant check of ACK, being done in reply wrapper --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/56c8a21d3ab00014ade59f4c721228f… Patch: https://github.com/kamailio/kamailio/commit/56c8a21d3ab00014ade59f4c721228f…

1 0

git:master:93c8b40b: tm: t_reply() skip sending reply if FL_MSG_NOREPLY is set
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 93c8b40bb08c8e0d1cc4440e5261fc1965cc6a21 URL: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T12:03:11+02:00 tm: t_reply() skip sending reply if FL_MSG_NOREPLY is set --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… Patch: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 68df52b5c1..6d8259aae4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1327,6 +1327,10 @@ static int ki_t_reply(sip_msg_t* msg, int code, str* reason) LM_DBG("ACKs are not replied\n"); return -1; } + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } if (t_check( msg , 0 )==-1) return -1; t=get_t();

1 0

git:master:7c39625e: sl: skip sending reply if FL_MSG_NOREPLY is set
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 7c39625e94a3c8cb5a2e1879454b4ce7f1888a93 URL: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T11:53:12+02:00 sl: skip sending reply if FL_MSG_NOREPLY is set --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… Patch: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index c523e8913b..4d17130a13 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -250,6 +250,11 @@ int send_reply(struct sip_msg *msg, int code, str *reason) struct cell *t; int ret = 1; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + if(reason->s[reason->len-1]=='\0') { r = reason->s; } else { diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index dbc5105d2c..1e408e653f 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -133,6 +133,11 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) if (msg->first_line.u.request.method_value==METHOD_ACK) goto error; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + init_dest_info(&dst); if (reply_to_via) { if (update_sock_struct_from_via(&dst.to, msg, msg->via1 )==-1) @@ -355,6 +360,11 @@ int sl_reply_error(struct sip_msg *msg ) int sip_error; int ret; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + ret=err2reason_phrase( prev_ser_error, &sip_error, err_buf, sizeof(err_buf), "SL"); if (ret>0) {

1 0

git:master:8a2a7ee6: sanity: set internal flag FL_MSG_NOREPLY if From/To headers are broken
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 8a2a7ee6d12db57dd32127f56cea31d58d8a74c9 URL: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 sanity: set internal flag FL_MSG_NOREPLY if From/To headers are broken --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… Patch: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index c125660387..292474aa8e 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -52,8 +52,10 @@ int sanity_reply(sip_msg_t *msg, int code, char *reason) if(msg->REQ_METHOD == METHOD_ACK) { return 1; } - if(slb.zreply(msg, code, reason) < 0) { - return -1; + if(!(msg->msg_flags&FL_MSG_NOREPLY)) { + if(slb.zreply(msg, code, reason) < 0) { + return -1; + } } return 0; } @@ -684,11 +686,12 @@ int check_parse_uris(struct sip_msg* _msg, int checks) { LM_DBG("looking up From header\n"); if ((!_msg->from && parse_headers(_msg, HDR_FROM_F, 0) != 0) || !_msg->from) { - LM_WARN("missing from header\n"); + LM_WARN("invalid from header\n"); if (_msg->REQ_METHOD != METHOD_ACK) { - if (sanity_reply(_msg, 400, "Missing From Header") < 0) { + if (sanity_reply(_msg, 400, "Invalid From Header") < 0) { LM_WARN("failed to send 400 via sl reply (missing From)\n"); } + _msg->msg_flags |= FL_MSG_NOREPLY; } return SANITY_CHECK_FAILED; } @@ -741,11 +744,12 @@ int check_parse_uris(struct sip_msg* _msg, int checks) { LM_DBG("looking up To header\n"); if ((!_msg->to && parse_headers(_msg, HDR_TO_F, 0) != 0) || !_msg->to) { - LM_WARN("missing to header\n"); + LM_WARN("invalid To header\n"); if (_msg->REQ_METHOD != METHOD_ACK) { - if (sanity_reply(_msg, 400, "Missing To Header") < 0) { + if (sanity_reply(_msg, 400, "Ivalid To Header") < 0) { LM_WARN("failed to send 400 via sl reply (missing To)\n"); } + _msg->msg_flags |= FL_MSG_NOREPLY; } return SANITY_CHECK_FAILED; }

1 0

git:master:37e9d645: core: parse msg - added internal flag to skip sending a reply
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 37e9d645f12401fc0394bec2bc813e3e7f191255 URL: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 core: parse msg - added internal flag to skip sending a reply --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… Patch: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 5922cfc1cc..0bbf83d9da 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -107,6 +107,7 @@ typedef enum request_method { #define FL_UAC_AUTH (1<<19) /* Proxy UAC-like authentication */ #define FL_ADD_SRVID (1<<20) /*!< add 'srvid' to local via hdr */ #define FL_ADD_XAVP_VIA (1<<21) /*!< add xavp fields to local via params */ +#define FL_MSG_NOREPLY (1<<22) /*!< do not send sip reply for request */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:e2b0106f: sanity: remove use of EXTRA_DEBUG define
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: e2b0106f15b73444c39fd9dd208299dd934c6b75 URL: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 sanity: remove use of EXTRA_DEBUG define - allow seeing dbg messages useful for troubleshooting --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d… Patch: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d…

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

- URL: https://github.com/kamailio/kamailio/commit/b6f49f92e11b3289a074cfe8a62d164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:25:39+02:00 sdpops: cast in dbg message to avoid compile warning on 32b systems (cherry picked from commit f6921b92d382db3c0a72bd1d97eb46d1f4aee2d7) - URL: https://github.com/kamailio/kamailio/commit/dd9bc5441ec4682213ed2fa07d8a7f7… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2018-09-10T08:26:02+02:00 modules/auth: fixed path in auth.xml (cherry picked from commit 26449dc2da3b47dd71265e8103de5957bd2245f4) - URL: https://github.com/kamailio/kamailio/commit/ff6af9edbbb08f6ccb9ae953b9ea6d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:29+02:00 core: debug message when dropping a sip reply (cherry picked from commit e4d2ca28ee2d42683d7604c6a767a201b6babbed) - URL: https://github.com/kamailio/kamailio/commit/d0f1d8212f0f42df8a1cc1e5c7b85fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:41+02:00 core: more accurate debug messages when forwarding a reply (cherry picked from commit 085e2c2ea5f85616c037b083495094a2232c405a) - URL: https://github.com/kamailio/kamailio/commit/5d6be9c971a0cd1bf3ebd10214e89f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:55+02:00 tm: more debug messages for reply relay (cherry picked from commit 927d738d0e1585ccbccc878ab55c219ae737091d) - URL: https://github.com/kamailio/kamailio/commit/8c191147abac8ffb1d2360f6a115617… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:28:09+02:00 tm: added fcount field for free operations debugging (cherry picked from commit e361e5ec2883775d14d92d46659d062b31c45f33) - URL: https://github.com/kamailio/kamailio/commit/3164b552f78762591199df6c29db55d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:04+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the empty string ("") if it is $null (cherry picked from commit b98cb43b1ea33706fe133f6585c0705892663ae6) - URL: https://github.com/kamailio/kamailio/commit/9db1528afb6b6d90251a25f42d8f4f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:16+02:00 app_lua: split function for returning pv null value (cherry picked from commit f3312715943867f76c8753eba992dad5859d8c2f) - URL: https://github.com/kamailio/kamailio/commit/c26b2fac5eefb47edcdba65a7ba9d68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:30+02:00 app_lua: new KEMI pv functions KSR.pv.getvn(...) and KSR.pv.getvs(...) - KSR.pv.getvn(pv, ival) - return the value of pv if not null, otherwise return the int value ival - KSR.pv.getvs(pv, sval) - return the value of pv if not null, otherwise return the str value sval (cherry picked from commit 1576dc7cf504a3a30e83919222f1b8441e4207b5) - URL: https://github.com/kamailio/kamailio/commit/4b05951967fb9460a0158fdb1765e4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:39+02:00 app_lua: proper return 'nil' for $null values of pvs (cherry picked from commit fd3656fba3fe5dcb472836f935e2b4781b02251e) - URL: https://github.com/kamailio/kamailio/commit/527c20056413d0cd088b8aadd2d84a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:05+02:00 app_python: implemented KSR.pv.gete(...) (cherry picked from commit 63498d6c2180645562f495077d6b414b12b39820) - URL: https://github.com/kamailio/kamailio/commit/9a3d4698491a4f020b1c0d4635f1d3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:30+02:00 app_jsdt: implemented kemi KSR.pv.gete(...) (cherry picked from commit d92216ebdb94c4a068437c083c9f1809ddfa8857) - URL: https://github.com/kamailio/kamailio/commit/57debe742063c776cf8b91e34d5cbe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:41+02:00 ipops: exported KSR.ipops.is_in_subnet(...) - match the function name from kamailio.cfg - so far it was exported as KSR.ipops.ip_is_in_subnet(...) (cherry picked from commit 7bd55ca760a2b1aed8da431b61370c750742ff84) - URL: https://github.com/kamailio/kamailio/commit/44fc897c51f23f3da3c0d556a270edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:52+02:00 app_sqlang: implemented KSR.pv.gete(...) (cherry picked from commit 89c65fa3210ab0682d4cb699d732ac1653ba0221) - URL: https://github.com/kamailio/kamailio/commit/50910ac1035df1d3899389d72314353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:31:10+02:00 app_python: give scan format to PyArg_ParseTuple() via param (cherry picked from commit c1701cf3e57adbf8448c414bfb8ba10426a69104) - URL: https://github.com/kamailio/kamailio/commit/b6ed4d39c68f543f18a4a938d1bba37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:31:27+02:00 app_lua: rmode 1 corresponds to int returned value (cherry picked from commit b7047205287a0fde12b3568bd0cd0425eeb68fcd) - URL: https://github.com/kamailio/kamailio/commit/57d8b5287d27fe32b302442c2b18a17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:32:17+02:00 tls: docs - some updates to sample tls.cfg (cherry picked from commit 957b43ddea8dad434736e800a16581d49ccb2478) - URL: https://github.com/kamailio/kamailio/commit/6815f91eba33216102f7e8ebb0a67e7… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-09-10T08:33:02+02:00 tm: crash on memcpy fix - in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added. (cherry picked from commit db3b9dbd48f7bb74abf08b0e97bcac15015df719) - URL: https://github.com/kamailio/kamailio/commit/2ce4f035be25c8d43a96d24331a5673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:33:29+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 (cherry picked from commit 35aef078dfbcb92de9591eea2841b3ba0f9682f6) - URL: https://github.com/kamailio/kamailio/commit/7417602f16f17495bad935e87ef504a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:01+02:00 core: xavp - more debug details when printing xavp (cherry picked from commit 3fef2b3c18f83add1af13c2b84303b507e27aeca) - URL: https://github.com/kamailio/kamailio/commit/82117ce2d576a1f9073e36d1e0508d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:28+02:00 htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi - GH #1614 (cherry picked from commit 9121118444e638223c789641618ed4145a67b0f3) - URL: https://github.com/kamailio/kamailio/commit/290073feb2ebf94bfa64be8071cf4cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:47+02:00 pv: increased transformation buffer slots from 4 to 8 (cherry picked from commit d68c1bcb350bce2f1951b604f97e246734e43b84) - URL: https://github.com/kamailio/kamailio/commit/31fd064f209246ef028d0d2369be9e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:35:42+02:00 htable: exported sht_rm_name() and sht_rm_value() to KEMI (cherry picked from commit 2806831045cdb8f110737a87470382c28c5ce094) - URL: https://github.com/kamailio/kamailio/commit/1fd8cc14ae5a81359ece661677b7818… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:11+02:00 htable: proper return on match for sw operator whith rm functions (cherry picked from commit dec17cb6af275789c4ae804d5e1004a9f77010a3) - URL: https://github.com/kamailio/kamailio/commit/e6676483116cac28a958d5dc5edeea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:26+02:00 tcpops: more debug messages when executing event route (cherry picked from commit d453bdd36a6cd569978a1d19e41d55b28c2b4e13) - URL: https://github.com/kamailio/kamailio/commit/ce5fd6f415e504f967e00820d6c57ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:52+02:00 core: tcp - improved safety check for available byte in tcp read buffer (cherry picked from commit 2fc11f183d8fcedeb35559c5236ad7159a6a5864) - URL: https://github.com/kamailio/kamailio/commit/aec30b799256fc3c1aeac537d111ecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:05+02:00 core: tcp - more safety check to avoid jumping out if receive buf for ws proto (cherry picked from commit db00d11d6a30cb779cecfae73487de6d05b6b915) - URL: https://github.com/kamailio/kamailio/commit/aa7d8921eac1379f3d31648f99f7138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:29+02:00 tls: cast to usigned for computing available size for read (cherry picked from commit 1e67fdd53a1c6dc3964d25e891caad24029b7887) - URL: https://github.com/kamailio/kamailio/commit/d877cd62175dd31d8eb7a1fbcabb32b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:57+02:00 rtpengine: safety check for tm uas.request field (cherry picked from commit 75040f62238d6181dc9aec977588c63d15dc5cbc) - URL: https://github.com/kamailio/kamailio/commit/b03b6f7a12e66eab1619e1f10eeba67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:52:53+02:00 acc: more debug message when checking if acc should be done (cherry picked from commit f21554c6befaddbc82016d5d498e11ab3720c404) - URL: https://github.com/kamailio/kamailio/commit/5195a700241650a1407f4e663db4c6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:05+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... (cherry picked from commit 5b223a2e8a92f351b8eab756f5256fda7645ff21) - URL: https://github.com/kamailio/kamailio/commit/c9b1410c13fb8d70d4785779b499898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:14+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align (cherry picked from commit 1aad02edc6b9ffb104900cbc624f0853166ae926) - URL: https://github.com/kamailio/kamailio/commit/7438c7511c4ee151d5126ee34748e49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:34+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far (cherry picked from commit 0ea62995ab026737411f3106a4584ba4ba640426) - URL: https://github.com/kamailio/kamailio/commit/ebcffdb917b2c2c0a1b6d85cbf9c46e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:44+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer (cherry picked from commit 35dec4c20d78f49ba242229c877894d70c94705c) - URL: https://github.com/kamailio/kamailio/commit/fb69f81152368b8727f6d51298b6f8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:14+02:00 dialog: update active and early dialogs stats for dmq operations - related to GH #1591 (cherry picked from commit bc41d0bc75f1b41f0185eeed37d5514525ef27be) - URL: https://github.com/kamailio/kamailio/commit/3c4f242fff1171fbe9c19472b8d9430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:25+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 (cherry picked from commit deb2904d73a7a540f8eb6e2e8722185b7f0a9a99) - URL: https://github.com/kamailio/kamailio/commit/9ff43b7f8017fb68681a49379ab9273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:36+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized (cherry picked from commit 1501e20b65f63c64a89b84196dc925cef79b7c76) - URL: https://github.com/kamailio/kamailio/commit/780e44b9045e6051fc7f41a34db2418… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:47+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 (cherry picked from commit 1db7dc4de6588131b4340390b5996141940b7ef0)

1 0

git:master:275290bd: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 275290bd7387b7794c4ae1bef1c94ee07007bece URL: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-12T08:47:05+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… Patch: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index de3ce988ea..60954cd3c7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -150,10 +150,11 @@ Ovidiu Sas 1.42. starts_with usage 1.43. set_body_multipart usage 1.44. append_body_part usage - 1.45. append_body_part_hex usage - 1.46. get_body_part usage - 1.47. get_body_part_raw usage - 1.48. remove_body_part usage + 1.45. append_body_part with headers + 1.46. append_body_part_hex usage + 1.47. get_body_part usage + 1.48. get_body_part_raw usage + 1.49. remove_body_part usage Chapter 1. Admin Guide @@ -1196,7 +1197,7 @@ text Example 1.44. append_body_part usage ... -$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling =required"); ... @@ -1209,6 +1210,27 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... + + If other headers are wanted to be added for a body part, they can be + appended after the value of the content-type parameter, separated by + `\r\n` (at the very end do not add the '\r\n'). + + Example 1.45. append_body_part with headers +... +$var(b) = ""; +append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +... + +# Will append this to the body: + +... +Content-Type: application/vnd.cirpack.isdn-ext +Content-Disposition: signal;handling=required + +7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c + --unique-boundary-1 ... @@ -1233,7 +1255,7 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. - Example 1.45. append_body_part_hex usage + Example 1.46. append_body_part_hex usage ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); @@ -1249,6 +1271,9 @@ kamailio --unique-boundary-1 ... + If other headers are wanted to be added for a body part, see the docs + for append_body_part(...) function. + 4.46. get_body_part(content_type, opv) Return the content of a multipart body SIP message, storing it in opv. @@ -1262,7 +1287,7 @@ kamailio This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, ONREPLY_ROUTE. - Example 1.46. get_body_part usage + Example 1.47. get_body_part usage ... get_body_part("application/vnd.cirpack.isdn-ext", "$var(pbody)"); ... @@ -1281,7 +1306,7 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(pbody)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, ONREPLY_ROUTE. - Example 1.47. get_body_part_raw usage + Example 1.48. get_body_part_raw usage ... get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); ... @@ -1301,7 +1326,7 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. - Example 1.48. remove_body_part usage + Example 1.49. remove_body_part usage ... remove_body_part("application/vnd.cirpack.isdn-ext"); ...

1 0

[kamailio/kamailio] Feature request: Wanted support of Content-ID in append_body_part (#1632)
by sergey-safarov 12 Sep '18

12 Sep '18

### Description According [RFC6442](https://tools.ietf.org/html/rfc6442#section-5.1) multipart body may contain payload with `Content-ID` header. Now `append_body_part` support only `Content-Disposition` optional header and not supports `Content-ID`. Wanted `Content-ID` to implement RFC6442 -- 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/1632

2 5

git:master:64097569: textops: docs - note about how to add additional headers for a body part
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 64097569eccad8185117255a6018a32615c9945d URL: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T08:40:01+02:00 textops: docs - note about how to add additional headers for a body part - GH #1632 --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Patch: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index cfcca4daf6..8e0f350056 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1694,7 +1694,7 @@ text <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... -$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); ... @@ -1706,6 +1706,31 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... +</programlisting> + </example> + <para> + If other headers are wanted to be added for a body part, they can be + appended after the value of the content-type parameter, separated by + `\r\n` (at the very end do not add the '\r\n'). + </para> + <example> + <title><function>append_body_part</function> with headers</title> + <programlisting format="linespecific"> +... +$var(b) = "<info>active</info>"; +append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +... + +# Will append this to the body: + +... +Content-Type: application/vnd.cirpack.isdn-ext +Content-Disposition: signal;handling=required + +7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c + --unique-boundary-1 ... </programlisting> @@ -1767,6 +1792,10 @@ kamailio ... </programlisting> </example> + <para> + If other headers are wanted to be added for a body part, see the docs + for append_body_part(...) function. + </para> </section> <section id="textops.f.get_body_part">

1 0

[kamailio/kamailio] jsonrpc reply error (#1640)
by juha-h 12 Sep '18

12 Sep '18

When I execute pua.publish over jsonrpc using pretty new Kamailio master: ```` # T 2018/09/11 18:19:03.550376 127.0.0.1:44190 -> 127.0.0.1:6060 [AP] POST /RPC HTTP/1.1. Host: 127.0.0.1:6060. Accept: */*. Content-Type: application/json. Content-Length: 339. .. {"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1} # T 2018/09/11 18:19:03.551735 127.0.0.1:5070 -> 127.0.0.1:5080 [AP] PUBLISH sip:test@test.tutpro.com SIP/2.0. ... # T 2018/09/11 18:19:03.553158 127.0.0.1:5080 -> 127.0.0.1:5070 [AP] SIP/2.0 200 OK. ... CSeq: 10 PUBLISH. # T 2018/09/11 18:19:03.556790 127.0.0.1:6060 -> 127.0.0.1:44190 [AP] HTTP/1.1 200 OK. Sia: SIP/2.0/TCP 127.0.0.1:44190. Content-Type: application/json. Server: OpenSIPg SIP Proxy (5.2.0-0b02 (x86_64/linux)). Content-Length: 48. .. { ."jsonrpc":."2.0", ."result":.{ .}, ."id":.1 } ```` I get error at reply: ```` Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context ```` -- 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/1640

3 5

git:master:1db7dc4d: jsonrpcs: set global active context to delayed value for async commands
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 1db7dc4de6588131b4340390b5996141940b7ef0 URL: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T23:12:02+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Patch: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5c558c60c4..1fd737298a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -120,7 +120,8 @@ extern int jsonrpc_dgram_destroy(void); * being currently processed. * @sa rpc_ctx */ -static jsonrpc_ctx_t _jsonrpc_ctx; +static jsonrpc_ctx_t _jsonrpc_ctx_global; +static jsonrpc_ctx_t *_jsonrpc_ctx_active = NULL; static xhttp_api_t xhttp_api; @@ -277,6 +278,7 @@ static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) if (jsonrpc_init_reply(ctx) < 0) return -1; jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); + _jsonrpc_ctx_active = ctx; } return 0; } @@ -773,10 +775,10 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) } isobject = (jnode->type==srjson_Object); - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -844,10 +846,10 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -905,10 +907,10 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -1100,6 +1102,7 @@ static void jsonrpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) r_ctx->msg=0; dctx->reply_ctx=0; shm_free(dctx); + _jsonrpc_ctx_active = NULL; return; } @@ -1233,7 +1236,8 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = msg; /* parse the jsonrpc request */ @@ -1312,7 +1316,8 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) scmd = *cmd; /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = NULL; /* mark it not send a reply out */ /* parse the jsonrpc request */

1 0

git:master:1501e20b: jsonrpcs: print flags in error message when rpc reply is not initialized
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 1501e20b65f63c64a89b84196dc925cef79b7c76 URL: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T20:31:07+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Patch: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 11857fe11e..5c558c60c4 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -775,7 +775,8 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -845,7 +846,8 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -905,7 +907,8 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; }

1 0

[kamailio/kamailio] Unable to change tls connection_timeout via kamcmd (#1639)
by arkadiam 11 Sep '18

11 Sep '18

### Description Following tls module documentation I'm trying to change connection_timeout value: ``` # kamcmd cfg.set_now_int tls connection_timeout 300 error: 400 - Failed to set the variable ```  ### Troubleshooting #### Log Messages  ``` Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:442]: handle_new_connect(): handle_stream read: new connection (1) on /var/run/kamailio//kamailio_ctl Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:386]: cfg_set_now(): ERROR: cfg_set_now(): integer value is out of range Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:653]: cfg_set_now(): ERROR: cfg_set_now(): failed to set the variable: tls.connection_timeout Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:495]: handle_stream_read(): handle_stream read: eof on /var/run/kamailio//kamailio_ctl ``` ### Possible Solutions Workaround: restart kamailio instead of trying to change variable of the running instance.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.7 (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_LISTEN 16, 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 5.3.1 ``` * **Operating System**:  ``` Linux sip02 4.4.0-134-generic #160-Ubuntu SMP Wed Aug 15 14:58:00 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/1639

2 4

git:master:deb2904d: tls: proper upper limit for tls connection lifetime
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: deb2904d73a7a540f8eb6e2e8722185b7f0a9a99 URL: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:50:25+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 --- Modified: src/modules/tls/tls_cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Patch: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… --- diff --git a/src/modules/tls/tls_cfg.h b/src/modules/tls/tls_cfg.h index b4427dda3e..ae404e14bc 100644 --- a/src/modules/tls/tls_cfg.h +++ b/src/modules/tls/tls_cfg.h @@ -34,8 +34,7 @@ /* maximum accepted lifetime (maximum possible is ~ MAXINT/2) * (it should be kept in sync w/ MAX_TCP_CON_LIFETIME from tcp_main.c: * MAX_TLS_CON_LIFETIME <= MAX_TCP_CON_LIFETIME )*/ -#define MAX_TLS_CON_LIFETIME (1U<<(sizeof(ticks_t)*8-1)) - +#define MAX_TLS_CON_LIFETIME ((1U<<(sizeof(ticks_t)*8-1))-1) struct cfg_group_tls {

1 0

git:master:bc41d0bc: dialog: update active and early dialogs stats for dmq operations
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: bc41d0bc75f1b41f0185eeed37d5514525ef27be URL: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:41:55+02:00 dialog: update active and early dialogs stats for dmq operations - related to GH #1591 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Patch: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 0cfd8a522e..08dbc84686 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -38,6 +38,7 @@ dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync(); +extern int dlg_enable_stats; /** * @brief add notification peer @@ -113,6 +114,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no unsigned int init_ts = 0, start_ts = 0, lifetime = 0; unsigned int state = 1; srjson_t *vj; + int newdlg = 0; /* received dmq message */ LM_DBG("dmq message received\n"); @@ -246,6 +248,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no /* prevent DB sync */ dlg->dflags &= ~(DLG_FLAG_NEW|DLG_FLAG_CHANGED); dlg->iflags |= DLG_IFLAG_DMQ_SYNC; + newdlg = 1; } else { /* remove existing profiles */ if (dlg->profile_links!=NULL) { @@ -341,6 +344,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg_unref(dlg, unref); goto error; } + if(newdlg==1) { + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, 1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, 1); + } + } dlg->state = state; break; @@ -363,6 +373,11 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC;

1 0

git:master:83adc896: htable: export sht_sets() and sht_seti() to kemi framework
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 83adc8963ef2fa324297beb70ca295a871931c95 URL: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T12:34:36+02:00 htable: export sht_sets() and sht_seti() to kemi framework --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Patch: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 04c4bb7c9a..61b9e8896a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -912,6 +912,70 @@ int ht_param(modparam_t type, void *val) } +/** + * + */ +static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.s = *itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.n = itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, 0, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { + LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1484,6 +1548,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_sets"), + SR_KEMIP_INT, ki_ht_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_seti"), + SR_KEMIP_INT, ki_ht_seti, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:35dec4c2: tm: set uas rb type along with the buffer when relaying replies
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 35dec4c20d78f49ba242229c877894d70c94705c URL: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T19:38:34+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Patch: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 62e844a55a..88ec5dd629 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,7 +1795,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; - totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1808,16 +1807,15 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ - if (save_clone) /* save for later use, typically branch picking */ - { + if (save_clone) { + /* save for later use, typically branch picking */ if (!store_reply( t, branch, p_msg )) goto error01; } - uas_rb = & t->uas.response; + /* initialize for outbound reply */ + uas_rb = &t->uas.response; if (relay >= 0 ) { - /* initialize sockets for outbound reply */ - uas_rb->rbtype=msg_status; /* only messages known to be relayed immediately will be * be called on; we do not evoke this callback on messages * stored in shmem -- they are fixed and one cannot change them @@ -1829,12 +1827,11 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } /* try building the outbound reply from either the current * or a stored message */ - relayed_msg = branch==relay ? p_msg : t->uac[relay].reply; + relayed_msg = (branch==relay) ? p_msg : t->uac[relay].reply; if (relayed_msg==FAKED_REPLY) { if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; - uas_rb->rbtype = 487; } else { relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; @@ -1889,7 +1886,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; - uas_rb->rbtype = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -1944,6 +1940,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, LM_ERR("cannot alloc reply shmem\n"); goto error03; } + uas_rb->rbtype = relayed_code; uas_rb->buffer_len = res_len; memcpy( uas_rb->buffer, buf, res_len ); if (relayed_msg==FAKED_REPLY) { /* to-tags for local replies */ @@ -1956,13 +1953,13 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, t->relayed_reply_branch = relay; if ( unlikely(is_invite(t) && relayed_msg!=FAKED_REPLY - && relayed_code>=200 && relayed_code < 300 - && has_tran_tmcbs( t, - TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY - |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { + && relayed_code>=200 && relayed_code < 300 + && has_tran_tmcbs( t, + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { totag_retr=update_totag_set(t, relayed_msg); } - }; /* if relay ... */ + } /* if relay ... */ UNLOCK_REPLIES( t );

1 0

git:master:0ea62995: tm: typedefs renamed to match better module and common pattern
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 0ea62995ab026737411f3106a4584ba4ba640426 URL: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:22:54+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far --- Modified: src/modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Patch: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 7aca7ed92c..bfcd28f2ca 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -162,7 +162,7 @@ typedef struct retr_buf struct dest_info dst; ticks_t retr_expire; ticks_t fr_expire; /* ticks value after which fr. will fire */ -} retr_buf_type; +} tm_retr_buf_t; /* User Agent Server content */ @@ -181,7 +181,7 @@ typedef struct ua_server * for e2e cancels */ #endif /* CANCEL_REASON_SUPPORT */ unsigned int status; -} ua_server_type; +} tm_ua_server_t; /* User Agent Client content */ @@ -244,15 +244,15 @@ typedef struct ua_client unsigned short on_reply; /* unused - keep the structure aligned to 32b */ unsigned short on_unused; -} ua_client_type; +} tm_ua_client_t; -struct totag_elem +typedef struct totag_elem { struct totag_elem *next; str tag; volatile int acked; -}; +} tm_totag_elem_t; /* structure for storing transaction state prior to suspending * of async transactions */ @@ -262,7 +262,7 @@ typedef struct async_state unsigned int backup_branch; unsigned int blind_uac; unsigned int ruri_new; -} async_state_type; +} tm_async_state_t; /* transaction's flags */ /* is the transaction's request an INVITE? */ @@ -506,7 +506,7 @@ typedef struct entry unsigned long cur_entries; #endif char _pad[ENTRY_PAD_BYTES]; -} entry_type; +} tm_entry_t; /* transaction table */

1 0

git:master:1aad02ed: tm: activ_type field renamed to rbtype in struct retr_buf
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 1aad02edc6b9ffb104900cbc624f0853166ae926 URL: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:15:30+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Patch: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085…

1 0

git:master:5b223a2e: tm: update uas rb activ_type when overwriting realyed_code
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 5b223a2e8a92f351b8eab756f5256fda7645ff21 URL: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T15:03:44+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Patch: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 271932c90c..14f244ef7d 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,6 +1795,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; + totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1803,8 +1804,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* *** store and relay message as needed *** */ reply_status = t_should_relay_response(t, msg_status, branch, &save_clone, &relay, cancel_data, p_msg ); - LM_DBG("branch=%d, save=%d, relay=%d icode=%d\n", - branch, save_clone, relay, t->uac[branch].icode); + LM_DBG("branch=%d, save=%d, relay=%d icode=%d msg status=%u\n", + branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ if (save_clone) /* save for later use, typically branch picking */ @@ -1833,8 +1834,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; + uas_rb->activ_type = 487; } else { - relayed_code = branch==relay + relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; } /* use to_tag from the original request, or if not present, @@ -1887,6 +1889,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; + uas_rb->activ_type = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -2003,6 +2006,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(relayed_code==uas_rb->activ_type) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, relayed_msg, TMCB_NONE_F); + } else { + LM_DBG("skip tm callback %d - relay code %d active %d\n", + TMCB_RESPONSE_OUT, relayed_code, + uas_rb->activ_type); } UNLOCK_REPLIES( t ); }

1 0

git:master:f21554c6: acc: more debug message when checking if acc should be done
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: f21554c6befaddbc82016d5d498e11ab3720c404 URL: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T09:18:27+02:00 acc: more debug message when checking if acc should be done --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Patch: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index d41108d3bc..e0443ce906 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -411,27 +411,40 @@ static inline int should_acc_reply(struct sip_msg *req, struct sip_msg *rpl, { unsigned int i; + LM_DBG("probing acc state - code: %d flags: 0x%x\n", code, + (req)?req->flags:0); /* negative transactions reported otherwise only if explicitly * demanded */ - if (code >= 300) { - if (!is_failed_acc_on(req)) return 0; + if (!is_failed_acc_on(req)) { + LM_DBG("failed acc is off\n"); + return 0; + } i = 0; while (failed_filter[i] != 0) { - if (failed_filter[i] == code) return 0; + if (failed_filter[i] == code) { + LM_DBG("acc code in filter: %d\n", code); + return 0; + } i++; } + LM_DBG("failed acc is on\n"); return 1; } - if ( !is_acc_on(req) ) + if ( !is_acc_on(req) ) { + LM_DBG("acc is off\n"); return 0; + } if ( code<200 && !(early_media && parse_headers(rpl,HDR_CONTENTLENGTH_F, 0) == 0 && - rpl->content_length && get_content_length(rpl) > 0)) + rpl->content_length && get_content_length(rpl) > 0)) { + LM_DBG("early media acc is off\n"); return 0; + } + LM_DBG("acc is on\n"); return 1; /* seed is through, we will account this reply */ } @@ -461,6 +474,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, int flags_to_reset = 0; int br = -1; + LM_DBG("preparing to report the record\n"); /* get winning branch index, if set */ if (t->relayed_reply_branch>=0) { br = t->relayed_reply_branch;

1 0

jsonrpc reply error
by Juha Heinanen 10 Sep '18

10 Sep '18

When I execute pua.publish over jsonrpc, I get error at reply: Sep 10 09:37:34 char /usr/bin/sip-proxy[11104]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1}> Sep 10 09:37:34 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context This is with pretty new master. -- Juha

1 0

git:master:75040f62: rtpengine: safety check for tm uas.request field
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 75040f62238d6181dc9aec977588c63d15dc5cbc URL: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:19:02+02:00 rtpengine: safety check for tm uas.request field --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Patch: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4187e61a84..e576117c35 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3310,6 +3310,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) { int method; int nosdp; + tm_cell_t *t = NULL; if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || (msg->cseq==NULL))) @@ -3339,9 +3340,12 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); if(method==METHOD_INVITE && nosdp==0) { msg->msg_flags |= FL_SDP_BODY; - if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL - && tmb.t_gett()!=T_UNDEFINED) - tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; + if(tmb.t_gett!=NULL) { + t = tmb.t_gett(); + if(t!=NULL && t!=T_UNDEFINED && t->uas.request!=NULL) { + t->uas.request->msg_flags |= FL_SDP_BODY; + } + } if(route_type==FAILURE_ROUTE) return rtpengine_delete(msg, flags); return rtpengine_offer_answer(msg, flags, OP_OFFER, 0);

1 0

git:master:ac65216b: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: ac65216b26449c05e27aaf772ade75477128a7d7 URL: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-09T15:32:03+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Patch: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754…

1 0

git:master:40518b64: htable: docs for sht_rm(htname, itname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: 40518b640f1811dd65196bd08e0460dff4e7040a URL: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-09T09:01:11+02:00 htable: docs for sht_rm(htname, itname) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Patch: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 6a8492a94e..e67e7cc74b 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -749,6 +749,26 @@ modparam("htable", "event_callback_mode", 1) ... sht_print(); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_rm"> + <title> + <function moreinfo="none">sht_rm(htname, itname)</function> + </title> + <para> + Delete the item with the name 'itname' from hash table 'htname'. + This API function equivaluent to '$sht(htname=>itname) = $null'. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_rm</function> usage</title> + <programlisting format="linespecific"> +... +sht_rm("ha", "test""); +... </programlisting> </example> </section>

1 0

git:master:f5661587: htable: added sht_rm(htname, iname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: f5661587f8547bc878965342aa36ce5e462d3e9a URL: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-08T21:29:11+02:00 htable: added sht_rm(htname, iname) - api function to remove an item from hash table --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Patch: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 214b6e3608..04c4bb7c9a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -66,6 +66,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_ht_key(void** param, int param_no); +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname); static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); static int w_ht_rm_name(struct sip_msg* msg, char* hname, char* op, char *val); @@ -106,7 +107,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ - {"sht_print", (cmd_function)ht_print, 0, 0, 0, + {"sht_print", (cmd_function)ht_print, 0, 0, 0, + ANY_ROUTE}, + {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, ANY_ROUTE}, @@ -543,6 +546,43 @@ static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) return ht_rm_items(msg, sname, sop, sval, 1); } +static int ki_ht_rm(sip_msg_t* msg, str* hname, str* iname) +{ + ht_t *ht; + + ht = ht_get_table(hname); + if(ht==NULL) { + LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); + return -1; + } + + /* delete it */ + if (ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, hname, + iname, 0, NULL, 0)!=0) { + LM_ERR("dmq relication failed\n"); + } + ht_del_cell(ht, iname); + return 1; +} + +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname) +{ + str shtname; + str sitname; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &shtname)<0 || shtname.len<=0) { + LM_ERR("cannot get the hash table name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itname, &sitname)<0 || sitname.len<=0) { + LM_ERR("cannot get the item table name\n"); + return -1; + } + + return ki_ht_rm(msg, &shtname, &sitname); +} + static int ht_has_str_items(sip_msg_t* msg, str* hname, str* op, str *val, int mkey) { @@ -1409,6 +1449,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm"), + SR_KEMIP_INT, ki_ht_rm, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("htable"), str_init("sht_rm_name_re"), SR_KEMIP_INT, ki_ht_rm_name_re, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] [5.1] pkg/kamailio/obs: RPM SPEC update (#1638)
by sergey-safarov 08 Sep '18

08 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1638 -- Commit Summary -- * [5.1] pkg/kamailio/obs: RPM SPEC update -- File Changes -- M pkg/kamailio/obs/kamailio.spec (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1638.patch https://github.com/kamailio/kamailio/pull/1638.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/1638

2 1

git:5.1:997ed8ad: Merge pull request #1638 from sergey-safarov/spec_update2
by GitHub 08 Sep '18

08 Sep '18

Module: kamailio Branch: 5.1 Commit: 997ed8adc9a058563e6763959864dc7c11b975d5 URL: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-08T08:53:07+02:00 Merge pull request #1638 from sergey-safarov/spec_update2 [5.1] pkg/kamailio/obs: RPM SPEC update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Patch: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba6512632a..a04b269101 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -62,6 +62,46 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 28 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 29 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -191,7 +231,7 @@ Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver -Conflicts: kamailio-radius < % ver, kamailio-redis < %ver +Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver @@ -416,7 +456,7 @@ This module implements protocol functions that use the libcurl to communicate wi Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons Requires: libxml2, kamailio = %ver -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. @@ -613,7 +653,7 @@ SIP Presence (and RLS, XCAP, etc) support for Kamailio. Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver -BuildRequires: python-devel +BuildRequires: python, python-devel %description python Python extensions for Kamailio. @@ -862,8 +902,6 @@ XML operation functions for Kamailio. %package xmlrpc Summary: XMLRPC transport and encoding for Kamailio RPCs and MI commands Group: System Environment/Daemons -#Requires: libxml2, xmlrpc-c, kamailio = %ver -#BuildRequires: libxml2-devel, xmlrpc-c-devel Requires: libxml2, kamailio = %ver BuildRequires: libxml2-devel @@ -909,13 +947,15 @@ UUID module for Kamailio. ln -s ../obs pkg/kamailio/fedora/24 ln -s ../obs pkg/kamailio/fedora/25 ln -s ../obs pkg/kamailio/fedora/26 +ln -s ../obs pkg/kamailio/fedora/27 +ln -s ../obs pkg/kamailio/fedora/28 +ln -s ../obs pkg/kamailio/fedora/29 mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -rm -Rf pkg/kamailio/centos mkdir -p pkg/kamailio/centos ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7

1 0

git:5.1:a6926871: [5.1] pkg/kamailio/obs: RPM SPEC update
by Sergey Safarov 08 Sep '18

08 Sep '18

Module: kamailio Branch: 5.1 Commit: a692687191ee3d030113534a38c37e4232fbd524 URL: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T11:14:49Z [5.1] pkg/kamailio/obs: RPM SPEC update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… Patch: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba6512632a..a04b269101 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -62,6 +62,46 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 28 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 29 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -191,7 +231,7 @@ Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver -Conflicts: kamailio-radius < % ver, kamailio-redis < %ver +Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver @@ -416,7 +456,7 @@ This module implements protocol functions that use the libcurl to communicate wi Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons Requires: libxml2, kamailio = %ver -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. @@ -613,7 +653,7 @@ SIP Presence (and RLS, XCAP, etc) support for Kamailio. Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver -BuildRequires: python-devel +BuildRequires: python, python-devel %description python Python extensions for Kamailio. @@ -862,8 +902,6 @@ XML operation functions for Kamailio. %package xmlrpc Summary: XMLRPC transport and encoding for Kamailio RPCs and MI commands Group: System Environment/Daemons -#Requires: libxml2, xmlrpc-c, kamailio = %ver -#BuildRequires: libxml2-devel, xmlrpc-c-devel Requires: libxml2, kamailio = %ver BuildRequires: libxml2-devel @@ -909,13 +947,15 @@ UUID module for Kamailio. ln -s ../obs pkg/kamailio/fedora/24 ln -s ../obs pkg/kamailio/fedora/25 ln -s ../obs pkg/kamailio/fedora/26 +ln -s ../obs pkg/kamailio/fedora/27 +ln -s ../obs pkg/kamailio/fedora/28 +ln -s ../obs pkg/kamailio/fedora/29 mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -rm -Rf pkg/kamailio/centos mkdir -p pkg/kamailio/centos ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7

1 0

git:master:af66d5a1: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: af66d5a186e26a5ad612f2dd47ab24b8336ae03f URL: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-07T15:46:27+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… Patch: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 511f95f792..d8c701df74 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -148,6 +148,7 @@ Daniel-Constantin Mierla 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -264,6 +265,7 @@ Daniel-Constantin Mierla 1.93. t_is_retr_async_reply usage 1.94. t_uac_send usage 1.95. event_route[tm:branch-failure] usage + 1.96. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -393,6 +395,7 @@ Chapter 1. Admin Guide 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -2943,6 +2946,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 6.1. event_route[tm:branch-failure] @@ -2967,6 +2971,18 @@ event_route[tm:branch-failure:myroute] { } ... +6.2. event_route[tm:local-response] + + Executed after the tm module has sent a local generated, transaction + stateful response. + + Example 1.96. event_route[tm:local-response] usage +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + 7. TM Module API 7.1. Defines

1 0

git:5.0:ab2681b0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.0 Commit: ab2681b0a2f1d9fbcecc3d8a99ea27bb79cfc05b URL: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-07T15:31:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… Patch: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 25df50f72f..2bbf6cb2b8 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -143,6 +143,7 @@ Daniel-Constantin Mierla 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -257,6 +258,7 @@ Daniel-Constantin Mierla 1.91. t_is_retr_async_reply usage 1.92. t_uac_send usage 1.93. event_route[tm:branch-failure] usage + 1.94. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -381,6 +383,7 @@ Chapter 1. Admin Guide 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -2870,6 +2873,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 6.1. event_route[tm:branch-failure] @@ -2894,6 +2898,18 @@ event_route[tm:branch-failure:myroute] { } ... +6.2. event_route[tm:local-response] + + Executed after the tm module has sent a local generated, transaction + stateful response. + + Example 1.94. event_route[tm:local-response] usage +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + 7. TM Module API 7.1. Defines

1 0

git:5.1:b889ab44: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.1 Commit: b889ab44b07b134e8c180a0ce2c643dd1be01f18 URL: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:20:36+02:00 tm: document event_route[tm:local-response] (cherry picked from commit 17145075e77c7f962703ce401e879887a5717265) --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… Patch: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

git:5.0:f84d1f3d: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.0 Commit: f84d1f3deca9f7b5065c98505cee99c941200c7b URL: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:20:12+02:00 tm: document event_route[tm:local-response] (cherry picked from commit 17145075e77c7f962703ce401e879887a5717265) --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… Patch: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

git:master:17145075: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: 17145075e77c7f962703ce401e879887a5717265 URL: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:18:35+02:00 tm: document event_route[tm:local-response] --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… Patch: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

Event: Kamailio Developers Meeting, Sep 27-28, 2018, in Dusseldorf, Germany
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Kamailio SIP Server project is organizing a meeting of its developers during September 27-28, 2018, hosted by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join. Please note we have a limited capacity of 20 seats in the meeting room. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: - https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 1

git:master:1e67fdd5: tls: cast to usigned for computing available size for read
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: 1e67fdd53a1c6dc3964d25e891caad24029b7887 URL: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 tls: cast to usigned for computing available size for read --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… Patch: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 7c66e3f550..1de6b94fda 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1014,8 +1014,8 @@ int tls_read_f(struct tcp_connection* c, int* flags) * If it's != 0 is changed only on destroy. It's not possible to have * parallel reads.*/ tls_c = c->extra_data; - bytes_free = c->req.b_size - (int)(r->pos - r->buf); - if (unlikely(bytes_free == 0)) { + bytes_free = c->req.b_size - (unsigned int)(r->pos - r->buf); + if (unlikely(bytes_free <= 0)) { ERR("Buffer overrun, dropping\n"); r->error = TCP_REQ_OVERRUN; return -1;

1 0

git:master:db00d11d: core: tcp - more safety check to avoid jumping out if receive buf for ws proto
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: db00d11d6a30cb779cecfae73487de6d05b6b915 URL: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 core: tcp - more safety check to avoid jumping out if receive buf for ws proto --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6… Patch: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6…

1 0

git:master:da59f7a2: dmq: fixed KEMI export for handle_message() after last commit adding int param
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: da59f7a2bb32b6c5995313249475207f9ca22790 URL: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 dmq: fixed KEMI export for handle_message() after last commit adding int param - new function handle_message_rc(...) exported to kemi --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Patch: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index d28686da9c..4c772e1481 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -380,6 +380,11 @@ static sr_kemi_t sr_kemi_dmq_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dmq"), str_init("handle_message_rc"), + SR_KEMIP_INT, ki_dmq_handle_message_rc, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("dmq"), str_init("is_from_node"), SR_KEMIP_INT, is_from_remote_node, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 2293cc3600..bce42d6ffd 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg, int returnval) +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -73,6 +73,12 @@ int ki_dmq_handle_message(sip_msg_t *msg, int returnval) return -1; } + +int ki_dmq_handle_message(sip_msg_t *msg) +{ + return ki_dmq_handle_message_rc(msg, 0); +} + int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { int i = 0; @@ -80,10 +86,10 @@ int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; } if(i>1) i = 1; - return ki_dmq_handle_message(msg, i); + return ki_dmq_handle_message_rc(msg, i); } int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg, 0); + return ki_dmq_handle_message_rc(msg, 0); } diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 9c9f835745..d47e421c6e 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -26,6 +26,7 @@ int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg, int returnval); +int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval); #endif

1 0

git:master:b80400e5: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: b80400e59aa4ef0e148335e3532ff33f7b371904 URL: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T15:46:29+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Patch: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33…

4 4

git:master:66245384: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 66245384f4598350699228249c7e79e37d30a5ff URL: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T16:16:23+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Patch: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e…

1 0

git:master:6bb63e2a: rtpengine: fix docs xml (broken in e528fce)
by Richard Fuchs 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 6bb63e2a59b795d19b24acc67adb9335c6abd363 URL: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T10:07:10-04:00 rtpengine: fix docs xml (broken in e528fce) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Patch: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index bb85885183..15449dbe19 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2613,6 +2613,7 @@ block_dtmf(); </title> <para> Reverses the effects of a previously issued <function>block_dtmf</function> call. + </para> <example> <title><function>unblock_dtmf</function> usage</title> <programlisting format="linespecific">

1 0

git:master:e528fce4: rtpengine: add block_dtmf and unblock_dtmf
by Richard Fuchs 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: e528fce4b61112f78b0081fcb0d53ef440cafce7 URL: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T09:40:14-04:00 rtpengine: add block_dtmf and unblock_dtmf --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Patch: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef…

1 0

git:master:4625c750: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 4625c7509e60a087389d22267c8cc10595593a54 URL: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T13:16:28+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Patch: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 733e0a8109..90faef20ac 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1469,6 +1469,8 @@ kamcmd dispatcher.ping_active 0 type). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. + * 'ping_from' - used to set the From URI in OPTIONS keepalives. It + overwrites the general ds_ping_from parameter. 6.1.2. File Format @@ -1479,7 +1481,8 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) Full line example: ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from +=sip:myproxy.com ... For database, each element of a line resides in a different column. @@ -1523,7 +1526,7 @@ r,opt) # - web: http://www.kamailio.org # - git: http://github.com/kamailio/ # -# Direct your questions about this file to: sr-users(a)lists.sip-router.org +# Direct your questions about this file to: sr-users(a)lists.kamailio.org # # Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php # for an explanation of possible statements, functions and parameters. @@ -1584,11 +1587,12 @@ sip_warning=no ####### Modules Section ######## # set module path -mpath="/usr/local/lib/kamailio/modules/" +#mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" +loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" @@ -1671,8 +1675,9 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) + if (is_method("INVITE|SUBSCRIBE")) { record_route(); + } # account only INVITEs if (is_method("INVITE")) { @@ -1757,6 +1762,7 @@ gnore and discard. route[REGISTRAR] { if(!is_method("REGISTER")) return; + sl_send_reply("404", "No registrar"); exit; }

1 0

git:master:8a64560e: Merge pull request #1636 from kamailio/gv/ds_ping_from
by GitHub 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 8a64560e1037afe723dbd8c3c26ce198258f35fb URL: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:15:00+02:00 Merge pull request #1636 from kamailio/gv/ds_ping_from dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Patch: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

1 0

git:master:3f9c38be: dispatcher: add ping_from attribute
by Giacomo Vacca 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 3f9c38be11416f7abe5c4448088ba66d2d3e6aad URL: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2018-09-05T14:35:52+02:00 dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Patch: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

1 0

[kamailio/kamailio] dispatcher: add ping_from attribute (#1636)
by Giacomo Vacca 06 Sep '18

06 Sep '18

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I was looking for a solution to set a dedicated From URI in OPTIONS requests to a specific dispatcher target. ds_ping_from ( https://www.kamailio.org/docs/modules/devel/modules/dispatcher.html#dispatc…) applies globally, while I needed the granularity of a single target. I can just add an attribute to the others, e.g. instead of ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ``` something like: ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ping_from=sip.custom.com ``` When the ping_from attribute is not specified, the general ds_ping_from applies and is used. This would save me from a solution like intercepting the outgoing OPTIONS and manipulating the From header. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1636 -- Commit Summary -- * dispatcher: add ping_from attribute -- File Changes -- M src/modules/dispatcher/dispatch.c (17) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1636.patch https://github.com/kamailio/kamailio/pull/1636.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/1636

2 2

git:5.1:216f8de9: Merge pull request #1637 from sergey-safarov/spec_update
by GitHub 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: 216f8de9cac6d611f6465ff007afa0bfdfe626ca URL: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:00:27+02:00 Merge pull request #1637 from sergey-safarov/spec_update [5.1] pkg/docker: Updated submodule --- Added: pkg/kamailio/Makefile Added: pkg/kamailio/README.md Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Patch: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b…

1 0

git:5.1:cd573038: pkg/kamailio/alpine: Added function to build package from local git tree
by Sergey Safarov 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: cd5730389d74b3cafbfa04d73b17fe2dd7121b8e URL: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T09:15:51Z pkg/kamailio/alpine: Added function to build package from local git tree (cherry picked from commit c9b3ed04a7ab49cbc2063b44f66f50366d7a3ba5) Copied from master: pkg/kamailio/Makefile pkg/kamailio/README.md --- Added: pkg/kamailio/Makefile Added: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2… Patch: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2…

1 0

git:5.1:6783a660: pkg/docker: Updated submodule
by Sergey Safarov 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: 6783a660ef658d82495a7176fe9d5fa03f3f23e0 URL: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T09:18:01Z pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… Patch: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… --- diff --git a/pkg/docker b/pkg/docker index 9f04def504..5e6a821c3a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75 +Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15

1 0

[kamailio/kamailio] [5.1] pkg/docker: Updated submodule (#1637)
by sergey-safarov 06 Sep '18

06 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1637 -- Commit Summary -- * pkg/kamailio/alpine: Added function to build package from local git tree * pkg/docker: Updated submodule -- File Changes -- M pkg/docker (2) A pkg/kamailio/Makefile (54) A pkg/kamailio/README.md (89) M pkg/kamailio/alpine/APKBUILD (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1637.patch https://github.com/kamailio/kamailio/pull/1637.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/1637

2 1

git:master:8d4653cc: tls: tls.cfg - more sample tls domain profiles
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 8d4653cc2e0113bcec4397657e27b8c19b1849a7 URL: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T12:57:56+02:00 tls: tls.cfg - more sample tls domain profiles - small edits to explanatory comments --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… Patch: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index dd25abd4ac..b84ba8fcfc 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -2,8 +2,9 @@ # Example Kamailio TLS Configuration File # -# This is the default server domain, settings -# in this domain will be used for all incoming +# --- +# This is the default server domain profile. +# Settings in this domain will be used for all incoming # connections that do not match any other server # domain in this configuration file. # @@ -20,8 +21,9 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem #ca_list = /usr/local/etc/kamailio/tls/cacert.pem #crl = /usr/local/etc/kamailio/tls/crl.pem -# This is the default client domain, settings -# in this domain will be used for all outgoing +# --- +# This is the default client domain profile. +# Settings in this domain will be used for all outgoing # TLS connections that do not match any other # client domain in this configuration file. # We require that servers present valid certificate. @@ -31,6 +33,7 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem verify_certificate = yes require_certificate = yes +# --- # This is an example server domain for TLS connections # received from the loopback interface. We allow # the use of TLSv1 protocols here, we do @@ -46,11 +49,12 @@ require_certificate = yes #private_key = /usr/local/etc/kamailio/tls/local_key.pem #certificate = /usr/local/etc/kamailio/tls/local_cert.pem #verify_depth = 3 -#ca_list = local_ca.pem -#crl = local_crl.pem +#ca_list = /usr/local/etc/kamailio/tls/local_ca.pem +#crl = /usr/local/etc/kamailio/tls/local_crl.pem #server_name = kamailio.org #server_id = kamailio.org +# --- # Special settings for connecting to the example.sip (1.2.3.4) # public SIP server. We do not verify the certificate of the # server because it can be expired. The server @@ -60,9 +64,43 @@ require_certificate = yes # #[client:1.2.3.4:5061] #verify_certificate = no -#certificate = /usr/local/etc/kamailio/tls/example_client.pem #private_key = /usr/local/etc/kamailio/tls/example_key.pem +#certificate = /usr/local/etc/kamailio/tls/example_cert.pem #ca_list = /usr/local/etc/kamailio/tls/example_ca.pem #crl = /usr/local/etc/kamailio/tls/example_crl.pem #server_name = example.sip #server_id = example.sip + +# --- +# Example server profile for listening on any ip/port +# - it requires to have 'server_name' to match on SNI (domain and subdomains) +# +#[server:any] +#method = TLSv1 +#verify_certificate = yes +#require_certificate = no +#private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem +#certificate = /usr/local/etc/kamailio/tls/mysipserver_org_cert.pem +#verify_depth = 3 +#ca_list = /usr/local/etc/kamailio/tls/mysipserver_org_ca.pem +#crl = /usr/local/etc/kamailio/tls/mysipserver_org_crl.pem +#server_name = mysipserver.org +#server_name_mode = 1 +#server_id = mysipserver.org + +# --- +# Example server profile for listening on any ip/port +# - it requires to have 'server_name' to match on SNI (only subdomains) +# +#[server:any] +#method = TLSv1 +#verify_certificate = yes +#require_certificate = no +#private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem +#certificate = /usr/local/etc/kamailio/tls/mysipserver_net_cert.pem +#verify_depth = 3 +#ca_list = /usr/local/etc/kamailio/tls/mysipserver_net_ca.pem +#crl = /usr/local/etc/kamailio/tls/mysipserver_net_crl.pem +#server_name = mysipserver.net +#server_name_mode = 2 +#server_id = mysipserver.net

1 0

git:master:d008a559: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: d008a559e00d161c0e2415d6dbbcd88c9349357b URL: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T11:31:38+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88… Patch: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88…

1 0

git:master:ae17309b: tls: docs - more details about content of tls.cfg
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: ae17309bf9f9866c469547971c3853b5c677f434 URL: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T11:21:51+02:00 tls: docs - more details about content of tls.cfg --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b… Patch: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b…

1 0

git:master:14b27ed9: tls: check tls domain cfg duplication after parsing all attributes
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 14b27ed9377c62df4fa9f230b9aa9490fea98294 URL: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T10:03:21+02:00 tls: check tls domain cfg duplication after parsing all attributes - allows definition of domain profiles with same address but different server_name (SNI) --- Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949… Patch: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949…

1 0

[kamailio/kamailio] pkg/kamailio: Updated RPM spec file (#1633)
by sergey-safarov 05 Sep '18

05 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1633 -- Commit Summary -- * pkg/kamailio: Updated RPM spec file -- File Changes -- M pkg/kamailio/obs/kamailio.spec (89) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1633.patch https://github.com/kamailio/kamailio/pull/1633.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/1633

2 2

git:master:1180b17e: Merge pull request #1633 from sergey-safarov/spec_update
by GitHub 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 1180b17ebd847455e52399341cdb724d6c9241e5 URL: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-05T19:14:10+02:00 Merge pull request #1633 from sergey-safarov/spec_update pkg/kamailio: Updated RPM spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724… Patch: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724…

1 0

git:master:8b3c399a: pkg/kamailio: Updated RPM spec file
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 8b3c399a27e6c7deed978d3b74bda4fc066f6540 URL: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T19:30:37Z pkg/kamailio: Updated RPM spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f… Patch: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f…

1 0

[kamailio/kamailio] pkg/docker: Updated subproject (#1630)
by sergey-safarov 05 Sep '18

05 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1630 -- Commit Summary -- * pkg/docker: Updated subproject -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1630.patch https://github.com/kamailio/kamailio/pull/1630.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/1630

2 2

git:master:4ce701bd: Merge pull request #1630 from sergey-safarov/master
by GitHub 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 4ce701bd910f516b5668e5068ee20e88b5fbf881 URL: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-05T19:13:45+02:00 Merge pull request #1630 from sergey-safarov/master pkg/docker: Updated subproject --- Modified: pkg/docker Modified: pkg/kamailio/Makefile Modified: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8… Patch: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8…

1 0

git:master:76087baf: pkg/docker: Updated submodule
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 76087baf7bc2e71f226da859bd938f13db4ad814 URL: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T21:55:59Z pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… Patch: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… --- diff --git a/pkg/docker b/pkg/docker index 9f04def504..5e6a821c3a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75 +Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15

1 0

git:master:c9b3ed04: pkg/kamailio/alpine: Added function to build package from local git tree
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: c9b3ed04a7ab49cbc2063b44f66f50366d7a3ba5 URL: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T21:55:56Z pkg/kamailio/alpine: Added function to build package from local git tree --- Modified: pkg/kamailio/Makefile Modified: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503… Patch: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503…

1 0

[kamailio/kamailio] Bug in tls #1491 (#1635)
by Prabhat Kumar 05 Sep '18

05 Sep '18

Kamailio version 5.1 ubuntu os 16.04 i have installed all the dependencies. when i am starting kamailio service i get this error sudo service kamailio status ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio; bad; vendor preset: enabled) Active: active (exited) since Wed 2018-09-05 12:40:48 UTC; 12min ago Docs: man:systemd-sysv-generator(8) Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: WARNING: tls [tls_init.c:778]: init_tls_h(): **openssl bug #1491 (crash/mem leaks on low memory)** wo Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold1 has been changed to Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold2 has been changed to Sep 05 12:40:48 ip-10-0-0-45 kamailio[2532]: * already running Sep 05 12:40:48 ip-10-0-0-45 kamailio[2532]: ...done. Sep 05 12:40:48 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:43:35 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:43:50 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:44:28 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:48:39 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. -- 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/1635

3 7

git:master:7dbe407d: tls: added server_name_mode attribute for tls domain profiles
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 7dbe407d31c0dbf9c1bb69d1fd11b8e7607c9766 URL: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T14:59:37+02:00 tls: added server_name_mode attribute for tls domain profiles - define how to match server_name (SNI): * 0 - match only the domain * 1 - match the domain and subdomains * 2 - match only the subdomains --- Modified: src/modules/tls/tls_cfg.c Modified: src/modules/tls/tls_cfg.h Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e… Patch: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e…

1 0

git:master:6cfc6087: tls: allow defining a tls profile (domain) for any address
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 6cfc60875063b9c75ef3a09d879e0e47b92935ea URL: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T13:01:19+02:00 tls: allow defining a tls profile (domain) for any address - token 'any' or 'all' can be used instead of the address [server:any] or [client:any] - useful when the IP address/port to listen on is not known upfront or many addresses are used to listen on - such profiles can be defined many times and must have server_name attribute (for SNI) --- Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4… Patch: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4…

1 0

git:master:2fc11f18: core: tcp - improved safety check for available byte in tcp read buffer
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 2fc11f183d8fcedeb35559c5236ad7159a6a5864 URL: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T11:48:02+02:00 core: tcp - improved safety check for available byte in tcp read buffer --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… Patch: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 0dc7838df8..6bb52745a4 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -356,7 +356,7 @@ int tcp_read(struct tcp_connection *c, int* flags) fd=c->fd; bytes_free=r->b_size- (int)(r->pos - r->buf); - if (unlikely(bytes_free==0)){ + if (unlikely(bytes_free<=0)){ LM_ERR("buffer overrun, dropping ([%s]:%u -> [%s]:%u)\n", ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);

1 0

git:5.0:247fd141: core: parse via - set len for host/port_str only if there is a value
by Henning Westerholt 04 Sep '18

04 Sep '18

Module: kamailio Branch: 5.0 Commit: 247fd14179d7e69020f8c52f824b314fa7e2fef7 URL: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-04T21:50:56+02:00 core: parse via - set len for host/port_str only if there is a value (cherry picked from commit 8cebf48eeee70d23c6cf827e24b2f5fabda669ab) --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… Patch: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index eb4c84bcf2..2207b45b38 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:5.1:e747a538: core: parse via - set len for host/port_str only if there is a value
by Henning Westerholt 04 Sep '18

04 Sep '18

Module: kamailio Branch: 5.1 Commit: e747a538ea50086d01f100726ba36eff99268803 URL: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-04T21:50:43+02:00 core: parse via - set len for host/port_str only if there is a value (cherry picked from commit 8cebf48eeee70d23c6cf827e24b2f5fabda669ab) --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… Patch: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 8c3d54ea5e..318bb8e6c6 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:master:1262884a: pv: added transformation {s.unbracket}
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 1262884a47719fd0349a9ce8553d70e167d5b05a URL: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T18:55:20+02:00 pv: added transformation {s.unbracket} - return value without surrounding (), [], {} or <> --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… Patch: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 79e31a9ded..a515393869 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1180,6 +1180,32 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_UNBRACKET: + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + break; + } + if(val->rs.len<2) { + break; + } + if(val->rs.len>TR_BUFFER_SIZE-2) { + LM_ERR("value too large: %d\n", val->rs.len); + return -1; + } + if((val->rs.s[0] == '(' && val->rs.s[val->rs.len-1] == ')') + || (val->rs.s[0] == '[' && val->rs.s[val->rs.len-1] == ']') + || (val->rs.s[0] == '{' && val->rs.s[val->rs.len-1] == '}') + || (val->rs.s[0] == '<' && val->rs.s[val->rs.len-1] == '>')) { + memcpy(_tr_buffer, val->rs.s+1, val->rs.len-2); + val->rs.len -= 2; + } else { + memcpy(_tr_buffer, val->rs.s, val->rs.len); + } + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2535,6 +2561,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==7 && strncasecmp(name.s, "unquote", 7)==0) { t->subtype = TR_S_UNQUOTE; goto done; + } else if(name.len==9 && strncasecmp(name.s, "unbracket", 9)==0) { + t->subtype = TR_S_UNBRACKET; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index ca24a3c108..da2cb87624 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,8 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, + TR_S_UNBRACKET }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:master:74f95d90: app_jsdt: fixed typo in exporting KSR.pv.getvs(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 74f95d902d43e6eb7c3af42d2d4fcb5fd029c28b URL: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T17:25:00+02:00 app_jsdt: fixed typo in exporting KSR.pv.getvs(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… Patch: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 414f20732d..7af7f91b9d 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -528,7 +528,7 @@ const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "gete", jsdt_sr_pv_gete, 1 /* 1 args */ }, { "getvn", jsdt_sr_pv_getvn, 2 /* 2 args */ }, - { "getvd", jsdt_sr_pv_getvs, 2 /* 2 args */ }, + { "getvs", jsdt_sr_pv_getvs, 2 /* 2 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

git:master:1891c312: app_jsdt: exported KSR.pv_getvn(...) and KSR.pv.getvs(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 1891c31204d59dd2270d8ea925259578145dc8f6 URL: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T15:56:43+02:00 app_jsdt: exported KSR.pv_getvn(...) and KSR.pv.getvs(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… Patch: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 9b6dda8472..414f20732d 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -239,6 +239,102 @@ static int jsdt_sr_pv_gete(duk_context *J) return jsdt_sr_pv_get_mode(J, 2); } +/** + * + */ +static int jsdt_sr_pv_push_valx (duk_context *J, int rmode, int vi, str *vs) +{ + if(rmode==1) { + duk_push_int(J, vi); + } else { + duk_push_lstring(J, vs->s, vs->len); + } + return 1; +} + +/** + * + */ +static int jsdt_sr_pv_get_valx (duk_context *J, int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + sr_jsdt_env_t *env_J; + int pl; + int xival = 0; + str xsval = str_init(""); + env_J = jsdt_sr_env_get(); + + if(duk_get_top(J)<2) { + LM_ERR("too few parameters [%d]\n", duk_get_top(J)); + return jsdt_sr_return_pv_null(J, 0); + } + if(rmode==1) { + if(!duk_is_number(J, 1)) { + LM_ERR("invalid int parameter\n"); + return jsdt_sr_return_pv_null(J, 0); + } + xival = duk_to_int(J, 1); + } else { + if(!duk_is_string(J, 1)) { + LM_ERR("invalid str parameter\n"); + return jsdt_sr_return_pv_null(J, 0); + } + xsval.s = (char*)duk_to_string(J, 1); + xsval.len = strlen(val.rs.s); + } + + pvn.s = (char*)duk_to_string(J, 0); + if(pvn.s==NULL || env_J->msg==NULL) { + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + + pvn.len = strlen(pvn.s); + LM_DBG("pv get: %s\n", pvn.s); + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { + LM_ERR("unable to get pv value for [%s]\n", pvn.s); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + duk_push_int(J, val.ri); + return 1; + } + duk_push_lstring(J, val.rs.s, val.rs.len); + return 1; +} + +/** + * + */ +static int jsdt_sr_pv_getvs (duk_context *J) +{ + return jsdt_sr_pv_get_valx(J, 0); +} + +/** + * + */ +static int jsdt_sr_pv_getvn (duk_context *J) +{ + return jsdt_sr_pv_get_valx(J, 1); +} + /** * */ @@ -431,6 +527,8 @@ const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "gete", jsdt_sr_pv_gete, 1 /* 1 args */ }, + { "getvn", jsdt_sr_pv_getvn, 2 /* 2 args */ }, + { "getvd", jsdt_sr_pv_getvs, 2 /* 2 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

[kamailio/kamailio] passing argument to event_callback function (#1627)
by Surendra Tiwari 04 Sep '18

04 Sep '18

### Description Right Now, There is no way to pass the parameter to event_callback function to be executed by KEMI Interpreter. This is required when we have to pass call_uuid for async call without suspending transaction. In callback we don't have anything refer to the previous transaction. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions We need to introduce parameter to event_callback with ; Initially let's keep it to only single parameter.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-3-45:~# kamailio -v version: kamailio 5.1.3 (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. id: unknown compiled on 15:16:50 Apr 24 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-3-45:~# uname -a Linux ip-172-31-3-45 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 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/1627

2 3

[kamailio/kamailio] undefined symbol: SHA1 (#1634)
by Prabhat Kumar 04 Sep '18

04 Sep '18

when i run command "kamailio -c kamailio.cfg" I get this error.. loading modules under config path: /usr/lib/x86_64-linux-gnu/kamailio/modules/ 0(12737) ERROR: <core> [sr_module.c:576]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/websocket.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/websocket.so: undefined symbol: SHA1 I tried reinstalling websocket modules but its not working. -- 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/1634

2 4

git:master:d453bdd3: tcpops: more debug messages when executing event route
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: d453bdd36a6cd569978a1d19e41d55b28c2b4e13 URL: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:52:58+02:00 tcpops: more debug messages when executing event route --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… Patch: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 8e5605c514..6815bf4897 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -204,6 +204,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; rt = tcp_closed_routes[tev->reason]; + LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); if (rt == -1) return; if (faked_msg_init() < 0) @@ -229,11 +230,13 @@ int tcpops_handle_tcp_closed(sr_event_param_t *evp) LM_WARN("received bad TCP closed event\n"); return -1; } + LM_DBG("received TCP closed event\n"); /* run event route if tcp_closed_event == 1 or if the * F_CONN_CLOSE_EV flag is explicitly set */ - if (tcp_closed_event == 1 || (tev->con->flags & F_CONN_CLOSE_EV)) + if (tcp_closed_event == 1 || (tev->con->flags & F_CONN_CLOSE_EV)) { tcpops_tcp_closed_run_route(tev); + } return 0; }

1 0

git:master:be55865f: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: be55865fb2601cc9141d6f3fb5ad0affd7507102 URL: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-04T11:31:32+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… Patch: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 2d393d8761..1fd1fbdf5b 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -68,6 +68,8 @@ Ovidiu Sas 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -117,6 +119,8 @@ Ovidiu Sas 1.27. sht_iterator_start usage 1.28. sht_iterator_end usage 1.29. sht_iterator_next usage + 1.30. sht_has_name usage + 1.31. sht_has_name usage Chapter 1. Admin Guide @@ -160,6 +164,8 @@ Chapter 1. Admin Guide 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -675,6 +681,8 @@ modparam("htable", "event_callback_mode", 1) 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 4.1. sht_print() @@ -852,6 +860,50 @@ sht_iterator_end("i1"); sht_iterator_end("i1"); ... +4.12. sht_has_name(htable, op, mval) + + Return greater than 0 (true) if the htable has an item that matches the + name against the mval parameter. + + The op parameter can be: + * eq - match the val parameter as string equal expression. + * ne - match the val parameter as string not-equal expression. + * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with' expression. + + All parameters can be static strings or contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.30. sht_has_name usage +... +if(sht_has_name("ha", "eq", "alice")) { + ... +} +... + +4.13. sht_has_str_value(htable, op, mval) + + Return greater than 0 (true) if the htable has an item that matches the + string value against the mval parameter. + + The op parameter can be: + * eq - match the val parameter as string equal expression. + * ne - match the val parameter as string not-equal expression. + * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with' expression. + + All parameters can be static strings or contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.31. sht_has_name usage +... +if(sht_has_str_value("ha", "eq", "alice")) { + ... +} +... + 5. Exported pseudo-variables * $sht(htable=>key)

1 0

git:master:dec17cb6: htable: proper return on match for sw operator whith rm functions
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: dec17cb6af275789c4ae804d5e1004a9f77010a3 URL: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:25:21+02:00 htable: proper return on match for sw operator whith rm functions --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… Patch: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 4070bf7b74..214b6e3608 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -489,6 +489,7 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:master:232c541a: htable: docs for sht_has_name(...) and sht_has_str_value(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 232c541ab6a084011380d94569215d599725e588 URL: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:12:16+02:00 htable: docs for sht_has_name(...) and sht_has_str_value(...) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… Patch: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 00f7a6eb41..6a8492a94e 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1026,6 +1026,114 @@ sht_iterator_end("i1"); } sht_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_has_name"> + <title> + <function moreinfo="none">sht_has_name(htable, op, mval)</function> + </title> + <para> + Return greater than 0 (true) if the htable has an item that matches + the name against the mval parameter. + </para> + <para> + The op parameter can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>eq</emphasis> - match the val parameter as string equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>ne</emphasis> - match the val parameter as string not-equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>re</emphasis> - match the val parameter as regular + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with' expression. + </para> + </listitem> + </itemizedlist> + <para> + All parameters can be static strings or contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_has_name</function> usage</title> + <programlisting format="linespecific"> +... +if(sht_has_name("ha", "eq", "alice")) { + ... +} +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_has_str_value"> + <title> + <function moreinfo="none">sht_has_str_value(htable, op, mval)</function> + </title> + <para> + Return greater than 0 (true) if the htable has an item that matches + the string value against the mval parameter. + </para> + <para> + The op parameter can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>eq</emphasis> - match the val parameter as string equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>ne</emphasis> - match the val parameter as string not-equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>re</emphasis> - match the val parameter as regular + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with' expression. + </para> + </listitem> + </itemizedlist> + <para> + All parameters can be static strings or contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_has_name</function> usage</title> + <programlisting format="linespecific"> +... +if(sht_has_str_value("ha", "eq", "alice")) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:37eb8b00: htable: new functions sht_has_name(...) and sht_has_str_value(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 37eb8b00c22da64df3d9f38645354af19c407bf5 URL: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:04:59+02:00 htable: new functions sht_has_name(...) and sht_has_str_value(...) - sht_has_name(htable, op, mval) - return >0 if there is an item matching its name with mval based on operator op - sht_has_str_valye(htable, op, mval) - return >0 if there is an item matching its string value with mval based on operator op --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af… Patch: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af…

1 0

[kamailio/kamailio] KEMI: add htable's sht_rm_* functions (#1614)
by Enrico Bandiera 04 Sep '18

04 Sep '18

Hi, currently htable module's sht_rm_* functions are not exported to KEMI, could anyone please export them to KEMI? Thanks, Enrico -- 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/1614

4 9

git:master:28068310: htable: exported sht_rm_name() and sht_rm_value() to KEMI
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 2806831045cdb8f110737a87470382c28c5ce094 URL: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T10:08:12+02:00 htable: exported sht_rm_name() and sht_rm_value() to KEMI --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Patch: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 43c58d1942..834583fa0c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -525,6 +525,17 @@ static int w_ht_rm_value(sip_msg_t* msg, char* hname, char* op, char *val) return w_ht_rm_items(msg, hname, op, val, 1); } +static int ki_ht_rm_name(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 0); + +} + +static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 1); +} + static int ht_reset_by_name(str *hname) { ht_t *ht; @@ -1321,6 +1332,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm_name"), + SR_KEMIP_INT, ki_ht_rm_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_rm_value"), + SR_KEMIP_INT, ki_ht_rm_value, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:d68c1bcb: pv: increased transformation buffer slots from 4 to 8
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: d68c1bcb350bce2f1951b604f97e246734e43b84 URL: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:48:02+02:00 pv: increased transformation buffer slots from 4 to 8 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Patch: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 30c6379a7f..79e31a9ded 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -59,7 +59,7 @@ static param_t* _tr_uri_params = NULL; /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 -#define TR_BUFFER_SLOTS 4 +#define TR_BUFFER_SLOTS 8 /*! transformation buffer */ static char **_tr_buffer_list = NULL;

1 0

git:master:533e8f5c: pv: new transformation {s.unquote}
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 533e8f5cca940652f8507a272b076d51161432bd URL: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:46:01+02:00 pv: new transformation {s.unquote} - return the value without surrounding double/single quotes (" or ') --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Patch: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93a5e3d6f..30c6379a7f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1156,6 +1156,30 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = 0; break; + case TR_S_UNQUOTE: + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + break; + } + if(val->rs.len<2) { + break; + } + if(val->rs.len>TR_BUFFER_SIZE-2) { + LM_ERR("value too large: %d\n", val->rs.len); + return -1; + } + if((val->rs.s[0] == val->rs.s[val->rs.len-1]) + && (val->rs.s[0] == '"' || val->rs.s[0] == '\'')) { + memcpy(_tr_buffer, val->rs.s+1, val->rs.len-2); + val->rs.len -= 2; + } else { + memcpy(_tr_buffer, val->rs.s, val->rs.len); + } + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2508,6 +2532,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==15 && strncasecmp(name.s, "urldecode.param", 15)==0) { t->subtype = TR_S_URLDECODEPARAM; goto done; + } else if(name.len==7 && strncasecmp(name.s, "unquote", 7)==0) { + t->subtype = TR_S_UNQUOTE; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index a4bc0759e8..ca24a3c108 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,7 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio] support usrloc handle_lost_tcp variable also in DB-Only scheme (#171)
by juha-h 04 Sep '18

04 Sep '18

--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/171

2 3

[kamailio/kamailio] auth_db Deprecate email_address in database schemas (#858)
by Olle E. Johansson 03 Sep '18

03 Sep '18

I suggest we delete the "email_address" field in database schemas for auth_db. I think it was put there as an example of extendability but a lot of users seems confused about this and Kamailio by default does not use that field at all. Any opinions? If we reach an agreement we'll produce patches and clean up the various schemas. -- 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/858

3 8

git:master:5e0440aa: kamctl: regenerated db schema files
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 5e0440aa27154c263fc883f3a7cb9680805af6c3 URL: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:51:59+02:00 kamctl: regenerated db schema files --- Modified: utils/kamctl/db_berkeley/kamailio/subscriber Modified: utils/kamctl/db_redis/kamailio/location Modified: utils/kamctl/db_redis/kamailio/subscriber Modified: utils/kamctl/db_sqlite/auth_db-create.sql Modified: utils/kamctl/dbtext/kamailio/subscriber Modified: utils/kamctl/mongodb/kamailio/subscriber.json Modified: utils/kamctl/mysql/auth_db-create.sql Modified: utils/kamctl/oracle/auth_db-create.sql Modified: utils/kamctl/postgres/auth_db-create.sql Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Patch: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968…

1 0

git:master:01045cc2: lib/srdb1: schema - removed rpid and email_address columns from subscriber
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 01045cc2e2f2b86e109c661ca1748809cda68b7a URL: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:48:39+02:00 lib/srdb1: schema - removed rpid and email_address columns from subscriber - they are not used by auth_db module - version number not needed to be updated, no default queries being affected - GH #858 --- Modified: src/lib/srdb1/schema/subscriber.xml --- Diff: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Patch: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… --- diff --git a/src/lib/srdb1/schema/subscriber.xml b/src/lib/srdb1/schema/subscriber.xml index 39575719ed..8aaa03976e 100644 --- a/src/lib/srdb1/schema/subscriber.xml +++ b/src/lib/srdb1/schema/subscriber.xml @@ -75,24 +75,6 @@ <description>md5(username@domain:realm:password)</description> </column> - <column> - <name>email_address</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>Email address</description> - </column> - - <column> - <name>rpid</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>The SIP Remote-Party-ID header identifies the calling party and includes user, party, screen and privacy headers that specify how a call is presented and screened.</description> - </column> - <index> <name>account_idx</name> <colref linkend="username"/>

1 0

[kamailio] add GnuTLS support (#371)
by zabbal 03 Sep '18

03 Sep '18

OpenSSL is well known for huge amount of deadly security vulnerabilities, even before heartbleed. It would be nice if I could avoid bringing in such a library just because of Kamailio - having support for GnuTLS will let the user to make such a choice. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/371

4 6

[kamailio/kamailio] ims_isc module does not deliver to AS after asynchronous SAR to HSS (distinct PSI) (#1168)
by Christoph VALENTIN 03 Sep '18

03 Sep '18

### Description This is the same test case as I used for bug Report #1160 I used kamailio as an scscf (based on the configuration files from kamailio/examples/scscf) I did some changes according to my needs I did some Basic tests - the results were satisfying --> OK I configured a distinct PSI on the HSS (sip:04321234501@vict-ims.net) --> OK I registered some user from a Zoiper Client --> OK I told zoiper to call sip:04321234501@vict-ims.net --> I received 555 AS Contacting Failed - iFC terminated dialog ### Troubleshooting For some reason, the ims_isc module cannot deliver the Initial INVITE to the AS. First I thought, there was a bug in TM module, however there was no bug in TM module (please find the Explanation in issue #1160) The ims_isc module issues a CRITICAL log: File 2017_06_20_distinct_psi_03_scscf_kamailio.log: Line 642 - 660: Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_avp.c:138]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_sar.c:84]: create_return_code(): created AVP successfully : [saa_return_code] - [1] Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=127 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=143 a=21 n=switch Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=130 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=131 a=5 n=route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=673 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=675 a=24 n=t_newtran Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: tm [tm.c:1316]: w_t_newtran(): ERROR: t_newtran: transaction already in process 0x7ff2a6e66a58 Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=677 a=25 n=set_dlg_profile Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=685 a=25 n=is_method Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=686 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=687 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=688 a=24 n=record_route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=698 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=26 n=isc_match_filter Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_isc [mod.c:233]: isc_match_filter(): Checking triggers Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: CRITICAL: ims_isc [mod.c:284]: isc_match_filter(): SKIP: 0 #### Reproduction I can help to reproduce the issue. mailto:christoph.valentin@kapsch.net Currently I have got an experimental test setup using Zoiper Clients. After week 27 I should have simulated test cases to repeat the Scenario "per mouse-click" #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` #### SIP Traffic  ``` sip || diameter traffic at the s-cscf (172.29.21.23) [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@vict-ims ~]# kamailio -v version: kamailio 4.4.5 (x86_64/linux) b0945e-dirty 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. id: b0945e -dirty compiled on 20:06:13 Jun 7 2017 with gcc 4.8.5 [root@vict-ims ~]# ``` * **Operating System**:  ``` [root@vict-ims ~]# uname -a Linux vict-ims 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux [root@vict-ims ~]# ``` -- 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/1168

2 8

git:master:91211184: htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 9121118444e638223c789641618ed4145a67b0f3 URL: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T14:50:16+02:00 htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi - GH #1614 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… Patch: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index fbe016e0aa..43c58d1942 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -354,13 +354,49 @@ static int fixup_ht_key(void** param, int param_no) return 0; } -static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo) +/** + * + */ +static int ht_rm_re_helper(sip_msg_t *msg, ht_t *ht, str *rexp, int rmode) +{ + int_str isval; + + if (ht->dmqreplicate>0) { + isval.s = *rexp; + if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &ht->name, NULL, + AVP_VAL_STR, &isval, rmode)!=0) { + LM_ERR("dmq relication failed for [%.*s]\n", ht->name.len, ht->name.s); + } + } + if(ht_rm_cell_re(rexp, ht, rmode)<0) + return -1; + return 1; +} + +/** + * + */ +static int ki_ht_rm_name_re(sip_msg_t *msg, str *htname, str *rexp) +{ + ht_t *ht; + + ht = ht_get_table(htname); + if(ht==NULL) { + return 1; + } + + return ht_rm_re_helper(msg, ht, rexp, 0); +} + +/** + * + */ +static int ht_rm_name_re(sip_msg_t* msg, char* key, char* foo) { ht_pv_t *hpv; str sre; pv_spec_t *sp; sp = (pv_spec_t*)key; - int_str isval; hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; @@ -375,24 +411,33 @@ static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo) LM_ERR("cannot get $sht expression\n"); return -1; } - if (hpv->ht->dmqreplicate>0) { - isval.s = sre; - if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &hpv->htname, NULL, AVP_VAL_STR, &isval, 0)!=0) { - LM_ERR("dmq relication failed\n"); - } + return ht_rm_re_helper(msg, hpv->ht, &sre, 0); +} + +/** + * + */ +static int ki_ht_rm_value_re(sip_msg_t *msg, str *htname, str *rexp) +{ + ht_t *ht; + + ht = ht_get_table(htname); + if(ht==NULL) { + return 1; } - if(ht_rm_cell_re(&sre, hpv->ht, 0)<0) - return -1; - return 1; + + return ht_rm_re_helper(msg, ht, rexp, 1); } -static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) +/** + * + */ +static int ht_rm_value_re(sip_msg_t* msg, char* key, char* foo) { ht_pv_t *hpv; str sre; pv_spec_t *sp; sp = (pv_spec_t*)key; - int_str isval; hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; @@ -407,16 +452,7 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) LM_ERR("cannot get $sht expression\n"); return -1; } - - if (hpv->ht->dmqreplicate>0) { - isval.s = sre; - if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &hpv->htname, NULL, AVP_VAL_STR, &isval, 1)!=0) { - LM_ERR("dmq relication failed\n"); - } - } - if(ht_rm_cell_re(&sre, hpv->ht, 1)<0) - return -1; - return 1; + return ht_rm_re_helper(msg, hpv->ht, &sre, 1); } static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, @@ -1275,6 +1311,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm_name_re"), + SR_KEMIP_INT, ki_ht_rm_name_re, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_rm_value_re"), + SR_KEMIP_INT, ki_ht_rm_value_re, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:23a4632f: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 23a4632ffacedf5b80b1be4a47cab6fddec90502 URL: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-03T13:01:47+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f… Patch: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f…

1 0

git:master:65a50a5b: rr: ignore_sips - new parameter to control use of sips schema
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 65a50a5b4a4e37d940f9a33ec6c0d8079249de59 URL: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T12:27:41+02:00 rr: ignore_sips - new parameter to control use of sips schema - if set to different than 0, then record-route headers will be added with sip schema even if r-uri comes with sips. Allow interoperability with some UAs messing up routing when sips is used - default is 0 - use sips schema if in r-uri (existing behaviour) --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… Patch: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 0d042b2d36..402e6d5573 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -69,6 +69,7 @@ #define RR_PARAM_BUF_SIZE 512 /*!< buffer for RR parameter */ +extern int rr_ignore_sips; /*! * \brief RR param buffer @@ -378,11 +379,11 @@ int record_route(struct sip_msg* _m, str *params) str user = {NULL, 0}; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - int sips; + int sips = 0; int ret = 0; - + user.len = 0; - + if (add_username) { /* check if there is a custom user set */ if (get_custom_user(_m, &user) < 0) { @@ -428,7 +429,9 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); @@ -453,7 +456,7 @@ int record_route(struct sip_msg* _m, str *params) goto error; } } - + l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -461,7 +464,7 @@ int record_route(struct sip_msg* _m, str *params) ret = -3; goto error; } - + if (build_rr(l, l2, &user, tag, params, INBOUND, sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); ret = -4; @@ -499,10 +502,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; char *rr_prefix; int rr_prefix_len; - int sips; + int sips = 0; int ret = 0; - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if(sips==0) { rr_prefix = RR_PREFIX_SIP; rr_prefix_len = RR_PREFIX_SIP_LEN; @@ -756,9 +761,9 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) struct lump* l; struct lump* l2; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - int sips; + int sips = 0; int ret = 0; - + user.len = 0; user.s = 0; @@ -799,7 +804,9 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = 0; } - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); @@ -825,7 +832,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) goto error; } } - + l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -833,7 +840,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) ret = -6; goto error; } - + if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); ret = -7; diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 36b1c046a8..a3ef5e880a 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -61,6 +61,7 @@ int rr_force_send_socket = 0; /*!< control if socket is forced by rr */ int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ static str custom_user_spec = {NULL, 0}; pv_spec_t custom_user_avp; +int rr_ignore_sips = 0; /*!< ignore sips schema when building record-route */ ob_api_t rr_obb; @@ -131,6 +132,7 @@ static param_export_t params[] ={ {"enable_socket_mismatch_warning",INT_PARAM,&enable_socket_mismatch_warning}, {"custom_user_avp", PARAM_STR, &custom_user_spec}, {"force_send_socket", PARAM_INT, &rr_force_send_socket}, + {"ignore_sips", PARAM_INT, &rr_ignore_sips}, {0, 0, 0 } };

1 0

git:master:096461d9: rr: docs for ignore_sips parameter
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 096461d90c5fd301fdfb77a52e2906e3f591f643 URL: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T12:49:39+02:00 rr: docs for ignore_sips parameter --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… Patch: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index f5fe00e131..7dd1868e2a 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -290,6 +290,26 @@ record_route(); ... modparam("rr", "force_send_socket", 1) ... +</programlisting> + </example> + </section> + <section id="rr.p.ignore_sips"> + <title><varname>ignore_sips</varname> (int)</title> + + <para> + If set to 1, the Record-Route header are build with 'sip' schema + always, ignoring the presence of 'sips' schema in request URI. + </para> + + <para><emphasis>Default value is 0 (use 'sips' if present in R-URI).</emphasis></para> + + <example> + <title>Set <varname>ignore_sips</varname> parameter</title> + + <programlisting format="linespecific"> +... +modparam("rr", "ignore_sips", 1) +... </programlisting> </example> </section>

1 0

git:master:8cebf48e: core: parse via - set len for host/port_str only if there is a value
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 8cebf48eeee70d23c6cf827e24b2f5fabda669ab URL: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:54:39+02:00 core: parse via - set len for host/port_str only if there is a value --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… Patch: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 8c3d54ea5e..318bb8e6c6 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:master:f8723954: dispatcher: more debug messages when updating dst
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: f8723954bf67359c92e8cd09ac6915f64ad1ce71 URL: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:23:38+02:00 dispatcher: more debug messages when updating dst --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… Patch: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 7d7105df29..cb87392eb8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2250,6 +2250,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; + LM_DBG("updating dst\n"); if(upos == DS_USE_NEXT) { if(!(ds_flags & DS_FAILOVER_ON) || ds_xavp_dst.len <= 0) { LM_WARN("failover support disabled\n"); @@ -2264,6 +2265,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } if(upos == DS_USE_NEXT) { + LM_DBG("updating dst with next record\n"); /* use next destination - delete the current one and search the next */ xavp_rm(rxavp, NULL); @@ -2282,7 +2284,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) lxavp = xavp_get(&ds_xavp_dst_addr, rxavp); if(lxavp==NULL || lxavp->val.type!=SR_XTYPE_STR) { - LM_WARN("no xavp uri field in next destination record\n"); + LM_WARN("no xavp uri field in next destination record (%p)\n", lxavp); return -1; }

1 0

git:master:3fef2b3c: core: xavp - more debug details when printing xavp
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 3fef2b3c18f83add1af13c2b84303b507e27aeca URL: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:23:08+02:00 core: xavp - more debug details when printing xavp --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… Patch: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e1cf394171..66797f910b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -540,11 +540,11 @@ void xavp_print_list_content(sr_xavp_t **head, int level) start = *head; else start=*_xavp_list_crt; - LM_INFO("+++++ start XAVP list: %p (level=%d)\n", start, level); + LM_INFO("+++++ start XAVP list: %p (%p) (level=%d)\n", start, head, level); avp = start; while(avp) { - LM_INFO(" *** XAVP name: %s\n", avp->name.s); + LM_INFO(" *** (l:%d - %p) XAVP name: %s\n", level, avp, avp->name.s); LM_INFO(" XAVP id: %u\n", avp->id); LM_INFO(" XAVP value type: %d\n", avp->val.type); switch(avp->val.type) { @@ -552,20 +552,20 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <null>\n"); break; case SR_XTYPE_INT: - LM_INFO(" XAVP value: %d\n", avp->val.v.i); + LM_INFO(" XAVP value (int): %d\n", avp->val.v.i); break; case SR_XTYPE_STR: - LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); + LM_INFO(" XAVP value (str): %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_INFO(" XAVP value: %lu\n", + LM_INFO(" XAVP value (time): %lu\n", (long unsigned int)avp->val.v.t); break; case SR_XTYPE_LONG: - LM_INFO(" XAVP value: %ld\n", avp->val.v.l); + LM_INFO(" XAVP value (long): %ld\n", avp->val.v.l); break; case SR_XTYPE_LLONG: - LM_INFO(" XAVP value: %lld\n", avp->val.v.ll); + LM_INFO(" XAVP value (llong): %lld\n", avp->val.v.ll); break; case SR_XTYPE_XAVP: LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); @@ -578,6 +578,7 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; } + LM_INFO(" *** (l:%d - %p) end\n", level, avp); avp = avp->next; } LM_INFO("----- end XAVP list: %p (level=%d)\n", start, level);

1 0

git:master:8e581a3e: core: functions to apply changes and update internal sip msg buffer
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 8e581a3ebe71eedb41ac7a41538e6b1b2b391744 URL: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-02T12:33:17+02:00 core: functions to apply changes and update internal sip msg buffer --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… Patch: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f82d72c3cb..6929b22e0f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3176,3 +3176,106 @@ int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, return 0; } +/** + * + */ +int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) +{ + sip_msg_t tmp; + + if(obuf==NULL || obuf->s==NULL || obuf->len<=0) { + LM_ERR("invalid buffer parameter\n"); + return -1; + } + + if(obuf->len >= BUF_SIZE) { + LM_ERR("new buffer is too large (%d)\n", obuf->len); + return -1; + } + /* temporary copy */ + memcpy(&tmp, msg, sizeof(sip_msg_t)); + + /* reset dst uri and path vector to avoid freeing - restored later */ + if(msg->dst_uri.s != NULL) { + msg->dst_uri.s = NULL; + msg->dst_uri.len = 0; + } + if(msg->path_vec.s != NULL) { + msg->path_vec.s = NULL; + msg->path_vec.len = 0; + } + + /* free old msg structure */ + free_sip_msg(msg); + memset(msg, 0, sizeof(sip_msg_t)); + + /* restore msg fields */ + msg->buf = tmp.buf; + msg->id = tmp.id; + msg->rcv = tmp.rcv; + msg->set_global_address = tmp.set_global_address; + msg->set_global_port = tmp.set_global_port; + msg->flags = tmp.flags; + msg->msg_flags = tmp.msg_flags; + msg->hash_index = tmp.hash_index; + msg->force_send_socket = tmp.force_send_socket; + msg->fwd_send_flags = tmp.fwd_send_flags; + msg->rpl_send_flags = tmp.rpl_send_flags; + msg->dst_uri = tmp.dst_uri; + msg->path_vec = tmp.path_vec; + + memcpy(msg->buf, obuf->s, obuf->len); + msg->len = obuf->len; + msg->buf[msg->len] = '\0'; + + /* reparse the message */ + LM_DBG("SIP message content updated - reparsing\n"); + if(parse_msg(msg->buf, msg->len, msg) != 0) { + LM_ERR("parsing new sip message failed [[%.*s]]\n", msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } + + return 1; +} + +/** + * + */ +int sip_msg_apply_changes(sip_msg_t *msg) +{ + int ret; + dest_info_t dst; + str obuf; + + if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { + LM_ERR("invalid usage - not in request route or a reply\n"); + return -1; + } + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf.s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); + } else { + if(msg->msg_flags & FL_RR_ADDED) { + LM_ERR("cannot apply msg changes after adding record-route" + " header - it breaks conditional 2nd header\n"); + return -1; + } + obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf.s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + ret = sip_msg_update_buffer(msg, &obuf); + /* free new buffer - copied in the static buffer from old sip_msg_t */ + pkg_free(obuf.s); + + return ret; +} diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index d95c89f5e4..b6360ce3ff 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -180,4 +180,15 @@ void process_lumps( struct sip_msg* msg, unsigned int* orig_offs, struct dest_info* send_info, int flag); + +/** + * set the internal buffer for sip msg with obuf and reparse + */ +int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); + +/** + * apply changes to sip msg buffer and reparse + */ +int sip_msg_apply_changes(sip_msg_t *msg); + #endif

1 0

git:master:6fadac0f: textopsx: use functions from core to apply changes
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 6fadac0fc8107a80663da7f975f066738151456b URL: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-02T12:42:37+02:00 textopsx: use functions from core to apply changes --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… Patch: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 24bdf0c84f..cf2fe52b84 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -145,8 +145,6 @@ static int mod_init(void) */ static int ki_msg_update_buffer(sip_msg_t *msg, str *obuf) { - sip_msg_t tmp; - if(obuf==NULL || obuf->s==NULL || obuf->len<=0) { LM_ERR("invalid buffer parameter\n"); return -1; @@ -156,52 +154,8 @@ static int ki_msg_update_buffer(sip_msg_t *msg, str *obuf) LM_ERR("new buffer is too large (%d)\n", obuf->len); return -1; } - /* temporary copy */ - memcpy(&tmp, msg, sizeof(sip_msg_t)); - - /* reset dst uri and path vector to avoid freeing - restored later */ - if(msg->dst_uri.s != NULL) { - msg->dst_uri.s = NULL; - msg->dst_uri.len = 0; - } - if(msg->path_vec.s != NULL) { - msg->path_vec.s = NULL; - msg->path_vec.len = 0; - } - - /* free old msg structure */ - free_sip_msg(msg); - memset(msg, 0, sizeof(sip_msg_t)); - - /* restore msg fields */ - msg->buf = tmp.buf; - msg->id = tmp.id; - msg->rcv = tmp.rcv; - msg->set_global_address = tmp.set_global_address; - msg->set_global_port = tmp.set_global_port; - msg->flags = tmp.flags; - msg->msg_flags = tmp.msg_flags; - msg->hash_index = tmp.hash_index; - msg->force_send_socket = tmp.force_send_socket; - msg->fwd_send_flags = tmp.fwd_send_flags; - msg->rpl_send_flags = tmp.rpl_send_flags; - msg->dst_uri = tmp.dst_uri; - msg->path_vec = tmp.path_vec; - - memcpy(msg->buf, obuf->s, obuf->len); - msg->len = obuf->len; - msg->buf[msg->len] = '\0'; - - /* reparse the message */ - LM_DBG("SIP message content updated - reparsing\n"); - if(parse_msg(msg->buf, msg->len, msg) != 0) { - LM_ERR("parsing new sip message failed [[%.*s]]\n", msg->len, msg->buf); - /* exit config execution - sip_msg_t structure is no longer - * valid/safe for config */ - return 0; - } - return 1; + return sip_msg_update_buffer(msg, obuf); } /** @@ -222,39 +176,12 @@ static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) */ static int ki_msg_apply_changes(sip_msg_t *msg) { - int ret; - dest_info_t dst; - str obuf; - if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { LM_ERR("invalid usage - not in request route or a reply\n"); return -1; } - init_dest_info(&dst); - dst.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - obuf.s = generate_res_buf_from_sip_res( - msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); - } else { - if(msg->msg_flags & FL_RR_ADDED) { - LM_ERR("cannot apply msg changes after adding record-route" - " header - it breaks conditional 2nd header\n"); - return -1; - } - obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, - &dst, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } - if(obuf.s == NULL) { - LM_ERR("couldn't update msg buffer content\n"); - return -1; - } - ret = ki_msg_update_buffer(msg, &obuf); - /* free new buffer - copied in the static buffer from old sip_msg_t */ - pkg_free(obuf.s); - - return ret; + return sip_msg_apply_changes(msg); } /**

1 0

Re: [sr-dev] [kamailio/kamailio] dmq: add optional parameter to dmq_handle_message() (bce0890)
by Emmanuel Schmidbauer 02 Sep '18

02 Sep '18

@miconda any chance this can get tagged for next release? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4…

1 0

[kamailio/kamailio] include_hf_value: Not expected behaviour (#1629)
by sergey-safarov 02 Sep '18

02 Sep '18

### Description I want modify `Accept` header using include_hf_value. Need to add additional values to current. I do this using. ``` include_hf_value("Accept", "application/sdp"); include_hf_value("Accept", "application/pidf+xml"); ``` Expected result in SIP message ``` Accept: application/sdp, application/pidf+xml ``` Realy i get ``` Accept: application/sdp Accept: application/pidf+xml ``` ### Troubleshooting #### Reproduction Need to add this to kamailio config ``` Accept: application/sdp Accept: application/pidf+xml ``` #### Debugging Data None #### Log Messages None #### SIP Traffic PCAP file is attached. ### Possible Solutions None ### Additional Information Used kamailio 5.1 branch commit 9f04def504051dc8da3989b1f96e4b6633d31a75 Docker container kamailio/kamailio-ci ``` / # kamailio -v version: kamailio 5.1.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 10:41:20 Aug 23 2018 with gcc 6.4.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" / # uname -a Linux 088bedf3b82f 4.14.13-300.fc27.x86_64 #1 SMP Thu Jan 11 04:00:01 UTC 2018 x86_64 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/1629

2 4

git:master:37c27ef7: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 37c27ef7b42e2db7ea5754d4fe96854debc54b66 URL: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-31T21:01:29+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… Patch: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 909443f69d..d4ddcb8645 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -46,7 +46,7 @@ Charles Chance 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) @@ -109,7 +109,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) @@ -269,17 +269,23 @@ modparam("dmq", "ping_interval", 90) 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) 4.5. dmq_is_from_node() -4.1. dmq_handle_message() +4.1. dmq_handle_message([continue]) Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. + Meaning of parameters: + * continue - by default, dmq_handle_message() will end execution of + routing script. If this optional parameter is set to "1", + dmq_handle_message() will continue executing the routing script + after it's been called. + This function can be used from REQUEST_ROUTE. Example 1.8. dmq_handle_message usage

1 0

git:master:18c1eb2c: Merge pull request #1626 from kamailio/dmq_handle_message-return
by GitHub 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 18c1eb2c05c9eadea240677db27576caaef0950c URL: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-31T19:50:05+01:00 Merge pull request #1626 from kamailio/dmq_handle_message-return dmq: add optional "continue" parameter to dmq_handle_message() --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… Patch: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index b374b8de31..d28686da9c 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -91,6 +91,8 @@ static void destroy(void); static cmd_export_t cmds[] = { {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, 0, 0, REQUEST_ROUTE}, + {"dmq_handle_message", (cmd_function)w_dmq_handle_message, 1, + fixup_int_1, 0, REQUEST_ROUTE}, {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, fixup_spve_all, 0, ANY_ROUTE}, {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, @@ -412,4 +414,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_dmq_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0903f6b40c..26555e24a3 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -219,12 +219,22 @@ modparam("dmq", "ping_interval", 90) <title>Functions</title> <section id="dmq.f.dmq_handle_message"> <title> - <function moreinfo="none">dmq_handle_message()</function> + <function moreinfo="none">dmq_handle_message([continue])</function> </title> <para> Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. </para> + <para>Meaning of parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>continue</emphasis> - by default, dmq_handle_message() will end + execution of routing script. If this optional parameter is set to "1", dmq_handle_message() + will continue executing the routing script after it's been called. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE. </para> diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 679f671fc6..2293cc3600 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg) +int ki_dmq_handle_message(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -60,7 +60,7 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("sending reply\n"); goto error; } - return 0; + return returnval; } LM_DBG("dmq_handle_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); @@ -68,12 +68,22 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("failed to add dmq job\n"); goto error; } - return 0; + return returnval; error: return -1; } +int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) +{ + int i = 0; + if(str1) { + if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; + } + if(i>1) i = 1; + return ki_dmq_handle_message(msg, i); +} + int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg); -} \ No newline at end of file + return ki_dmq_handle_message(msg, 0); +} diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 5131f87c02..9c9f835745 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -24,7 +24,8 @@ #ifndef _MESSAGE_H_ #define _MESSAGE_H_ +int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message(sip_msg_t *msg, int returnval); #endif

1 0

git:master:bce08905: dmq: add optional parameter to dmq_handle_message()
by Emmanuel Schmidbauer 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: bce08905dc0bea2f9bce44460dcaee4e786b9bd2 URL: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-08-31T14:17:26-04:00 dmq: add optional parameter to dmq_handle_message() --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… Patch: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index b374b8de31..d28686da9c 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -91,6 +91,8 @@ static void destroy(void); static cmd_export_t cmds[] = { {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, 0, 0, REQUEST_ROUTE}, + {"dmq_handle_message", (cmd_function)w_dmq_handle_message, 1, + fixup_int_1, 0, REQUEST_ROUTE}, {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, fixup_spve_all, 0, ANY_ROUTE}, {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, @@ -412,4 +414,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_dmq_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0903f6b40c..26555e24a3 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -219,12 +219,22 @@ modparam("dmq", "ping_interval", 90) <title>Functions</title> <section id="dmq.f.dmq_handle_message"> <title> - <function moreinfo="none">dmq_handle_message()</function> + <function moreinfo="none">dmq_handle_message([continue])</function> </title> <para> Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. </para> + <para>Meaning of parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>continue</emphasis> - by default, dmq_handle_message() will end + execution of routing script. If this optional parameter is set to "1", dmq_handle_message() + will continue executing the routing script after it's been called. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE. </para> diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 679f671fc6..2293cc3600 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg) +int ki_dmq_handle_message(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -60,7 +60,7 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("sending reply\n"); goto error; } - return 0; + return returnval; } LM_DBG("dmq_handle_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); @@ -68,12 +68,22 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("failed to add dmq job\n"); goto error; } - return 0; + return returnval; error: return -1; } +int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) +{ + int i = 0; + if(str1) { + if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; + } + if(i>1) i = 1; + return ki_dmq_handle_message(msg, i); +} + int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg); -} \ No newline at end of file + return ki_dmq_handle_message(msg, 0); +} diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 5131f87c02..9c9f835745 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -24,7 +24,8 @@ #ifndef _MESSAGE_H_ #define _MESSAGE_H_ +int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message(sip_msg_t *msg, int returnval); #endif

1 0

[kamailio/kamailio] dmq: add optional parameter to dmq_handle_message() (#1626)
by Emmanuel Schmidbauer 31 Aug '18

31 Aug '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1626 -- Commit Summary -- * dmq: add optional parameter to dmq_handle_message() -- File Changes -- M src/modules/dmq/dmq.c (4) M src/modules/dmq/doc/dmq_admin.xml (12) M src/modules/dmq/message.c (19) M src/modules/dmq/message.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1626.patch https://github.com/kamailio/kamailio/pull/1626.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/1626

2 4

uac module unused var in master
by Juha Heinanen 31 Aug '18

31 Aug '18

CC (gcc) [M uac.so] uac_reg.o uac_reg.c: In function 'rpc_uac_reg_active': uac_reg.c:2110:6: warning: unused variable 'none' [-Wunused-variable] str none = {"none", 4}; ^~~~

2 1

git:master:0d2dd5b0: uac: remove unused variable 'none' compiler warning, reported from Juha
by Henning Westerholt 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 0d2dd5b0a2c4c910e27ae7162d72f446ff92e365 URL: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-31T19:12:19+02:00 uac: remove unused variable 'none' compiler warning, reported from Juha --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… Patch: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index ba53c8ed12..625cd434be 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -2107,7 +2107,6 @@ static void rpc_uac_reg_active(rpc_t* rpc, void* ctx) } omode = *reg_active; *reg_active = (nmode)?1:0; - str none = {"none", 4}; /* add entry node */ if (rpc->add(ctx, "{", &th) < 0) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev