[Asterisk-code-review] sipp: Fix non-compliant XML scenario files. (testsuite[13])
Joshua Colp
asteriskteam at digium.com
Thu Apr 23 05:36:28 CDT 2020
Joshua Colp has uploaded this change for review. ( https://gerrit.asterisk.org/c/testsuite/+/14323 )
Change subject: sipp: Fix non-compliant XML scenario files.
......................................................................
sipp: Fix non-compliant XML scenario files.
As of SIPp 3.6.0 scenario files that use '<' and '>'
in XML attributes need to properly escape them. Failing
to do this results in the parser interpreting it as a
new tag.
This change escapes these characters in all the
non-compliant files.
Note, though, that the chan_sip route test is now
set to skipped as this unfortunately breaks the test.
Since chan_sip is no longer supported and receives
minimal changes I opted to skip it.
ASTERISK-28850
Change-Id: I28f5b429bb213e0f2549eaec06b5a32dd9148ddf
---
M tests/channels/SIP/message_auth_cust_hdr/sipp/message_recv.xml
M tests/channels/SIP/message_mark_all_outbound/sipp/message_recv.xml
M tests/channels/SIP/message_send_ami/sipp/message_recv.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_anonymous.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_default.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_fred.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_goober.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_noname.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_passed.xml
M tests/channels/SIP/message_unauth_from/sipp/message_recv_unknown.xml
M tests/channels/SIP/no_ack_dialog_cleanup/sipp/bob.xml
M tests/channels/SIP/path/sipp/ua1_invite_recv.xml
M tests/channels/SIP/path/sipp/ua1_register.xml
M tests/channels/SIP/route/test-config.yaml
M tests/channels/SIP/sendrpid/pai/trust_legacy/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/pai/trust_legacy/pres_prohib/sipp/receive.xml
M tests/channels/SIP/sendrpid/pai/trust_no/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/pai/trust_yes/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/pai/trust_yes/pres_prohib/sipp/receive.xml
M tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_prohib/sipp/receive.xml
M tests/channels/SIP/sendrpid/rpid/trust_no/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/rpid/trust_yes/pres_allow/sipp/receive.xml
M tests/channels/SIP/sendrpid/rpid/trust_yes/pres_prohib/sipp/receive.xml
M tests/channels/SIP/sip_unregister/sipp/registerv4-auth.xml
M tests/channels/SIP/sip_unregister/sipp/registerv4.xml
M tests/channels/SIP/sip_unregister/sipp/registerv6-auth.xml
M tests/channels/SIP/sip_unregister/sipp/registerv6.xml
M tests/channels/pjsip/basic_calls/outgoing/nominal/from_user/sipp/check_from_user.xml
M tests/channels/pjsip/connected_line/connected_line_allow/sipp/alice.xml
M tests/channels/pjsip/connected_line/connected_line_allow/sipp/bob.xml
M tests/channels/pjsip/connected_line/connected_line_no_send/sipp/alice.xml
M tests/channels/pjsip/connected_line/connected_line_no_send/sipp/bob.xml
M tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/alice.xml
M tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/bob.xml
M tests/channels/pjsip/dialplan_functions/pjsip_aor/sipp/dynamic-contact.xml
M tests/channels/pjsip/dialplan_functions/pjsip_contact/sipp/dynamic-contact.xml
M tests/channels/pjsip/headers/anonymous_from_basic_call/sipp/bob.xml
M tests/channels/pjsip/headers/non-anonymous_from_basic_call/sipp/bob.xml
M tests/channels/pjsip/message/message_confbridge/sipp/message_recv.xml
M tests/channels/pjsip/message/message_from/sipp/message_recv.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/maximum_expiration/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/minimum_expiration/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv6.xml
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/path/sipp/ua1_invite_recv.xml
M tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_register.xml
M tests/channels/pjsip/registration/inbound/nominal/regcontext/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/single_contact/authed/sipp/register-auth.xml
M tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed_drop_options/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/unregister/single_contact/sipp/register-noauth.xml
M tests/channels/pjsip/registration/inbound/off-nominal/unregister/no_expires_header/sipp/register-noauth.xml
M tests/channels/pjsip/registration/outbound/line_parameter/sipp/register.xml
M tests/channels/pjsip/set_var/sipp/invite_recv.xml
M tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe-direction-recipient.xml
M tests/channels/pjsip/subscriptions/presence/digium_presence/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/presence/no_accept_header/sipp/subscribe.xml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
M tests/channels/pjsip/transfers/asterisk/endpoint/redirect/sipp/alice.xml
M tests/channels/pjsip/transfers/asterisk/uri/redirect/sipp/alice.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uac-no-hangup.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uas.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uac-no-hangup.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uas.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local/sipp/uas.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas.xml
M tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas_hangup.xml
M tests/codecs/opus/fec/jitterbuffer/adaptive/sipp/invite_recv.xml
M tests/codecs/opus/fec/jitterbuffer/fixed/sipp/invite_recv.xml
M tests/codecs/opus/fec/no_jitterbuffer/sipp/invite_recv.xml
83 files changed, 228 insertions(+), 227 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/23/14323/1
diff --git a/tests/channels/SIP/message_auth_cust_hdr/sipp/message_recv.xml b/tests/channels/SIP/message_auth_cust_hdr/sipp/message_recv.xml
index d8f1b98..46d642d 100644
--- a/tests/channels/SIP/message_auth_cust_hdr/sipp/message_recv.xml
+++ b/tests/channels/SIP/message_auth_cust_hdr/sipp/message_recv.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
@@ -37,7 +37,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
diff --git a/tests/channels/SIP/message_mark_all_outbound/sipp/message_recv.xml b/tests/channels/SIP/message_mark_all_outbound/sipp/message_recv.xml
index d8f1b98..46d642d 100644
--- a/tests/channels/SIP/message_mark_all_outbound/sipp/message_recv.xml
+++ b/tests/channels/SIP/message_mark_all_outbound/sipp/message_recv.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
@@ -37,7 +37,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
diff --git a/tests/channels/SIP/message_send_ami/sipp/message_recv.xml b/tests/channels/SIP/message_send_ami/sipp/message_recv.xml
index d8f1b98..46d642d 100644
--- a/tests/channels/SIP/message_send_ami/sipp/message_recv.xml
+++ b/tests/channels/SIP/message_send_ami/sipp/message_recv.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
@@ -37,7 +37,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
<!-- Check that the X-Custom-Header header is what we expect. -->
<ereg regexp=".*" search_in="hdr" header="X-Custom-Header:" check_it="true" assign_to="1" />
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_anonymous.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_anonymous.xml
index 3eef6a2..4988b12 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_anonymous.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_anonymous.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"Anonymous\" <sip:anonymous at invalid>" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Anonymous\" <sip:anonymous at invalid>" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_default.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_default.xml
index fe8f79a..042a7f7 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_default.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_default.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"asterisk\" <sip:asterisk@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"asterisk\" <sip:asterisk@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_fred.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_fred.xml
index 26aa161..4ea53ae 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_fred.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_fred.xml
@@ -9,9 +9,9 @@
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
<!--
- <ereg regexp="From: \"Johnny Appleseed\" <sip:9876@" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="From: \"Johnny Appleseed\" <sip:9876@" search_in="msg" check_it="true" assign_to="2" />
-->
- <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"Johnny Appleseed\" <sip:9876@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_goober.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_goober.xml
index 29e9e86..b5f9475 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_goober.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_goober.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"The Goober\" <sip:3829@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"The Goober\" <sip:3829@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_noname.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_noname.xml
index 3704356..a75b9ab 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_noname.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_noname.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp="" \"asterisk\" <sip:6719@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp="" \"asterisk\" <sip:6719@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_passed.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_passed.xml
index 6fd2b42..c3995c9 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_passed.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_passed.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"user\" <sip:user@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"user\" <sip:user@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/message_unauth_from/sipp/message_recv_unknown.xml b/tests/channels/SIP/message_unauth_from/sipp/message_recv_unknown.xml
index 3f2ef23..b7187e7 100644
--- a/tests/channels/SIP/message_unauth_from/sipp/message_recv_unknown.xml
+++ b/tests/channels/SIP/message_unauth_from/sipp/message_recv_unknown.xml
@@ -8,7 +8,7 @@
<!-- NOTE: The regexp action must assign_to a variable and that variable must be used. -->
<ereg regexp=".*" search_in="hdr" header="From:" check_it="true" assign_to="1" />
<log message="Received MESSAGE From header: [$1]." />
- <ereg regexp=" \"unknown_user\" <sip:asterisk@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+ <ereg regexp=" \"unknown_user\" <sip:asterisk@" search_in="hdr" header="From:" check_it="true" assign_to="2" />
<log message="Using assigned value because I must: [$2]." />
</action>
</recv>
diff --git a/tests/channels/SIP/no_ack_dialog_cleanup/sipp/bob.xml b/tests/channels/SIP/no_ack_dialog_cleanup/sipp/bob.xml
index c5bacc5..523a89e 100644
--- a/tests/channels/SIP/no_ack_dialog_cleanup/sipp/bob.xml
+++ b/tests/channels/SIP/no_ack_dialog_cleanup/sipp/bob.xml
@@ -47,7 +47,7 @@
<recv request="ACK">
<action>
- <ereg regexp="<(.*)>" search_in="hdr" header="Contact:" assign_to="_,contact"/>
+ <ereg regexp="<(.*)>" search_in="hdr" header="Contact:" assign_to="_,contact"/>
<ereg regexp=".*" search_in="hdr" header="From:" assign_to="from"/>
<ereg regexp=".*" search_in="hdr" header="To:" assign_to="to"/>
</action>
diff --git a/tests/channels/SIP/path/sipp/ua1_invite_recv.xml b/tests/channels/SIP/path/sipp/ua1_invite_recv.xml
index db0a54f..0577431 100644
--- a/tests/channels/SIP/path/sipp/ua1_invite_recv.xml
+++ b/tests/channels/SIP/path/sipp/ua1_invite_recv.xml
@@ -23,7 +23,7 @@
<Global variables="remote_tag" />
<recv request="INVITE" crlf="true">
<action>
- <ereg regexp=".*<sip:P3.EXAMPLEHOME.COM;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
+ <ereg regexp=".*<sip:P3.EXAMPLEHOME.COM;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
header="Route:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/path/sipp/ua1_register.xml b/tests/channels/SIP/path/sipp/ua1_register.xml
index d92a678..db40f01 100644
--- a/tests/channels/SIP/path/sipp/ua1_register.xml
+++ b/tests/channels/SIP/path/sipp/ua1_register.xml
@@ -23,7 +23,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp=".*<sip:P3.EXAMPLEHOME.COM;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
+ <ereg regexp=".*<sip:P3.EXAMPLEHOME.COM;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
search_in="hdr" header="Path:" check_it="true" assign_to="1"/>
<ereg regexp=".*path.*"
search_in="hdr" header="Supported:" check_it="true" assign_to="2"/>
diff --git a/tests/channels/SIP/route/test-config.yaml b/tests/channels/SIP/route/test-config.yaml
index 286765d..4f66cc0 100644
--- a/tests/channels/SIP/route/test-config.yaml
+++ b/tests/channels/SIP/route/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'See ASTERISK-28850'
summary: 'SIP Record-Route Support'
description: |
'This test verifies SIP Record-Route handling.
diff --git a/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_allow/sipp/receive.xml
index 5a43b11..3a0bcc1 100644
--- a/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_prohib/sipp/receive.xml b/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_prohib/sipp/receive.xml
index 856dbf0..1ed1809 100644
--- a/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_prohib/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/pai/trust_legacy/pres_prohib/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"Anonymous\" <sip:anonymous at anonymous.invalid>"
+ <ereg regexp="\"Anonymous\" <sip:anonymous at anonymous.invalid>"
header="P-Asserted-Identity:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/pai/trust_no/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/pai/trust_no/pres_allow/sipp/receive.xml
index 5a43b11..3a0bcc1 100644
--- a/tests/channels/SIP/sendrpid/pai/trust_no/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/pai/trust_no/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/pai/trust_yes/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/pai/trust_yes/pres_allow/sipp/receive.xml
index 5a43b11..3a0bcc1 100644
--- a/tests/channels/SIP/sendrpid/pai/trust_yes/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/pai/trust_yes/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/pai/trust_yes/pres_prohib/sipp/receive.xml b/tests/channels/SIP/sendrpid/pai/trust_yes/pres_prohib/sipp/receive.xml
index bc29a79..46511e6 100644
--- a/tests/channels/SIP/sendrpid/pai/trust_yes/pres_prohib/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/pai/trust_yes/pres_prohib/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_allow/sipp/receive.xml
index f2eeee0..a59762e 100644
--- a/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
header="Remote-Party-ID:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_prohib/sipp/receive.xml b/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_prohib/sipp/receive.xml
index 5916366..6f68f2d 100644
--- a/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_prohib/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/rpid/trust_legacy/pres_prohib/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at anonymous.invalid>;party=calling;privacy=full;screen=yes"
+ <ereg regexp="\"alice\" <sip:alice at anonymous.invalid>;party=calling;privacy=full;screen=yes"
header="Remote-Party-ID:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/rpid/trust_no/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/rpid/trust_no/pres_allow/sipp/receive.xml
index f2eeee0..a59762e 100644
--- a/tests/channels/SIP/sendrpid/rpid/trust_no/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/rpid/trust_no/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
header="Remote-Party-ID:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_allow/sipp/receive.xml b/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_allow/sipp/receive.xml
index f2eeee0..a59762e 100644
--- a/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_allow/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_allow/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=off;screen=yes"
header="Remote-Party-ID:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_prohib/sipp/receive.xml b/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_prohib/sipp/receive.xml
index db0b5f4..8862be9 100644
--- a/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_prohib/sipp/receive.xml
+++ b/tests/channels/SIP/sendrpid/rpid/trust_yes/pres_prohib/sipp/receive.xml
@@ -10,7 +10,7 @@
search_in="hdr"
check_it="true"
assign_to="to_hdr,remote_tag"/>
- <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=full;screen=yes"
+ <ereg regexp="\"alice\" <sip:alice at 127.0.0.1>;party=calling;privacy=full;screen=yes"
header="Remote-Party-ID:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/SIP/sip_unregister/sipp/registerv4-auth.xml b/tests/channels/SIP/sip_unregister/sipp/registerv4-auth.xml
index 5d30db0..e5233d6 100644
--- a/tests/channels/SIP/sip_unregister/sipp/registerv4-auth.xml
+++ b/tests/channels/SIP/sip_unregister/sipp/registerv4-auth.xml
@@ -44,7 +44,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="Contact: <sip:ipv4-auth(1|2)@127.0.0.2:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
+ <ereg regexp="Contact: <sip:ipv4-auth(1|2)@127.0.0.2:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/SIP/sip_unregister/sipp/registerv4.xml b/tests/channels/SIP/sip_unregister/sipp/registerv4.xml
index 98beb56..e0b1473 100644
--- a/tests/channels/SIP/sip_unregister/sipp/registerv4.xml
+++ b/tests/channels/SIP/sip_unregister/sipp/registerv4.xml
@@ -23,7 +23,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="Contact: <sip:(ipv4|ipv42)@127.0.0.2:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
+ <ereg regexp="Contact: <sip:(ipv4|ipv42)@127.0.0.2:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/SIP/sip_unregister/sipp/registerv6-auth.xml b/tests/channels/SIP/sip_unregister/sipp/registerv6-auth.xml
index f3db7d9..b06148f 100644
--- a/tests/channels/SIP/sip_unregister/sipp/registerv6-auth.xml
+++ b/tests/channels/SIP/sip_unregister/sipp/registerv6-auth.xml
@@ -44,7 +44,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="Contact: <sip:ipv6-auth(1|2)@\[::2\]:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
+ <ereg regexp="Contact: <sip:ipv6-auth(1|2)@\[::2\]:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/SIP/sip_unregister/sipp/registerv6.xml b/tests/channels/SIP/sip_unregister/sipp/registerv6.xml
index 77dadab..ebc35f7 100644
--- a/tests/channels/SIP/sip_unregister/sipp/registerv6.xml
+++ b/tests/channels/SIP/sip_unregister/sipp/registerv6.xml
@@ -23,7 +23,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="Contact: <sip:(ipv6|ipv62)@.::2.:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
+ <ereg regexp="Contact: <sip:(ipv6|ipv62)@.::2.:5062>;expires=(3600|5[5-9])" search_in="msg" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/basic_calls/outgoing/nominal/from_user/sipp/check_from_user.xml b/tests/channels/pjsip/basic_calls/outgoing/nominal/from_user/sipp/check_from_user.xml
index a592ae7..487ae9e 100644
--- a/tests/channels/pjsip/basic_calls/outgoing/nominal/from_user/sipp/check_from_user.xml
+++ b/tests/channels/pjsip/basic_calls/outgoing/nominal/from_user/sipp/check_from_user.xml
@@ -11,7 +11,7 @@
search_in="hdr"
check_it="true"
assign_to="remote_tag"/>
- <ereg regexp=".*<sip:banana at .*"
+ <ereg regexp=".*<sip:banana at .*"
header="From:"
seach_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_allow/sipp/alice.xml b/tests/channels/pjsip/connected_line/connected_line_allow/sipp/alice.xml
index 7281153..aa4600e 100644
--- a/tests/channels/pjsip/connected_line/connected_line_allow/sipp/alice.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_allow/sipp/alice.xml
@@ -37,7 +37,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="\"Bob2\" <sip:bob2 at 127.0.0.1>"
+ <ereg regexp="\"Bob2\" <sip:bob2 at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_allow/sipp/bob.xml b/tests/channels/pjsip/connected_line/connected_line_allow/sipp/bob.xml
index 5c151e5..9fc4b98 100644
--- a/tests/channels/pjsip/connected_line/connected_line_allow/sipp/bob.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_allow/sipp/bob.xml
@@ -5,12 +5,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="From"
search_in="hdr"
check_it="true"
assign_to="from"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
@@ -81,12 +81,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="From"
search_in="hdr"
check_it="true"
assign_to="connected_from"/>
- <ereg regexp="\"Charle\" <sip:charle at 127.0.0.1>"
+ <ereg regexp="\"Charle\" <sip:charle at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/alice.xml b/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/alice.xml
index ae9587f..02463a1 100644
--- a/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/alice.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/alice.xml
@@ -37,7 +37,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="\"Bob\" <sip:bob at 127.0.0.1>"
+ <ereg regexp="\"Bob\" <sip:bob at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/bob.xml b/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/bob.xml
index 2eddf40..3289e06 100644
--- a/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/bob.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_no_send/sipp/bob.xml
@@ -5,12 +5,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="From"
search_in="hdr"
check_it="true"
assign_to="from"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/alice.xml b/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/alice.xml
index ae9587f..02463a1 100644
--- a/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/alice.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/alice.xml
@@ -37,7 +37,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="\"Bob\" <sip:bob at 127.0.0.1>"
+ <ereg regexp="\"Bob\" <sip:bob at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/bob.xml b/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/bob.xml
index 2eddf40..3289e06 100644
--- a/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/bob.xml
+++ b/tests/channels/pjsip/connected_line/connected_line_no_trust/sipp/bob.xml
@@ -5,12 +5,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="From"
search_in="hdr"
check_it="true"
assign_to="from"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_aor/sipp/dynamic-contact.xml b/tests/channels/pjsip/dialplan_functions/pjsip_aor/sipp/dynamic-contact.xml
index 268966b..b56bd71 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_aor/sipp/dynamic-contact.xml
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_aor/sipp/dynamic-contact.xml
@@ -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)@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" />
</action>
</recv>
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_contact/sipp/dynamic-contact.xml b/tests/channels/pjsip/dialplan_functions/pjsip_contact/sipp/dynamic-contact.xml
index 06d73c8..a244246 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_contact/sipp/dynamic-contact.xml
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_contact/sipp/dynamic-contact.xml
@@ -22,7 +22,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)@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" />
</action>
</recv>
diff --git a/tests/channels/pjsip/headers/anonymous_from_basic_call/sipp/bob.xml b/tests/channels/pjsip/headers/anonymous_from_basic_call/sipp/bob.xml
index 1fffcf1..f8babb1 100644
--- a/tests/channels/pjsip/headers/anonymous_from_basic_call/sipp/bob.xml
+++ b/tests/channels/pjsip/headers/anonymous_from_basic_call/sipp/bob.xml
@@ -5,17 +5,17 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Anonymous\" <sip:anonymous at anonymous.invalid>"
+ <ereg regexp="\"Anonymous\" <sip:anonymous at anonymous.invalid>"
header="From"
search_in="hdr"
check_it="true"
assign_to="from"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/headers/non-anonymous_from_basic_call/sipp/bob.xml b/tests/channels/pjsip/headers/non-anonymous_from_basic_call/sipp/bob.xml
index c05dfab..a0bbd48 100644
--- a/tests/channels/pjsip/headers/non-anonymous_from_basic_call/sipp/bob.xml
+++ b/tests/channels/pjsip/headers/non-anonymous_from_basic_call/sipp/bob.xml
@@ -5,17 +5,17 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="From"
search_in="hdr"
check_it="true"
assign_to="from"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/message/message_confbridge/sipp/message_recv.xml b/tests/channels/pjsip/message/message_confbridge/sipp/message_recv.xml
index 5af8837..8a343f0 100644
--- a/tests/channels/pjsip/message/message_confbridge/sipp/message_recv.xml
+++ b/tests/channels/pjsip/message/message_confbridge/sipp/message_recv.xml
@@ -48,7 +48,7 @@
<recv request="MESSAGE" timeout="15000">
<action>
<ereg regexp="text/html" search_in="hdr" header="Content-Type:" check_it="true" assign_to="dummy"/>
- <ereg regexp="<head><body>this is a test</body></html>" search_in="body" check_it="true" assign_to="dummy"/>
+ <ereg regexp="<head><body>this is a test</body></html>" search_in="body" check_it="true" assign_to="dummy"/>
</action>
</recv>
diff --git a/tests/channels/pjsip/message/message_from/sipp/message_recv.xml b/tests/channels/pjsip/message/message_from/sipp/message_recv.xml
index 412c80b..a57f4fc 100644
--- a/tests/channels/pjsip/message/message_from/sipp/message_recv.xml
+++ b/tests/channels/pjsip/message/message_from/sipp/message_recv.xml
@@ -9,7 +9,7 @@
<action>
<!-- Check that the From header is what we expect -->
<!-- note - from some reason the incoming header has leading spaces on it -->
- <ereg regexp="\s*(.*>)" search_in="hdr" header="From:" assign_to="empty,from0" />
+ <ereg regexp="\s*(.*>)" search_in="hdr" header="From:" assign_to="empty,from0" />
<log message="Comparing from=[$from] with from0=[$from0]"/>
<strcmp assign_to="result" variable="from" variable2="from0" />
<test assign_to="empty" variable="result" compare="not_equal" value="" />
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/maximum_expiration/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/maximum_expiration/sipp/register-noauth.xml
index 22a364b..d23616d 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/maximum_expiration/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/maximum_expiration/sipp/register-noauth.xml
@@ -22,7 +22,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="sip:((alice|bob)-office at 127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)-office at .::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+ <ereg regexp="sip:((alice|bob)-office at 127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)-office at .::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/minimum_expiration/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/minimum_expiration/sipp/register-noauth.xml
index 450fbc1..b89807c 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/minimum_expiration/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/minimum_expiration/sipp/register-noauth.xml
@@ -22,7 +22,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp="sip:((alice|bob)-office at 127.0.0.1:506[1-2]>;expires=(30|2[5-9])|(charlie|carol)-office at .::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)-office at 127.0.0.1:506[1-2]>;expires=(30|2[5-9])|(charlie|carol)-office 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/config_options/remove_existing/sipp/register-v13.18-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
index c88bb6f..8954e4f 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
@@ -21,7 +21,7 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
</action>
</recv>
@@ -44,8 +44,8 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
</action>
</recv>
@@ -68,9 +68,9 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
- <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
</action>
</recv>
@@ -93,11 +93,11 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
- <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
- <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
</action>
</recv>
@@ -121,13 +121,13 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
- <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
- <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
- <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
</action>
</recv>
@@ -151,15 +151,15 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
- <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
- <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
- <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
- <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
- <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
</action>
</recv>
@@ -204,14 +204,14 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
- <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
- <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
- <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
- <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
- <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
- <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
- <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
index c065406..5202950 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
@@ -21,7 +21,7 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
</action>
</recv>
@@ -44,8 +44,8 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
</action>
</recv>
@@ -68,9 +68,9 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
</action>
</recv>
@@ -93,11 +93,11 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
</action>
</recv>
@@ -121,13 +121,13 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
</action>
</recv>
@@ -151,15 +151,15 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
</action>
</recv>
@@ -204,14 +204,14 @@
<recv response="200" rtd="true">
<action>
<!-- Ensure the expected old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
- <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv4.xml
index 375c7c2..4766ced 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv4.xml
@@ -29,7 +29,7 @@
<!--
Ensure the received expires parameter is 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=1[0-5]" search_in="msg" check_it="true" assign_to="1"/>
+ <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="1"/>
</action>
</recv>
@@ -66,7 +66,7 @@
<!--
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)-home at 127.0.0.3:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <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="2" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv6.xml
index fc1ceb0..0b534ab 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/mixed/unauthed/sipp/mixed-noauth-contact-expiry-ipv6.xml
@@ -29,7 +29,7 @@
<!--
Ensure the received expires parameter is 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=1[0-5]" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at .::2.:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="1"/>
</action>
</recv>
@@ -66,7 +66,7 @@
<!--
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)-home at .::3.:5063>;expires=(20|1[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <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="2" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv4.xml
index d2ab1a0..5589933 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv4.xml
@@ -54,8 +54,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 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" />
</action>
</recv>
@@ -113,8 +113,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 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" />
</action>
</recv>
@@ -176,8 +176,8 @@
the Expires header for the other contact. Both 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="5"/>
- <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="6" />
+ <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="5"/>
+ <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="6" />
</action>
</recv>
@@ -238,8 +238,8 @@
the default_expiration Asterisk configuration option for the other
contact. Both 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="7"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at 127.0.0.3:5063>;expires=(30|2[5-9])" search_in="msg" check_it="true" assign_to="8" />
+ <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="7"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at 127.0.0.3:5063>;expires=(30|2[5-9])" search_in="msg" check_it="true" assign_to="8" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv6.xml
index 607ee46..95ea0f5 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/authed/sipp/register-auth-multi-contact-expiry-ipv6.xml
@@ -54,8 +54,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 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" />
</action>
</recv>
@@ -113,8 +113,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 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" />
</action>
</recv>
@@ -176,8 +176,8 @@
the Expires header for the other contact. Both 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="5"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="6" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at .::2.:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="5"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(10|[5-9])" search_in="msg" check_it="true" assign_to="6" />
</action>
</recv>
@@ -238,8 +238,8 @@
the default_expiration Asterisk configuration option for the other
contact. Both 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="7"/>
- <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(30|2[5-9])" search_in="msg" check_it="true" assign_to="8" />
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-office at .::2.:5062>;expires=1[0-5]" search_in="msg" check_it="true" assign_to="7"/>
+ <ereg regexp="Contact: <sip:(alice|bob|charlie|carol)-home at .::3.:5063>;expires=(30|2[5-9])" search_in="msg" check_it="true" assign_to="8" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv4.xml
index 7443679..f8e5816 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv4.xml
@@ -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 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" />
</action>
</recv>
@@ -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 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" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv6.xml
index 6239986..1e88a87 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/multiple_contacts/unauthed/sipp/register-noauth-multi-contact-expiry-ipv6.xml
@@ -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 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" />
</action>
</recv>
@@ -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 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" />
</action>
</recv>
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 0872a52..8017088 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
@@ -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;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" />
+ <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>
@@ -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;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" />
+ <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 467ce19..4b07c50 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
@@ -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;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" />
+ <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>
@@ -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;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" />
+ <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/path/sipp/ua1_invite_recv.xml b/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_invite_recv.xml
index 38d03b0..54f2efa 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_invite_recv.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_invite_recv.xml
@@ -29,13 +29,13 @@
search_in="hdr"
check_it="true"
assign_to="remote"/>
- <ereg regexp=".*<sip:127.0.0.1:5062;lr>.*"
+ <ereg regexp=".*<sip:127.0.0.1:5062;lr>.*"
header="Route:"
search_in="hdr"
check_it="true"
occurence="1"
assign_to="1"/>
- <ereg regexp=".*<sip:P1.EXAMPLEVISITED.COM;lr>.*"
+ <ereg regexp=".*<sip:P1.EXAMPLEVISITED.COM;lr>.*"
header="Route:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_register.xml b/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_register.xml
index 6221e6b..758c0cc 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_register.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/path/sipp/ua1_register.xml
@@ -23,7 +23,7 @@
<recv response="200" rtd="true">
<action>
- <ereg regexp=".*<sip:127.0.0.1:5062;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
+ <ereg regexp=".*<sip:127.0.0.1:5062;lr>,<sip:P1.EXAMPLEVISITED.COM;lr>.*"
search_in="hdr" header="Path:" check_it="true" assign_to="1"/>
<ereg regexp=".*path.*"
search_in="hdr" header="Supported:" check_it="true" assign_to="2"/>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/regcontext/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/regcontext/sipp/register-noauth.xml
index b5386f4..21ef680 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/regcontext/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/regcontext/sipp/register-noauth.xml
@@ -26,7 +26,7 @@
<!--
Ensure the received expires parameter is ~60 as no expiration config options are set with a 5 second tolerance
-->
- <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+ <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[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/authed/sipp/register-auth.xml b/tests/channels/pjsip/registration/inbound/nominal/single_contact/authed/sipp/register-auth.xml
index 717a5cc..3e90c88 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/single_contact/authed/sipp/register-auth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/single_contact/authed/sipp/register-auth.xml
@@ -42,7 +42,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)@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" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed/sipp/register-noauth.xml
index ebd3be0..aea1f3c 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/single_contact/unauthed/sipp/register-noauth.xml
@@ -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)@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" />
</action>
</recv>
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 e5bdb12..dc68e22 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
@@ -21,7 +21,7 @@
<recv response="200" rtd="true">
<action>
- <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" />
+ <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/unregister/all_contacts/sipp/register-noauth-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv4.xml
index 0f7c88e..28f53e6 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv4.xml
@@ -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)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv6.xml
index 693b39e..4c9dcf3 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/unregister/all_contacts/sipp/register-noauth-ipv6.xml
@@ -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:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv4.xml
index b2cdcab..876a926 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv4.xml
@@ -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)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
@@ -84,8 +84,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)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
- <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="5" />
+ <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="5" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv6.xml
index 86aa42b..c6a8540 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/unregister/multiple_contacts/sipp/register-noauth-ipv6.xml
@@ -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:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
</action>
</recv>
@@ -84,8 +84,8 @@
<!--
Ensure the received expires parameters are what was sent in the Expires header with a 5 second tolerance
-->
- <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="5" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="5" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/unregister/single_contact/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/nominal/unregister/single_contact/sipp/register-noauth.xml
index 28368ad..98b3a18 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/unregister/single_contact/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/unregister/single_contact/sipp/register-noauth.xml
@@ -26,7 +26,7 @@
<!--
Ensure the received expires parameter is ~60 as no expiration config options are set with a 5 second tolerance
-->
- <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+ <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/inbound/off-nominal/unregister/no_expires_header/sipp/register-noauth.xml b/tests/channels/pjsip/registration/inbound/off-nominal/unregister/no_expires_header/sipp/register-noauth.xml
index 24a46cf..f2528d8 100644
--- a/tests/channels/pjsip/registration/inbound/off-nominal/unregister/no_expires_header/sipp/register-noauth.xml
+++ b/tests/channels/pjsip/registration/inbound/off-nominal/unregister/no_expires_header/sipp/register-noauth.xml
@@ -26,7 +26,7 @@
<!--
Ensure the received expires parameter is ~60 as no expiration config options are set with a 5 second tolerance
-->
- <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+ <ereg regexp="sip:((alice|bob)@127.0.0.1:506[1-2]>;expires=(60|5[5-9])|(charlie|carol)@.::1.:506[3-4]>;expires=(60|5[5-9]))" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/registration/outbound/line_parameter/sipp/register.xml b/tests/channels/pjsip/registration/outbound/line_parameter/sipp/register.xml
index 0cef003..8c60416 100644
--- a/tests/channels/pjsip/registration/outbound/line_parameter/sipp/register.xml
+++ b/tests/channels/pjsip/registration/outbound/line_parameter/sipp/register.xml
@@ -6,7 +6,7 @@
<!-- UA registers -->
<recv request="REGISTER">
<action>
- <ereg regexp="(\<.*\>)"
+ <ereg regexp="(\<.*\>)"
header="Contact:"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/set_var/sipp/invite_recv.xml b/tests/channels/pjsip/set_var/sipp/invite_recv.xml
index 4633e53..a14e8a3 100644
--- a/tests/channels/pjsip/set_var/sipp/invite_recv.xml
+++ b/tests/channels/pjsip/set_var/sipp/invite_recv.xml
@@ -6,7 +6,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp="\"foo\"\\s+<sip:foo.*(;tag=.*)"
+ <ereg regexp="\"foo\"\\s+<sip:foo.*(;tag=.*)"
search_in="hdr"
header="From:"
check_it="true"
diff --git a/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe-direction-recipient.xml b/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe-direction-recipient.xml
index ccb7597..042c187 100644
--- a/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe-direction-recipient.xml
+++ b/tests/channels/pjsip/subscriptions/presence/dialog_info_xml/sipp/subscribe-direction-recipient.xml
@@ -24,11 +24,11 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"0\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
- <dialog id=\"presence\">
- <state>terminated</state>
- </dialog>
-</dialog-info>" check_it="true" search_in="body" assign_to="body1" />
+ <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"0\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
+ <dialog id=\"presence\">
+ <state>terminated</state>
+ </dialog>
+</dialog-info>" check_it="true" search_in="body" assign_to="body1" />
</action>
</recv>
@@ -51,11 +51,11 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
- <dialog id=\"presence\" direction=\"recipient\">
- <state>early</state>
- </dialog>
-</dialog-info>" check_it="true" search_in="body" assign_to="body2" />
+ <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
+ <dialog id=\"presence\" direction=\"recipient\">
+ <state>early</state>
+ </dialog>
+</dialog-info>" check_it="true" search_in="body" assign_to="body2" />
</action>
</recv>
@@ -78,11 +78,11 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"2\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
- <dialog id=\"presence\">
- <state>confirmed</state>
- </dialog>
-</dialog-info>" check_it="true" search_in="body" assign_to="body3" />
+ <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"2\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
+ <dialog id=\"presence\">
+ <state>confirmed</state>
+ </dialog>
+</dialog-info>" check_it="true" search_in="body" assign_to="body3" />
</action>
</recv>
@@ -105,16 +105,16 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"3\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
- <dialog id=\"presence\">
- <state>confirmed</state>
- <local>
- <target uri=\"sip:presence at 127.0.0.1(:5060)?\">
- <param pname=\"\+sip.rendering\" pvalue=\"no\" />
- </target>
- </local>
- </dialog>
-</dialog-info>" check_it="true" search_in="body" assign_to="body4" />
+ <ereg regexp="<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"3\" state=\"full\" entity=\"sip:presence at 127.0.0.1(:5060)?\">
+ <dialog id=\"presence\">
+ <state>confirmed</state>
+ <local>
+ <target uri=\"sip:presence at 127.0.0.1(:5060)?\">
+ <param pname=\"\+sip.rendering\" pvalue=\"no\" />
+ </target>
+ </local>
+ </dialog>
+</dialog-info>" check_it="true" search_in="body" assign_to="body4" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/presence/digium_presence/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/presence/digium_presence/sipp/subscribe.xml
index 257b3c0..7e2a760 100644
--- a/tests/channels/pjsip/subscriptions/presence/digium_presence/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/presence/digium_presence/sipp/subscribe.xml
@@ -25,7 +25,7 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp=".*\s*digium_presence type=\"away\" subtype=\"lunch\">banana" check_it="true" search_in="body" assign_to="body" />
+ <ereg regexp=".*\s*digium_presence type=\"away\" subtype=\"lunch\">banana" check_it="true" search_in="body" assign_to="body" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/presence/no_accept_header/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/presence/no_accept_header/sipp/subscribe.xml
index 96ec574..acac6dd 100644
--- a/tests/channels/pjsip/subscriptions/presence/no_accept_header/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/presence/no_accept_header/sipp/subscribe.xml
@@ -24,7 +24,7 @@
<recv request="NOTIFY" crlf="true">
<action>
- <ereg regexp=".*\s*digium_presence type=\"away\" subtype=\"lunch\">banana" check_it="true" search_in="body" assign_to="body" />
+ <ereg regexp=".*\s*digium_presence type=\"away\" subtype=\"lunch\">banana" check_it="true" search_in="body" assign_to="body" />
</action>
</recv>
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
index e640ebd..6e8572b 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/sipp/subscribe.xml
@@ -40,7 +40,7 @@
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
- <ereg regexp="<name>pres_list</name>.+<resource uri=\"sip:alice at 127.0.0.1:5060\">.+<resource uri=\"sip:bob at 127.0.0.1:5060\">"
+ <ereg regexp="<name>pres_list</name>.+<resource uri=\"sip:alice at 127.0.0.1:5060\">.+<resource uri=\"sip:bob at 127.0.0.1:5060\">"
search_in="body" check_it="true" assign_to="1" />
</action>
@@ -67,7 +67,7 @@
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
- <ereg regexp="<presence entity=\"sip:alice at 127.0.0.1:5060\"[^>]+>[^<]*<note>Ready</note>[^<]*<tuple id=\"alice\">[^<]*<status>[^<]*<basic>open</basic>[^<]*</status>"
+ <ereg regexp="<presence entity=\"sip:alice at 127.0.0.1:5060\"[^>]+>[^<]*<note>Ready</note>[^<]*<tuple id=\"alice\">[^<]*<status>[^<]*<basic>open</basic>[^<]*</status>"
search_in="body" check_it="true" assign_to="1" />
</action>
</recv>
@@ -148,7 +148,7 @@
<action>
<ereg regexp="eventlist" search_in="hdr" header="Require:" check_it="true" assign_to="1" />
- <ereg regexp="<presence entity=\"sip:bob at 127.0.0.1:5060\"[^>]+>[^<]*<note>Ready</note>[^<]*<tuple id=\"bob\">[^<]*<status>[^<]*<basic>open</basic>[^<]*</status>"
+ <ereg regexp="<presence entity=\"sip:bob at 127.0.0.1:5060\"[^>]+>[^<]*<note>Ready</note>[^<]*<tuple id=\"bob\">[^<]*<status>[^<]*<basic>open</basic>[^<]*</status>"
search_in="body" check_it="true" assign_to="1" />
</action>
</recv>
diff --git a/tests/channels/pjsip/transfers/asterisk/endpoint/redirect/sipp/alice.xml b/tests/channels/pjsip/transfers/asterisk/endpoint/redirect/sipp/alice.xml
index ba79e8e..27f6ffe 100644
--- a/tests/channels/pjsip/transfers/asterisk/endpoint/redirect/sipp/alice.xml
+++ b/tests/channels/pjsip/transfers/asterisk/endpoint/redirect/sipp/alice.xml
@@ -35,7 +35,7 @@
<recv response="302" rtd="true">
<action>
- <ereg regexp="Contact: <sip:bob at 127.0.0.1:5062>"
+ <ereg regexp="Contact: <sip:bob at 127.0.0.1:5062>"
check_it="true" assign_to="1"/>
<test assign_to="1" variable="1" compare="equal" value=""/>
</action>
diff --git a/tests/channels/pjsip/transfers/asterisk/uri/redirect/sipp/alice.xml b/tests/channels/pjsip/transfers/asterisk/uri/redirect/sipp/alice.xml
index 27a0520..688c53d 100644
--- a/tests/channels/pjsip/transfers/asterisk/uri/redirect/sipp/alice.xml
+++ b/tests/channels/pjsip/transfers/asterisk/uri/redirect/sipp/alice.xml
@@ -35,7 +35,7 @@
<recv response="302" rtd="true">
<action>
- <ereg regexp="Contact: <sip:asterisk at 127.0.0.1:5063>"
+ <ereg regexp="Contact: <sip:asterisk at 127.0.0.1:5063>"
check_it="true" assign_to="1"/>
<test assign_to="1" variable="1" compare="equal" value=""/>
</action>
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uac-no-hangup.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uac-no-hangup.xml
index 305133e..af367bd 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uac-no-hangup.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uac-no-hangup.xml
@@ -64,12 +64,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uas.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uas.xml
index 9eec4b8..b7b2951 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uas.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local/sipp/uas.xml
@@ -84,12 +84,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uac-no-hangup.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uac-no-hangup.xml
index 305133e..af367bd 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uac-no-hangup.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uac-no-hangup.xml
@@ -64,12 +64,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uas.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uas.xml
index d9cda73..c387594 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uas.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/callee_local_blonde/sipp/uas.xml
@@ -86,12 +86,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local/sipp/uas.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local/sipp/uas.xml
index 66ec663..16d65d3 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local/sipp/uas.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local/sipp/uas.xml
@@ -84,12 +84,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas.xml
index 9eec4b8..b7b2951 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas.xml
@@ -84,12 +84,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
+ <ereg regexp="\"Alice\" <sip:alice at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas_hangup.xml b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas_hangup.xml
index e9bb6c0..9f395b6 100644
--- a/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas_hangup.xml
+++ b/tests/channels/pjsip/transfers/attended_transfer/nominal/caller_local_blonde/sipp/uas_hangup.xml
@@ -86,12 +86,12 @@
<recv request="INVITE">
<action>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="P-Asserted-Identity"
search_in="hdr"
check_it="true"
assign_to="asserted_identity"/>
- <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
+ <ereg regexp="\"Charlie\" <sip:charlie at 127.0.0.1>"
header="Remote-Party-ID"
search_in="hdr"
check_it="true"
diff --git a/tests/codecs/opus/fec/jitterbuffer/adaptive/sipp/invite_recv.xml b/tests/codecs/opus/fec/jitterbuffer/adaptive/sipp/invite_recv.xml
index fecf311..ee21873 100644
--- a/tests/codecs/opus/fec/jitterbuffer/adaptive/sipp/invite_recv.xml
+++ b/tests/codecs/opus/fec/jitterbuffer/adaptive/sipp/invite_recv.xml
@@ -6,7 +6,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
+ <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
search_in="hdr"
header="From:"
check_it="true"
diff --git a/tests/codecs/opus/fec/jitterbuffer/fixed/sipp/invite_recv.xml b/tests/codecs/opus/fec/jitterbuffer/fixed/sipp/invite_recv.xml
index fecf311..ee21873 100644
--- a/tests/codecs/opus/fec/jitterbuffer/fixed/sipp/invite_recv.xml
+++ b/tests/codecs/opus/fec/jitterbuffer/fixed/sipp/invite_recv.xml
@@ -6,7 +6,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
+ <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
search_in="hdr"
header="From:"
check_it="true"
diff --git a/tests/codecs/opus/fec/no_jitterbuffer/sipp/invite_recv.xml b/tests/codecs/opus/fec/no_jitterbuffer/sipp/invite_recv.xml
index fecf311..ee21873 100644
--- a/tests/codecs/opus/fec/no_jitterbuffer/sipp/invite_recv.xml
+++ b/tests/codecs/opus/fec/no_jitterbuffer/sipp/invite_recv.xml
@@ -6,7 +6,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
+ <ereg regexp="\"alice\"\\s+<sip:alice.*(;tag=.*)"
search_in="hdr"
header="From:"
check_it="true"
--
To view, visit https://gerrit.asterisk.org/c/testsuite/+/14323
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: 13
Gerrit-Change-Id: I28f5b429bb213e0f2549eaec06b5a32dd9148ddf
Gerrit-Change-Number: 14323
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200423/0aae94e9/attachment-0001.html>
More information about the asterisk-code-review
mailing list