fix: regression caused by the introduction of the X-Call-Direction he…

…ader
fonoster · Aug 16, 2024 · 173c623 · 173c623
1 parent 97dd0fc
commit 173c623
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/compose.dev.yaml b/compose.dev.yaml
@@ -156,12 +156,13 @@ services:
 
   #
   # SIP End to End Test (SEET) compliance test for SIPConnect v1.1 support
-  # docker-compose -f compose.yaml -f compose.dev.yaml up \
-  #   --abort-on-container-exit --exit-code-from compliance
+  # docker compose -f compose.yaml -f compose.dev.yaml up \
+  #  --build --abort-on-container-exit --exit-code-from compliance \
+  #   compliance edgeport01 edgeport02 dispatcher registry requester apiserver connect location
   #
   compliance:
     container_name: compliance
-    image: fonoster/seet:1.1.1
+    image: fonoster/seet:1.2.0
     depends_on:
       - edgeport01
       - edgeport02
@@ -170,6 +171,7 @@ services:
       - requester
       - apiserver
       - connect
+      - location
     environment:
       SCENARIOS: /seet.json
     ports:

diff --git a/etc/scenarios/rr/uac_invite_callee_bye.xml b/etc/scenarios/rr/uac_invite_callee_bye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
-<scenario name="RR.Tst.Plan.1.1.2.UAC">
+<scenario name="RR.Tst.Plan.1.5.1.UAC">
 
   <Global variables="requestURI,from,to" />
 
@@ -87,7 +87,8 @@
     </action>
   </recv>
 
-  <!-- The stack is not generating routes for the following command -->
+  <!-- WARNING: This step is failing due to a bug in the connect processor which
+        overwrites the contact header with the peer EdgePort. -->
   <send>
     <![CDATA[
       ACK [$remoteURI] SIP/2.0

diff --git a/etc/scenarios/rr/uas_agent_to_agent_callee_bye.xml b/etc/scenarios/rr/uas_agent_to_agent_callee_bye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE scenario SYSTEM "sipp.dtd">
 
-<scenario name="RR.Tst.Plan.1.1.2.UAS">
+<scenario name="RR.Tst.Plan.1.5.1.UAS">
 
   <recv request="INVITE" rrs="true" />
 

diff --git a/mods/connect/src/handlers/request.ts b/mods/connect/src/handlers/request.ts
@@ -72,6 +72,8 @@ export const handleRequest =
           action: CT.HeaderModifierAction.ADD
         }
 
+        if (!route.headers) route.headers = []
+
         route.headers.push(p)
       }
 

diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "start:requester": "cross-env NODE_ENV=dev LOGS_LEVEL=verbose ./mods/requester/requester.sh",
     "start:rtprelay": "cross-env  NODE_ENV=dev LOGS_LEVEL=verbose nodemon mods/rtprelay/src/runner",
     "start:docs": "cd docs && npm start",
-    "start:deps": "docker-compose -f compose.dev.yaml up rtpengine redis postgres adminer -d",
-    "stop:deps": "docker-compose -f compose.dev.yaml down rtpengine redis postgres adminer",
+    "start:deps": "docker compose -f compose.dev.yaml up rtpengine redis postgres adminer -d",
+    "stop:deps": "docker compose -f compose.dev.yaml down rtpengine redis postgres adminer",
     "db:migrate": "npx prisma migrate dev --schema ./mods/pgdata/schema.prisma --name changeme",
     "generate:certs": "./.scripts/generate-certs.sh",
     "convert:certs": "./.scripts/convert-to-p12.sh && mv signaling.p12 etc/certs/",
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,8 @@ export const handleRequest = @@
               action: CT.HeaderModifierAction.ADD
             }
+            if (!route.headers) route.headers = []
             route.headers.push(p)
           }
@@ Expand Down @@