NDT-DEV email list created

Revision: 829
Author:   

Date:     Wed Jul 17 07:49:43 2013
Log:      Added server type (Web10G or Web100) to end of version string  
advertised to the client.

Updated the Java Applet and C Client printouts to print the correct type.
http://code.google.com/p/ndt/source/detail?r=829

Modified:
 /branches/ndt-web10g/Applet/NDTConstants.java
 /branches/ndt-web10g/Applet/Tcpbw100.java
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_ca_ES.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_el_GR.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_en_US.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_fr_FR.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_nb_NO.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_nl_NL.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_pt_BR.properties
 /branches/ndt-web10g/Applet/Tcpbw100_msgs_ru_RU.properties
 /branches/ndt-web10g/README_WEB10G
 /branches/ndt-web10g/src/web100-admin.c
 /branches/ndt-web10g/src/web100clt.c
 /branches/ndt-web10g/src/web100srv.c

=======================================
--- /branches/ndt-web10g/Applet/NDTConstants.java       Wed Jun 19 20:10:20 
2013
+++ /branches/ndt-web10g/Applet/NDTConstants.java       Wed Jul 17 07:49:43 
2013
@@ -26,7 +26,7 @@
         */
        public static final String VERSION = "3.6.5.2";

-	public static final String NDT_TITLE_STR = "TCP/Web100 Network Diagnostic  
Tool v";
+	public static final String NDT_TITLE_STR = "Network Diagnostic Tool  
Client v";

        // Section: Test type
        public static final byte TEST_MID = (1 << 0);
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100.java   Wed Jun 19 20:10:20 2013
+++ /branches/ndt-web10g/Applet/Tcpbw100.java   Wed Jul 17 07:49:43 2013
@@ -177,6 +177,8 @@
        // int _iPkts, _iLength=8192, _iCurrentRTO;
        int _iPkts, _iLength = NDTConstants.PREDEFINED_BUFFER_SIZE, 
_iCurrentRTO;
        int _iC2sData, _iC2sAck, _iS2cData, _iS2cAck;
+	// Lowercase string either web100 or web10g used to select Message based  
upon server type
+       String _sServerType = "web100";
        // added for mailto url
        protected URL _targetURL;

@@ -550,8 +552,6 @@
                                int testsNum = ((Integer) 
_spinnerTestCount.getValue())
                                                .intValue();
                                _bTestInProgress = true;
-                               createDiagnoseWindow();
-                               createStatsWindow();
                                _buttonStartTest.setEnabled(false);
                                _buttonDetails.setEnabled(false);
                                _buttonStatistics.setEnabled(false);
@@ -896,7 +896,10 @@
         * Create the "More details" window.
         */
        public void createDiagnoseWindow() {
-               showStatus(_resBundDisplayMsgs.getString("getWeb100Var"));
+               if (_sServerType.compareTo("web100") == 0)
+                       
showStatus(_resBundDisplayMsgs.getString("getWeb100Var"));
+               else
+                       
showStatus(_resBundDisplayMsgs.getString("getWeb10gVar"));

                // create new frame
                if (_frameWeb100Vars == null) {
@@ -904,7 +907,7 @@
                }

                // Get title for this window
-               
_frameWeb100Vars.setTitle(_resBundDisplayMsgs.getString("web100Var"));
+		_frameWeb100Vars.setTitle(_resBundDisplayMsgs.getString(_sServerType  
+ "Var"));
                Panel buttons = new Panel();
                _frameWeb100Vars.getContentPane().add("South", buttons);

@@ -918,7 +921,7 @@

                // Create Text area for displaying results, add "Heading"
                _txtDiagnosis = new JTextArea(
-                               _resBundDisplayMsgs.getString("web100KernelVar") + 
":\n", 15,
+                               _resBundDisplayMsgs.getString(_sServerType + 
"KernelVar") + ":\n", 15,
                                30);
                _txtDiagnosis.setEditable(true);
                _buttonDismiss.setEnabled(true);
@@ -959,7 +962,7 @@

                // Text area for Statistics, add "heading"
                _txtStatistics = new JTextArea(
-                               _resBundDisplayMsgs.getString("web100Stats") + 
":\n", 25, 70);
+                               _resBundDisplayMsgs.getString(_sServerType + "Stats") + 
":\n", 25, 70);
                _txtStatistics.setEditable(true);
                _buttonStatsDismiss.setEnabled(true);
                _buttonStatsCopy.setEnabled(_bCanCopy);
@@ -2478,9 +2481,6 @@
                                                                        // 
already encountered
                } // end waiting

-               _frameWeb100Vars.toBack();
-               _frameDetailedStats.toBack();
-
                // Tests can be started. Read server response again.
                // The server must send a message to verify version, and this 
