Changeset 642

Timestamp:

03/03/06 17:36:04 (7 years ago)

Author:

perry

Message:

Update to support libtrace3, also fix (minor) warnings where possible!

Location:

trunk/tools/tracereport

Files:

• contain.h (modified) (2 diffs)
• port_report.c (modified) (1 diff)
• tracereport.c (modified) (1 diff)

trunk/tools/tracereport/contain.h

@@ -105 +105 @@
                 keytype b = ((struct _map_t*)_map_b)->key;              \
                 return (exp);                                           \
-        };
+        }
                 
                 
@@ -158 +158 @@
         int name ## _cmp(const splay *a,const splay *b) {               \
                 return cmp(((name ## _t*)a)->key,((name ## _t *)b)->key); \
-        };
+        }
 
 #define SET_INSERT(name,vkey) \

trunk/tools/tracereport/port_report.c

@@ -16 +16 @@
 {
         struct libtrace_ip *ip = trace_get_ip(packet);
+        int port;
         if (!ip)
                 return;
 
-        int port = trace_get_server_port(ip->ip_p,
+        port = trace_get_server_port(ip->ip_p,
                         trace_get_source_port(packet),
                         trace_get_destination_port(packet))==USE_SOURCE

trunk/tools/tracereport/tracereport.c

@@ -66 +66 @@
 
         trace = trace_create(uri);
+        if (trace_is_err(trace)) {
+                trace_perror(trace,"trace_create");
+                return 1;
+        }
+
+        if (trace_start(trace)==-1) {
+                trace_perror(trace,"trace_start");
+                return 1;
+        }
 
         for (;;) {