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