Author: file Date: Fri Dec 12 07:08:03 2014 New Revision: 6084 URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=6084 Log: pjsip: Update blind transfer direct media tests to expect a re-INVITE and then BYE.
Previous behavior was such that a re-INVITE and BYE would be immediately received together. This has now changed to a more sane full re-INVITE transaction and then a BYE. Review: https://reviewboard.asterisk.org/r/4249/ Modified: asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/callee_direct_media/sipp/alice.xml asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/caller_direct_media/sipp/bob.xml Modified: asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/callee_direct_media/sipp/alice.xml URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/callee_direct_media/sipp/alice.xml?view=diff&rev=6084&r1=6083&r2=6084 ============================================================================== --- asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/callee_direct_media/sipp/alice.xml (original) +++ asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/callee_direct_media/sipp/alice.xml Fri Dec 12 07:08:03 2014 @@ -157,67 +157,20 @@ <!-- A re-INVITE will come from Asterisk to redirect media back to it - as Alice leaves the bridge. At the same time, Alice will get hung up. - Cache the needed values from the INVITE so we can handle both requets. + as Alice leaves the bridge. --> - <recv request="INVITE" crlf="true"> - <action> - <ereg regexp="(.*)" - header="Via:" - search_in="hdr" - check_it="true" - assign_to="reinvite_via"/> - <ereg regexp="(.*)" - header="From:" - search_in="hdr" - check_it="true" - assign_to="reinvite_from"/> - <ereg regexp="(.*)" - header="To:" - search_in="hdr" - check_it="true" - assign_to="reinvite_to"/> - <ereg regexp="(.*)" - header="Call-ID:" - search_in="hdr" - check_it="true" - assign_to="reinvite_call_id"/> - <ereg regexp="(.*)" - header="CSeq:" - search_in="hdr" - check_it="true" - assign_to="reinvite_cseq"/> - </action> - </recv> - - <recv request="BYE" /> - - <send> - <![CDATA[ - - SIP/2.0 200 OK - [last_Via:] - [last_From:] - [last_To:] - [last_Call-ID:] - [last_CSeq:] - Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]> - Content-Type: application/sdp - Content-Length: 0 - - ]]> - </send> - - <send retrans="500"> - <![CDATA[ - - SIP/2.0 200 OK - Via: [$reinvite_via] - From: [$reinvite_from] - To: [$reinvite_to] - Call-ID: [$reinvite_call_id] - CSeq: [$reinvite_cseq] - Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]> + <recv request="INVITE" crlf="true"/> + + <send retrans="500"> + <![CDATA[ + + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]> Content-Type: application/sdp Content-Length: [len] @@ -237,6 +190,24 @@ crlf="true"> </recv> + <recv request="BYE" /> + + <send> + <![CDATA[ + + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]> + Content-Type: application/sdp + Content-Length: 0 + + ]]> + </send> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> Modified: asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/caller_direct_media/sipp/bob.xml URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/caller_direct_media/sipp/bob.xml?view=diff&rev=6084&r1=6083&r2=6084 ============================================================================== --- asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/caller_direct_media/sipp/bob.xml (original) +++ asterisk/trunk/tests/channels/pjsip/transfers/blind_transfer/caller_direct_media/sipp/bob.xml Fri Dec 12 07:08:03 2014 @@ -157,66 +157,19 @@ <!-- A re-INVITE will come from Asterisk to redirect media back to it - as Bob leaves the bridge. At the same time, Bob will get hung up. - Cache the needed values from the INVITE so we can handle both requets. + as Bob leaves the bridge. --> - <recv request="INVITE" crlf="true"> - <action> - <ereg regexp="(.*)" - header="Via:" - search_in="hdr" - check_it="true" - assign_to="reinvite_via"/> - <ereg regexp="(.*)" - header="From:" - search_in="hdr" - check_it="true" - assign_to="reinvite_from"/> - <ereg regexp="(.*)" - header="To:" - search_in="hdr" - check_it="true" - assign_to="reinvite_to"/> - <ereg regexp="(.*)" - header="Call-ID:" - search_in="hdr" - check_it="true" - assign_to="reinvite_call_id"/> - <ereg regexp="(.*)" - header="CSeq:" - search_in="hdr" - check_it="true" - assign_to="reinvite_cseq"/> - </action> - </recv> - - <recv request="BYE" /> - - <send> - <![CDATA[ - - SIP/2.0 200 OK - [last_Via:] - [last_From:] - [last_To:] - [last_Call-ID:] - [last_CSeq:] - Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]> - Content-Type: application/sdp - Content-Length: 0 - - ]]> - </send> - - <send retrans="500"> - <![CDATA[ - - SIP/2.0 200 OK - Via: [$reinvite_via] - From: [$reinvite_from] - To: [$reinvite_to] - Call-ID: [$reinvite_call_id] - CSeq: [$reinvite_cseq] + <recv request="INVITE" crlf="true"/> + + <send retrans="500"> + <![CDATA[ + + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]> Content-Type: application/sdp Content-Length: [len] @@ -237,6 +190,24 @@ crlf="true"> </recv> + <recv request="BYE" /> + + <send> + <![CDATA[ + + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]> + Content-Type: application/sdp + Content-Length: 0 + + ]]> + </send> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
