NDT-DEV email list created

Revision: 1008
Author:   

Date:     Wed Mar 12 06:27:30 2014 UTC
Log:      Merged Issue93 branch into trunk

http://code.google.com/p/ndt/source/detail?r=1008

Modified:
 /trunk
 /trunk/src/test_c2s_srv.c
 /trunk/src/web100-pcap.c
 /trunk/src/web100srv.c
 /trunk/src/web100srv.h

=======================================
--- /trunk/src/test_c2s_srv.c   Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/test_c2s_srv.c   Wed Mar 12 06:27:30 2014 UTC
@@ -294,7 +294,9 @@
           continue;
         break;
       }
-      memcpy(meta.c2s_ndttrace, tmpstr, strlen(tmpstr));
+
+      if (strlen(tmpstr) > 5)
+        memcpy(meta.c2s_ndttrace, tmpstr, strlen(tmpstr));
       // name of nettrace file passed back from pcap child
       log_println(3, "--tracefile after packet_trace %s",
                   meta.c2s_ndttrace);
=======================================
--- /trunk/src/web100-pcap.c    Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/web100-pcap.c    Wed Mar 12 06:27:30 2014 UTC
@@ -27,7 +27,6 @@
   u_int16_t speed[32];
 } iflist;

-static int dumptrace;
 static pcap_t *pd;
 static pcap_dumper_t *pdump;
 static int* mon_pipe;
=======================================
--- /trunk/src/web100srv.c      Fri Feb 21 16:32:03 2014 UTC
+++ /trunk/src/web100srv.c      Wed Mar 12 06:27:30 2014 UTC
@@ -101,7 +101,7 @@
 // list of global variables used throughout this program.
 static int window = 64000;  // TCP buffer size
 static int count_vars = 0;
-static int dumptrace = 0;
+int dumptrace = 0;
 static int usesyslog = 0;
 static int multiple = 0;
 static int compress = 1;
=======================================
--- /trunk/src/web100srv.h      Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/web100srv.h      Wed Mar 12 06:27:30 2014 UTC
@@ -332,4 +332,7 @@
 sig_atomic_t sig17;
 pid_t sig17_pid[256];

+/* global variables shared with other source files */
+extern int dumptrace;
+
 #endif  // SRC_WEB100SRV_H_