First checks of RTPCHECK and minor cleanup

Issue #483
SIPp · Sep 18, 2020 · a1664e5 · a1664e5
1 parent 4caf78e
commit a1664e5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 210 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,28 @@ Changes in 3.7.0
 (Nothing yet. Just added this to diverge from branch/3.6.)
 
 
+Features added in 3.7.0
+=======================
+
+* RTPCHECK code by Jeannot Langlois (@jeannotlanglois). Command line examples:
+    ```
+    # SET-SIDE (RTP)
+    ./sipp -m 1 -sf sipp_scenarios/pfca_uac_apattern.xml \
+      -t u1 -i 127.0.0.2 -p 5060 -mp 4000 127.0.0.3:5060
+    # ICP-SIDE (RTP)
+    ./sipp -m 1 -sf sipp_scenarios/pfca_uas.xml \
+      -i 127.0.0.3 -t u1 -p 5060 -mp 5000 -rtp_echo
+
+    # SET-SIDE (SRTP)
+    ./sipp -m 1 -sf sipp_scenarios/pfca_uac_bpattern_crypto_simple.xml \
+      -t u1 -i 127.0.0.2 -p 5060 -mp 4000 -rtpcheck_debug -srtpcheck_debug \
+      127.0.0.3:5060
+    # ICP-SIDE (SRTP)
+    ./sipp -m 1 -sf sipp_scenarios/pfca_uas_both_crypto_simple.xml \
+      -t u1 -i 127.0.0.3 -p 5060 -mp 5000 -srtpcheck_debug
+    ```
+
+
 BREAKING(!) changes in 3.6.1
 ============================
 

diff --git a/Makefile.am b/Makefile.am
diff --git a/commandlines.rtpcheck b/commandlines.rtpcheck
diff --git a/commandlines.srtpcheck b/commandlines.srtpcheck
diff --git a/sipp_scenarios/pfca_uas_both_crypto_simple.xml b/sipp_scenarios/pfca_uas_both_crypto_simple.xml
@@ -100,16 +100,16 @@
     ]]>
   </send>
 
+  <recv request="ACK">
+  </recv>
+
   <nop>
     <action>
         <exec rtp_echo="startaudio,0,PCMU/8000" />
         <exec rtp_echo="startvideo,99,H264/90000" />
     </action>
   </nop>
 
-  <recv request="ACK">
-  </recv>
-
   <nop>
     <action>
         <exec rtp_echo="updateaudio,0,PCMU/8000" />
@@ -119,7 +119,7 @@
 
   <recv request="BYE">
   </recv>
-  
+
   <send>
     <![CDATA[
       SIP/2.0 200 OK

diff --git a/src/call.cpp b/src/call.cpp
@@ -2709,7 +2709,8 @@ char* call::createSendingMessage(SendingMessage *src, int P_index, char *msg_buf
                     (_RCAST(struct sockaddr_in *, &(play_args_v.from)))->sin_port = port;
                 }
             } else {
-                ERROR("media_port keyword with no audio or video on the current line (%s)", begin);
+                // This check will not do, as we use the media_port in other places too.
+                //ERROR("media_port keyword with no audio or video on the current line (%s)", begin);
             }
 #endif
             dest += sprintf(dest, "%u", port);
@@ -2737,7 +2738,8 @@ char* call::createSendingMessage(SendingMessage *src, int P_index, char *msg_buf
             } else if (strstr(begin, "video")) {
                 play_args = &play_args_v;
             } else {
-                ERROR("media_port keyword with no audio or video on the current line (%s)", begin);
+                // This check will not do, as we use the media_port in other places too.
+                //ERROR("media_port keyword with no audio or video on the current line (%s)", begin);
             }
             if (media_ip_is_ipv6) {
                 (_RCAST(struct sockaddr_in6 *, &(play_args->from)))->sin6_port = htons(port);