[asterisk-commits] pabelanger: branch pabelanger/sipp r1081 - in /asterisk/team/pabelanger/sipp/...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Dec 6 15:08:07 CST 2010


Author: pabelanger
Date: Mon Dec  6 15:08:03 2010
New Revision: 1081

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1081
Log:
First round of XML updates

Modified:
    asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/sipp/uas.xml
    asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml
    asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml
    asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml
    asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/register.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
    asterisk/team/pabelanger/sipp/tests/sip/options/sipp/options.xml
    asterisk/team/pabelanger/sipp/tests/sip/options/sipp/options2.xml

Modified: asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/sipp/uas.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/sipp/uas.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/sipp/uas.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/sipp/uas.xml Mon Dec  6 15:08:03 2010
@@ -20,96 +20,91 @@
 <!--                                                                    -->
 
 <scenario name="Basic UAS responder">
-  <!-- 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.                             -->
-  <recv request="INVITE" crlf="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.                             -->
+    <recv request="INVITE" crlf="true"/>
 
-  <!-- The '[last_*]' keyword is replaced automatically by the          -->
-  <!-- specified header if it was present in the last message received  -->
-  <!-- (except if it was a retransmission). If the header was not       -->
-  <!-- present or if no message has been received, the '[last_*]'       -->
-  <!-- keyword is discarded, and all bytes until the end of the line    -->
-  <!-- are also discarded.                                              -->
-  <!--                                                                  -->
-  <!-- If the specified header was present several times in the         -->
-  <!-- message, all occurences are concatenated (CRLF seperated)        -->
-  <!-- to be used in place of the '[last_*]' keyword.                   -->
+    <!-- The '[last_*]' keyword is replaced automatically by the          -->
+    <!-- specified header if it was present in the last message received  -->
+    <!-- (except if it was a retransmission). If the header was not       -->
+    <!-- present or if no message has been received, the '[last_*]'       -->
+    <!-- keyword is discarded, and all bytes until the end of the line    -->
+    <!-- are also discarded.                                              -->
+    <!--                                                                  -->
+    <!-- If the specified header was present several times in the         -->
+    <!-- message, all occurences are concatenated (CRLF seperated)        -->
+    <!-- to be used in place of the '[last_*]' keyword.                   -->
 
