Fix data rewrite in tunnel mode

jlucansky · Dec 26, 2020 · ac2e302 · ac2e302
1 parent bf60cec
commit ac2e302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Source/Swiddler/Channels/Channel.cs b/Source/Swiddler/Channels/Channel.cs
@@ -34,6 +34,13 @@ public void Observe(Channel other)
             Observers.Add(other);
         }
 
+        public void ObserveAfter<T>(Channel other) where T: Channel
+        {
+            int index = Observers.FindIndex(x => x is T) + 1;
+            if (index < 0) index = 0;
+            Observers.Insert(index, other);
+        }
+
         /// <summary>
         /// Marks all sending packets (Reads) from this channel with specified flow.
         /// </summary>

diff --git a/Source/Swiddler/Common/Session.cs b/Source/Swiddler/Common/Session.cs
@@ -334,10 +334,10 @@ private void StartClient()
                 {
                     ServerChannel.DefaultFlow = TrafficFlow.Outbound;
 
-                    ServerChannel.Observers.Insert(0, ClientChannel);
+                    ServerChannel.ObserveAfter<RewriteChannel>(ClientChannel);
                     ClientChannel.Observe(ServerChannel);
 
-                    SessionChannel.Observers.Insert(0, ClientChannel); // user input data send to client channel
+                    SessionChannel.ObserveAfter<RewriteChannel>(ClientChannel); // user input data send to client channel
                     ClientChannel.Observe(SessionChannel);
 
                     IPEndPoint src = null, dst = targetEP;