Changeset bab946c

Timestamp:

01/15/19 16:47:20 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

e9fe6ac

Parents:

edd0448

Message:

Fix clashes between global and local variable names in tools.

Location:

tools

Files:

• traceanon/traceanon.cc (modified) (12 diffs)
• tracertstats/tracertstats.c (modified) (3 diffs)
• tracesplit/tracesplit.c (modified) (3 diffs)
• tracestats/tracestats.c (modified) (3 diffs)

tools/traceanon/traceanon.cc

@@ -46 +46 @@
 };
 
-bool enc_source = false;
-bool enc_dest   = false;
+bool enc_source_opt = false;
+bool enc_dest_opt   = false;
 enum enc_type_t enc_type = ENC_NONE;
 char *key = NULL;
@@ -54 +54 @@
 trace_option_compresstype_t compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
 
-struct libtrace_t *trace = NULL;
+struct libtrace_t *inptrace = NULL;
 
 static void cleanup_signal(int signal)
@@ -60 +60 @@
         (void)signal;
         // trace_pstop isn't really signal safe because its got lots of locks in it
-        trace_pstop(trace);
+        trace_pstop(inptrace);
 }
 
@@ -182 +182 @@
         ip6 = trace_get_ip6(packet);
 
-        if (ipptr && (enc_source || enc_dest)) {
-                encrypt_ips(anon, ipptr,enc_source,enc_dest);
+        if (ipptr && (enc_source_opt || enc_dest_opt)) {
+                encrypt_ips(anon, ipptr,enc_source_opt,enc_dest_opt);
                 ipptr->ip_sum = 0;
-        } else if (ip6 && (enc_source || enc_dest)) {
-                encrypt_ipv6(anon, ip6, enc_source, enc_dest);
+        } else if (ip6 && (enc_source_opt || enc_dest_opt)) {
+                encrypt_ipv6(anon, ip6, enc_source_opt, enc_dest_opt);
         }
 
@@ -197 +197 @@
 
         udp = trace_get_udp(packet);
-        if (udp && (enc_source || enc_dest)) {
+        if (udp && (enc_source_opt || enc_dest_opt)) {
                 udp->check = 0;
         }
 
         tcp = trace_get_tcp(packet);
-        if (tcp && (enc_source || enc_dest)) {
+        if (tcp && (enc_source_opt || enc_dest_opt)) {
                 tcp->check = 0;
         }
 
         icmp6 = trace_get_icmp6(packet);
-        if (icmp6 && (enc_source || enc_dest)) {
+        if (icmp6 && (enc_source_opt || enc_dest_opt)) {
                 icmp6->checksum = 0;
         }
@@ -357 +357 @@
                         case 'Z': compress_type_str=optarg; break;         
                         case 'z': level = atoi(optarg); break;
-                        case 's': enc_source=true; break;
-                        case 'd': enc_dest  =true; break;
+                        case 's': enc_source_opt=true; break;
+                        case 'd': enc_dest_opt  =true; break;
                         case 'c': 
                                   if (key!=NULL) {
@@ -442 +442 @@
 
         /* open input uri */
-        trace = trace_create(argv[optind]);
-        if (trace_is_err(trace)) {
-                trace_perror(trace,"trace_create");
+        inptrace = trace_create(argv[optind]);
+        if (trace_is_err(inptrace)) {
+                trace_perror(inptrace,"trace_create");
                 exitcode = 1;
                 goto exitanon;
@@ -463 +463 @@
          * special case to have.
          */
-        trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_t){0});
+        trace_set_combiner(inptrace, &combiner_ordered, (libtrace_generic_t){0});
 
         pktcbs = trace_create_callback_set();
@@ -475 +475 @@
         trace_set_starting_cb(repcbs, init_output);
 
-        trace_set_perpkt_threads(trace, maxthreads);
+        trace_set_perpkt_threads(inptrace, maxthreads);
 
         if (filterstring) {
@@ -481 +481 @@
         }
 
-        if (filter && trace_config(trace, TRACE_OPTION_FILTER, filter) == -1)
+        if (filter && trace_config(inptrace, TRACE_OPTION_FILTER, filter) == -1)
         {
-                trace_perror(trace, "Configuring input filter");
+                trace_perror(inptrace, "Configuring input filter");
                 exitcode = 1;
                 goto exitanon;
         }
 
-        if (trace_pstart(trace, output, pktcbs, repcbs)==-1) {
-                trace_perror(trace,"trace_start");
+        if (trace_pstart(inptrace, output, pktcbs, repcbs)==-1) {
+                trace_perror(inptrace,"trace_start");
                 exitcode = 1;
                 goto exitanon;
@@ -502 +502 @@
 
         // Wait for the trace to finish
-        trace_join(trace);
+        trace_join(inptrace);
 
 exitanon:
@@ -509 +509 @@
         if (repcbs)
                 trace_destroy_callback_set(repcbs);
-        if (trace)
-                trace_destroy(trace);
+        if (inptrace)
+                trace_destroy(inptrace);
         return exitcode;
 }

tools/tracertstats/tracertstats.c

@@ -80 +80 @@
 struct output_data_t *output = NULL;
 
-uint64_t count;
-uint64_t bytes;
+uint64_t totalcount;
+uint64_t totalbytes;
 
 struct libtrace_t *currenttrace;
@@ -178 +178 @@
         }
         while ((glob_last_ts >> 32) < (ts >> 32)) {
-                report_results(glob_last_ts >> 32, count, bytes, stats);
-                count = 0;
-                bytes = 0;
+                report_results(glob_last_ts >> 32, totalcount, totalbytes,
+                                stats);
+                totalcount = 0;
+                totalbytes = 0;
                 for (j = 0; j < filter_count; j++)
                         filters[j].count = filters[j].bytes = 0;
                 glob_last_ts = ts;
         }
-        count += res->total.count;
+        totalcount += res->total.count;
         packets_seen += res->total.count;
-        bytes += res->total.bytes;
+        totalbytes += res->total.bytes;
         for (j = 0; j < filter_count; j++) {
                 filters[j].count += res->filters[j].count;
@@ -344 +345 @@
                 stats = trace_get_statistics(trace, stats);
         }
-        report_results((glob_last_ts >> 32), count, bytes, stats);
+        report_results((glob_last_ts >> 32), totalcount, totalbytes, stats);
         if (trace_is_err(trace))
                 trace_perror(trace,"%s",uri);

tools/tracesplit/tracesplit.c

@@ -52 +52 @@
 uint64_t filescreated = 0;
 uint16_t snaplen = 0;
-int jump=0;
+int jumpopt=0;
 int verbose=0;
 int compress_level=-1;
@@ -324 +324 @@
 
         /* Support "jump"ping to the nth IP header. */
-        if (jump) {
+        if (jumpopt) {
             /* Skip headers */
-            struct libtrace_packet_t *newpacket = perform_jump(*packet, jump);
+            struct libtrace_packet_t *newpacket = perform_jump(*packet, jumpopt);
             if (newpacket) {
                 /* If an IP header was found on the nth layer down
@@ -404 +404 @@
                         case 'i': interval=atoi(optarg);
                                   break;
-                        case 'j': jump=atoi(optarg);
+                        case 'j': jumpopt=atoi(optarg);
                                   break;
                         case 'm': maxfiles=atoi(optarg);

tools/tracestats/tracestats.c

@@ -54 +54 @@
 #include <pthread.h>
 
-struct libtrace_t *trace = NULL;
+struct libtrace_t *inptrace = NULL;
 
 static void cleanup_signal(int signal UNUSED)
 {
-        if (trace)
-                trace_pstop(trace);
+        if (inptrace)
+                trace_pstop(inptrace);
 }
 
@@ -196 +196 @@
         libtrace_callback_set_t *pktcbs, *rescbs;
 
-        trace = trace_create(uri);
-
-        if (trace_is_err(trace)) {
-                trace_perror(trace,"Failed to create trace");
+        inptrace = trace_create(uri);
+
+        if (trace_is_err(inptrace)) {
+                trace_perror(inptrace,"Failed to create trace");
                 return;
         }
@@ -214 +214 @@
 
         if (threadcount != 0)
-                trace_set_perpkt_threads(trace, threadcount);
+                trace_set_perpkt_threads(inptrace, threadcount);
 
         /* Start the trace as a parallel trace */
-        if (trace_pstart(trace, NULL, pktcbs, rescbs)==-1) {
-                trace_perror(trace,"Failed to start trace");
+        if (trace_pstart(inptrace, NULL, pktcbs, rescbs)==-1) {
+                trace_perror(inptrace,"Failed to start trace");
                 return;
         }
 
         /* Wait for all threads to stop */
-        trace_join(trace);
-
-        if (trace_is_err(trace))
-                trace_perror(trace,"%s",uri);
-
-        trace_destroy(trace);
+        trace_join(inptrace);
+
+        if (trace_is_err(inptrace))
+                trace_perror(inptrace,"%s",uri);
+
+        trace_destroy(inptrace);
         trace_destroy_callback_set(pktcbs);
         trace_destroy_callback_set(rescbs);