fix: revert changes from version 2.2.1 due to signaling issues

fonoster · Sep 27, 2023 · 69146c5 · 69146c5
1 parent d7c2664
commit 69146c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/mods/connect/src/tailor.ts b/mods/connect/src/tailor.ts
@@ -29,8 +29,8 @@ export const tailor = (route: Route, req: MessageRequest): MessageRequest =>
     A.removeSelfRoutes,
     A.removeXEdgePortRef,
     // NOTE: We should consider making the overwriteContactWithSenderInfo an Agent/Peer level alteration
-    A.overwriteContactWithSenderInfo,
-    // A.fixInvalidContact,
+    // A.overwriteContactWithSenderInfo,
+    A.fixInvalidContact,
     A.fixRequestURI(route),
     A.addSelfVia(route),
     A.applyXHeaders(route),

diff --git a/mods/edgeport/src/main/java/io/routr/headers/MessageConverter.java b/mods/edgeport/src/main/java/io/routr/headers/MessageConverter.java
@@ -201,9 +201,13 @@ static private NetInterface buildNetInterface(String ipAddress, int port, ViaHea
   }
 
   static private NetInterface getSenderFromRequest(final RequestEventExt event) {
+    if (event == null) {
+      return NetInterface.newBuilder().build();
+    }
+
     Request request = event.getRequest();
     ViaHeader via = (ViaHeader) request.getHeader(ViaHeader.NAME);
-    return buildNetInterface(event.getRemoteIpAddress(), event.getRemotePort(), via);
+    return MessageConverter.getSenderFromVia(via);
   }
 
   static private NetInterface getSenderFromResponse(final ResponseEventExt event) {
@@ -212,6 +216,18 @@ static private NetInterface getSenderFromResponse(final ResponseEventExt event)
     return buildNetInterface(event.getRemoteIpAddress(), event.getRemotePort(), via);
   }
 
+  static private NetInterface getSenderFromVia(final ViaHeader via) {
+    if (via == null) {
+      return NetInterface.newBuilder().build();
+    }
+
+    return NetInterface.newBuilder()
+      .setHost(via.getHost())
+      .setPort(via.getPort())
+      .setTransport(Transport.valueOf(via.getTransport().toUpperCase()))
+      .build();
+  }
+
   static private Converter getConverterByHeader(Class<?> clasz) {
     Class<Converter> converter = ClassFinder.findConverterByHeaderClass(clasz);
     if (converter != null) {