NDT-DEV email list created

Revision: 804
Author:   

Date:     Tue Apr  9 06:42:50 2013
Log:      Include Richard Sanger's fixes for issue 74


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

Modified:
 /trunk/Applet/NDTConstants.java
 /trunk/Applet/Tcpbw100.java
 /trunk/Applet/Tcpbw100_msgs_en_US.properties

=======================================
--- /trunk/Applet/NDTConstants.java     Mon Oct 29 10:56:28 2012
+++ /trunk/Applet/NDTConstants.java     Tue Apr  9 06:42:50 2013
@@ -100,6 +100,7 @@
 	// Section: RFC 1323 options ( Seems like 0/1/2/3 are the options  
available)

        public static final int RFC_1323_DISABLED = 0;
+       public static final int RFC_1323_ENABLED = 1;

        // Section: Buffer limitation test thresholds
        public static final float BUFFER_LIMITED = 0.15f; //unused right now
=======================================
--- /trunk/Applet/Tcpbw100.java Mon Oct 29 10:56:28 2012
+++ /trunk/Applet/Tcpbw100.java Tue Apr  9 06:42:50 2013
@@ -266,7 +266,7 @@
        private String pub_statistics = "Test not run.";
        private String pub_status = "notStarted";
        private double pub_time = 0.0;
-       private int pub_bytes = 0;
+       private long pub_bytes = 0;
        private String _sIsAutoRun;
        private String _sUserAgent = null;

@@ -2746,7 +2746,13 @@
                                _sEmailText += sSysvar + " " + sStrval + 
"\n%0A";
                                if (sStrval.indexOf(".") == -1) { // no 
decimal point, hence
                                                                              
                          // integer
-                                       iSysval = Integer.parseInt(sStrval);
+                                       try{
+                                               iSysval = 
Integer.parseInt(sStrval);
+						// If it fails as an int it's probably to big since the values are  
often unsigned
+                                       } catch (Exception e) {
+                                               System.out.println("Exception 
occured reading a web100 var - " + e);
+                                               iSysval = -1;
+                                       }
                                        // save value into a key value 
expected by us
                                        save_int_values(sSysvar, iSysval);
                                } else { // if not integer, save as double
@@ -3592,12 +3598,14 @@

                // get client side IP
                String sClientSideClientIp = tokens.nextToken();
-               k = sClientSideServerIp.indexOf("/");
-               sClientSideServerIp = sClientSideServerIp.substring(k + 1);
+               k = sClientSideClientIp.indexOf("/");
+               sClientSideClientIp = sClientSideClientIp.substring(k + 1);

                // MSS = 1456 = Ethernet MTU = 1500 - 24 -20 (bytes of IP 
header) =
                // 1456, thus preserved
-
+               if(_iTimestampsEnabled == NDTConstants.RFC_1323_ENABLED)
+                       iMss += 12;
+
                if (iMss == NDTConstants.ETHERNET_MTU_SIZE)
                        _txtStatistics.append(_resBundDisplayMsgs
                                        .getString("packetSizePreserved") + 
"\n");
=======================================
--- /trunk/Applet/Tcpbw100_msgs_en_US.properties        Tue May 10 01:51:49 
2011
+++ /trunk/Applet/Tcpbw100_msgs_en_US.properties        Tue Apr  9 06:42:50 
2013
@@ -32,7 +32,7 @@
 clientInfo = Client System Details
 clientIpModified = Information: Network Address Translation (NAT) box is  
modifying the Client's IP address
 clientIpNotFound = Client IP address not found.  For IE users, modify the  
Java parameters\n click Tools - Internet Options - Security - Custom Level,  
scroll down to\n Microsoft VM - Java permissions and click Custom, click  
Java Custom Settings\n Edit Permissions - Access to all Network Addresses,  
click Eanble and save changes
-clientIpPreserved = Server IP addresses are preserved End-to-End
+clientIpPreserved = Client IP addresses are preserved End-to-End
 clientSays = but Client says
 close = Close
 comments = Comments