NDT-DEV email list created

Revision: 392
Author:   

Date:     Tue May 10 01:51:49 2011
Log:      Added META test (applet part).
http://code.google.com/p/ndt/source/detail?r=392

Modified:
 /trunk/Applet/Tcpbw100.java
 /trunk/Applet/Tcpbw100_msgs_ca_ES.properties
 /trunk/Applet/Tcpbw100_msgs_en_US.properties
 /trunk/Applet/Tcpbw100_msgs_fr_FR.properties
 /trunk/Applet/Tcpbw100_msgs_nb_NO.properties
 /trunk/Applet/Tcpbw100_msgs_nl_NL.properties
 /trunk/Applet/Tcpbw100_msgs_pt_BR.properties
 /trunk/Applet/Tcpbw100_msgs_ru_RU.properties

=======================================
--- /trunk/Applet/Tcpbw100.java Mon May  2 09:05:05 2011
+++ /trunk/Applet/Tcpbw100.java Tue May 10 01:51:49 2011
@@ -104,6 +104,12 @@
   private static final byte TEST_S2C = (1 << 2);
   private static final byte TEST_SFW = (1 << 3);
   private static final byte TEST_STATUS = (1 << 4);
+  private static final byte TEST_META = (1 << 5);
+
+  private static final String META_CLIENT_OS = "client.os.name";
+  private static final String META_BROWSER_OS = "client.browser.name";
+  private static final String META_CLIENT_KERNEL_VERSION  
= "client.kernel.version";
+  private static final String META_CLIENT_VERSION = "client.version";

   /* we really should do some clean-up in this java code... maybe later ;)  
*/
   private static final byte COMM_FAILURE  = 0;
@@ -486,7 +492,7 @@
   boolean testInProgress = false;
   String host = null;
   String tmpstr, tmpstr2;
-  byte tests = TEST_MID | TEST_C2S | TEST_S2C | TEST_SFW | TEST_STATUS;
+  byte tests = TEST_MID | TEST_C2S | TEST_S2C | TEST_SFW | TEST_STATUS |  
TEST_META;
   int c2sResult = SFW_NOTTESTED;
   int s2cResult = SFW_NOTTESTED;

@@ -1414,6 +1420,67 @@
     pub_status = "done";
     return false;
   }
+
+  public boolean test_meta(Protocol ctl) throws IOException
+  {
+    Message msg = new Message();
+    if ((tests & TEST_META) == TEST_META) {
+      showStatus(messages.getString("metaTest"));
+      results.append(messages.getString("sendingMetaInformation") + " ");
+      statistics.append(messages.getString("sendingMetaInformation")  
+ " ");
+      emailText += messages.getString("sendingMetaInformation") + " ";
+      pub_status = "sendingMetaInformation";
+
+      if (ctl.recv_msg(msg) != 0) {
+        errmsg = messages.getString("protocolError") +  
Integer.parseInt(new String(msg.body), 16) + " instead\n";
+        return true;
+      }
+      if (msg.type != TEST_PREPARE) {
+        errmsg = messages.getString("metaWrongMessage") + "\n";
+        if (msg.type == MSG_ERROR) {
+            errmsg += "ERROR MSG: " + Integer.parseInt(new  
String(msg.body), 16) + "\n";
+        }
+        return true;
+      }
+
+      if (ctl.recv_msg(msg) != 0) {
+        errmsg = messages.getString("protocolError") +  
Integer.parseInt(new String(msg.body), 16) + " instead\n";
+        return true;
+      }
+      if (msg.type != TEST_START) {
+        errmsg = messages.getString("metaWrongMessage") + "\n";
+        if (msg.type == MSG_ERROR) {
+            errmsg += "ERROR MSG: " + Integer.parseInt(new  
String(msg.body), 16) + "\n";
+        }
+        return true;
+      }
+
+      ctl.send_msg(TEST_MSG, (META_CLIENT_OS + ":" +  
System.getProperty("os.name")).getBytes());
+      // TODO ctl.send_msg(TEST_MSG, (META_BROWSER_OS + ":"  
+ "unknown").getBytes());
+      ctl.send_msg(TEST_MSG, (META_CLIENT_KERNEL_VERSION + ":" +  
System.getProperty("os.version")).getBytes());
+      ctl.send_msg(TEST_MSG, (META_CLIENT_VERSION + ":" +  
VERSION).getBytes());
+
+      ctl.send_msg(TEST_MSG, new byte[0]);
+
+      if (ctl.recv_msg(msg) != 0) {
+        errmsg = messages.getString("protocolError") +  
Integer.parseInt(new String(msg.body), 16) + " instead\n";
+        return true;
+      }
+      if (msg.type != TEST_FINALIZE) {
+        errmsg = messages.getString("metaWrongMessage");
+        if (msg.type == MSG_ERROR) {
+            errmsg += "ERROR MSG: " + Integer.parseInt(new  
String(msg.body), 16) + "\n";
+        }
+        return true;
+      }
+      results.append(messages.getString("done") + "\n");
+      statistics.append(messages.getString("done") + "\n");
+      emailText += messages.getString("done") + "\n%0A";
+    }
+
+    pub_status = "done";
+    return false;
+  }

   public void dottcp(StatusPanel sPanel) throws IOException {
       Socket ctlSocket = null;
@@ -1619,6 +1686,14 @@
                        
results.append(messages.getString("s2cThroughputFailed") + "\n");
                       tests &= (~TEST_S2C);
                   }
