Changeset 5c25d3a for lib/trace.c

Timestamp:

10/06/04 15:13:44 (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:

f0a2f98

Parents:

b007afc

Message:

fixes in trace_get_server_port()

File:

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

lib/trace.c

@@ -1204 +1204 @@
  * @author Daniel Lawson
  */
-#define ROOT_SERVER(x) (x < 512)
-#define ROOT_CLIENT(x) (512 <= x < 1024)
-#define NONROOT_SERVER(x) (x >= 5000)
-#define NONROOT_CLIENT(x) (1024 <= x < 5000)
-#define DYNAMIC(x) (49152 < x < 65535)
+#define ROOT_SERVER(x) ((x) < 512)
+#define ROOT_CLIENT(x) ((512 <= (x)) && ((x) < 1024))
+#define NONROOT_SERVER(x) ((x) >= 5000)
+#define NONROOT_CLIENT(x) ((1024 <= (x)) && ((x) < 5000))
+#define DYNAMIC(x) ((49152 < (x)) && ((x) < 65535))
 #define SERVER(x) ROOT_SERVER(x) || NONROOT_SERVER(x)
 #define CLIENT(x) ROOT_CLIENT(x) || NONROOT_CLIENT(x) 
@@ -1225 +1225 @@
          */
 
-        int8_t server, client;
+        uint16_t server, client;
 
         /* equal */
@@ -1232 +1232 @@
 
         /* root server port, 0 - 511 */
-        if (ROOT_SERVER(source) && ROOT_SERVER(dest))
+        if (ROOT_SERVER(source) && ROOT_SERVER(dest)) {
+                if (source < dest)
+                        return USE_SOURCE;
                 return USE_DEST;
+        }
 
         if (ROOT_SERVER(source) && !ROOT_SERVER(dest))
                 return USE_SOURCE;
-
         if (!ROOT_SERVER(source) && ROOT_SERVER(dest))
                 return USE_DEST;
 
         /* non-root server */
-        if (NONROOT_SERVER(source) && NONROOT_SERVER(dest))
+        if (NONROOT_SERVER(source) && NONROOT_SERVER(dest)) {
+                if (source < dest)
+                        return USE_SOURCE;
                 return USE_DEST;
+        }
         if (NONROOT_SERVER(source) && !NONROOT_SERVER(dest))
                 return USE_SOURCE;
@@ -1250 +1255 @@
 
         /* root client */
-        if (ROOT_CLIENT(source) && ROOT_CLIENT(dest))
+        if (ROOT_CLIENT(source) && ROOT_CLIENT(dest)) {
+                if (source < dest)
+                        return USE_SOURCE;
                 return USE_DEST;
+        }
         if (ROOT_CLIENT(source) && !ROOT_CLIENT(dest))
                 return USE_DEST;
@@ -1258 +1266 @@
         
         /* nonroot client */
-        if (NONROOT_CLIENT(source) && NONROOT_CLIENT(dest))
+        if (NONROOT_CLIENT(source) && NONROOT_CLIENT(dest)) {
+                if (source < dest) 
+                        return USE_SOURCE;
                 return USE_DEST;
+        }
         if (NONROOT_CLIENT(source) && !NONROOT_CLIENT(dest))
                 return USE_DEST;
@@ -1265 +1276 @@
                 return USE_SOURCE;
 
+        /* dynamic range */
         if (DYNAMIC(source) && DYNAMIC(dest))
                 return USE_DEST;