sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:892ab273: test/unit: create unit test 61

by Mikko Lehto

Module: kamailio Branch: master Commit: 892ab2737cf931c6bd232439715e80874a7f1d97 URL: https://github.com/kamailio/kamailio/commit/892ab2737cf931c6bd232439715e808… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-28T12:38:08+02:00 test/unit: create unit test 61 - tests Lua exported sdp_remove_line_by_prefix() --- Added: test/unit/61-message-sdp.sip Added: test/unit/61.cfg Added: test/unit/61.sh --- Diff: https://github.com/kamailio/kamailio/commit/892ab2737cf931c6bd232439715e808… Patch: https://github.com/kamailio/kamailio/commit/892ab2737cf931c6bd232439715e808…

7 years, 5 months

git:master:0ede53d0: modules/app_lua: support 1 or 2 parameters with sr.sdpops.sdp_remove_line_by_prefix()

by Mikko Lehto

Module: kamailio Branch: master Commit: 0ede53d0872cbd426dcb3542dbca5ca7c00139e2 URL: https://github.com/kamailio/kamailio/commit/0ede53d0872cbd426dcb3542dbca5ca… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-28T12:37:53+02:00 modules/app_lua: support 1 or 2 parameters with sr.sdpops.sdp_remove_line_by_prefix() --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/0ede53d0872cbd426dcb3542dbca5ca… Patch: https://github.com/kamailio/kamailio/commit/0ede53d0872cbd426dcb3542dbca5ca… --- diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 81fcd4f..f1b5703 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -2157,7 +2157,8 @@ static int lua_sr_sdpops_remove_transport(lua_State *L) static int lua_sr_sdpops_remove_line_by_prefix(lua_State *L) { int ret; - str param[2]; + str prefix = STR_NULL; + str media = STR_NULL; sr_lua_env_t *env_L; env_L = sr_lua_env_get(); @@ -2174,18 +2175,22 @@ static int lua_sr_sdpops_remove_line_by_prefix(lua_State *L) return app_lua_return_error(L); } - if(lua_gettop(L)!=1) + if(lua_gettop(L)==1) { + prefix.s = (char *) lua_tostring(L, -1); + prefix.len = strlen(prefix.s); + } else if(lua_gettop(L)==2) + { + prefix.s = (char *) lua_tostring(L, -2); + prefix.len = strlen(prefix.s); + media.s = (char *) lua_tostring(L, -1); + media.len = strlen(media.s); + } else { LM_ERR("incorrect number of arguments\n"); return app_lua_return_error(L); } - param[0].s = (char *) lua_tostring(L, -2); - param[0].len = strlen(param[0].s); - param[1].s = (char *) lua_tostring(L, -1); - param[1].len = strlen(param[1].s); - - ret = _lua_sdpopsb.sdp_remove_line_by_prefix(env_L->msg, &param[0], &param[1]); + ret = _lua_sdpopsb.sdp_remove_line_by_prefix(env_L->msg, &prefix, &media); return app_lua_return_int(L, ret); }

7 years, 5 months

git:master:18c7eaf1: modules/app_lua: sdpops API changed

by Mikko Lehto

Module: kamailio Branch: master Commit: 18c7eaf11c69eccea195020d4b82f96ddae5dafb URL: https://github.com/kamailio/kamailio/commit/18c7eaf11c69eccea195020d4b82f96… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-17T02:27:09+02:00 modules/app_lua: sdpops API changed --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/18c7eaf11c69eccea195020d4b82f96… Patch: https://github.com/kamailio/kamailio/commit/18c7eaf11c69eccea195020d4b82f96… --- diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index df88648..81fcd4f 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -2157,7 +2157,7 @@ static int lua_sr_sdpops_remove_transport(lua_State *L) static int lua_sr_sdpops_remove_line_by_prefix(lua_State *L) { int ret; - str media; + str param[2]; sr_lua_env_t *env_L; env_L = sr_lua_env_get(); @@ -2180,10 +2180,12 @@ static int lua_sr_sdpops_remove_line_by_prefix(lua_State *L) return app_lua_return_error(L); } - media.s = (char*)lua_tostring(L, -1); - media.len = strlen(media.s); + param[0].s = (char *) lua_tostring(L, -2); + param[0].len = strlen(param[0].s); + param[1].s = (char *) lua_tostring(L, -1); + param[1].len = strlen(param[1].s); - ret = _lua_sdpopsb.sdp_remove_line_by_prefix(env_L->msg, &media); + ret = _lua_sdpopsb.sdp_remove_line_by_prefix(env_L->msg, &param[0], &param[1]); return app_lua_return_int(L, ret); }

7 years, 5 months

