Play out some RTCP from the acct_rtcp_hep test case.

sippy · Mar 9, 2020 · a234005 · a234005
1 parent 5cf4fef
commit a234005
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 29 deletions.
diff --git a/tests/recording/basic b/tests/recording/basic
@@ -10,33 +10,38 @@ BASEDIR="$(readlink -f -- $BASEDIR)"
 
 . $(dirname $0)/../functions
 
-PCAP_DIR="${BASEDIR}/rtp_analyze"
+PCAP_DIR1="${BASEDIR}/rtp_analyze"
+PCAP_DIR2="${BASEDIR}/acct_rtcp_hep"
 CD_DIR="${BASEDIR}/recording"
 RECSIZE=109564
 RECORD_DIR="${BUILDDIR}"
 RECORD_SPL_DIR="${CD_DIR}"
 
 run_udpreplay() {
   direction=${1}
-  rtp_oport=${2}
-  rtp_nport=${3}
-  rtcp_oport=$((${rtp_oport} + 1))
+  rtp_oport1=${2}
+  rtp_oport2=${3}
+  rtp_nport=${4}
+  rtcp_oport1=$((${rtp_oport1} + 1))
+  rtcp_oport2=$((${rtp_oport2} + 1))
   rtcp_nport=$((${rtp_nport} + 1))
   #UDPREPLAY_ARGS="-o udpreplay_${direction}.pcap"
-  tcprewrite --dstipmap=0.0.0.0/0:127.0.0.1 --portmap=${rtp_oport}:${rtp_nport} --portmap=${rtcp_oport}:${rtcp_nport} \
-   -i "${PCAP_DIR}/srtp1.${direction}.rtp" -o recording.${rtp_nport}.${direction}.pcap || return 1
+  tcprewrite --dstipmap=0.0.0.0/0:127.0.0.1 --portmap=${rtp_oport1}:${rtp_nport} --portmap=${rtcp_oport1}:${rtcp_nport} \
+   -i "${PCAP_DIR1}/srtp1.${direction}.rtp" -o recording.1.${rtp_nport}.${direction}.pcap || return 1
+  tcprewrite --dstipmap=0.0.0.0/0:127.0.0.1 --portmap=${rtp_oport2}:${rtp_nport} --portmap=${rtcp_oport2}:${rtcp_nport} \
+   -i "${PCAP_DIR2}/rtcp.${direction}.pcap" -o recording.2.${rtp_nport}.${direction}.pcap || return 1
   if [ "${direction}" = "o" ]
   then
     NPKTS1=300
-    NPKTS2=153
+    NPKTS2=163
   else
     NPKTS1=302
-    NPKTS2=149
+    NPKTS2=159
   fi
   sleep 1
-  udpreplay -r 2 -n ${NPKTS1} ${UDPREPLAY_ARGS} recording.${rtp_nport}.${direction}.pcap
-  sleep 3
-  exec udpreplay -r 2 -n ${NPKTS2} ${UDPREPLAY_ARGS} recording.${rtp_nport}.${direction}.pcap
+  udpreplay -r 2 -n ${NPKTS1} ${UDPREPLAY_ARGS} recording.1.${rtp_nport}.${direction}.pcap
+  sleep 2
+  exec udpreplay -r 2 -n ${NPKTS2} ${UDPREPLAY_ARGS} recording.2.${rtp_nport}.${direction}.pcap
 }
 
 run_rtpproxy() {
@@ -88,7 +93,7 @@ run_rtpproxy() {
   (cat "${CD_DIR}/basic.input" "${CD_DIR}/basic.${rproto}.input"; \
    sleep 8; cat "${CD_DIR}/basic.stats.input" "${CD_DIR}/basic.recstop${recstop}.input" \
     "${CD_DIR}/basic.refresh.input"; \
-   sleep 6; cat "${CD_DIR}/basic.stats.input") | \
+   sleep 7; cat "${CD_DIR}/basic.stats.input") | \
    sed -u "s|%%CALLID%%|${CALL_ID}|g ; s|%%REC_PORT%%|${rport}|g" | \
    ${RTPPROXY} ${RTPP_ARGS} ${RTPP_REC_ARGS} | sed \
    "s|^${rtp_porta}$|%%PORT_A%%|g ;  s|^${rtp_porto}$|%%PORT_O%%|g"
@@ -144,11 +149,11 @@ run_recording() {
     sleep 0.2
     report_rc ${RTPP_NC_RC} "Starting NetCat on port ${REC_PORT}/udp"
   fi
-  run_udpreplay a 2280 ${RTP_PORT_A} &
+  run_udpreplay a 2280 2006 ${RTP_PORT_A} &
   UDPRPL_A_RC=${?}
   UDPRPL_A_PID=${!}
   report_rc ${UDPRPL_A_RC} "Starting udpreplay (answering) to ${RTP_PORT_A}/rtp"
-  run_udpreplay o 2240 ${RTP_PORT_O} &
+  run_udpreplay o 2240 2008 ${RTP_PORT_O} &
   UDPRPL_O_RC=${?}
   UDPRPL_O_PID=${!}
   report_rc ${UDPRPL_O_RC} "Starting udpreplay (originate) to ${RTP_PORT_O}/rtp"

diff --git a/tests/recording/basic.files.output b/tests/recording/basic.files.output
@@ -9,8 +9,8 @@ rtpa_nsent=302 rtpa_nrcvd=302 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 0
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
 %%CALL_ID%%=from_tag_1.a.rtcp: 0
 %%CALL_ID%%=from_tag_1.a.rtp: 302

diff --git a/tests/recording/basic.files_stophalf.output b/tests/recording/basic.files_stophalf.output
@@ -8,10 +8,10 @@ rtpa_nsent=302 rtpa_nrcvd=302 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 0
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
 %%CALL_ID%%=from_tag_1.a.rtcp: 0
 %%CALL_ID%%=from_tag_1.a.rtp: 302
-%%CALL_ID%%=from_tag_1.o.rtcp: 0
-%%CALL_ID%%=from_tag_1.o.rtp: 453
+%%CALL_ID%%=from_tag_1.o.rtcp: 1
+%%CALL_ID%%=from_tag_1.o.rtp: 462
diff --git a/tests/recording/basic.remote.output b/tests/recording/basic.remote.output
@@ -9,6 +9,6 @@ rtpa_nsent=302 rtpa_nrcvd=302 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 0
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
diff --git a/tests/recording/basic.singlefile.output b/tests/recording/basic.singlefile.output
@@ -9,7 +9,7 @@ rtpa_nsent=302 rtpa_nrcvd=302 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 0
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
 %%CALL_ID%%=from_tag_1.pcap: 602
diff --git a/tests/recording/basic.singlefile_stophalf.output b/tests/recording/basic.singlefile_stophalf.output
@@ -8,7 +8,7 @@ rtpa_nsent=302 rtpa_nrcvd=302 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 0
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
-%%CALL_ID%%=from_tag_1.pcap: 755
+%%CALL_ID%%=from_tag_1.pcap: 765
diff --git a/tests/recording/basic.stopall.output b/tests/recording/basic.stopall.output
@@ -10,7 +10,7 @@ E50
 E50
 %%PORT_A%%
 %%PORT_O%%
-rtpa_nsent=453 rtpa_nrcvd=453 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
-rtpa_nsent=451 rtpa_nrcvd=451 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
+rtpa_nsent=463 rtpa_nrcvd=462 rtpa_ndups=0 rtpa_nlost=1 rtpa_perrs=0
+rtpa_nsent=461 rtpa_nrcvd=461 rtpa_ndups=0 rtpa_nlost=0 rtpa_perrs=0
 MEMDEB(rtpproxy): all clear
 %%CALL_ID%%=from_tag_1.pcap: 602