Changeset b007afc for lib/trace.c

Timestamp:

10/06/04 14:52:05 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5c25d3a

Parents:

0afc0d7

Message:

trace_get_server_port

File:

• lib/trace.c (modified) (2 diffs)

lib/trace.c

@@ -1210 +1210 @@
 #define DYNAMIC(x) (49152 < x < 65535)
 #define SERVER(x) ROOT_SERVER(x) || NONROOT_SERVER(x)
-#define CLIENT(x) ROOT_CLIENT(x) || NONROOT_CLIENT(x) || DYNAMIC(x)
+#define CLIENT(x) ROOT_CLIENT(x) || NONROOT_CLIENT(x) 
 
 int8_t trace_get_server_port(uint8_t protocol, uint16_t source, uint16_t dest) {
@@ -1227 +1227 @@
         int8_t server, client;
 
-        if (SERVER(source) && CLIENT(dest)) {
+        /* equal */
+        if (source == client)
+                return USE_DEST;
+
+        /* root server port, 0 - 511 */
+        if (ROOT_SERVER(source) && ROOT_SERVER(dest))
+                return USE_DEST;
+
+        if (ROOT_SERVER(source) && !ROOT_SERVER(dest))
                 return USE_SOURCE;
-        } else if (SERVER(dest) && CLIENT(source)) {
+
+        if (!ROOT_SERVER(source) && ROOT_SERVER(dest))
                 return USE_DEST;
-        } else if (ROOT_SERVER(source) && !ROOT_SERVER(dest)) {
+
+        /* non-root server */
+        if (NONROOT_SERVER(source) && NONROOT_SERVER(dest))
+                return USE_DEST;
+        if (NONROOT_SERVER(source) && !NONROOT_SERVER(dest))
                 return USE_SOURCE;
-        } else if (ROOT_SERVER(dest) && !ROOT_SERVER(source)) {
+        if (!NONROOT_SERVER(source) && NONROOT_SERVER(dest))
                 return USE_DEST;
-        }
-        
+
+        /* root client */
+        if (ROOT_CLIENT(source) && ROOT_CLIENT(dest))
+                return USE_DEST;
+        if (ROOT_CLIENT(source) && !ROOT_CLIENT(dest))
+                return USE_DEST;
+        if (!ROOT_CLIENT(source) && ROOT_CLIENT(dest))
+                return USE_SOURCE;
+        
+        /* nonroot client */
+        if (NONROOT_CLIENT(source) && NONROOT_CLIENT(dest))
+                return USE_DEST;
+        if (NONROOT_CLIENT(source) && !NONROOT_CLIENT(dest))
+                return USE_DEST;
+        if (!NONROOT_CLIENT(source) && NONROOT_CLIENT(dest))
+                return USE_SOURCE;
+
+        if (DYNAMIC(source) && DYNAMIC(dest))
+                return USE_DEST;
+        if (DYNAMIC(source) && !DYNAMIC(dest))
+                return USE_DEST;
+        if (!DYNAMIC(source) && DYNAMIC(dest))
+                return USE_SOURCE;
+        /*
+        if (SERVER(source) && CLIENT(dest)) 
+                return USE_SOURCE;
+        
+        if (SERVER(dest) && CLIENT(source)) 
+                return USE_DEST;
+        if (ROOT_SERVER(source) && !ROOT_SERVER(dest)) 
+                return USE_SOURCE;
+        if (ROOT_SERVER(dest) && !ROOT_SERVER(source)) 
+                return USE_DEST;
+        */
         // failing that test...
         if (source < dest) {