git:master:8d4c2e41: test/unit: update unit test 60

by Mikko Lehto

Module: kamailio Branch: master Commit: 8d4c2e419068b034ced89828878c6635d69c8d6f URL: https://github.com/kamailio/kamailio/commit/8d4c2e419068b034ced89828878c663… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-17T01:17:00+02:00 test/unit: update unit test 60 - Kamailio sdpops manipulates SDP in MESSAGE request - count certain SDP lines before and after sdp_remove_line_by_prefix() - only m=video is to be manipulated - verify by counting prefix line count vs. other lines --- Added: test/unit/60-message-sdp9.sip Modified: test/unit/60.cfg Modified: test/unit/60.sh --- Diff: https://github.com/kamailio/kamailio/commit/8d4c2e419068b034ced89828878c663… Patch: https://github.com/kamailio/kamailio/commit/8d4c2e419068b034ced89828878c663… --- diff --git a/test/unit/60-message-sdp9.sip b/test/unit/60-message-sdp9.sip new file mode 100644 index 0000000..1e0019a --- /dev/null +++ b/test/unit/60-message-sdp9.sip @@ -0,0 +1,31 @@ +MESSAGE sip:bob@example.invalid SIP/2.0 +From: sip:alice@example.invalid;tag=45dfdf49 +To: sip:bob@example.invalid +Call-ID: 1172299593a +CSeq: 1 MESSAGE +Content-Type: application/sdp +Max-Forwards: 2 +X-Case: 60-test9 +X-Info: sdpops remove_line_by_prefix test9 - filter video attribute + +v=0 +o=FreeSWITCH 1447318678 1447318679 IN IP4 10.0.0.145 +s=FreeSWITCH +c=IN IP4 10.0.0.145 +t=0 0 +m=audio 28504 RTP/AVP 96 101 +a=rtpmap:96 opus/48000/2 +a=fmtp:96 useinbandfec=1; maxaveragebitrate=14400; maxplaybackrate=8000 +a=rtpmap:101 telephone-event/48000 +a=fmtp:101 0-16 +a=ptime:20 +a=sendrecv +a=rtcp:28505 IN IP4 10.0.0.145 +a=rtcp-fb:101 nack +m=video 21992 RTP/SAVPF 100 +a=rtpmap:100 VP8/90000 +a=rtcp:21992 IN IP4 10.0.0.150 +a=rtcp-fb:100 ccm fir +a=rtcp-fb:100 nack +a=rtcp-fb:100 nack pli + diff --git a/test/unit/60.cfg b/test/unit/60.cfg index 62c0a5b..cd7aa1c 100644 --- a/test/unit/60.cfg +++ b/test/unit/60.cfg @@ -26,6 +26,13 @@ route { sl_send_reply(200,"OK"); exit; } + if ($hdr(X-Case) == '60-test9') { + sdp_remove_line_by_prefix("a=rtcp","video"); + msg_apply_changes(); + set_reply_body($rb,"application/sdp"); + sl_send_reply(200,"OK"); + exit; + } sl_send_reply(500,"Unknown test case"); exit; diff --git a/test/unit/60.sh b/test/unit/60.sh index e3f0b02..54d514c 100755 --- a/test/unit/60.sh +++ b/test/unit/60.sh @@ -85,6 +85,27 @@ else exit ${ret} fi +# Filter only video stream attributes +FILE="60-message-sdp9.sip" +TOTALBEFORE=$(awk '/^v=0/,/^$/ {total++; if ($0 ~ /^a=rtcp/ ) { prefix++;} else { other++} } END {if (prefix) {print other " + " prefix} else { print other " + 0"} }' ${FILE}) +OTHERBEFORE=$(echo ${TOTALBEFORE}|cut -d+ -f1) +PREFIXBEFORE=$(echo ${TOTALBEFORE}|cut -d+ -f2) +sipsak ${SIPSAKOPTS} -f ${FILE} > ${TMPFILE} +ret=$? +if [ "${ret}" -eq 0 ] ; then + TOTALAFTER=$(awk '/^v=0/,/^$/ {total++; if ($0 ~ /^a=rtcp:/ ) { prefix++;} else { other++} } END {if (prefix) {print other " + " prefix} else { print other " + 0"} }' ${TMPFILE}) + OTHERAFTER=$(echo ${TOTALBEFORE}|cut -d+ -f1) + PREFIXAFTER=$(echo ${TOTALAFTER}|cut -d+ -f2) + if [ ${PREFIXAFTER} -eq 1 ] && [ ${OTHERBEFORE} -eq ${OTHERAFTER} ]; then + ret=0 + else + ret=1 + echo "found ${PREFIXAFTER} lines with prefix \"a=rtcp\", was expecting 1 (in m=audio)(${FILE})" + fi + else + echo "invalid sipsak return: ${ret}" +fi + kill_kamailio rm ${TMPFILE} exit ${ret}