+                  break;
+              case TEST_META:
+                  sPanel.setText(messages.getString("meta"));
+                  if (test_meta(ctl)) {
+                      results.append(errmsg);
+                      results.append(messages.getString("metaFailed")  
+ "\n");
+                      tests &= (~TEST_META);
+                  }
                   break;
               default:
                   errmsg = messages.getString("unknownID") + "\n";
=======================================
--- /trunk/Applet/Tcpbw100_msgs_ca_ES.properties        Mon Apr 12 16:00:51 
2010
+++ /trunk/Applet/Tcpbw100_msgs_ca_ES.properties        Tue May 10 01:51:49 
2011
@@ -100,6 +100,10 @@
 loggingWrongMessage = Logant al servidor: Es rep un tipus de missatge  
erroni.
 lookupError = Incapa\u00e7 d'obtenir la adre\u00e7a IP remota
 mboxWrongMessage = Test intermig: Rebut tipus de missatge erroni
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Middlebox
 middleboxFail = El servidor ha fallat mentre es provaba la middlebox
 middleboxFail2 = test Middlebox FALLA!
@@ -157,6 +161,7 @@
 sackReceived = Blocs SACK rebuts
 scalingFactors = Factors d'Escala
 seconds = segons
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Servidor
 serverAcksReport = El servidor confirma que l'enlla\u00e7 reportat \u00e9s
 serverFault = Fallida de Servidor: Error desconegut. Torneu-ho a provar  
m\u00e9s tard, si us plau.
=======================================
--- /trunk/Applet/Tcpbw100_msgs_en_US.properties        Fri Apr  9 09:49:47 
2010
+++ /trunk/Applet/Tcpbw100_msgs_en_US.properties        Tue May 10 01:51:49 
2011
@@ -100,6 +100,10 @@
 loggingWrongMessage = Logging to server: Received wrong type of the message
 lookupError = Unable to obtain remote IP address
 mboxWrongMessage = Middlebox test: Received wrong type of the message
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Middlebox
 middleboxFail = Server Failed while middlebox testing
 middleboxFail2 = Middlebox test FAILED!
@@ -156,6 +160,7 @@
 sackReceived = SACK blocks received
 scalingFactors = Scaling Factors
 seconds = seconds
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Server
 serverAcksReport = Server Acks report link is
 serverFault = Server Fault: unknown fault occurred.  Please try again later
=======================================
--- /trunk/Applet/Tcpbw100_msgs_fr_FR.properties        Tue Apr 13 19:14:36 
2010
+++ /trunk/Applet/Tcpbw100_msgs_fr_FR.properties        Tue May 10 01:51:49 
2011
@@ -100,6 +100,10 @@
 loggingWrongMessage = Enregistrement aupr\u00E8s du serveur:  
r\u00E9ception du mauvais type de message
 lookupError = Impossible d'obtenir l'adresse IP distante
 mboxWrongMessage = Test de middlebox : r\u00E9ception du mauvais type de  
