NDT-DEV email list created

Revision: 368
Author: 

Date: Sun Jul  4 20:51:50 2010
Log: Merge trunk r361:r367 into android branch

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

Modified:
 /branches/android
 /branches/android/java/net/measurementlab/ndt/NdtTests.java
 /branches/android/src/web100-admin.c
 /branches/android/src/web100srv.c

=======================================
--- /branches/android/java/net/measurementlab/ndt/NdtTests.java	Wed Jun  9  
15:23:05 2010
+++ /branches/android/java/net/measurementlab/ndt/NdtTests.java	Sun Jul  4  
20:51:50 2010
@@ -529,7 +529,8 @@
         return true;
       }

-       // Get server IP address from the outSocket.
+       // Get client and server IP addresses from the outSocket.
+	uiServices.setVariable("pub_clientIP",  
outSocket.getLocalAddress().getHostAddress().toString());
 	uiServices.setVariable("pub_host",  
outSocket.getInetAddress().getHostAddress().toString());


@@ -1568,7 +1569,7 @@
                // Fix for JS API not reporting NAT'd IPs correctly
                // Assign client and server IP addresses for JA API
                // based on public, not local IP.
-               uiServices.setVariable("pub_clientIP", ssip);
+               uiServices.setVariable("pub_clientIP", scip);


                // results.append("ssip=" + ssip + " scip=" + scip + "\n");
=======================================
--- /branches/android/src/web100-admin.c        Wed Dec 13 15:18:41 2006
+++ /branches/android/src/web100-admin.c        Sun Jul  4 20:51:50 2010
@@ -438,7 +438,7 @@
   int CurrentRTO, CurrentRwinRcvd, CongestionSignals, PktsOut = 0;
   FILE *fp;
   int c2sspd = 0, s2cspd = 0;
-  char ip_addr2[64], buff[256], *str, tmpstr[32];
+  char ip_addr2[64], buff[512], *str, tmpstr[32];
   int link=0, mismatch=0, bad_cable=0, half_duplex=0, congestion=0;
   int c2sdata = 0, c2sack, s2cdata, s2cack = 0;
   int totalcnt=0, view_flag=0;
=======================================
--- /branches/android/src/web100srv.c   Sat Jun  5 14:33:40 2010
+++ /branches/android/src/web100srv.c   Sun Jul  4 20:51:50 2010
@@ -1815,7 +1815,7 @@
     }

     if (head_ptr != NULL) {
-        if ((time(0) - head_ptr->stime) > 60)  {
+        if ((time(0) - head_ptr->stime) > 70)  {
 	    log_println(6, "Fault: Something in queue, but child %d (fd=%d) has  
exceeded wait time",
                        head_ptr->pid, head_ptr->ctlsockfd);
            /* Should send new 9977 'test aborted' signal to client.  Using 
this