support for routing based on X-Jambonz-Routing header

2026-01-25 02:07:59 +00:00 · 2022-01-08 13:01:02 -05:00
parent 9d228d4805
commit fa7de71650
15 changed files with 87 additions and 41 deletions
--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -118,7 +118,7 @@ services:
        ipv4_address: 172.39.0.24

  influxdb:
-    image: influxdb:1.8-alpine
+    image: influxdb:1.8
    ports:
      - "8086:8086"
    networks:
--- a/test/scenarios/uac-cancel.xml
+++ b/test/scenarios/uac-cancel.xml
@@ -36,6 +36,7 @@
      Subject: uac-pcap-carrier-success
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: phone
      Content-Type: application/sdp
      Content-Length: [len]

@@ -103,4 +104,3 @@
  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>

 </scenario>
-
--- a/test/scenarios/uac-device-invalid-password.xml
+++ b/test/scenarios/uac-device-invalid-password.xml
@@ -34,6 +34,7 @@
      Contact: sip:sipp@[local_ip]:[local_port]
      Max-Forwards: 70
      Subject: uac-device-unknown-user
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-device-unknown-realm.xml
+++ b/test/scenarios/uac-device-unknown-realm.xml
@@ -34,6 +34,7 @@
      Contact: sip:sipp@[local_ip]:[local_port]
      Max-Forwards: 70
      Subject: uac-device-unknown-user
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-device-unknown-user.xml
+++ b/test/scenarios/uac-device-unknown-user.xml
@@ -34,6 +34,7 @@
      Contact: sip:sipp@[local_ip]:[local_port]
      Max-Forwards: 70
      Subject: uac-device-unknown-user
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-pcap-carrier-fail-limits.xml
+++ b/test/scenarios/uac-pcap-carrier-fail-limits.xml
@@ -16,6 +16,7 @@
      Max-Forwards: 70
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: ff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: phone
      Subject: uac-pcap-carrier-fail-limits
      Content-Type: application/sdp
      Content-Length: [len]
--- a/test/scenarios/uac-pcap-carrier-success-reinvite.xml
+++ b/test/scenarios/uac-pcap-carrier-success-reinvite.xml
@@ -17,6 +17,7 @@
      Subject: uac-pcap-carrier-success
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: phone
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-pcap-carrier-success.xml
+++ b/test/scenarios/uac-pcap-carrier-success.xml
@@ -16,6 +16,7 @@
      Max-Forwards: 70
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: phone
      Subject: uac-pcap-carrier-success
      Content-Type: application/sdp
      Content-Length: [len]
--- a/test/scenarios/uac-pcap-device-404.xml
+++ b/test/scenarios/uac-pcap-device-404.xml
@@ -37,6 +37,7 @@
      Subject: uac-pcap-device-success
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: ff649e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-pcap-device-success-in-dialog-request.xml
+++ b/test/scenarios/uac-pcap-device-success-in-dialog-request.xml
@@ -34,6 +34,7 @@
      Contact: sip:sipp@[local_ip]:[local_port]
      Max-Forwards: 70
      Subject: uac-pcap-device-success
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-pcap-device-success.xml
+++ b/test/scenarios/uac-pcap-device-success.xml
@@ -35,6 +35,7 @@
      Contact: sip:sipp@[local_ip]:[local_port]
      Max-Forwards: 70
      Subject: uac-pcap-device-success
+      X-Jambonz-Routing: user
      Content-Type: application/sdp
      Content-Length: [len]

--- a/test/scenarios/uac-sip-uri-auth-success.xml
+++ b/test/scenarios/uac-sip-uri-auth-success.xml
@@ -37,6 +37,7 @@
      Subject: uac-sip-uri-auth-success
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: sip
      Content-Type: application/sdp
      Content-Length: [len]

@@ -90,6 +91,7 @@
      Subject: uac-sip-uri-auth-success
      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
+      X-Jambonz-Routing: sip
      Content-Type: application/sdp
      Content-Length: [len]

@@ -126,7 +128,7 @@
      To: <sip:sip:john@jambonz.org>[peer_tag_param]
      [last_Call-ID:]
      CSeq: 2 ACK
-      Subject: uac-sip-uri-auth-success
+      Subject: 
      Content-Length: 0

    ]]>