-  <send>
-    <![CDATA[
+    <send>
+        <![CDATA[
 
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
+        SIP/2.0 180 Ringing
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[pid]SIPpTag01[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+        Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
+        SIP/2.0 200 OK
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[pid]SIPpTag01[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+        Content-Type: application/sdp
+        Content-Length: [len]
 
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-      a=sendrecv
+        v=0
+        o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+        s=-
+        c=IN IP[media_ip_type] [media_ip]
+        t=0 0
+        m=audio [media_port] RTP/AVP 0
+        a=rtpmap:0 PCMU/8000
+        a=sendrecv
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv request="ACK"
+    <recv request="ACK"
         rtd="true"
         crlf="true">
-  </recv>
+    </recv>
 
-  <recv request="BYE">
-  </recv>
+    <recv request="BYE"/>
 
-  <send>
-    <![CDATA[
+    <send>
+        <![CDATA[
 
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
+        SIP/2.0 200 OK
+        [last_Via:]
+        [last_From:]
+        [last_To:]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+        Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <!-- 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"/>
+    <!-- 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"/>
 
+    <!-- definition of the response time repartition table (unit is ms)   -->
+    <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
 
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
+    <!-- definition of the call length repartition table (unit is ms)     -->
+    <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml Mon Dec  6 15:08:03 2010
@@ -2,101 +2,95 @@
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
 <scenario name="DTMF TEST 1">
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Type: application/sdp
-      Content-Length: [len]
+        INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
+        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+        From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+        To: test <sip:test@[remote_ip]:[remote_port]>
+        Call-ID: [call_id]
+        CSeq: 1 INVITE
+        Contact: sip:test1@[local_ip]:[local_port]
+        Max-Forwards: 70
+        Subject: Performance Test
+        Content-Type: application/sdp
+        Content-Length: [len]
 
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
+        v=0
+        o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+        s=-
+        c=IN IP[media_ip_type] [media_ip]
+        t=0 0
+        m=audio [media_port] RTP/AVP 0 101
+        a=rtpmap:0 PCMU/8000
+        a=rtpmap:101 telephone-event/8000
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="100"
+    <recv response="100"
         optional="true">
-  </recv>
+    </recv>
 
-  <recv response="180" optional="true">
-  </recv>
+    <recv response="180" optional="true" />
 
-  <recv response="183" optional="true">
-  </recv>
+    <recv response="183" optional="true" />
 
-  <recv response="200" rtd="true">
-  </recv>
+    <recv response="200" rtd="true" />
 
-  <send>
-    <![CDATA[
+    <send>
+        <![CDATA[
 
-	  ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 1 ACK
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <!-- Brief pause before sending DTMF... -->
-  <pause milliseconds="500" />
+    <!-- Brief pause before sending DTMF... -->
+    <pause milliseconds="500" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/broken_dtmf.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/broken_dtmf.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <!-- Also, we have enough time to retrieve the value read -->
-  <pause milliseconds="1500" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <!-- Also, we have enough time to retrieve the value read -->
+    <pause milliseconds="1500" />
 
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:[test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:[test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 2 BYE
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="200" crlf="true">
-  </recv>
+    <recv response="200" crlf="true" />
 
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+    <!-- definition of the response time repartition table (unit is ms)   -->
+    <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200" />
 
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
+    <!-- definition of the call length repartition table (unit is ms)     -->
+    <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000" />
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml Mon Dec  6 15:08:03 2010
@@ -2,181 +2,175 @@
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
 <scenario name="DTMF TEST 1">
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Type: application/sdp
-      Content-Length: [len]
+            INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>
+            Call-ID: [call_id]
+            CSeq: 1 INVITE
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Type: application/sdp
+            Content-Length: [len]
 
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
+            v=0
+            o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+            s=-
+            c=IN IP[media_ip_type] [media_ip]
+            t=0 0
+            m=audio [media_port] RTP/AVP 0 101
+            a=rtpmap:0 PCMU/8000
+            a=rtpmap:101 telephone-event/8000
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="100"
+    <recv response="100"
         optional="true">
-  </recv>
+    </recv>
 
-  <recv response="180" optional="true">
-  </recv>
+    <recv response="180" optional="true" />
 
-  <recv response="183" optional="true">
-  </recv>
+    <recv response="183" optional="true" />
 
-  <recv response="200" rtd="true">
-  </recv>
+    <recv response="200" rtd="true" />
 
-  <send>
-    <![CDATA[
+    <send>
+        <![CDATA[
 
-	  ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 1 ACK
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <!-- Brief pause before sending DTMF... -->
-  <pause milliseconds="500" />
+    <!-- Brief pause before sending DTMF... -->
+    <pause milliseconds="500" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_1.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_1.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_2.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_2.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_3.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_3.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_4.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_4.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_5.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_5.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_6.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_6.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_7.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_7.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_8.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_8.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_9.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_9.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_star.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_star.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 2 BYE
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="200" crlf="true">
-  </recv>
+    <recv response="200" crlf="true" />
 
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+    <!-- definition of the response time repartition table (unit is ms)   -->
+    <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200" />
 
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
+    <!-- definition of the call length repartition table (unit is ms)     -->
+    <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000" />
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml Mon Dec  6 15:08:03 2010
@@ -2,126 +2,120 @@
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
 <scenario name="DTMF TEST 1">
-  <send retrans="500">
-    <![CDATA[
+    <send retrans="500">
+        <![CDATA[
 
-      INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Type: application/sdp
-      Content-Length: [len]
+            INVITE sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>
+            Call-ID: [call_id]
+            CSeq: 1 INVITE
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Type: application/sdp
+            Content-Length: [len]
 
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
+            v=0
+            o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+            s=-
+            c=IN IP[media_ip_type] [media_ip]
+            t=0 0
+            m=audio [media_port] RTP/AVP 0 101
+            a=rtpmap:0 PCMU/8000
+            a=rtpmap:101 telephone-event/8000
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="100"
+    <recv response="100"
         optional="true">
-  </recv>
+    </recv>
 
-  <recv response="180" optional="true">
-  </recv>
+    <recv response="180" optional="true" />
 
-  <recv response="183" optional="true">
-  </recv>
+    <recv response="183" optional="true" />
 
-  <recv response="200" rtd="true">
-  </recv>
+    <recv response="200" rtd="true" />
 
-  <send>
-    <![CDATA[
+    <send>
+        <![CDATA[
 
-	  ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 1 ACK
+            Contact: test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <!-- Brief pause before sending DTMF... -->
-  <pause milliseconds="500" />
+    <!-- Brief pause before sending DTMF... -->
+    <pause milliseconds="500" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_1_noend.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_1_noend.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_2_noend.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_2_noend.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_3_noend.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_3_noend.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
 
-  <nop>
-  	<action>
-		<exec play_pcap_audio="sipp/dtmf_2833_4.pcap" />
-	</action>
-  </nop>
+    <nop>
+        <action>
+            <exec play_pcap_audio="sipp/dtmf_2833_4.pcap" />
+        </action>
+    </nop>
 
-  <!-- This pause gives enough time to play the DTMF -->
-  <pause milliseconds="160" />
-  <send retrans="500">
-    <![CDATA[
+    <!-- This pause gives enough time to play the DTMF -->
+    <pause milliseconds="160" />
+    <send retrans="500">
+        <![CDATA[
 
-      BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Contact: sip:test1@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
+            BYE sip:test@[remote_ip]:[remote_port] SIP/2.0
+            Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+            From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+            To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+            Call-ID: [call_id]
+            CSeq: 2 BYE
+            Contact: sip:test1@[local_ip]:[local_port]
+            Max-Forwards: 70
+            Subject: Performance Test
+            Content-Length: 0
 
-    ]]>
-  </send>
+        ]]>
+    </send>
 
-  <recv response="200" crlf="true">
-  </recv>
+    <recv response="200" crlf="true" />
 
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+    <!-- definition of the response time repartition table (unit is ms)   -->
+    <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200" />
 
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
+    <!-- definition of the call length repartition table (unit is ms)     -->
+    <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000" />
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/register.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/register.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/register.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/sipp/register.xml Mon Dec  6 15:08:03 2010
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-
 <!--
 This scenario will execute a sip register with the given parameters.
 -->
+<scenario name="Register">
+    <send retrans="500">
+        <![CDATA[
 
+        REGISTER sip:test1@[remote_ip]:[remote_port] SIP/2.0
+        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+        From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
+        To: test1 <sip:test1@[remote_ip]:[remote_port]>
+        Call-ID: [call_id]
+        CSeq: 1 REGISTER
+        Contact: sip:test1@[local_ip]:[local_port]
+        Content-Length: 0
+        Expires: 120
 
-<scenario name="Register">
-	<send retrans="500">
-		<![CDATA[
+        ]]>
+    </send>
 
-		REGISTER sip:test1@[remote_ip]:[remote_port] SIP/2.0
-		Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-		From: test1 <sip:test1@[local_ip]:[local_port]>;tag=[call_number]
-		To: test1 <sip:test1@[remote_ip]:[remote_port]>
-		Call-ID: [call_id]
-		CSeq: 1 REGISTER
-		Contact: sip:test1@[local_ip]:[local_port]
-		Content-Length: 0
-		Expires: 120
-
-		]]>
-	</send>
-
-	<recv response="100" optional="true" />
-	<recv response="200"/>
-
+    <recv response="100" optional="true" />
+    <recv response="200" />
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml Mon Dec  6 15:08:03 2010
@@ -1,107 +1,91 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="wait for a call followed by a refer">
+    <Global variables="file,user"/>
+    <nop>
+        <action>
+            <lookup assign_to="line" file="[$file]" key="[$user]"/>
+        </action>
+    </nop>
+    <Reference variables="file,user"/>
+    <recv request="INVITE" crlf="true"/>
+    <send>
+        <![CDATA[
 
-	<Global variables="file,user"/>
-	<nop>
-		<action>
-			<lookup assign_to="line" file="[$file]" key="[$user]"/>
-		</action>
-	</nop>
-	<Reference variables="file,user"/>
+        SIP/2.0 180 Ringing
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-	<recv request="INVITE" crlf="true"/>
+        ]]>
+    </send>
+    <send>
+        <![CDATA[
+        SIP/2.0 200 OK
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-	<send>
-		<![CDATA[
+        ]]>
+    </send>
+    <recv request="ACK" optional="false"/>
+    <recv request="REFER" optional="false"/>
+    <send>
+        <![CDATA[
 
-		SIP/2.0 180 Ringing
-		[last_Via:]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		[last_CSeq:]
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Content-Length: 0
+        SIP/2.0 200 Ok
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-		]]>
-	</send>
+        ]]>
+    </send>
+    <send>
+        <![CDATA[
 
-	<send>
-		<![CDATA[
+        NOTIFY sip:[field0 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        CSeq: 1 NOTIFY
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Max-Forwards: 70
+        Subscription-state: terminated;reason=noresource
+        Content-Type: message/sipfrag;version=2.0
+        Content-Length: [len]
+        Event: refer;id=103
 
-		SIP/2.0 200 OK
-		[last_Via:]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		[last_CSeq:]
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Content-Length: 0
+        SIP/2.0 [field1 line="[$line]"]
 
-		]]>
-	</send>
-	
-	<recv request="ACK" optional="false"/>
+        ]]>
+    </send>
+    <recv response="200" optional="false"/>
+    <recv request="BYE" optional="false"/>
+    <send>
+        <![CDATA[
 
-	<recv request="REFER" optional="false"/>
-	
-	<send>
-		<![CDATA[
+        SIP/2.0 200 OK
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-		SIP/2.0 200 Ok
-		[last_Via:]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		[last_CSeq:]
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Content-Length: 0
-
-		]]>
-	</send>
-
-	<send>
-		<![CDATA[
-		
-		NOTIFY sip:[field0 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
-		Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		CSeq: 1 NOTIFY
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Max-Forwards: 70
-		Subscription-state: terminated;reason=noresource
-		Content-Type: message/sipfrag;version=2.0
-		Content-Length: [len]
-		Event: refer;id=103
-
-		SIP/2.0 [field1 line="[$line]"]
-
-		]]>
-	</send>
-	
-	<recv response="200" optional="false"/>
-
-
-	<recv request="BYE" optional="false"/>
-
-	<send>
-		<![CDATA[
-
-		SIP/2.0 200 OK
-		[last_Via:]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		[last_CSeq:]
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Content-Length: 0
-
-		]]>
-	</send>
-
-
+        ]]>
+    </send>
 </scenario>
-

Modified: asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml?view=diff&rev=1081&r1=1080&r2=1081
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml Mon Dec  6 15:08:03 2010
@@ -1,107 +1,92 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="wait for a call followed by a refer">
+    <Global variables="file,user"/>
+    <nop>
+        <action>
+            <lookup assign_to="line" file="[$file]" key="[$user]"/>
+        </action>
+    </nop>
+    <Reference variables="file,user"/>
+    <recv request="INVITE" crlf="true"/>
+    <send>
+        <![CDATA[
 
-	<Global variables="file,user"/>
-	<nop>
-		<action>
-			<lookup assign_to="line" file="[$file]" key="[$user]"/>
-		</action>
-	</nop>
-	<Reference variables="file,user"/>
+        SIP/2.0 180 Ringing
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-	<recv request="INVITE" crlf="true"/>
+        ]]>
+    </send>
+    <send>
+        <![CDATA[
 
-	<send>
-		<![CDATA[
+        SIP/2.0 200 OK
+        [last_Via:]
+        [last_From:]
+        [last_To:];tag=[call_number]
+        [last_Call-ID:]
+        [last_CSeq:]
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Content-Length: 0
 
-		SIP/2.0 180 Ringing
-		[last_Via:]
-		[last_From:]
-		[last_To:];tag=[call_number]
-		[last_Call-ID:]
-		[last_CSeq:]
-		Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
-		Content-Length: 0
+        ]]>
+    </send>
+    <recv request="ACK" optional="false"/>
+    <recv request="REFER" optional="false"/>
+    <send>
+        <![CDATA[
 

[... 1081 lines stripped ...]



More information about the asterisk-commits mailing list