is
                // a MSG_LOGIN type of message
@@ -2518,6 +2518,15 @@
                }
                System.out.println("Server version: " + 
vVersion.substring(1));

+               // If we have connected to a Web10G server rebrand ourselves 
as such
+               _sServerType = vVersion.endsWith("Web10G") ? "web10g" : 
"web100";
+
+		// Only create the windows once we have connected to the server so this  
works
+               createDiagnoseWindow();
+               createStatsWindow();
+               _frameWeb100Vars.toBack();
+               _frameDetailedStats.toBack();
+
                // Read server message again. Server must send a message to 
negotiate
                // the test suite, and this is
                // a MSG_LOGIN type of message which indicates the same set 
of tests as
@@ -3064,7 +3073,7 @@
                        // System.getProperty("java.class.version") + "\n");

                        _txtStatistics.append("\n\t------  "
-                                       + 
_resBundDisplayMsgs.getString("web100Details")
+                                       + _resBundDisplayMsgs.getString(_sServerType + 
"Details")
                                        + "  ------\n");

                        // Now add data to the statistics pane about access 
speed/technology
@@ -3167,9 +3176,9 @@
                        }

                        _txtStatistics.append("\n"
-                                       + _resBundDisplayMsgs.getString("web100rtt") + 
" =  "
+                                       + _resBundDisplayMsgs.getString(_sServerType + 
"rtt") + " =  "
                                        + NDTUtils.prtdbl(avgrtt) + " " + "ms" + 
"; ");
-                       _sEmailText += "\n%0A" + 
_resBundDisplayMsgs.getString("web100rtt")
+			_sEmailText += "\n%0A" + _resBundDisplayMsgs.getString(_sServerType  
+ "rtt")
                                        + " = " + NDTUtils.prtdbl(avgrtt) + " " + "ms" 