message
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Middlebox
 middleboxFail = \u00C9chec du serveur lors du test de middlebox
 middleboxFail2 = Test de middlebox \u00C9CHOU\u00C9!
@@ -156,6 +160,7 @@
 sackReceived = Blocs SACK re\u00E7us
 scalingFactors = Facteurs d'\u00E9chelle
 seconds = secondes
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Serveur
 serverAcksReport = les Acks du serveur rapportent que le lien est
 serverFault = Erreur du serveur: une erreur inconnue a eu lieu.  Veuillez  
re-essayer plus tard.
=======================================
--- /trunk/Applet/Tcpbw100_msgs_nb_NO.properties        Mon Apr 12 16:00:51 
2010
+++ /trunk/Applet/Tcpbw100_msgs_nb_NO.properties        Tue May 10 01:51:49 
2011
@@ -99,6 +99,10 @@
 loggingWrongMessage = Logging til tjener: Mottok feil type melding
 lookupError = Greide ikke sl\u00e5 opp tjenerens IP-addresse
 mboxWrongMessage = Mellombokstest: Mottok feil type melding
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Mellomboks
 middleboxFail = Tjenerfeil under mellombokstesting
 middleboxFail2 = Mellombokstest feilet!
@@ -155,6 +159,7 @@
 sackReceived = SACK-blokker ble mottatt.
 scalingFactors = Skaleringsfaktorer
 seconds = sekunder
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Tjener
 serverAcksReport = basert p\u00e5 ack fra tjeneren ansl\u00e5s linken til
 serverFault = Tjener Forkastningen; Ukjente forkastningen oppstod. Du kan  
pr\u00f8ve senere
=======================================
--- /trunk/Applet/Tcpbw100_msgs_nl_NL.properties        Mon Apr 12 16:00:51 
2010
+++ /trunk/Applet/Tcpbw100_msgs_nl_NL.properties        Tue May 10 01:51:49 
2011
@@ -100,6 +100,10 @@
 loggingWrongMessage = Loggen naar server: Verkeerd type bericht ontvangen
 lookupError = Kan geen remote IP adres verkrijgen
 mboxWrongMessage = Middlebox test: Verkeerd type bericht ontvangen
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Middlebox
 middleboxFail = Server heeft gefaald while middlebox testing
 middleboxFail2 = Middlebox test MISLUKT!
@@ -156,6 +160,7 @@
 sackReceived = SACK blocks ontvangen
 scalingFactors = Scaling Factoren
 seconds = seconden
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Server
 serverAcksReport = Server Acks zegt dat link is
 serverFault = De Fout van de server: de onbekende fout kwam voor. Gelieve  
te proberen opnieuw later
=======================================
--- /trunk/Applet/Tcpbw100_msgs_pt_BR.properties        Tue May 18 10:32:00 
2010
+++ /trunk/Applet/Tcpbw100_msgs_pt_BR.properties        Tue May 10 01:51:49 
2011
@@ -100,6 +100,10 @@
 loggingWrongMessage = Logando ao servidor: Tipo errado de mensagem foi  
recebido
 lookupError = N\u00E3o foi poss\u00EDvel obter o endere\u00E7o IP remoto
 mboxWrongMessage = Teste Middlebox : Tipo errado de mensagem foi recebido
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
 middlebox = Middlebox
 middleboxFail = Servidor falhou durante o teste de middlebox
 middleboxFail2 = Teste Middlebox FALHOU!
@@ -156,6 +160,7 @@
 sackReceived = Blocos SACK recebidos
 scalingFactors = Fatores de Escala/escalonamento
 seconds = segundos
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
 server = Servidor
 serverAcksReport = Servidor Acks reporta que o link \u00E9
 serverBusy = Servidor Ocupado: Muitos clientes aguardando na fila do  
servidor. Por favor, tente novamente mais tarde.
=======================================
--- /trunk/Applet/Tcpbw100_msgs_ru_RU.properties        Tue Apr 13 19:14:36 
2010
+++ /trunk/Applet/Tcpbw100_msgs_ru_RU.properties        Tue May 10 01:51:49 
2011
@@ -98,8 +98,12 @@
 linkHalfDpx =\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435  
