NDT-DEV email list created

Revision: 1030
Author:   

Date:     Fri Mar 21 07:54:57 2014 UTC
Log:      Merged Issue96 branch into trunk
http://code.google.com/p/ndt/source/detail?r=1030

Modified:
 /trunk
 /trunk/src/test_mid_srv.c
 /trunk/src/web100srv.c

=======================================
--- /trunk/src/test_mid_srv.c   Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/test_mid_srv.c   Fri Mar 21 07:54:57 2014 UTC
@@ -228,11 +228,6 @@
       if (j == 4)
         return RETRY_EXCEEDED_WAITING_DATA;
     }
-
-    // get meta test details copied into results
-    memcpy(&meta.c_addr, &cli_addr, clilen);
-    /* meta.c_addr = cli_addr; */
-    meta.family = ((struct sockaddr *) &cli_addr)->sa_family;

     buff[0] = '\0';
     // get tcp_stat connection data
=======================================
--- /trunk/src/web100srv.c      Wed Mar 12 06:27:30 2014 UTC
+++ /trunk/src/web100srv.c      Fri Mar 21 07:54:57 2014 UTC
@@ -2172,6 +2172,11 @@
               // socket interrupted, retry
               if ((ctlsockfd == -1) && (errno == EINTR))
                 continue;  // sig child
+
+             // get meta test details copied into results
+              memcpy(&meta.c_addr, &cli_addr, clilen);
+              meta.family = ((struct sockaddr *) &cli_addr)->sa_family;
+
               size_t tmpstrlen = sizeof(tmpstr);
               memset(tmpstr, 0, tmpstrlen);
               // get addr details based on socket info available