+ "; ";

                        
_txtStatistics.append(_resBundDisplayMsgs.getString("packetsize")
@@ -3377,7 +3386,7 @@

                        // Update statistics on TCP negotiated optional 
Performance Settings
                        _txtStatistics.append("\n"
-                                       + 
_resBundDisplayMsgs.getString("web100tcpOpts") + " \n");
+                                       + _resBundDisplayMsgs.getString(_sServerType + 
"tcpOpts") + " \n");
                        _txtStatistics.append("RFC 2018 Selective Acknowledgment: 
");
                        if (_iSACKEnabled != 0)
                                
_txtStatistics.append(_resBundDisplayMsgs.getString("on")
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_ca_ES.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_ca_ES.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = subxaxarxa Full duplex Fast Ethernet
 general = General
 generatingReport = Generant informe de problemes: Aquest informe  
s'enviar\u00e0 per e-mail a la persona que especifiquis
-getWeb100Var = Obt\u00e9 les variables WEB100
+getWeb100Var = Obt\u00e9 les variables Web100
+getWeb10gVar = Obt\u00e9 les variables Web10G
 halfDuplex = subxarxa Half duplex Fast Ethernet
-id = Eina de diagn\u00f2stic de xara TCP/Web100
+id = Eina de diagn\u00f2stic de xara TCP/Web100/Web10G
 immediate = immediat
 inboundTest = Test d'entrada Tcpbw100...
 inboundWrongMessage = Test de throughput C2S: Rebut un tipus de missatge  
erroni
@@ -212,11 +213,17 @@
 version = Versi\u00f3
 versionWrongMessage = Negociant la versi\u00f3 de NDT: S'ha rebut un  
missatge erroni.
 web100Details = An\u00e0lisi detallat Web100
-web100KernelVar = Variables de Kernel WEB100
-web100Stats = Estad\u00edstiques WEB100 habilitades
+web100KernelVar = Variables de Kernel Web100
+web100Stats = Estad\u00edstiques Web100 habilitades
 web100Var = Variables Web100
 web100rtt = Web100 informa el temps d'anada i tornada (RTT)
 web100tcpOpts = Web100 informa que TCP ha negociat els par\u00e0metres de  
funcionament \u00f2ptims a:
+web10gDetails = An\u00e0lisi detallat Web10G
+web10gKernelVar = Variables de Kernel Web10G
+web10gStats = Estad\u00edstiques Web10G habilitades
+web10gVar = Variables Web10G
+web10grtt = Web10G informa el temps d'anada i tornada (RTT)
+web10gtcpOpts = Web10G informa que TCP ha negociat els par\u00e0metres de  
funcionament \u00f2ptims a:
 willImprove = Millorar\u00e0 el funcionament
 workstation = Estaci\u00f3 de treball
 your = El seu
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_el_GR.properties	Thu Feb 14  
06:01:40 2013
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_el_GR.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = \u03c5\u03c0\u03bf\u03b4\u03af\u03ba\u03c4\u03c5\u03bf Full  
duplex Fast Ethernet
 general = \u0393\u03b5\u03bd\u03b9\u03ba\u03ac
 generatingReport = \u03a0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae  
\u03b4\u03b5\u03bb\u03c4\u03af\u03bf\u03c5  
\u03c0\u03c1\u03bf\u03b2\u03bb\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2:   
\u0391\u03c5\u03c4\u03ae \u03b7 \u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac  
\u03b8\u03b1  
\u03c4\u03b1\u03c7\u03c5\u03b4\u03c1\u03bf\u03bc\u03b7\u03b8\u03b5\u03af  
\u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03c9\u03c0\u03bf  
\u03c0\u03bf\u03c5 \u03b8\u03b1  
\u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03b5\u03c4\u03b5
-getWeb100Var = Get WEB100 Variables
+getWeb100Var = Get Web100 Variables
+getWeb10gVar = Get Web10G Variables
 halfDuplex = \u03c5\u03c0\u03bf\u03b4\u03af\u03ba\u03c4\u03c5\u03bf Half  
duplex Fast Ethernet
-id = TCP/Web100 \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf  
\u0394\u03b9\u03ac\u03b3\u03bd\u03c9\u03c3\u03b7\u03c2  
\u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5
+id = TCP/Web100/Web10G \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf  
\u0394\u03b9\u03ac\u03b3\u03bd\u03c9\u03c3\u03b7\u03c2  
\u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5
 immediate = \u03b1\u03bc\u03ad\u03c3\u03c9\u03c2
 inboundTest = Tcpbw100 \u03b4\u03bf\u03ba\u03b9\u03bc\u03ae  
\u03b5\u03b9\u03c3\u03b5\u03c1\u03c7\u03cc\u03bc\u03b5\u03bd\u03b7\u03c2  
\u03ba\u03af\u03bd\u03b7\u03c3\u03b7\u03c2...
 inboundWrongMessage = \u0394\u03bf\u03ba\u03b9\u03bc\u03ae:  
\u03c4\u03b1\u03c7\u03cd\u03c4\u03b7\u03c4\u03b1  
\u03b4\u03b9\u03b1\u03bc\u03b5\u03c4\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2  
\u03b1\u03c0\u03cc \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7  
\u03c0\u03c1\u03bf\u03c2  
\u03b5\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae:  
\u039b\u03ac\u03b2\u03b1\u03bc\u03b5 \u03bb\u03ac\u03b8\u03bf\u03c2  
\u03c4\u03cd\u03c0\u03bf  
\u03bc\u03b7\u03bd\u03cd\u03bc\u03b1\u03c4\u03bf\u03c2
@@ -211,11 +212,17 @@
 version = \u0388\u03ba\u03b4\u03bf\u03c3\u03b7
 versionWrongMessage =  
\u0394\u03b9\u03b1\u03c0\u03c1\u03b1\u03b3\u03bc\u03ac\u03c4\u03b5\u03c5\u03c3\u03b7  
\u03ad\u03ba\u03b4\u03bf\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 NDT:  
\u039b\u03ac\u03b2\u03b1\u03bc\u03b5 \u03bb\u03ac\u03b8\u03bf\u03c2  
\u03c4\u03cd\u03c0\u03bf\u03c5  
\u03bc\u03b7\u03bd\u03cd\u03bc\u03b1\u03c4\u03bf\u03c2
 web100Details = Web100  
\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03b5\u03c1\u03ae\u03c2  
\u03b1\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7
-web100KernelVar = WEB100  
\u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2  
\u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
-web100Stats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac  
\u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 WEB100
+web100KernelVar = Web100  
\u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2  
\u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
+web100Stats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac  
\u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 Web100
 web100Var = \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2  
Web100
 web100rtt = To Web100 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9  
\u03cc\u03c4\u03b9 \u03bf \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2  
\u03b1\u03c0\u03cc\u03ba\u03c1\u03b9\u03c3\u03b7\u03c2 (Round trip time)
 web100tcpOpts = To Web100 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9  
\u03cc\u03c4\u03b9 \u03c4\u03bf TCP  
\u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af  
\u03c4\u03b9\u03c2 \u03b5\u03be\u03ae\u03c2  
\u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2:
+web10gDetails = Web10G  
\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03b5\u03c1\u03ae\u03c2  
\u03b1\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7
+web10gKernelVar = Web10G  
\u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2  
\u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
+web10gStats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac  
\u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 Web10G
+web10gVar = \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2  
Web10G
+web10grtt = To Web10G \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9  
\u03cc\u03c4\u03b9 \u03bf \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2  
\u03b1\u03c0\u03cc\u03ba\u03c1\u03b9\u03c3\u03b7\u03c2 (Round trip time)
+web10gtcpOpts = To Web10G \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9  
\u03cc\u03c4\u03b9 \u03c4\u03bf TCP  
\u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af  
\u03c4\u03b9\u03c2 \u03b5\u03be\u03ae\u03c2  
\u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2:
 willImprove = \u03b8\u03b1  
\u03b2\u03b5\u03bb\u03c4\u03b9\u03ce\u03c3\u03b5\u03b9 \u03c4\u03b7\u03bd  
\u03b5\u03c0\u03af\u03b4\u03bf\u03c3\u03b7
 workstation = \u03a3\u03c4\u03b1\u03b8\u03bc\u03cc\u03c2  
\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2
 your = \u03a4\u03bf \u03b4\u03b9\u03ba\u03cc \u03c3\u03b1\u03c2
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_en_US.properties	Tue Apr  9  
06:42:50 2013
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_en_US.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = Full duplex Fast Ethernet subnet
 general = General
 generatingReport = Generating Trouble Report:  This report will be emailed  
to the person you specify
-getWeb100Var = Get WEB100 Variables
+getWeb100Var = Get Web100 Variables
+getWeb10gVar = Get Web10G Variables
 halfDuplex = Half duplex Fast Ethernet subnet
-id = TCP/Web100 Network Diagnostic Tool
+id = TCP/Web100/Web10G Network Diagnostic Tool
 immediate = immediate
 inboundTest = Tcpbw100 inbound test...
 inboundWrongMessage = C2S throughput test: Received wrong type of the  
message
@@ -211,11 +212,17 @@
 version = Version
 versionWrongMessage = Negotiating NDT version: Received wrong type of the  
message
 web100Details = Web100 Detailed Analysis
-web100KernelVar = WEB100 Kernel Variables
-web100Stats = WEB100 Enabled Statistics
+web100KernelVar = Web100 Kernel Variables
+web100Stats = Web100 Enabled Statistics
 web100Var = Web100 Variables
 web100rtt = Web100 reports the Round trip time
 web100tcpOpts = Web100 reports TCP negotiated the optional Performance  
Settings to:
+web10gDetails = Web10G Detailed Analysis
+web10gKernelVar = Web10G Kernel Variables
+web10gStats = Web10G Enabled Statistics
+web10gVar = Web10G Variables
+web10grtt = Web10G reports the Round trip time
+web10gtcpOpts = Web10G reports TCP negotiated the optional Performance  
Settings to:
 willImprove = will improve performance
 workstation = Workstation
 your = Your
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_fr_FR.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_fr_FR.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = Full duplex Fast Ethernet subnet
 general = G\u00E9n\u00E9ral
 generatingReport = G\u00E9n\u00E9ration du rapport d'incident:  Ce rapport  
sera envoy\u00E9 \u00E0 la personne sp\u00E9cifi\u00E9e
-getWeb100Var = R\u00E9cup\u00E9rer les variables WEB100
+getWeb100Var = R\u00E9cup\u00E9rer les variables Web100
+getWeb10gVar = R\u00E9cup\u00E9rer les variables Web10G
 halfDuplex = Half duplex Fast Ethernet subnet
-id = Outil de diagnostics r\u00E9seau TCP/Web100
+id = Outil de diagnostics r\u00E9seau TCP/Web100/Web10G
 immediate = imm\u00E9diat
 inboundTest = test d'entr\u00E9e Tcpbw100...
 inboundWrongMessage = Test de d\u00E9bit C2S : r\u00E9ception du mauvais  
type de message
@@ -211,11 +212,17 @@
 version = Version
 versionWrongMessage = Negotiating NDT version: r\u00E9ception du mauvais  
type de message
 web100Details = Analyse d\u00E9taill\u00E9e Web100
-web100KernelVar = Variables du noyau WEB100
-web100Stats = Statistiques activ\u00E9es WEB100
+web100KernelVar = Variables du noyau Web100
+web100Stats = Statistiques activ\u00E9es Web100
 web100Var = Variables Web100
 web100rtt = Web100 rapporte le temps d'aller-retour (RTT)
 web100tcpOpts = Web100 rapporte que TCP a n\u00E9goci\u00E9 les  
param\u00E8tres de performances facultatifs \u00E0 :
+web10gDetails = Analyse d\u00E9taill\u00E9e Web10G
+web10gKernelVar = Variables du noyau Web10G
+web10gStats = Statistiques activ\u00E9es WebB10G
+web10gVar = Variables Web10G
+web10grtt = Web10G rapporte le temps d'aller-retour (RTT)
+web10gtcpOpts = Web10G rapporte que TCP a n\u00E9goci\u00E9 les  
param\u00E8tres de performances facultatifs \u00E0 :
 willImprove = am\u00E9liorera les performances
 workstation = Poste de travail
 your = Votre
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_nb_NO.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_nb_NO.properties	Wed Jul 17  
07:49:43 2013
@@ -74,9 +74,10 @@
 fullDuplex = full dupleks "Fast Ethernet"-subnett
 general = Annet
 generatingReport = Genererer feilrapport; denne vil bli sendt til personen  
du spesifiserer
-getWeb100Var = Viser variabler fra WEB100
+getWeb100Var = Viser variabler fra Web100
+getWeb10gVar = Viser variabler fra Web10G
 halfDuplex = Halv-dupleks "Fast Ethernet"-subnett
-id = TCP/Web100 nettverksdiagnostikkverkt\u00f8y
+id = TCP/Web100/Web10G nettverksdiagnostikkverkt\u00f8y
 immediate = umiddelbart
 inboundTest = Tcpbw100 innkommende test...
 inboundWrongMessage = Klient-til-tjener-ytelsestest: mottok feil melding
@@ -213,11 +214,17 @@
 version = Versjon
 versionWrongMessage = Avtaler NDT-versjon: Mottok feil type melding
 web100Details = Detaljerte opplysninger fra Web100
-web100KernelVar = Kjernevariabler fra WEB100
-web100Stats = Statistikk fra WEB100
+web100KernelVar = Kjernevariabler fra Web100
+web100Stats = Statistikk fra Web100
 web100Var = Variabler fra Web100
 web100rtt = Web100 melder at rundreisetid
 web100tcpOpts = Web100 melder at valgbare felt i  TCP som p\u00e5virker  
ytelse er satt til:
+web10gDetails = Detaljerte opplysninger fra Web10G
+web10gKernelVar = Kjernevariabler fra Web10G
+web10gStats = Statistikk fra Web10G
+web10gVar = Variabler fra Web10G
+web10grtt = Web10G melder at rundreisetid
+web10gtcpOpts = Web10G melder at valgbare felt i  TCP som p\u00e5virker  
ytelse er satt til:
 willImprove = vil forbedre ytelsen
 workstation = Arbeidsstasjon
 your = Din
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_nl_NL.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_nl_NL.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = Full duplex Fast Ethernet subnet
 general = normaal
 generatingReport = Probleem Rapport Genereren: Dit rapport wordt gemaild  
naar de persoon die u opgeeft
-getWeb100Var = Vraag WEB100 Variabelen op
+getWeb100Var = Vraag Web100 Variabelen op
+getWeb10gVar = Vraag Web10G Variabelen op
 halfDuplex = Half duplex Fast Ethernet subnet
-id = TCP/Web100 Network Diagnostic Tool
+id = TCP/Web100/Web10G Network Diagnostic Tool
 immediate = direct
 inboundTest = Tcpbw100 inkomende test...
 inboundWrongMessage = C2S doorvoer test: Verkeerd type bericht ontvangen
@@ -211,11 +212,17 @@
 version = Versie
 versionWrongMessage = Overleggen NDT versie: Verkeerd type bericht  
ontvangen
 web100Details = Web100 gedetaileerde Analyze
-web100KernelVar = WEB100 Kernel Variabelen
-web100Stats = WEB100 Enabled Statistieken
+web100KernelVar = Web100 Kernel Variabelen
+web100Stats = Web100 Enabled Statistieken
 web100Var = Web100 Variabelen
 web100rtt = Web100 rapporteerd de Round trip time
 web100tcpOpts = Web100 heeft voor TCP de volgende optionele settings  
overlegd:
+web10gDetails = Web10G gedetaileerde Analyze
+web10gKernelVar = Web10G Kernel Variabelen
+web10gStats = Web10G Enabled Statistieken
+web10gVar = Web10G Variabelen
+web10grtt = Web10G rapporteerd de Round trip time
+web10gtcpOpts = Web10G heeft voor TCP de volgende optionele settings  
overlegd:
 willImprove = zal de performance verbeteren
 workstation = Werkstation
 your = Uw
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_pt_BR.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_pt_BR.properties	Wed Jul 17  
07:49:43 2013
@@ -73,9 +73,10 @@
 fullDuplex = sub-rede Full duplex Fast Ethernet
 general = Geral
 generatingReport = Gerando Relat\u00F3rio de Problemas:  Esse  
relat\u00F3rio ser\u00E1 enviado por email para a pessoa que voc\u00EA  
especificar
-getWeb100Var = Buscar vari\u00E1veis web100
+getWeb100Var = Buscar vari\u00E1veis Web100
+getWeb10gVar = Buscar vari\u00E1veis Web10G
 halfDuplex = sub-rede Half duplex Fast Ethernet
-id =  TCP/Web100 Ferramenta de Diagn\u00F3stico da Rede
+id =  TCP/Web100/Web10G Ferramenta de Diagn\u00F3stico da Rede
 immediate = imediato
 inboundTest = Tcpbw100 teste de entrada inbound test...
 inboundWrongMessage = C2S teste de taxa de transfer\u00EAncia: Tipo errado  
de mensagem foi recebido
@@ -209,12 +210,18 @@
 vendor = Fabricante
 version = Vers\u00E3o
 versionWrongMessage = Negociando vers\u00E3o do NDT : Tipo errado de  
mensagem foi recebido
-web100Details = An\u00E1lise detalhada WEB100
-web100KernelVar = Vari\u00E1veis do Kernel WEB100
-web100Stats = Estat\u00EDsticas WEB100 dispon\u00EDveis
+web100Details = An\u00E1lise detalhada Web100
+web100KernelVar = Vari\u00E1veis do Kernel Web100
+web100Stats = Estat\u00EDsticas Web100 dispon\u00EDveis
 web100Var = Vari\u00E1veis Web100
 web100rtt = Web100 reporta o tempo de Ida e Volta
 web100tcpOpts = Web100 verifica que TCP negociou as  
configura\u00E7\u00F5es de performance opicionais para:
+web10gDetails = An\u00E1lise detalhada Web10G
+web10gKernelVar = Vari\u00E1veis do Kernel Web10G
+web10gStats = Estat\u00EDsticas Web10G dispon\u00EDveis
+web10gVar = Vari\u00E1veis Web10G
+web10grtt = Web10G reporta o tempo de Ida e Volta
+web10gtcpOpts = Web10G verifica que TCP negociou as  
configura\u00E7\u00F5es de performance opicionais para:
 willImprove = ir\u00E1 melhorar a performance
 workstation = Esta\u00E7\u00E3o de trabalho
 your = Sua
=======================================
--- /branches/ndt-web10g/Applet/Tcpbw100_msgs_ru_RU.properties	Tue May 10  
01:51:49 2011
+++ /branches/ndt-web10g/Applet/Tcpbw100_msgs_ru_RU.properties	Wed Jul 17  
07:49:43 2013
@@ -73,8 +73,10 @@
 fullDuplex =  
\u043F\u043E\u043B\u043D\u043E\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F  
Fast Ethernet \u043F\u043E\u0434\u0441\u0435\u0442\u044C
 general= \u041E\u0431\u0449\u0438\u0435
 generatingReport = \u0413\u043E\u0442\u043E\u0432\u0438\u0442\u0441\u044F  
\u043E\u0442\u0447\u0435\u0442 \u043E  
\u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0435:  
\u0414\u0430\u043D\u043D\u044B\u0439 \u043E\u0442\u0447\u0435\u0442  
\u0431\u0443\u0434\u0435\u0442 \u0432\u044B\u0441\u043B\u0430\u043D  
\u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u043C  
\u043B\u0438\u0446\u0430\u043C
-getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C WEB100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
-halfDuplex =  
\u043F\u043E\u043B\u0443\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F  
Fast Ethernet \u043F\u043E\u0434\u0441\u0435\u0442\u044C  ID = TCP/Web100  
Network Diagnostic Tool (NDT)
+getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C Web100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+getWeb100Var = \u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C Web10G  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+halfDuplex =  
\u043F\u043E\u043B\u0443\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F  
Fast Ethernet \u043F\u043E\u0434\u0441\u0435\u0442\u044C
+id = TCP/Web100/Web10G Network Diagnostic Tool (NDT)
 immediate = \u0441\u0438\u044E \u043C\u0438\u043D\u0443\u0442\u0443
 inboundTest = Tcpbw100 \u0432\u0445\u043E\u0434\u044F\u0449\u0438\u0439  
\u0442\u0435\u0441\u0442 ...
 inboundWrongMessage = C2S \u0442\u0435\u0441\u0442 \u043D\u0430  
\u043F\u0440\u043E\u043F\u0443\u0441\u043A\u043D\u0443\u044E  
\u0441\u043F\u043E\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u044C:\u041F\u043E\u043B\u0443\u0447\u0435\u043D  
\u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439  
\u0442\u0438\u043F \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F
@@ -208,12 +210,18 @@
 vendor  =  
\u041F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C
 version = \u0412\u0435\u0440\u0441\u0438\u044F
 versionWrongMessage =  
\u0412\u044B\u044F\u0441\u043D\u0435\u043D\u0438\u0435  
\u0432\u0435\u0440\u0441\u0438\u0438 \u0418\u0421\u0414:  
\u041F\u043E\u043B\u0443\u0447\u0435\u043D  
\u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439  
\u0442\u0438\u043F \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F
-web100Details = WEB100  
\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u044B\u0439  
\u041E\u0442\u0447\u0435\u0442
-web100KernelVar = WEB100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435  
\u044F\u0434\u0440\u0430
-web100Stats = WEB100   
\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430  
\u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430
-web100Var = WEB100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
-web100rtt = WEB100 \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442 \u043E  
\u0442\u0443\u0434\u0430-\u043E\u0431\u0440\u0430\u0442\u043D\u043E\u0439  
\u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0435 (RTT)
-web100tcpOpts = WEB100 \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442  
\u043E \u0442\u043E\u043C \u0447\u0442\u043E  \u0432  
\u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0435  
\u043E\u0431\u043C\u0435\u043D\u0430 TCP \u0431\u044B\u043B\u0438  
\u043D\u0430\u0439\u0434\u0435\u043D\u044B  
\u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435  
\u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B  
\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438:
+web100Details = Web100  
\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u044B\u0439  
\u041E\u0442\u0447\u0435\u0442
+web100KernelVar = Web100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435  
\u044F\u0434\u0440\u0430
+web100Stats = Web100   
\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430  
\u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430
+web100Var = Web100  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+web100rtt = Web100 \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442 \u043E  
\u0442\u0443\u0434\u0430-\u043E\u0431\u0440\u0430\u0442\u043D\u043E\u0439  
\u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0435 (RTT)
+web100tcpOpts = Web100 \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442  
\u043E \u0442\u043E\u043C \u0447\u0442\u043E  \u0432  
\u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0435  
\u043E\u0431\u043C\u0435\u043D\u0430 TCP \u0431\u044B\u043B\u0438  
\u043D\u0430\u0439\u0434\u0435\u043D\u044B  
\u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435  
\u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B  
\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438:
+web10gDetails = Web10G  
\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u044B\u0439  
\u041E\u0442\u0447\u0435\u0442
+web10gKernelVar = Web10G  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435  
\u044F\u0434\u0440\u0430
+web10gStats = Web10G   
\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430  
\u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430
+web10gVar = Web10G  
\u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+web10grtt = Web10G \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442 \u043E  
\u0442\u0443\u0434\u0430-\u043E\u0431\u0440\u0430\u0442\u043D\u043E\u0439  
\u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0435 (RTT)
+web10gtcpOpts = Web10G \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442  
\u043E \u0442\u043E\u043C \u0447\u0442\u043E  \u0432  
\u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0435  
\u043E\u0431\u043C\u0435\u043D\u0430 TCP \u0431\u044B\u043B\u0438  
\u043D\u0430\u0439\u0434\u0435\u043D\u044B  
\u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435  
\u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B  
\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438:
 willImprove = \u043F\u043E\u0437\u0432\u043E\u043B\u0438\u0442  
\u043F\u043E\u0432\u044B\u0441\u0438\u0442\u044C  
\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C  
\u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0439
 workstation = \u0420\u0430\u0431\u043E\u0447\u0430\u044F  
\u0421\u0442\u0430\u043D\u0446\u0438\u044F
 your = \u0412\u0430\u0448
=======================================
--- /branches/ndt-web10g/README_WEB10G  Wed Jun 19 20:10:20 2013
+++ /branches/ndt-web10g/README_WEB10G  Wed Jul 17 07:49:43 2013
@@ -84,4 +84,4 @@
 Or to myself 

 (Richard Sanger).


-My work has been funded by Waikato University/The WAND group.
+My work has been funded by The University of Waikato/The WAND group.
=======================================
--- /branches/ndt-web10g/src/web100-admin.c     Thu Apr 11 07:52:06 2013
+++ /branches/ndt-web10g/src/web100-admin.c     Wed Jul 17 07:49:43 2013
@@ -763,7 +763,7 @@
         MinRTT = atoi(tmpstr);
       }

-display: log_println(4, "Web100 variables line received\n");
+display: log_println(4, TCP_STAT_NAME" variables line received\n");
          totalcnt = calculate(date, SumRTT, CountRTT, CongestionSignals,
                               PktsOut, DupAcksIn, AckPktsIn, CurrentMSS,
                               SndLimTimeRwin, SndLimTimeCwnd,  
SndLimTimeSender,
=======================================
--- /branches/ndt-web10g/src/web100clt.c        Wed Jun 19 20:10:20 2013
+++ /branches/ndt-web10g/src/web100clt.c        Wed Jul 17 07:49:43 2013
@@ -48,6 +48,9 @@
 double loss, estimate, avgrtt, spd, waitsec, timesec, rttsec;
 double order, rwintime, sendtime, cwndtime, rwin, swin, cwin;
 double mylink;
+/* Set to either Web10G or Web100 */
+const char *ServerType;
+
 static struct option long_options[] = {
   { "name", 1, 0, 'n' }, { "port", 1, 0, 'p' },
   { "debug", 0, 0, 'd' }, { "help", 0, 0, 'h' },
@@ -106,7 +109,8 @@

 void printWeb100VarInfo() {
   int i = 0;
-  printf(" --- Detailed description of the Web100 variables ---\n\n");
+
+  printf(" --- Detailed description of the %s variables ---\n\n",  
ServerType);

   while (web100vartable[i][0]) {
     printf("* %s\n    %s\n", web100vartable[i][0], web100vartable[i][1]);
@@ -187,10 +191,10 @@
     results_sfw(tests, host);

     if (msglvl > 0) {
-      printf("\n\t------  Web100 Detailed Analysis  ------\n");
+      printf("\n\t------  %s Detailed Analysis  ------\n", ServerType);

-      printf("\nWeb100 reports the Round trip time = %0.2f msec;",
-             avgrtt);
+      printf("\n%s reports the Round trip time = %0.2f msec;",
+             ServerType, avgrtt);

       printf("the Packet size = %d Bytes; and \n", CurrentMSS);

@@ -207,8 +211,8 @@

       // Now print details of optional Performance settings values like the
       // following list:
-      printf("\n    Web100 reports TCP negotiated the optional  
Performance "
-             "Settings to: \n");
+      printf("\n    %s reports TCP negotiated the optional Performance "
+             "Settings to: \n", ServerType);

       // ..Selective ack options
       print_SAck_RFC2018(SACKEnabled);
@@ -234,9 +238,9 @@
                                c2sAck, s2cData, s2cAck);
     }
   } else {
-    printf("No Web100 data collected!  Possible Duplex Mismatch condition "
+    printf("No %s data collected!  Possible Duplex Mismatch condition "
            "caused Server to client test to run long.\nCheck for  
host=Full "
-           "and switch=Half mismatch condition\n");
+           "and switch=Half mismatch condition\n", ServerType);
   }
 }

@@ -757,7 +761,7 @@
   // Version compatibility between server-client must be verified

   buff[msgLen] = 0;
-  if (buff[0] != 'v') {  // payload does'nt start with a version indicator
+  if (buff[0] != 'v') {  // payload doesn't start with a version indicator
     log_println(0, "Incompatible version number");
     exit(4);
   }
@@ -766,6 +770,12 @@
     log_println(1, "WARNING: NDT server has different version number (%s)",
                 &buff[1]);
   }
+
+  ServerType = "Web100";
+  if (strlen(buff) > 6) {
+    if (strcmp(&buff[strlen(buff) - 6], "Web10G") == 0)
+      ServerType = "Web10G";
+  }

   // Server must send a message to negotiate the test suite, and this is
   // a MSG_LOGIN type of message which indicates the same set of tests as
=======================================
--- /branches/ndt-web10g/src/web100srv.c        Wed Jun 19 20:10:20 2013
+++ /branches/ndt-web10g/src/web100srv.c        Wed Jul 17 07:49:43 2013
@@ -978,7 +978,7 @@
   autotune = tcp_stat_autotune(ctlsockfd, agent, conn);

   // client needs to be version compatible. Send current version
-  snprintf(buff, sizeof(buff), "v%s", VERSION);
+  snprintf(buff, sizeof(buff), "v%s", VERSION "-" TCP_STAT_NAME);
   send_msg(ctlsockfd, MSG_LOGIN, buff, strlen(buff));

   // initiate test with MSG_LOGIN message.
@@ -1560,6 +1560,10 @@
   setCurrentDirn(currentDirn);
   // end protocol logging

+#if USE_WEB10G
+  log_println(0, "WARNING: The Web10G NDT server is still in testing"
+              " and may contain bugs.");
+#endif
   // Get server execution options
   while ((c =
           getopt_long(
@@ -1630,7 +1634,7 @@
 #if USE_WEB100
                     VarFileName = optarg;
 #elif USE_WEB10G
-                    log_println(2, "Web10g doesn't require varfile.  
Ignored.");
+                    log_println(2, "Web10G doesn't require varfile.  
Ignored.");
 #endif
                     break;
                   case 'i':
@@ -1843,7 +1847,7 @@
   // Initialize tcp_stat structures
   count_vars = tcp_stat_init(VarFileName);
   if (count_vars == -1) {
-    log_println(0, "No web100 variables file found, terminating program");
+    log_println(0, "No Web100 variables file found, terminating program");
     exit(-5);
   }