Change which interface tcpprep will send "client" and "server"

traffic to. Now traffic client->server will be the primary interface and server->client traffic will be secondary interface. refs appneta#507
baigubulu · Apr 24, 2012 · 6abd467 · 6abd467
1 parent cd0ab87
commit 6abd467
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 14 deletions.
diff --git a/src/tcpreplay_opts.def b/src/tcpreplay_opts.def
@@ -162,8 +162,8 @@ flag = {
     doc         = <<- EOText
 Select the algoritim used for sleeping between packets.  Valid options are
 "current" and "ver325".  Current tends to be best for very high speeds, while
-the older ver325 mode works best when trying to reproduce the most accurate timings
-which is necessary for VOIP and other time sensitive protocols.
+the older ver325 mode works best when trying to reproduce the most accurate 
+timings which is necessary for VOIP and other time sensitive protocols.
 EOText;
 };
 
@@ -291,17 +291,26 @@ flag = {
     arg-type    = string;
     max         = 1;
     must-set;
-    descrip     = "Server/primary traffic output interface";
-    doc         = "";
+    descrip     = "Client to server/RX/primary traffic output interface";
+    doc         = <<- EOText
+Required network interface used to send either all traffic or traffic which is 
+marked as 'primary' via tcpprep.  Primary traffic is usually client-to-server 
+or inbound (RX) on khial virtual interfaces.
+EOText;
 };
 
 flag = {
     name        = intf2;
     value       = I;
     arg-type    = string;
     max         = 1;
-    descrip     = "Client/secondary traffic output interface";
-    doc         = "";
+    descrip     = "Server to client/TX/secondary traffic output interface";
+    doc         = <<- EOText
+Optional network interface used to send traffic which is marked as 'secondary' 
+via tcpprep.  Secondary traffic is usually server-to-client or outbound 
+(TX) on khial virtual interfaces.  Generally, it only makes sense to use this
+option with --cachefile.
+EOText;
 };
 
 

diff --git a/src/tree.c b/src/tree.c
@@ -272,18 +272,14 @@ check_ip_tree(const int mode, const unsigned long ip)
     }
 #endif
 
-    /*
-     * FIXME: Is this logic correct?  I think this might be backwards :(
-     */
-
     /* return node type if we found the node, else return the default (mode) */
     if (node != NULL) {
         switch (node->type) {
         case DIR_SERVER:
-            return TCPR_DIR_C2S;
+            return TCPR_DIR_S2C;
             break;
         case DIR_CLIENT:
-            return TCPR_DIR_S2C;
+            return TCPR_DIR_C2S;
             break;
         case DIR_UNKNOWN:
         case DIR_ANY:
@@ -297,10 +293,10 @@ check_ip_tree(const int mode, const unsigned long ip)
     return_unknown:
     switch (mode) {
     case DIR_SERVER:
-        return TCPR_DIR_C2S;
+        return TCPR_DIR_S2C;
         break;
     case DIR_CLIENT:
-        return TCPR_DIR_S2C;
+        return TCPR_DIR_C2S;
         break;
     default:
         return -1;

diff --git a/test/test.auto_bridge b/test/test.auto_bridge
diff --git a/test/test.auto_client b/test/test.auto_client
diff --git a/test/test.auto_first b/test/test.auto_first
diff --git a/test/test.auto_router b/test/test.auto_router
diff --git a/test/test.auto_server b/test/test.auto_server
diff --git a/test/test.prep_config b/test/test.prep_config
diff --git a/test/test2.rewrite_endpoint b/test/test2.rewrite_endpoint
diff --git a/test/test2.rewrite_mac b/test/test2.rewrite_mac
diff --git a/test/test2.rewrite_skip b/test/test2.rewrite_skip