[Asterisk-code-review] Changes for actual ignore uri user options tests. (testsuite[master])
Anonymous Coward
asteriskteam at digium.com
Fri Sep 23 17:38:40 CDT 2016
Anonymous Coward #1000019 has submitted this change and it was merged.
Change subject: Changes for actual ignore_uri_user_options tests.
......................................................................
Changes for actual ignore_uri_user_options tests.
.../basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options
.../basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options
.../basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options
.../diversion/diversion_basic_drop_options
.../diversion/diversion_request_drop_options
.../diversion/diversion_response_drop_options
.../handle_options_request_drop_options
.../message/message_basic_drop_options
.../registration/inbound/nominal/multiple_contacts/unauthed_drop_options
.../registration/inbound/nominal/single_contact/unauthed_drop_options
.../subscriptions/mwi/sub_setup_teardown_drop_options
.../transfers/blind_transfer/caller_with_hold_drop_options
ASTERISK-26316
Reported by: Kevin Harwell
Change-Id: Id98328bd0aeadbb2179c1f0d0b0e5d45c50f3e6e
---
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/test-config.yaml
M tests/channels/pjsip/diversion/diversion_basic_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user1.xml
M tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user2.xml
M tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user3.xml
M tests/channels/pjsip/diversion/diversion_basic_drop_options/test-config.yaml
M tests/channels/pjsip/diversion/diversion_request_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user1.xml
M tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user2.xml
M tests/channels/pjsip/diversion/diversion_request_drop_options/test-config.yaml
M tests/channels/pjsip/diversion/diversion_response_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user1.xml
M tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user2.xml
M tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user3.xml
M tests/channels/pjsip/diversion/diversion_response_drop_options/test-config.yaml
M tests/channels/pjsip/handle_options_request_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/handle_options_request_drop_options/sipp/options_200.xml
M tests/channels/pjsip/handle_options_request_drop_options/sipp/options_404.xml
M tests/channels/pjsip/handle_options_request_drop_options/test-config.yaml
M tests/channels/pjsip/message/message_basic_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/message/message_basic_drop_options/sipp/message.xml
M tests/channels/pjsip/message/message_basic_drop_options/test-config.yaml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/test-config.yaml
M tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/test-config.yaml
M tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/sipp/mwi_subscription.xml
M tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/test-config.yaml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/configs/ast1/pjsip.conf
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/alice.xml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/bob.xml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/charlie.xml
M tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
54 files changed, 377 insertions(+), 341 deletions(-)
Approvals:
George Joseph: Looks good to me, approved
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, but someone else must approve
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/configs/ast1/pjsip.conf
index 802cf5c..5c2f11f 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/configs/ast1/pjsip.conf
@@ -51,3 +51,6 @@
auth_type=md5
md5_cred=c9b9e23e2160fd69b19f99116da19711
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
index 2148931..c2975cf 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -25,13 +25,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -42,13 +42,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -67,13 +67,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
@@ -95,13 +95,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 3 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
index 39fb61f..8ea0a5c 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -35,13 +35,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -52,13 +52,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -86,13 +86,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
@@ -105,13 +105,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 3 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
index 56542d1..97e8102 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -25,13 +25,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -42,13 +42,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -67,13 +67,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
index a5570f0..e5a41af 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -35,13 +35,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -52,13 +52,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -87,13 +87,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/test-config.yaml
index bef0a55..de712c7 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user_drop_options/test-config.yaml
@@ -70,7 +70,7 @@
- { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- sipp :
version : 'v3.0'
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/configs/ast1/pjsip.conf
index 9732121..9a22e4a 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/configs/ast1/pjsip.conf
@@ -50,3 +50,6 @@
username=alice
password=swordfish
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
index 2148931..c2975cf 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -25,13 +25,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -42,13 +42,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -67,13 +67,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
@@ -95,13 +95,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 3 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
index 39fb61f..8ea0a5c 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -35,13 +35,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -52,13 +52,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -86,13 +86,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
@@ -105,13 +105,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 3 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
index 56542d1..97e8102 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -25,13 +25,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -42,13 +42,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -67,13 +67,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
index a5570f0..e5a41af 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -35,13 +35,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: sipp <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: sut <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:sipp@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:sipp;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
@@ -52,13 +52,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 2 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
[authentication username=alice password=swordfish]
Subject: Test
@@ -87,13 +87,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/test-config.yaml
index bef0a55..de712c7 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user_drop_options/test-config.yaml
@@ -70,7 +70,7 @@
- { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- sipp :
version : 'v3.0'
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/configs/ast1/pjsip.conf
index 8952928..2c36d2b 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/configs/ast1/pjsip.conf
@@ -43,3 +43,6 @@
[alice-ipv6-tcp](endpoint-template-ipv6)
transport=local-transport-tcp6
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
index 5d5e8bb..0807d62 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -29,13 +29,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
@@ -57,13 +57,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
index 1790d39..76c9a0f 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/echo_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -39,13 +39,13 @@
<send>
<![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
@@ -58,13 +58,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:echo@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:echo;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
index b40d318..0c7ecfb 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_deferred_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -29,13 +29,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Type: application/sdp
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
index 790992f..efdcc2c 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/sipp/playback_with_initial_sdp.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
User-Agent: Test
@@ -39,13 +39,13 @@
<send>
<![CDATA[
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:playback;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: test1 <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: test <sip:test;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
Call-ID: [call_id]
CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:test;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Subject: Test
Content-Length: 0
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/test-config.yaml
index 97579a6..33f8b1c 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_drop_options/test-config.yaml
@@ -38,7 +38,7 @@
- { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- sipp :
version : 'v3.0'
diff --git a/tests/channels/pjsip/diversion/diversion_basic_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/diversion/diversion_basic_drop_options/configs/ast1/pjsip.conf
index 144b2d4..10d6cac 100644
--- a/tests/channels/pjsip/diversion/diversion_basic_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/diversion/diversion_basic_drop_options/configs/ast1/pjsip.conf
@@ -38,3 +38,7 @@
direct_media=no
disallow=all
allow=ulaw
+
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user1.xml b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user1.xml
index a7c8dda..76e38c4 100644
--- a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user1.xml
+++ b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user1.xml
@@ -3,13 +3,13 @@
<scenario name="send an invite to user2">
<send retrans="500">
<![CDATA[
- INVITE sip:user2@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:user2;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: user1 <sip:user1@[local_ip]:[local_port]>;tag=[call_number]
- To: user2 <sip:user2@[remote_ip]:[remote_port]>
+ From: user1 <sip:user1;phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: user2 <sip:user2;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: [cseq] INVITE
- Contact: sip:user1@[local_ip]:[local_port]
+ Contact: sip:user1;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Content-Type: application/sdp
Content-Length: [len]
@@ -39,10 +39,10 @@
<send>
<![CDATA[
- ACK sip:user3@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:user3;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user3@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user3;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] ACK
Call-ID: [call_id]
Max-Forwards: 70
@@ -53,10 +53,10 @@
<pause milliseconds="3000"/>
<send retrans="500">
<![CDATA[
- BYE sip:user3@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:user3;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user3@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user3;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] BYE
Call-ID: [call_id]
Max-Forwards: 70
diff --git a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user2.xml b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user2.xml
index da9b1fa..24d5655 100644
--- a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user2.xml
+++ b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user2.xml
@@ -11,7 +11,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]>
+ Contact: <sip:user3;phone-context=national@[local_ip]>
Content-Length: 0
]]>
</send>
diff --git a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user3.xml b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user3.xml
index 05293d8..947dd19 100644
--- a/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user3.xml
+++ b/tests/channels/pjsip/diversion/diversion_basic_drop_options/sipp/user3.xml
@@ -17,7 +17,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -30,7 +30,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -43,7 +43,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Type: application/sdp
Content-Length: [len]
diff --git a/tests/channels/pjsip/diversion/diversion_basic_drop_options/test-config.yaml b/tests/channels/pjsip/diversion/diversion_basic_drop_options/test-config.yaml
index 3219207..4bf768b 100644
--- a/tests/channels/pjsip/diversion/diversion_basic_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/diversion/diversion_basic_drop_options/test-config.yaml
@@ -5,7 +5,7 @@
'user1 calls user2 which is set to forward calls to user3.'
properties:
- minversion: '12'
+ minversion: '13.12.0'
dependencies:
- app : 'sipp'
- asterisk : 'app_dial'
diff --git a/tests/channels/pjsip/diversion/diversion_request_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/diversion/diversion_request_drop_options/configs/ast1/pjsip.conf
index 144b2d4..10d6cac 100644
--- a/tests/channels/pjsip/diversion/diversion_request_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/diversion/diversion_request_drop_options/configs/ast1/pjsip.conf
@@ -38,3 +38,7 @@
direct_media=no
disallow=all
allow=ulaw
+
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user1.xml b/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user1.xml
index be9d3ac..9f84124 100644
--- a/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user1.xml
+++ b/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user1.xml
@@ -3,15 +3,15 @@
<scenario name="send an invite to user2">
<send retrans="500">
<![CDATA[
- INVITE sip:user2@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:user2;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: user1 <sip:user1@[local_ip]:[local_port]>;tag=[call_number]
- To: user2 <sip:user2@[remote_ip]:[remote_port]>
+ From: user1 <sip:user1;phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: user2 <sip:user2;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: [cseq] INVITE
- Contact: sip:user1@[local_ip]:[local_port]
+ Contact: sip:user1;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
- Diversion: <sip:amenhotep at 127.0.0.1>;reason=unconditional
+ Diversion: <sip:amenhotep;phone-context=national at 127.0.0.1>;reason=unconditional
Content-Type: application/sdp
Content-Length: [len]
@@ -40,10 +40,10 @@
<send>
<![CDATA[
- ACK sip:user2@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:user2;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user2@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user2;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] ACK
Call-ID: [call_id]
Max-Forwards: 70
@@ -54,10 +54,10 @@
<send retrans="500">
<![CDATA[
- BYE sip:user2@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:user2;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user2@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user2;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] BYE
Call-ID: [call_id]
Max-Forwards: 70
diff --git a/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user2.xml b/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user2.xml
index c6b1b39..3e0e306 100644
--- a/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user2.xml
+++ b/tests/channels/pjsip/diversion/diversion_request_drop_options/sipp/user2.xml
@@ -17,7 +17,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user2@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user2;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -30,7 +30,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user2@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user2;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -43,7 +43,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user2@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user2;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Type: application/sdp
Content-Length: [len]
diff --git a/tests/channels/pjsip/diversion/diversion_request_drop_options/test-config.yaml b/tests/channels/pjsip/diversion/diversion_request_drop_options/test-config.yaml
index 9fc1d17..00b0027 100644
--- a/tests/channels/pjsip/diversion/diversion_request_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/diversion/diversion_request_drop_options/test-config.yaml
@@ -5,7 +5,7 @@
'user1 calls user2 with an invite containing a diversion header.'
properties:
- minversion: '12'
+ minversion: '13.12.0'
dependencies:
- app : 'sipp'
- asterisk : 'app_dial'
diff --git a/tests/channels/pjsip/diversion/diversion_response_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/diversion/diversion_response_drop_options/configs/ast1/pjsip.conf
index 144b2d4..10d6cac 100644
--- a/tests/channels/pjsip/diversion/diversion_response_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/diversion/diversion_response_drop_options/configs/ast1/pjsip.conf
@@ -38,3 +38,7 @@
direct_media=no
disallow=all
allow=ulaw
+
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user1.xml b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user1.xml
index cae005c..ea2a82f 100644
--- a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user1.xml
+++ b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user1.xml
@@ -3,13 +3,13 @@
<scenario name="send an invite to user2">
<send retrans="500">
<![CDATA[
- INVITE sip:user2@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:user2;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: user1 <sip:user1@[local_ip]:[local_port]>;tag=[call_number]
- To: user2 <sip:user2@[remote_ip]:[remote_port]>
+ From: user1 <sip:user1;phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: user2 <sip:user2;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: [cseq] INVITE
- Contact: sip:user1@[local_ip]:[local_port]
+ Contact: sip:user1;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Content-Type: application/sdp
Content-Length: [len]
@@ -39,10 +39,10 @@
<send>
<![CDATA[
- ACK sip:user3@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:user3;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user3@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user3;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] ACK
Call-ID: [call_id]
Max-Forwards: 70
@@ -53,10 +53,10 @@
<send retrans="500">
<![CDATA[
- BYE sip:user3@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:user3;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:user1@[local_ip]>;tag=[call_number]
- To: <sip:user3@[remote_ip]:[remote_port]>[peer_tag_param]
+ From: <sip:user1;phone-context=national@[local_ip]>;tag=[call_number]
+ To: <sip:user3;phone-context=national@[remote_ip]:[remote_port]>[peer_tag_param]
CSeq: [cseq] BYE
Call-ID: [call_id]
Max-Forwards: 70
diff --git a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user2.xml b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user2.xml
index 3e5946c..ce4e803 100644
--- a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user2.xml
+++ b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user2.xml
@@ -11,8 +11,8 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]>
- Diversion: <sip:amenhotep at 127.0.0.1>;reason=unconditional
+ Contact: <sip:user3;phone-context=national@[local_ip]>
+ Diversion: <sip:amenhotep;phone-context=national at 127.0.0.1>;reason=unconditional
Content-Length: 0
]]>
</send>
diff --git a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user3.xml b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user3.xml
index 43a4788..a1e70df 100644
--- a/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user3.xml
+++ b/tests/channels/pjsip/diversion/diversion_response_drop_options/sipp/user3.xml
@@ -17,7 +17,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -30,7 +30,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
</send>
@@ -43,7 +43,7 @@
[last_To:];tag=[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:user3@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:user3;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Type: application/sdp
Content-Length: [len]
diff --git a/tests/channels/pjsip/diversion/diversion_response_drop_options/test-config.yaml b/tests/channels/pjsip/diversion/diversion_response_drop_options/test-config.yaml
index 4ce6052..4f86f55 100644
--- a/tests/channels/pjsip/diversion/diversion_response_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/diversion/diversion_response_drop_options/test-config.yaml
@@ -7,7 +7,7 @@
response coming from user2 contains a diversion header.'
properties:
- minversion: '12'
+ minversion: '13.12.0'
dependencies:
- app : 'sipp'
- asterisk : 'app_dial'
diff --git a/tests/channels/pjsip/handle_options_request_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/handle_options_request_drop_options/configs/ast1/pjsip.conf
index 87f889e..03dff99 100644
--- a/tests/channels/pjsip/handle_options_request_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/handle_options_request_drop_options/configs/ast1/pjsip.conf
@@ -6,3 +6,7 @@
[sipp]
type=endpoint
context=default
+
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_200.xml b/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_200.xml
index 3f0e075..e0eb646 100644
--- a/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_200.xml
+++ b/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_200.xml
@@ -4,13 +4,13 @@
<scenario name="UAC OPTIONS">
<send retrans="500"> <![CDATA[
- OPTIONS sip:1234@[remote_ip]:[remote_port] SIP/2.0
+ OPTIONS sip:1234;phone-context=national@[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: Asterisk <sip:1234@[remote_ip]:[remote_port]>
+ From: sipp <sip:sipp;phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: Asterisk <sip:1234;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 OPTIONS
- Contact: sip:sipp@[local_ip]:[local_port]
+ Contact: sip:sipp;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Subject: Asterisk Testsuite
Content-Length: [len]
diff --git a/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_404.xml b/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_404.xml
index a67ec81..1eb757b 100644
--- a/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_404.xml
+++ b/tests/channels/pjsip/handle_options_request_drop_options/sipp/options_404.xml
@@ -4,13 +4,13 @@
<scenario name="UAC OPTIONS">
<send retrans="500"> <![CDATA[
- OPTIONS sip:5555@[remote_ip]:[remote_port] SIP/2.0
+ OPTIONS sip:5555;phone-context=national@[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: Asterisk <sip:5555@[remote_ip]:[remote_port]>
+ From: sipp <sip:sipp;phone-context=national@[local_ip]:[local_port]>;tag=[call_number]
+ To: Asterisk <sip:5555;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 OPTIONS
- Contact: sip:sipp@[local_ip]:[local_port]
+ Contact: sip:sipp;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Subject: Asterisk Testsuite
Content-Length: [len]
diff --git a/tests/channels/pjsip/handle_options_request_drop_options/test-config.yaml b/tests/channels/pjsip/handle_options_request_drop_options/test-config.yaml
index ec3cf66..392926e 100644
--- a/tests/channels/pjsip/handle_options_request_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/handle_options_request_drop_options/test-config.yaml
@@ -20,7 +20,7 @@
# TODO: Test authentication of OPTION request
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- sipp :
version : 'v3.0'
diff --git a/tests/channels/pjsip/message/message_basic_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/message/message_basic_drop_options/configs/ast1/pjsip.conf
index 01434aa..046fff7 100644
--- a/tests/channels/pjsip/message/message_basic_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/message/message_basic_drop_options/configs/ast1/pjsip.conf
@@ -32,3 +32,7 @@
direct_media=no
disallow=all
allow=ulaw
+
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/message/message_basic_drop_options/sipp/message.xml b/tests/channels/pjsip/message/message_basic_drop_options/sipp/message.xml
index a9a5176..9371f30 100644
--- a/tests/channels/pjsip/message/message_basic_drop_options/sipp/message.xml
+++ b/tests/channels/pjsip/message/message_basic_drop_options/sipp/message.xml
@@ -4,10 +4,10 @@
<send retrans="500">
<![CDATA[
- MESSAGE sip:user1@[remote_ip]:[remote_port] SIP/2.0
+ MESSAGE sip:user1;phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: user <sip:user@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: <sip:user1@[remote_ip]:[remote_port]>
+ From: user <sip:user;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: <sip:user1;phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 MESSAGE
Max-Forwards: 70
diff --git a/tests/channels/pjsip/message/message_basic_drop_options/test-config.yaml b/tests/channels/pjsip/message/message_basic_drop_options/test-config.yaml
index dda35d1..e12c4a1 100644
--- a/tests/channels/pjsip/message/message_basic_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/message/message_basic_drop_options/test-config.yaml
@@ -5,7 +5,7 @@
application MessageSend to send a MESSAGE to a receiver.'
properties:
- minversion: '12'
+ minversion: '13.12.0'
dependencies:
- app : 'sipp'
- asterisk : 'res_pjsip'
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/configs/ast1/pjsip.conf
index 9a86ca1..08ac9c6 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/configs/ast1/pjsip.conf
@@ -59,3 +59,6 @@
minimum_expiration=5
default_expiration=30
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv4.xml
index 7443679..0872a52 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv4.xml
@@ -8,13 +8,13 @@
REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "[service]" <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 REGISTER
Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office at 127.0.0.2:5062>;transport=[transport]
- Contact: "[service]" <sip:[service]-home at 127.0.0.3:5063>;transport=[transport]
+ Contact: "[service]" <sip:[service]-office;phone-context=national at 127.0.0.2:5062>;transport=[transport]
+ Contact: "[service]" <sip:[service]-home;phone-context=national at 127.0.0.3:5063>;transport=[transport]
Subject: Performance Test
Expires: 10
Content-Length: 0
@@ -27,8 +27,8 @@
<!--
ensure the received expires parameters are what was sent in the expires header with a 5 second tolerance
-->
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at 127.0.0.2:5062>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at 127.0.0.3:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office;phone-context=national at 127.0.0.2:5062>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home;phone-context=national at 127.0.0.3:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
@@ -42,13 +42,13 @@
REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "[service]" <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 REGISTER
Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office at 127.0.0.2:5062>;transport=[transport];expires=15
- Contact: "[service]" <sip:[service]-home at 127.0.0.3:5063>;transport=[transport];expires=20
+ Contact: "[service]" <sip:[service]-office;phone-context=national at 127.0.0.2:5062>;transport=[transport];expires=15
+ Contact: "[service]" <sip:[service]-home;phone-context=national at 127.0.0.3:5063>;transport=[transport];expires=20
Subject: Performance Test
Expires: 10
Content-Length: 0
@@ -61,8 +61,8 @@
<!--
Ensure the received expires parameters are what was sent in the expires parameters with a 5 second tolerance
-->
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at 127.0.0.2:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="3"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at 127.0.0.3:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="4" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office;phone-context=national at 127.0.0.2:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home;phone-context=national at 127.0.0.3:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="4" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv6.xml
index 6239986..467ce19 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/sipp/register-noauth-multi-contact-expiry-ipv6.xml
@@ -8,13 +8,13 @@
REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "[service]" <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 REGISTER
Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office@[customip1]:5062>;transport=[transport]
- Contact: "[service]" <sip:[service]-home@[customip2]:5063>;transport=[transport]
+ Contact: "[service]" <sip:[service]-office;phone-context=national@[customip1]:5062>;transport=[transport]
+ Contact: "[service]" <sip:[service]-home;phone-context=national@[customip2]:5063>;transport=[transport]
Subject: Performance Test
Expires: 10
Content-Length: 0
@@ -27,8 +27,8 @@
<!--
ensure the received expires parameters are what was sent in the expires header with a 5 second tolerance
-->
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at .::2.:5062>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office;phone-context=national at .::2.:5062>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home;phone-context=national at .::3.:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
@@ -42,13 +42,13 @@
REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "[service]" <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 REGISTER
Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office@[customip1]:5062>;transport=[transport];expires=15
- Contact: "[service]" <sip:[service]-home@[customip2]:5063>;transport=[transport];expires=20
+ Contact: "[service]" <sip:[service]-office;phone-context=national@[customip1]:5062>;transport=[transport];expires=15
+ Contact: "[service]" <sip:[service]-home;phone-context=national@[customip2]:5063>;transport=[transport];expires=20
Subject: Performance Test
Expires: 10
Content-Length: 0
@@ -61,8 +61,8 @@
<!--
Ensure the received expires parameters are what was sent in the expires parameters with a 5 second tolerance
-->
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at .::2.:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="3"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="4" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office;phone-context=national at .::2.:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home;phone-context=national at .::3.:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="4" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/test-config.yaml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/test-config.yaml
index 81ea388..f169b1e 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed_drop_options/test-config.yaml
@@ -49,7 +49,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:alice-office at 127.0.0.2:5062'
+ Contact: 'sip:alice-office;phone-context=national at 127.0.0.2:5062'
Expiration: '10'
requirements:
match:
@@ -62,7 +62,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:alice-home at 127.0.0.3:5063'
+ Contact: 'sip:alice-home;phone-context=national at 127.0.0.3:5063'
Expiration: '10'
requirements:
match:
@@ -75,7 +75,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:alice-office at 127.0.0.2:5062'
+ Contact: 'sip:alice-office;phone-context=national at 127.0.0.2:5062'
Expiration: '15'
requirements:
match:
@@ -88,7 +88,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:alice-home at 127.0.0.3:5063'
+ Contact: 'sip:alice-home;phone-context=national at 127.0.0.3:5063'
Expiration: '20'
requirements:
match:
@@ -104,7 +104,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:bob-office at 127.0.0.2:5062'
+ Contact: 'sip:bob-office;phone-context=national at 127.0.0.2:5062'
Expiration: '10'
requirements:
match:
@@ -117,7 +117,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:bob-home at 127.0.0.3:5063'
+ Contact: 'sip:bob-home;phone-context=national at 127.0.0.3:5063'
Expiration: '10'
requirements:
match:
@@ -130,7 +130,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:bob-office at 127.0.0.2:5062'
+ Contact: 'sip:bob-office;phone-context=national at 127.0.0.2:5062'
Expiration: '15'
requirements:
match:
@@ -143,7 +143,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:bob-home at 127.0.0.3:5063'
+ Contact: 'sip:bob-home;phone-context=national at 127.0.0.3:5063'
Expiration: '20'
requirements:
match:
@@ -159,7 +159,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:charlie-office@\[::2\]:5062'
+ Contact: 'sip:charlie-office;phone-context=national@\[::2\]:5062'
Expiration: '10'
requirements:
match:
@@ -172,7 +172,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:charlie-home@\[::3\]:5063'
+ Contact: 'sip:charlie-home;phone-context=national@\[::3\]:5063'
Expiration: '10'
requirements:
match:
@@ -185,7 +185,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:charlie-office@\[::2\]:5062'
+ Contact: 'sip:charlie-office;phone-context=national@\[::2\]:5062'
Expiration: '15'
requirements:
match:
@@ -198,7 +198,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:charlie-home@\[::3\]:5063'
+ Contact: 'sip:charlie-home;phone-context=national@\[::3\]:5063'
Expiration: '20'
requirements:
match:
@@ -214,7 +214,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:carol-office@\[::2\]:5062'
+ Contact: 'sip:carol-office;phone-context=national@\[::2\]:5062'
Expiration: '10'
requirements:
match:
@@ -227,7 +227,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:carol-home@\[::3\]:5063'
+ Contact: 'sip:carol-home;phone-context=national@\[::3\]:5063'
Expiration: '10'
requirements:
match:
@@ -240,7 +240,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:carol-office@\[::2\]:5062'
+ Contact: 'sip:carol-office;phone-context=national@\[::2\]:5062'
Expiration: '15'
requirements:
match:
@@ -253,7 +253,7 @@
match:
Event: 'TestEvent'
State: 'AOR_CONTACT_ADDED'
- Contact: 'sip:carol-home@\[::3\]:5063'
+ Contact: 'sip:carol-home;phone-context=national@\[::3\]:5063'
Expiration: '20'
requirements:
match:
@@ -261,7 +261,7 @@
count: '1'
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- buildoption: 'TEST_FRAMEWORK'
- python: 'twisted'
@@ -271,4 +271,3 @@
- asterisk: 'res_pjsip'
tags:
- pjsip
-
diff --git a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/configs/ast1/pjsip.conf
index c9361f3..6035048 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/configs/ast1/pjsip.conf
@@ -59,3 +59,6 @@
minimum_expiration=5
default_expiration=30
+[global]
+type=global
+ignore_uri_user_options=yes
diff --git a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml
index ebd3be0..e5bdb12 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml
@@ -7,12 +7,12 @@
REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "[service]" <sip:[service];phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 REGISTER
Max-Forwards: 70
- Contact: <sip:[service]@[local_ip]:[local_port]>;transport=[transport]
+ Contact: <sip:[service];phone-context=national@[local_ip]:[local_port]>;transport=[transport]
Subject: Performance Test
Content-Length: 0
@@ -21,7 +21,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(30|2[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(30|2[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+ <ereg regexp="sip:((alice|bob);phone-context=national at 127.0.0.1:506[1-2]>;expires=(30|2[5-9])|(charlie|carol);phone-context=national at .::1.:506[3-4]>;expires=(30|2[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/test-config.yaml b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/test-config.yaml
index 9c7d344..fa47f25 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/test-config.yaml
@@ -42,7 +42,7 @@
AOR: 'alice'
requirements:
match:
- Contact: 'sip:alice at 127.0.0.1:5061'
+ Contact: 'sip:alice;phone-context=national at 127.0.0.1:5061'
Expiration: '30'
count: '1'
-
@@ -55,7 +55,7 @@
AOR: 'bob'
requirements:
match:
- Contact: 'sip:bob at 127.0.0.1:5062'
+ Contact: 'sip:bob;phone-context=national at 127.0.0.1:5062'
Expiration: '30'
count: '1'
-
@@ -68,7 +68,7 @@
AOR: 'charlie'
requirements:
match:
- Contact: 'sip:charlie@\[::1\]:5063'
+ Contact: 'sip:charlie;phone-context=national@\[::1\]:5063'
Expiration: '30'
count: '1'
-
@@ -81,12 +81,12 @@
AOR: 'carol'
requirements:
match:
- Contact: 'sip:carol@\[::1\]:5064'
+ Contact: 'sip:carol;phone-context=national@\[::1\]:5064'
Expiration: '30'
count: '1'
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- buildoption: 'TEST_FRAMEWORK'
- python: 'twisted'
diff --git a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/configs/ast1/pjsip.conf
index ca0dbb7..89b8a79 100644
--- a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/configs/ast1/pjsip.conf
@@ -1,5 +1,6 @@
[global]
type=global
+ignore_uri_user_options=yes
debug=yes
[local-transport]
diff --git a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/sipp/mwi_subscription.xml b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/sipp/mwi_subscription.xml
index 98fe44e..6fefb44 100644
--- a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/sipp/mwi_subscription.xml
+++ b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/sipp/mwi_subscription.xml
@@ -5,13 +5,13 @@
<!-- Subscribe -->
<send retrans="500">
<![CDATA[
- SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ SUBSCRIBE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "alice" <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "alice" <sip:[service]@[remote_ip]:[remote_port]>
+ From: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "alice" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: 1 SUBSCRIBE
- Contact: "alice" <sip:alice@[local_ip]:[local_port]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Max-Forwards: 70
Event: message-summary
Expires: 300
@@ -45,7 +45,7 @@
[last_To:]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Content-Length: 0
]]>
@@ -54,13 +54,13 @@
<!-- Resubscribe -->
<send retrans="500">
<![CDATA[
- SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ SUBSCRIBE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "alice" <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "alice" <sip:[service]@[remote_ip]:[remote_port]>[$to_tag]
+ From: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "alice" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[$to_tag]
Call-ID: [call_id]
CSeq: 2 SUBSCRIBE
- Contact: "alice" <sip:alice@[local_ip]:[local_port]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Max-Forwards: 70
Event: message-summary
Expires: 600
@@ -90,7 +90,7 @@
[last_To:]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Content-Length: 0
]]>
@@ -101,13 +101,13 @@
<!-- Unsubscribe -->
<send retrans="500">
<![CDATA[
- SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ SUBSCRIBE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "alice" <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "alice" <sip:[service]@[remote_ip]:[remote_port]>[$to_tag]
+ From: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "alice" <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[$to_tag]
Call-ID: [call_id]
CSeq: 3 SUBSCRIBE
- Contact: "alice" <sip:alice@[local_ip]:[local_port]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Max-Forwards: 70
Event: message-summary
Expires: 0
@@ -137,7 +137,7 @@
[last_To:]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+ Contact: "alice" <sip:alice;phone-context=national@[local_ip]:[local_port]>
Content-Length: 0
]]>
diff --git a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/test-config.yaml b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/test-config.yaml
index 8b93740..bba8135 100644
--- a/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options/test-config.yaml
@@ -6,7 +6,7 @@
is expected.'
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- python: 'twisted'
- python: 'starpy'
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/configs/ast1/pjsip.conf b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/configs/ast1/pjsip.conf
index 271bed7..a207e63 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/configs/ast1/pjsip.conf
@@ -1,5 +1,6 @@
[global]
type=global
+ignore_uri_user_options=yes
debug=yes
[local-transport]
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/alice.xml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/alice.xml
index bc16036..9315fbe 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/alice.xml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/alice.xml
@@ -5,13 +5,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
- To: <sip:[service]@[remote_ip]:[remote_port]>
+ From: <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
+ To: <sip:[service];phone-context=national@[remote_ip]:[remote_port]>
Call-ID: [call_id]
CSeq: [cseq] INVITE
- Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:alice;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Content-Type: application/sdp
Content-Length: [len]
@@ -45,13 +45,13 @@
<send>
<![CDATA[
- ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
[last_Via:]
[last_From:]
[last_To:]
Call-ID: [call_id]
CSeq: [cseq] ACK
- Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:alice;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Content-Length: 0
@@ -71,13 +71,13 @@
<send retrans="500">
<![CDATA[
- INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ INVITE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
[last_Via:]2
[last_From:]
[last_To:]
[last_Call-ID:]
CSeq: [cseq] INVITE
- Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:alice;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Content-Type: application/sdp
Content-Length: [len]
@@ -102,13 +102,13 @@
<send>
<![CDATA[
- ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ ACK sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
[last_Via:]2
[last_From:]
[last_To:]
Call-ID: [call_id]
CSeq: [cseq] ACK
- Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:alice;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Max-Forwards: 70
Content-Length: 0
@@ -121,17 +121,17 @@
<send retrans="500">
<![CDATA[
- REFER sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ REFER sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
[last_Via:]3
- From: <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
- To: <sip:[service]@[remote_ip]:[remote_port]>[$remote_tag]
+ From: <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
+ To: <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[$remote_tag]
Call-ID: [call_id]
CSeq: 3 REFER
- Contact: sip:alice@[local_ip]:[local_port];transport=[transport]
+ Contact: sip:alice;phone-context=national@[local_ip]:[local_port];transport=[transport]
Max-Forwards: 70
Subject: Performance Test
- Refer-To: sip:charlie@[remote_ip]:[remote_port];user=phone
- Referred-By: sip:alice@[local_ip]:[local_port]
+ Refer-To: sip:charlie;phone-context=national@[remote_ip]:[remote_port];user=phone
+ Referred-By: sip:alice;phone-context=national@[local_ip]:[local_port]
Content-Length: 0
]]>
@@ -190,13 +190,13 @@
<send retrans="500">
<![CDATA[
- BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+ BYE sip:[service];phone-context=national@[remote_ip]:[remote_port] SIP/2.0
[last_Via:]4
- From: <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
- To: <sip:[service]@[remote_ip]:[remote_port]>[$remote_tag]
+ From: <sip:alice;phone-context=national@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
+ To: <sip:[service];phone-context=national@[remote_ip]:[remote_port]>[$remote_tag]
Call-ID: [call_id]
CSeq: [cseq] BYE
- Contact: sip:alice@[local_ip]:[local_port]
+ Contact: sip:alice;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/bob.xml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/bob.xml
index 3870eac..1226e20 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/bob.xml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/bob.xml
@@ -14,7 +14,7 @@
[last_To:];tag=[pid]SIPpTag[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:bob;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Length: 0
]]>
@@ -29,7 +29,7 @@
[last_To:];tag=[pid]SIPpTag[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:bob;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Type: application/sdp
Content-Length: [len]
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/charlie.xml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/charlie.xml
index 1966182..e8fad62 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/charlie.xml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/sipp/charlie.xml
@@ -18,7 +18,7 @@
check_it="true"
assign_to="remote_user"/>
<!-- Check the Referred-By header. -->
- <ereg regexp="sip:alice at 127.0.0.2:5060"
+ <ereg regexp="sip:alice;phone-context=national at 127.0.0.2:5060"
header="Referred-By"
search_in="hdr"
check_it="true"
@@ -36,7 +36,7 @@
[last_To:];tag=[pid]SIPpTag[call_number]
[last_Call-ID:]
[last_CSeq:]
- Contact: <sip:charlie@[local_ip]:[local_port];transport=[transport]>
+ Contact: <sip:charlie;phone-context=national@[local_ip]:[local_port];transport=[transport]>
Content-Type: application/sdp
Content-Length: [len]
@@ -75,7 +75,7 @@
To: <[$remote_user]@[remote_ip]:[remote_port]>[$remote_tag]
Call-ID: [call_id]
CSeq: [cseq] BYE
- Contact: sip:charlie@[local_ip]:[local_port]
+ Contact: sip:charlie;phone-context=national@[local_ip]:[local_port]
Max-Forwards: 70
Subject: Performance Test
Content-Length: 0
diff --git a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
index 701cd3d..cde1e74 100644
--- a/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
+++ b/tests/channels/pjsip/transfers/blind_transfer/caller_with_hold_drop_options/test-config.yaml
@@ -11,7 +11,7 @@
along with Bob being placed on hold and taken off hold appropriately.'
properties:
- minversion: '12.0.0'
+ minversion: '13.12.0'
dependencies:
- python : 'twisted'
- python : 'starpy'
@@ -110,7 +110,7 @@
Event: 'VarSet'
Channel: 'PJSIP/bob-.{8}'
Variable: '_{0,2}SIPREFERREDBYHDR'
- Value: 'sip:alice at 127.0.0.2:5060'
+ Value: 'sip:alice;phone-context=national at 127.0.0.2:5060'
count: 2
-
type: 'headermatch'
@@ -118,7 +118,7 @@
match:
Event: 'VarSet'
Variable: 'SIPREFERTOHDR'
- Value: 'sip:charlie at 127.0.0.1'
+ Value: 'sip:charlie;phone-context=national at 127.0.0.1'
count: 2
-
type: 'headermatch'
--
To view, visit https://gerrit.asterisk.org/3862
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id98328bd0aeadbb2179c1f0d0b0e5d45c50f3e6e
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
More information about the asterisk-code-review
mailing list