sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,jessie,slave #1076

by jenkins＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 293.91 KB...] make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M app_perl.so] perlfunc.o CC (gcc) [M app_perl.so] app_perl_mod.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] perlvdb_oohelpers.o CC (gcc) [M db_perlvdb.so] perlvdb_conv.o CC (gcc) [M db_perlvdb.so] db_perlvdb.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~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kutils" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M utils.so] xcap_auth.o CC (gcc) [M utils.so] pidf.o CC (gcc) [M utils.so] conf.o CC (gcc) [M utils.so] utils.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M utils.so] utils.so CC (gcc) [M http_client.so] http_client.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] functions.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="klua" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_sr.o CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M memcached.so] memcached.o CC (gcc) [M memcached.so] mcd_var.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] utilities.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] sub_agent.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[2]: Nothing to be done for 'every-module'. make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] network.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M cplc.so] sub_list.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] cpl_sig.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~dev4+0~20180410005855.1092+jessie/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' CC (gcc) [M db_redis.so] redis_dbase.o redis_dbase.c: In function 'db_redis_dump_reply': redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("printing %lu elements in array reply\n", reply->elements); ^ redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_scan_query_keys': redis_dbase.c:685:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 12 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of reply elements for scan on table '%.*s', expected 2, got %lu\n", ^ redis_dbase.c:685:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] redis_dbase.c:717:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid null key at cursor result index %lu while scanning table '%.*s'\n", ^ redis_dbase.c:717:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:722:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid key type at cursor result index %lu while scanning table '%.*s', expected string\n", ^ redis_dbase.c:722:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_convert_row': redis_dbase.c:986:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:986:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:1001:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 13 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of columns at row %d/%d, expecting %d, got %lu\n", ^ redis_dbase.c:1001:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 11 has type 'size_t' [-Wformat=] redis_dbase.c:1012:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("converting column #%lu of row #%d", colidx, RES_ROW_N(_r)); ^ redis_dbase.c:1012:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_delete': redis_dbase.c:1317:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1317:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_update': redis_dbase.c:1571:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1571:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_table.o make[4]: 'libsrdb2.so.1.0' is up to date. make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] redis_client.o redis_client.c: In function 'redisc_init': redis_client.c:141:4: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for(int i= 0; i< sentinels_count; i++) { ^ redis_client.c:141:4: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code redis_client.c:169:8: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for(int row = 0; row< res->elements; row++){ ^ redis_client.c:172:9: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for(int i= 0; i< res2->elements; i+= 2) { ^ ../../Makefile.rules:100: recipe for target 'redis_client.o' failed make[3]: *** [redis_client.o] Error 1 Makefile:511: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie/src' Makefile:27: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev4+0~20180410005855.1092+jessie' debian/rules:137: recipe for target 'build-stamp' failed 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.7680/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.7680/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_IaYdDN 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.7680 + '[' 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/jessie-i386.building.7528 + '[' -r /var/run/lock/jessie-i386.update.7528 ']' + '[' '' = 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.Kb7TGf3npB ']' + rm -rf /tmp/tmp.Kb7TGf3npB + '[' -n /tmp/apt-jdg_IaYdDN ']' + sudo rm -rf /tmp/apt-jdg_IaYdDN + '[' -n 1681 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=321 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Apr 10 01:44:31 UTC 2018 [running 321 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Apr 10 01:44:31 UTC 2018 [running 321 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?

6 years, 7 months

git:master:f54ce325: pv: added new transformation {uri.tosocket}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f54ce325ced4ac8c0361a2c736cc199b5b641a6d URL: https://github.com/kamailio/kamailio/commit/f54ce325ced4ac8c0361a2c736cc199… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T13:52:14+02:00 pv: added new transformation {uri.tosocket} - converts a sip uri to socket address format - from sip:address:port;transport=proto to proto:address:port --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/f54ce325ced4ac8c0361a2c736cc199… Patch: https://github.com/kamailio/kamailio/commit/f54ce325ced4ac8c0361a2c736cc199… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index dd7d9a7f62..f93a5e3d6f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1180,6 +1180,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, str sv; param_hooks_t phooks; param_t *pit=NULL; + str sproto; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1; @@ -1337,6 +1338,31 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len++; } break; + case TR_URI_TOSOCKET: + if(msg==NULL) { + val->rs = _tr_empty; + break; + } else { + if(get_valid_proto_string(msg->rcv.proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol\n"); + val->rs = _tr_empty; + break; + } + tr_set_crt_buffer(); + val->rs.len = snprintf(_tr_buffer, TR_BUFFER_SIZE, + "%.*s:%.*s:%d", sproto.len, sproto.s, + _tr_parsed_uri.host.len, _tr_parsed_uri.host.s, + (_tr_parsed_uri.port_no!=0) + ?(int)_tr_parsed_uri.port_no:5060); + if(val->rs.len<=0 || val->rs.len>=TR_BUFFER_SIZE) { + LM_WARN("error converting uri to socket address [%.*s]\n", + _tr_uri.len, _tr_uri.s); + val->rs = _tr_empty; + break; + } + val->rs.s = _tr_buffer; + } + break; default: LM_ERR("unknown subtype %d\n", subtype); @@ -2594,6 +2620,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==6 && strncasecmp(name.s, "scheme", 6)==0) { t->subtype = TR_URI_SCHEME; goto done; + } else if(name.len==6 && strncasecmp(name.s, "tosocket", 8)==0) { + t->subtype = TR_URI_TOSOCKET; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index aacb722b95..a4bc0759e8 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -47,7 +47,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

6 years, 7 months

git:master:b96a3140: pv: new config variable $sas

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b96a31409a3671f5f89617901886d9b5ffc61c73 URL: https://github.com/kamailio/kamailio/commit/b96a31409a3671f5f89617901886d9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T13:29:01+02:00 pv: new config variable $sas - return source address in socket format (proto:address:port) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/b96a31409a3671f5f89617901886d9b… Patch: https://github.com/kamailio/kamailio/commit/b96a31409a3671f5f89617901886d9b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5743dd6d4d..258be56399 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -400,6 +400,9 @@ static pv_export_t mod_pvs[] = { {{"RAut", (sizeof("RAut")-1)}, /* */ PVT_OTHER, pv_get_rcvadv_uri_full, 0, 0, 0, 0, 0}, + {{"sas", (sizeof("sas")-1)}, /* */ + PVT_OTHER, pv_get_srcaddr_socket, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b087f5ad1b..098d5435c2 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -726,6 +726,31 @@ int pv_get_srcaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &sr); } +int pv_get_srcaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str ssock; + str sr; + + if(msg==NULL) + return -1; + + if(get_src_address_socket(msg, &ssock)<0) + return pv_get_null(msg, param, res); + + if (ssock.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, ssock.s, ssock.len); + sr.len = ssock.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + int pv_get_srcaddr_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 898b3a8513..148e87f269 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -142,6 +142,9 @@ int pv_get_srcaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_srcaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_srcaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

6 years, 7 months

git:master:0537f584: core: added helper function to retrieve source address in socket format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0537f584d5032146a627b6173114a7cdd213e384 URL: https://github.com/kamailio/kamailio/commit/0537f584d5032146a627b6173114a7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T13:28:34+02:00 core: added helper function to retrieve source address in socket format --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/0537f584d5032146a627b6173114a7c… Patch: https://github.com/kamailio/kamailio/commit/0537f584d5032146a627b6173114a7c… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index efad8f9f63..2a3d3b1de5 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1102,6 +1102,65 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) return 0; } +/** + * get source proto:ip:port (socket address format) + */ +int get_src_address_socket(sip_msg_t *m, str *ssock) +{ + static char buf[MAX_URI_SIZE]; + char* p; + str ip, port; + int len; + str proto; + + if (!ssock || !m) { + ERR("invalid parameter value\n"); + return -1; + } + + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + + ip.s = ip_addr2a(&m->rcv.src_ip); + ip.len = strlen(ip.s); + + port.s = int2str(m->rcv.src_port, &port.len); + + len = proto.len + 1 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; + + if (len+1 >= MAX_URI_SIZE) { + ERR("buffer too small\n"); + return -1; + } + + p = buf; + + memcpy(p, proto.s, proto.len); + p += proto.len; + + *p++ = ':'; + + if (m->rcv.src_ip.af==AF_INET6) + *p++ = '['; + memcpy(p, ip.s, ip.len); + p += ip.len; + if (m->rcv.src_ip.af==AF_INET6) + *p++ = ']'; + + *p++ = ':'; + + memcpy(p, port.s, port.len); + p += port.len; + *p = '\0'; + + ssock->s = buf; + ssock->len = len; + + return 0; +} + /** * get received-on-socket ip, port and protocol in SIP URI format * - tmode - 0: short format (transport=udp is not added, being default) diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 9270e0bba9..3d69e8d462 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -499,6 +499,11 @@ void msg_ldata_reset(sip_msg_t*); */ int get_src_uri(sip_msg_t *m, int tmode, str *uri); +/** + * get source proto:ip:port (socket address format) + */ +int get_src_address_socket(sip_msg_t *m, str *ssock); + /** * get received-on-socket ip, port and protocol in SIP URI format */

6 years, 7 months

git:master:52e69b49: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 52e69b493083187313bce49e3b979c178df1e7ab URL: https://github.com/kamailio/kamailio/commit/52e69b493083187313bce49e3b979c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-10T12:46:38+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/52e69b493083187313bce49e3b979c1… Patch: https://github.com/kamailio/kamailio/commit/52e69b493083187313bce49e3b979c1… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 5d0b75fd8c..9e7ac29f59 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -53,6 +53,7 @@ Muhammad Shahzad Shafi 4.13. resetxflag(flag) 4.14. set_send_socket(saddr) 4.15. set_recv_socket(saddr) + 4.16. set_source_address(saddr) 5. RPC Commands @@ -89,8 +90,9 @@ Muhammad Shahzad Shafi 1.16. resetxflag usage 1.17. set_send_socket usage 1.18. set_recv_socket usage - 1.19. event_route[network:msg] use cases - 1.20. Sample PERL code for do_compress and do_uncompress + 1.19. set_source_address usage + 1.20. event_route[network:msg] use cases + 1.21. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 4.13. resetxflag(flag) 4.14. set_send_socket(saddr) 4.15. set_recv_socket(saddr) + 4.16. set_source_address(saddr) 5. RPC Commands @@ -260,6 +263,7 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.13. resetxflag(flag) 4.14. set_send_socket(saddr) 4.15. set_recv_socket(saddr) + 4.16. set_source_address(saddr) 4.1. append_branch([ uri, [ q ] ]) @@ -469,7 +473,7 @@ resetxflag("1"); Example 1.17. set_send_socket usage ... -set_send_socket("upd:127.0.0.1:5060"); +set_send_socket("udp:127.0.0.1:5060"); ... 4.15. set_recv_socket(saddr) @@ -484,7 +488,22 @@ set_send_socket("upd:127.0.0.1:5060"); Example 1.18. set_recv_socket usage ... -set_recv_socket("upd:127.0.0.1:5060"); +set_recv_socket("udp:127.0.0.1:5060"); +... + +4.16. set_source_address(saddr) + + Set the source address for the message. + + Meaning of the parameters is as follows: + * saddr - the source address in socket format. Can be a static string + or contain pseudo-variable. + + This function can be used from ANY_ROUTE. + + Example 1.19. set_source_address usage +... +set_source_address("udp:127.0.0.1:5080"); ... 5. RPC Commands @@ -621,7 +640,7 @@ set_recv_socket("upd:127.0.0.1:5060"); Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.19. event_route[network:msg] use cases + Example 1.20. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -652,7 +671,7 @@ event_route[network:msg] { } ... - Example 1.20. Sample PERL code for do_compress and do_uncompress + Example 1.21. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

6 years, 7 months

git:master:d8e823d5: corex: added documentation for set_source_address()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d8e823d5e57a05fdf3f785c713566a766bdfd6b0 URL: https://github.com/kamailio/kamailio/commit/d8e823d5e57a05fdf3f785c713566a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T12:33:57+02:00 corex: added documentation for set_source_address() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d8e823d5e57a05fdf3f785c713566a7… Patch: https://github.com/kamailio/kamailio/commit/d8e823d5e57a05fdf3f785c713566a7… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index ed38520696..96b3df667c 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -518,7 +518,7 @@ resetxflag("1"); <title><function>set_send_socket</function> usage</title> <programlisting format="linespecific"> ... -set_send_socket("upd:127.0.0.1:5060"); +set_send_socket("udp:127.0.0.1:5060"); ... </programlisting> </example> @@ -545,7 +545,33 @@ set_send_socket("upd:127.0.0.1:5060"); <title><function>set_recv_socket</function> usage</title> <programlisting format="linespecific"> ... -set_recv_socket("upd:127.0.0.1:5060"); +set_recv_socket("udp:127.0.0.1:5060"); +... +</programlisting> + </example> + </section> + <section id="corex.f.set_source_address"> + <title><function moreinfo="none">set_source_address(saddr)</function></title> + <para> + Set the source address for the message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>saddr</emphasis> - the source address in socket format. + Can be a static string or contain pseudo-variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_source_address</function> usage</title> + <programlisting format="linespecific"> +... +set_source_address("udp:127.0.0.1:5080"); ... </programlisting> </example>

6 years, 7 months

git:master:684ae261: corex: added set_source_address() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 684ae26119e3921c6e7b39556339b4f1d77f7d36 URL: https://github.com/kamailio/kamailio/commit/684ae26119e3921c6e7b39556339b4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T12:28:53+02:00 corex: added set_source_address() function --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/684ae26119e3921c6e7b39556339b4f… Patch: https://github.com/kamailio/kamailio/commit/684ae26119e3921c6e7b39556339b4f… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 9781115783..c78ba1bb22 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -25,6 +25,8 @@ #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/socket_info.h" +#include "../../core/resolve.h" #include "../../core/lvalue.h" #include "../../core/pvar.h" #include "../../core/kemi.h" @@ -51,6 +53,7 @@ static int w_resetxflag(struct sip_msg *msg, char *flag, str *s2); static int w_setxflag(struct sip_msg *msg, char *flag, char *s2); static int w_set_send_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2); +static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int fixup_file_op(void** param, int param_no); @@ -106,6 +109,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null, 0, ANY_ROUTE }, + {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -635,6 +640,53 @@ static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2) return ki_set_recv_socket(msg, &ssock); } +/** + * + */ +static int ki_set_source_address(sip_msg_t *msg, str *saddr) +{ + sr_phostp_t rp; + union sockaddr_union faddr; + char cproto; + int ret; + + if(msg==NULL || saddr==NULL || saddr->len<=0) { + LM_ERR("bad parameters\n"); + return -1; + } + + if(parse_protohostport(saddr, &rp)<0) { + LM_ERR("failed to parse the address [%.*s]\n", saddr->len, saddr->s); + return -1; + } + + cproto = (char)rp.proto; + ret = sip_hostport2su(&faddr, &rp.host, (unsigned short)rp.port, &cproto); + if(ret!=0) { + LM_ERR("failed to resolve address [%.*s]\n", saddr->len, saddr->s); + return -1; + } + + msg->rcv.src_su=faddr; + su2ip_addr(&msg->rcv.src_ip, &faddr); + msg->rcv.src_port=rp.port; + + return 1; +} + +/** + * + */ +static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2) +{ + str saddr; + if (fixup_get_svalue(msg, (gparam_t*)paddr, &saddr) != 0 || saddr.len<=0) { + LM_ERR("cannot get source address value\n"); + return -1; + } + return ki_set_source_address(msg, &saddr); +} + /** * */ @@ -680,6 +732,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("set_source_address"), + SR_KEMIP_INT, ki_set_source_address, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

6 years, 7 months

git:master:358e507e: core: exposed parse_protohostport() prototype

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 358e507ea449ce00450ee59ecfa50079831ab29f URL: https://github.com/kamailio/kamailio/commit/358e507ea449ce00450ee59ecfa5007… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-10T10:55:58+02:00 core: exposed parse_protohostport() prototype --- Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/358e507ea449ce00450ee59ecfa5007… Patch: https://github.com/kamailio/kamailio/commit/358e507ea449ce00450ee59ecfa5007… --- diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 03225acb6d..641d8a2760 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -146,5 +146,6 @@ typedef struct _sr_phostp { } sr_phostp_t; struct socket_info* lookup_local_socket(str *phostp); +int parse_protohostport(str* ins, sr_phostp_t *r); #endif

6 years, 7 months

a bunch of db_redis compile Wformat warnings

by Henning Westerholt

Hi, I noticed a bunch of db_redis Wformat compile warnings in the jenkins autobuild output: CC (gcc) [M db_redis.so] redis_dbase.o redis_dbase.c: In function 'db_redis_dump_reply': redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("printing %lu elements in array reply\n", reply->elements); ^ redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_scan_query_keys': redis_dbase.c:685:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 12 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of reply elements for scan on table '%.*s', expected 2, got %lu\n", ^ redis_dbase.c:685:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] redis_dbase.c:717:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid null key at cursor result index %lu while scanning table '%.*s'\n", ^ redis_dbase.c:717:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:722:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid key type at cursor result index %lu while scanning table '%.*s', expected string\n", ^ redis_dbase.c:722:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_convert_row': redis_dbase.c:986:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:986:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:1001:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 13 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of columns at row %d/%d, expecting %d, got %lu \n", ^ redis_dbase.c:1001:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 11 has type 'size_t' [-Wformat=] redis_dbase.c:1012:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("converting column #%lu of row #%d", colidx, RES_ROW_N(_r)); ^ redis_dbase.c:1012:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_delete': redis_dbase.c:1317:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1317:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_update': redis_dbase.c:1571:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1571:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] Best regards, Henning

6 years, 7 months

git:master:baf7d813: ndb_redis: fix error introduced commit in 95cfa343857e4: 'for' loop initial decl.

by Henning Westerholt

Module: kamailio Branch: master Commit: baf7d8137fde96ece0f29faaa8fb89b0a80ab657 URL: https://github.com/kamailio/kamailio/commit/baf7d8137fde96ece0f29faaa8fb89b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-10T07:34:36+02:00 ndb_redis: fix error introduced commit in 95cfa343857e4: 'for' loop initial decl. - fix error related to sentinel patch, introduced in commit 95cfa343857e4 - error: 'for' loop initial declarations are only allowed in C99 mode --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/baf7d8137fde96ece0f29faaa8fb89b… Patch: https://github.com/kamailio/kamailio/commit/baf7d8137fde96ece0f29faaa8fb89b… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index b92239ab74..bbf57e1e79 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -71,6 +71,7 @@ int redisc_init(void) char addr[256], pass[256], unix_sock_path[256], sentinel_group[256]; unsigned int port, db, sock = 0, haspass = 0, sentinel_master = 1; + int i, row; redisc_server_t *rsrv=NULL; param_t *pit = NULL; struct timeval tv_conn; @@ -138,7 +139,7 @@ int redisc_init(void) // if sentinels are provided, we need to connect to them and retrieve the redis server // address / port if(sentinels_count > 0) { - for(int i= 0; i< sentinels_count; i++) { + for(i= 0; i< sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; redisContext *redis; @@ -166,10 +167,10 @@ int redisc_init(void) res = redisCommand(redis, "SENTINEL slaves %s", sentinel_group); if( res && (res->type == REDIS_REPLY_ARRAY) ) { - for(int row = 0; row< res->elements; row++){ + for(row = 0; row< res->elements; row++){ res2 = res->element[row]; - for(int i= 0; i< res2->elements; i+= 2) { + for(i= 0; i< res2->elements; i+= 2) { if( strncmp(res2->element[i]->str, "ip", 2) == 0 ) { strncpy(addr, res2->element[i+1]->str, res2->element[i+1]->len); addr[res2->element[i+1]->len] = '\0';

6 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018