Index: tests/channels/SIP/tests.yaml
===================================================================
--- tests/channels/SIP/tests.yaml	(revision 4212)
+++ tests/channels/SIP/tests.yaml	(working copy)
@@ -59,3 +59,4 @@
     - dir: 'session_timers'
     - test: 'path'
     - test: 'alwaysauthreject'
+    - test: 'route'
Index: tests/channels/SIP/route/sipp/send-invite.xml
===================================================================
--- tests/channels/SIP/route/sipp/send-invite.xml	(revision 0)
+++ tests/channels/SIP/route/sipp/send-invite.xml	(working copy)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="iso-8859-2" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="INVITE + record-route">
+  <nop hide="true">
+    <action>
+      <assignstr assign_to="1" value="[call_number]" />
+      <strcmp assign_to="rr_type" variable="1" value="1" />
+    </action>
+  </nop>
+
+  <nop hide="true" next="4" test="rr_type">
+    <action>
+      <assignstr assign_to="rr_out" value="<strict1@[local_ip]:[local_port]>,<strict2@[local_ip]:[local_port]>" />
+      <assignstr assign_to="rr_rcv" value="[$rr_out]" />
+      <assignstr assign_to="bye_uri" value="strict1@[local_ip]:[local_port]" />
+      <assignstr assign_to="rr_bye" value="<strict2@[local_ip]:[local_port]>,<sip:51@[local_ip]:[local_port]>" />
+    </action>
+  </nop>
+
+  <nop hide="true">
+    <action>
+      <assignstr assign_to="rr_out" value="<loose1@[local_ip]:[local_port];lr>,<loose2@[local_ip]:[local_port];lr>" />
+      <assignstr assign_to="rr_rcv" value="[$rr_out]" />
+      <assignstr assign_to="bye_uri" value="sip:51@[local_ip]:[local_port]" />
+      <assignstr assign_to="rr_bye" value="<loose1@[local_ip]:[local_port];lr>,<loose2@[local_ip]:[local_port];lr>" />
+    </action>
+  </nop>
+
+  <label id="4"/>
+
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:52@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:51@[local_ip]:[local_port]>;tag=[call_number]
+      To: <sip:52@[remote_ip]:[remote_port]>
+      Call-ID: [call_id]
+      CSeq: [cseq] INVITE
+      Contact: sip:51@[local_ip]:[local_port]
+      Record-Route: [$rr_out]
+      Max-Forwards: 100
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+
+    ]]>
+  </send>
+
+  <recv response="100">
+    <action>
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Record-Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <recv response="180">
+    <action>
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Record-Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <recv response="183" optional="true">
+    <action>
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Record-Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <recv response="200" rrs="true">
+    <action>
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Record-Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      ACK [next_url] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: <sip:51@[local_ip]:[local_port]>;tag=[call_number]
+      [last_To:]
+      [routes]
+      Call-ID: [call_id]
+      CSeq: [cseq] ACK
+      Contact: sip:51@[local_ip]:[local_port]
+      Max-Forwards: 100
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="BYE">
+    <action>
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_bye" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+
+      <ereg regexp="BYE\s*([^ ]*) SIP/2.0" search_in="msg" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="bye_uri" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+</scenario>
+
Index: tests/channels/SIP/route/sipp/recv-invite.xml
===================================================================
--- tests/channels/SIP/route/sipp/recv-invite.xml	(revision 0)
+++ tests/channels/SIP/route/sipp/recv-invite.xml	(working copy)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uas' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="UAS for Route testing">
+  <nop hide="true">
+    <action>
+      <assignstr assign_to="1" value="[call_number]" />
+      <strcmp assign_to="rr_type" variable="1" value="1" />
+    </action>
+  </nop>
+
+  <nop hide="true" next="4" test="rr_type">
+    <action>
+      <assignstr assign_to="rr_out" value="<test1-subsystem1@[local_ip]:[local_port]>,<test1-subsystem2@[local_ip]:[local_port]>" />
+      <assignstr assign_to="rr_uri" value="test1-subsystem2@[local_ip]:[local_port]" />
+      <assignstr assign_to="rr_rcv" value="<test1-subsystem1@[local_ip]:[local_port]>,<sip:[local_ip]:[local_port]>" />
+    </action>
+  </nop>
+
+  <nop hide="true">
+    <action>
+      <assignstr assign_to="rr_out" value="<test1-subsystem1@[local_ip]:[local_port];lr>,<test1-subsystem2@[local_ip]:[local_port];lr>" />
+      <assignstr assign_to="rr_uri" value="sip:[local_ip]:[local_port]" />
+      <assignstr assign_to="rr_rcv" value="<test1-subsystem2@[local_ip]:[local_port];lr>,<test1-subsystem1@[local_ip]:[local_port];lr>" />
+    </action>
+  </nop>
+
+  <label id="4"/>
+
+  <recv request="INVITE" crlf="true"></recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Record-Route: [$rr_out]
+      Contact: <sip:[local_ip]:[local_port]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Record-Route: [$rr_out]
+      Contact: <sip:[local_ip]:[local_port]>
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <recv request="ACK" rtd="true" crlf="true">
+    <action>
+      <ereg regexp="ACK\s*([^ ]*) SIP/2.0" search_in="msg" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_uri" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <recv request="BYE">
+    <action>
+      <ereg regexp="BYE\s*([^ ]*) SIP/2.0" search_in="msg" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_uri" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+
+      <ereg regexp="\s*(.*)\s*" search_in="hdr" header="Route:" assign_to="1,2"/>
+      <strcmp assign_to="1" variable="2" variable2="rr_rcv" />
+      <test assign_to="2" variable="1" compare="equal" value="0" />
+      <ereg assign_to="2" regexp="." search_in="var" variable="1" check_it="true" />
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+</scenario>
+
Index: tests/channels/SIP/route/test-config.yaml
===================================================================
--- tests/channels/SIP/route/test-config.yaml	(revision 0)
+++ tests/channels/SIP/route/test-config.yaml	(working copy)
@@ -0,0 +1,41 @@
+testinfo:
+    summary:     'SIP Record-Route Support'
+    description: |
+        'This test verifies SIP Record-Route handling for incoming calls.
+        Test includes loose and strict routes.'
+
+properties:
+    minversion: '1.8.0'
+    dependencies:
+        - python : 'twisted'
+        - python : 'starpy'
+        - app : 'sipp'
+        - asterisk : 'chan_sip'
+    tags:
+        - SIP
+
+test-modules:
+    test-object:
+        config-section: sipp-config
+        typename: 'sipp.SIPpTestCase'
+    modules:
+        # Need to originate exactly 2 channels for recv-invite.
+        -
+            config-section: originator-recv-invite
+            typename: 'PluggableModules.Originator'
+        -
+            config-section: originator-recv-invite
+            typename: 'PluggableModules.Originator'
+
+originator-recv-invite:
+    application: 'Wait'
+    data: '1'
+    trigger: 'ami_connect'
+
+sipp-config:
+    fail-on-any: True
+    test-iterations:
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'send-invite.xml', '-p': '5061', '-m': '2', },}
+                - { 'key-args': {'scenario': 'recv-invite.xml', '-p': '5062', '-m': '2', },}
Index: tests/channels/SIP/route/configs/ast1/sip.conf
===================================================================
--- tests/channels/SIP/route/configs/ast1/sip.conf	(revision 0)
+++ tests/channels/SIP/route/configs/ast1/sip.conf	(working copy)
@@ -0,0 +1,7 @@
+[general]
+udpbindaddr=127.0.0.1
+
+[ua1]
+type=peer
+host=127.0.0.1
+port=5062
Index: tests/channels/SIP/route/configs/ast1/extensions.conf
===================================================================
--- tests/channels/SIP/route/configs/ast1/extensions.conf	(revision 0)
+++ tests/channels/SIP/route/configs/ast1/extensions.conf	(working copy)
@@ -0,0 +1,8 @@
+[default]
+exten => s,1,Answer()
+same => n,Dial(SIP/ua1,1)
+same => n,Hangup()
+
+exten => _XX,1,Ringing()
+same => n,Answer()
+same => n,Hangup()