docs: Update XML files to the most recent builtin versions.

ls *.xml | sed -e 's/....$//' | while read x; do ../sipp -sd $x >$x.xml; done
litkinger · Apr 11, 2017 · 58b46cc · 58b46cc
1 parent f11af31
commit 58b46cc
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 57 deletions.
diff --git a/docs/3pcc-A.xml b/docs/3pcc-A.xml
@@ -46,7 +46,7 @@
       SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag05[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -87,7 +87,7 @@
 
   <!-- Keep the call open for a while in case the 200 is lost to be     -->
   <!-- able to retransmit it if we receive the BYE again.               -->
-  <pause milliseconds="2000"/>
+  <timewait milliseconds="2000"/>
 
 </scenario>
 
diff --git a/docs/3pcc-B.xml b/docs/3pcc-B.xml
@@ -46,7 +46,7 @@
       SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag06[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -87,6 +87,6 @@
 
   <!-- Keep the call open for a while in case the 200 is lost to be     -->
   <!-- able to retransmit it if we receive the BYE again.               -->
-  <pause milliseconds="2000"/>
+  <timewait milliseconds="2000"/>
 
 </scenario>
diff --git a/docs/3pcc-C-A.xml b/docs/3pcc-C-A.xml
@@ -41,8 +41,8 @@
 
       INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag03[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -55,11 +55,12 @@
 
   <recv response="100" optional="true"> </recv>
   <recv response="180" optional="true"> </recv>
+  <recv response="183" optional="true"> </recv>
   <recv response="200" crlf="true" start_rtd="true">
     <action>
        <ereg regexp="Content-Type:.*" 
              search_in="msg"  
-             assign_to="1"/> 
+             assign_to="1" /> 
     </action>
   </recv>
 
@@ -75,7 +76,7 @@
     <action>
        <ereg regexp="Content-Type:.*"  
              search_in="msg"  
-             assign_to="2"/>
+             assign_to="2" /> 
     </action>
 
   </recvCmd>
@@ -85,8 +86,8 @@
 
       ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag03[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -105,8 +106,8 @@
 
       BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag03[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE
       Contact: sip:sipp@[local_ip]:[local_port]

diff --git a/docs/3pcc-C-B.xml b/docs/3pcc-C-B.xml
@@ -42,7 +42,7 @@
   <action>
        <ereg regexp="Content-Type:.*"  
              search_in="msg"  
-             assign_to="1"/>
+             assign_to="1" /> 
   </action>
 </recvCmd>
 
@@ -51,8 +51,8 @@
 
       INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag04[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -65,11 +65,12 @@
 
   <recv response="100" optional="true"> </recv>
   <recv response="180" optional="true"> </recv>
+  <recv response="183" optional="true"> </recv>
   <recv response="200" crlf="true">
     <action>
        <ereg regexp="Content-Type:.*"  
              search_in="msg"  
-             assign_to="2"/>
+             assign_to="2" /> 
     </action>
   </recv>
 
@@ -79,8 +80,8 @@
 
       ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag04[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -108,8 +109,8 @@
 
       BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag04[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE
       Contact: sip:sipp@[local_ip]:[local_port]

diff --git a/docs/branchc.xml b/docs/branchc.xml
@@ -25,7 +25,7 @@
 
       REGISTER sip:CA.cym.com SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: ua1 <sip:[email protected]:[local_port]>;tag=[call_number]
+      From: ua1 <sip:[email protected]:[local_port]>;tag=[pid]SIPpTag07[call_number]
       To: ua1 <sip:[email protected]:[local_port]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
@@ -50,7 +50,7 @@
 
       INVITE sip:[email protected] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: ua[call_number] <sip:[email protected]:[local_port]>;tag=[call_number]
+      From: ua[call_number] <sip:[email protected]:[local_port]>;tag=[pid]SIPpTag07b[call_number]
       To: ua2 <sip:[email protected]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
@@ -77,6 +77,9 @@
   <recv response="180" optional="true">
   </recv>
 
+  <recv response="183" optional="true">
+  </recv>
+
   <!-- Do something different on an optional receive   -->
   <recv response="403" optional="true" next="1">
   </recv>
@@ -96,7 +99,7 @@
 
       ACK sip:[email protected] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: ua1 <sip:[email protected]:[local_port]>;tag=[call_number]
+      From: ua1 <sip:[email protected]:[local_port]>;tag=[pid]SIPpTag07b[call_number]
       To: ua2 <sip:[email protected]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
@@ -117,7 +120,7 @@
 
       BYE sip:[email protected] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: ua1 <sip:[email protected]:[local_port]>;tag=[call_number]
+      From: ua1 <sip:[email protected]:[local_port]>;tag=[pid]SIPpTag07b[call_number]
       To: ua2 <sip:[email protected]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE

diff --git a/docs/branchs.xml b/docs/branchs.xml
@@ -29,7 +29,7 @@
       SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag08[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -56,7 +56,7 @@
       SIP/2.0 180 Ringing
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag08b[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -72,7 +72,7 @@
       SIP/2.0 403 Error
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag08b[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -89,7 +89,7 @@
       SIP/2.0 100 Trying
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag08b[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -104,18 +104,18 @@
       SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:];tag=[pid]SIPpTag08b[call_number]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
       Content-Type: application/sdp
-      Content-Length: 136
+      Content-Length: [len]
 
       v=0
-      o=user1 53655765 2353687637 IN IP4 127.0.0.1
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
       s=-
+      c=IN IP[media_ip_type] [media_ip]
       t=0 0
-      c=IN IP4 [media_ip]
       m=audio [media_port] RTP/AVP 0
       a=rtpmap:0 PCMU/8000
 
@@ -139,7 +139,7 @@
       SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
-      [last_To:];tag=[call_number]
+      [last_To:]
       [last_Call-ID:]
       [last_CSeq:]
       Contact: <sip:[local_ip]:[local_port];transport=[transport]>
@@ -150,7 +150,7 @@
 
   <!-- Keep the call open for a while in case the 200 is lost to be     -->
   <!-- able to retransmit it if we receive the BYE again.               -->
-  <pause milliseconds="4000"/>
+  <timewait milliseconds="4000"/>
 
   <!-- Definition of the response time repartition table (unit is ms)   -->
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>

diff --git a/docs/regexp.xml b/docs/regexp.xml
@@ -25,8 +25,8 @@
 
       INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag02[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -52,6 +52,8 @@
 
   <recv response="180" optional="true">
   </recv>
+  <recv response="183" optional="true">
+  </recv>
 
   <recv response="200" start_rtd="true">
     <!-- Definition of regexp in the action tag. The regexp must follow -->
@@ -100,8 +102,8 @@
     <![CDATA[
       ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag02[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       retrievedIp: [$1]
@@ -127,8 +129,8 @@
 
       BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag02[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE
       Contact: sip:sipp@[local_ip]:[local_port]

diff --git a/docs/uac.xml b/docs/uac.xml
@@ -27,8 +27,8 @@
 
       INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -55,6 +55,9 @@
   <recv response="180" optional="true">
   </recv>
 
+  <recv response="183" optional="true">
+  </recv>
+
   <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
   <!-- are saved and used for following messages sent. Useful to test   -->
   <!-- against stateful SIP proxies/B2BUAs.                             -->
@@ -68,8 +71,8 @@
 
       ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -90,8 +93,8 @@
 
       BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE
       Contact: sip:sipp@[local_ip]:[local_port]

diff --git a/docs/uac_pcap.xml b/docs/uac_pcap.xml
@@ -27,8 +27,8 @@
 
       INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -42,7 +42,7 @@
       s=-
       c=IN IP[local_ip_type] [local_ip]
       t=0 0
-      m=audio [auto_media_port] RTP/AVP 8
+      m=audio [auto_media_port] RTP/AVP 8 101
       a=rtpmap:8 PCMA/8000
       a=rtpmap:101 telephone-event/8000
       a=fmtp:101 0-11,16
@@ -69,8 +69,8 @@
 
       ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:sipp@[local_ip]:[local_port]
@@ -107,8 +107,8 @@
 
       BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 BYE
       Contact: sip:sipp@[local_ip]:[local_port]