Changeset f0a2f98

Timestamp:

10/06/04 15:46:32 (18 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:

f9bb6c5

Parents:

5c25d3a

Message:

more fixes

File:

• lib/trace.c (modified) (1 diff)

lib/trace.c

@@ -1260 +1260 @@
                 return USE_DEST;
         }
-        if (ROOT_CLIENT(source) && !ROOT_CLIENT(dest))
+        if (ROOT_CLIENT(source) && !ROOT_CLIENT(dest)) {
+                /* prefer root-client over nonroot-client */
+                if (NONROOT_CLIENT(dest))
+                        return USE_SOURCE;
                 return USE_DEST;
-        if (!ROOT_CLIENT(source) && ROOT_CLIENT(dest))
+        }
+        if (!ROOT_CLIENT(source) && ROOT_CLIENT(dest)) {
+                /* prefer root-client over nonroot-client */
+                if (NONROOT_CLIENT(source))
+                        return USE_DEST;
                 return USE_SOURCE;
+        }
         
         /* nonroot client */