7 years, 5 months

git:master:60703e86: modules/sdpops: add optional media parameter to sdp_remove_line_by_prefix()

by Mikko Lehto

Module: kamailio Branch: master Commit: 60703e86eff4849501938b2dcbb85382a9febb9d URL: https://github.com/kamailio/kamailio/commit/60703e86eff4849501938b2dcbb8538… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-17T01:15:11+02:00 modules/sdpops: add optional media parameter to sdp_remove_line_by_prefix() - allows removing lines only within media description --- Modified: modules/sdpops/api.h Modified: modules/sdpops/doc/sdpops_admin.xml Modified: modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60703e86eff4849501938b2dcbb8538… Patch: https://github.com/kamailio/kamailio/commit/60703e86eff4849501938b2dcbb8538…

7 years, 5 months

git:master:3690bce2: test/unit: update unit test 60

by Mikko Lehto

Module: kamailio Branch: master Commit: 3690bce25ee7ca01bb9d36ec253e727c2c10bc9f URL: https://github.com/kamailio/kamailio/commit/3690bce25ee7ca01bb9d36ec253e727… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-16T23:45:21+02:00 test/unit: update unit test 60 - make sipsak use localhost to avoid name lookup error - kill Kamailio by using pid file - do not pass -L to sipsak in order to have proper (CR LF) line ending --- Modified: test/unit/60.sh Modified: test/unit/include/common Modified: test/unit/include/require.sh --- Diff: https://github.com/kamailio/kamailio/commit/3690bce25ee7ca01bb9d36ec253e727… Patch: https://github.com/kamailio/kamailio/commit/3690bce25ee7ca01bb9d36ec253e727… --- diff --git a/test/unit/60.sh b/test/unit/60.sh index c487136..e3f0b02 100755 --- a/test/unit/60.sh +++ b/test/unit/60.sh @@ -20,26 +20,27 @@ . include/common . include/require.sh -CFG=60.cfg +CFGFILE=60.cfg TMPFILE=$(mktemp -t kamailio-test.XXXXXXXXXX) +SIPSAKOPTS="-H localhost -s sip:127.0.0.1 -v" if ! (check_sipsak && check_kamailio && check_module "sdpops"); then exit 0 fi -${BIN} -w . -f ${CFG} > /dev/null +${BIN} -w ${RUN_DIR} -Y ${RUN_DIR} -P ${PIDFILE} -f ${CFGFILE} > /dev/null ret=$? sleep 1 if [ "${ret}" -ne 0 ] ; then echo "start fail" - ${KILL} + kill_kamailio exit ${ret} fi # Borken SDP should give 500 response FILE="60-message-sdp0.sip" -sipsak -f ${FILE} -L -s sip:127.0.0.1 -v > ${TMPFILE} +sipsak ${SIPSAKOPTS} -f ${FILE} > ${TMPFILE} ret=$? if [ "${ret}" -eq 1 ] ; then ret=0 @@ -55,7 +56,7 @@ for i in 1 2 3 4 5 6 7; do TOTALBEFORE=$(awk '/^v=0/,/^$/ {total++; if ($0 ~ /^a=X-cap/ ) { prefix++;} else { other++} } END {if (prefix) {print other " + " prefix} else { print other " + 0"} }' ${FILE}) OTHERBEFORE=$(echo ${TOTALBEFORE}|cut -d+ -f1) - sipsak -f ${FILE} -L -s sip:127.0.0.1 -v > ${TMPFILE} + sipsak ${SIPSAKOPTS} -f ${FILE} > ${TMPFILE} ret=$? if [ "${ret}" -eq 0 ] ; then TOTALAFTER=$(awk '/^v=0/,/^$/ {total++; if ($0 ~ /^a=X-cap/ ) { prefix++;} else { other++} } END {if (prefix) {print other " + " prefix} else { print other " + 0"} }' ${TMPFILE}) @@ -74,7 +75,7 @@ done # Empty body should get 500 response FILE="60-message-sdp8.sip" -sipsak -f ${FILE} -L -s sip:127.0.0.1 -v > ${TMPFILE} +sipsak ${SIPSAKOPTS} -f ${FILE} > ${TMPFILE} ret=$? if [ "${ret}" -eq 1 ] ; then ret=0 @@ -84,7 +85,7 @@ else exit ${ret} fi -${KILL} - +kill_kamailio +rm ${TMPFILE} exit ${ret} diff --git a/test/unit/include/common b/test/unit/include/common index 2459843..ba8aa71 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -1,6 +1,7 @@ # all database modules DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist" # root directory relative to tests +RUN_DIR="." SRC_DIR="../.." CTL_DIR="$SRC_DIR/utils/kamctl" CTLRC="$CTL_DIR/kamctlrc" @@ -19,5 +20,6 @@ else fi fi KILL="killall -15 $BNAME" +PIDFILE="${RUN_DIR}/kamailio.pid" # test directory relative to root TEST_DIR="test/unit" diff --git a/test/unit/include/require.sh b/test/unit/include/require.sh index 85cfc84..c7642bb 100644 --- a/test/unit/include/require.sh +++ b/test/unit/include/require.sh @@ -63,3 +63,7 @@ check_sipsak() { fi; return 0 } + +kill_kamailio() { + kill $(cat ${PIDFILE}) +}