\u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u0432  
\u043F\u043E\u043B\u0443\u0434\u0443\u043F\u043B\u0435\u043A\u0441\u043D\u043E\u043C  
\u0440\u0435\u0436\u0438\u043C\u0435
 loggingWrongMessage =  
\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0430  
\u0441\u0435\u0440\u0432\u0435\u0440:  
\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
 lookupError = \u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E  
\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C   
\u0443\u0434\u0430\u043B\u0435\u043D\u043D\u044B\u0439  
IP-\u0430\u0434\u0440\u0435\u0441
-mboxWrongMessage = \u0422\u0435\u0441\u0442  
\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u044B\u0445  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432:  
\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
-middlebox =  
\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u043E\u0435  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
+mboxWrongMessage = \u0422\u0435\u0441\u0442  
\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u044B\u0445  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432:  
\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
+meta = META
+metaFailed = META test FAILED!
+metaTest = META test...
+metaWrongMessage = META test: Received wrong type of the message
+middlebox =  
\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u043E\u0435  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
 middleboxFail = \u0418\u0421\u0414  \u043D\u0435 \u0441\u043C\u043E\u0433  
\u043F\u0440\u043E\u0442\u0435\u0441\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C  
\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u043E\u0435  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
 middleboxFail2 =  
\u0422\u0435\u0441\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435  
\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u044B\u0445  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432  
\u0431\u044B\u043B\u043E \u043E\u0431\u043E\u0440\u0432\u0430\u043D\u043E !
 middleboxModifyingMss =  
\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F:    
\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u0447\u043D\u043E\u0435  
\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E  
\u0441\u0435\u0442\u0438 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442  
MSS(\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439  
\u0440\u0430\u0437\u043C\u0435\u0440  
\u0441\u0435\u0433\u043C\u0435\u043D\u0442\u0430  
\u0434\u0430\u043D\u043D\u044B\u0445)
@@ -154,8 +158,9 @@
 s2cThroughputFailed = S2C \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  
\u041D\u0415 \u0421\u0420\u0410\u0411\u041E\u0422\u0410\u041B !
 sackReceived = \u0431\u043B\u043E\u043A\u0438 SACK  
\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u044B
 scalingFactors = \u0424\u0430\u043A\u0442\u043E\u0440\u044B  
\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
-seconds = \u0441\u0435\u043A\u0443\u043D\u0434
-server = \u0421\u0435\u0440\u0432\u0435\u0440
+seconds = \u0441\u0435\u043A\u0443\u043D\u0434
+sendingMetaInformation = Sending META  
information . . . . . . . . . . . . . . . . . . .
+server = \u0421\u0435\u0440\u0432\u0435\u0440
 serverAcksReport = \u0421\u0435\u0440\u0432\u0435\u0440  
\u043E\u0442\u0432\u0435\u0442\u0438\u043B \u0441 Ack  \u0447\u0442\u043E  
\u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
 serverBusy = \u0421\u0435\u0440\u0432\u0435\u0440  
\u0437\u0430\u043D\u044F\u0442: \u0421\u043B\u0438\u0448\u043A\u043E\u043C  
\u043C\u043D\u043E\u0433\u043E  
\u043A\u043B\u0438\u0435\u043D\u0442\u043E\u0432  
\u043E\u0436\u0438\u0434\u0430\u044E\u0442 \u0432  
\u043E\u0447\u0435\u0440\u0435\u0434\u0438  
\u0441\u0435\u0440\u0432\u0435\u0440\u0430.  
\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430,  
\u043F\u043E\u0432\u0442\u043E\u0440\u0438\u0442\u0435  
\u043F\u043E\u043F\u044B\u0442\u043A\u0443 \u043F\u043E\u0437\u0436\u0435
 serverBusy15s = \u0421\u0435\u0440\u0432\u0435\u0440  
\u0437\u0430\u043D\u044F\u0442:  
\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430,  
\u043F\u043E\u0434\u043E\u0436\u0434\u0438\u0442\u0435 15  
\u0441\u0435\u043A\u0443\u043D\u0434 \u043F\u043E\u043A\u0430  
\u0437\u0430\u043A\u043E\u043D\u0447\u0438\u0442\u0441\u044F  
\u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439  
\u0442\u0435\u0441\u0442