7 years, 5 months

[kamailio/kamailio] modules/sdpops - extend sdp_remove_line_by_prefix() (#863)

by Mikko Lehto

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/863 -- Commit Summary -- * test/unit: update unit test 60 * modules/sdpops: add optional media parameter to sdp_remove_line_by_prefix() * test/unit: update unit test 60 -- File Changes -- M modules/sdpops/api.h (2) M modules/sdpops/doc/sdpops_admin.xml (2) M modules/sdpops/sdpops_mod.c (146) A test/unit/60-message-sdp9.sip (31) M test/unit/60.cfg (7) M test/unit/60.sh (36) M test/unit/include/common (2) M test/unit/include/require.sh (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/863.patch https://github.com/kamailio/kamailio/pull/863.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/863

7 years, 5 months

git:4.4:ae7f6d49: Merge pull request #869 from giavac/gv/correlation_id_backport

by GitHub

Module: kamailio Branch: 4.4 Commit: ae7f6d49ed1caf4a133f72012196a876d258e159 URL: https://github.com/kamailio/kamailio/commit/ae7f6d49ed1caf4a133f72012196a87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-30T11:14:08+01:00 Merge pull request #869 from giavac/gv/correlation_id_backport sipcapture: remove workaround of correlation_id --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ae7f6d49ed1caf4a133f72012196a87… Patch: https://github.com/kamailio/kamailio/commit/ae7f6d49ed1caf4a133f72012196a87… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 425a79b..57f1c05 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2307,7 +2307,6 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(log_table, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column; @@ -2482,7 +2481,6 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d else if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(_table->s, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column;

7 years, 5 months

git:4.4:973e8ef6: sipcapture: remove workaround of correlation_id

by Giacomo Vacca

Module: kamailio Branch: 4.4 Commit: 973e8ef6e2f0323168f42ff9f77a86862604b51d URL: https://github.com/kamailio/kamailio/commit/973e8ef6e2f0323168f42ff9f77a868… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2016-11-30T08:54:22+01:00 sipcapture: remove workaround of correlation_id - Compatible with Asterisk >= 10 (cherry picked from commit 6cb0bec7d2491ed3365dc237fc1d8608af246c3a) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/973e8ef6e2f0323168f42ff9f77a868… Patch: https://github.com/kamailio/kamailio/commit/973e8ef6e2f0323168f42ff9f77a868… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 425a79b..57f1c05 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2307,7 +2307,6 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(log_table, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column; @@ -2482,7 +2481,6 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d else if(correlation_id) { corrtmp.s = correlation_id; corrtmp.len = strlen(correlation_id); - if(!strncmp(_table->s, "rtcp_capture",12)) corrtmp.len--; } db_keys[0] = &date_column;

7 years, 5 months

[kamailio/kamailio] rtjson from replace (#868)

by dnadares

The **rtjson** module is updating the "from" sip header twice with the "from" and "to" json fields. By the way "to" sip header keeps unchanged. This is the json example: `.... response.routes[0].headers = { "from": { "display": "Anonymous", "uri": "sip:anonymous@anonymous.invalid" }, "to": { "display": "44444444", "uri": "sip:44444444@172.16.213.38" }, }; .... ` The result would be: From: Anonymous4444444444<sip:anonymous@anonymous.invalidsip:4444444444@172.16.213.38>;tag=1. To: sut <sip:0115555555@172.16.213.38:5060>. I modified one line and now works correctly `diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 5542e63..60bdcad 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -481,7 +481,7 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) xuri.len = strlen(xuri.s); } if(xdsp.len>0 || xuri.len>0) { **- uacb.replace_from(msg, &xdsp, &xuri); + uacb.replace_to(msg, &xdsp, &xuri);** } } }` From: Anonymous <sip:anonymous@anonymous.invalid>;tag=1. To: 4444444444 <sip:4444444444@172.16.213.38>. -- 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/868

7 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016