Skip to Content.
Sympa Menu

ndt-dev - [ndt] r308 committed - Reverting protocol messages to r278. Change is due to MLab use....

Subject: NDT-DEV email list created

List archive

[ndt] r308 committed - Reverting protocol messages to r278. Change is due to MLab use....


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt] r308 committed - Reverting protocol messages to r278. Change is due to MLab use....
  • Date: Mon, 08 Mar 2010 22:35:09 +0000
Revision: 308
Author: jwzurawski
Date: Mon Mar 8 14:34:02 2010
Log: Reverting protocol messages to r278. Change is due to MLab use.

-jason


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

Modified:
/trunk/Applet/Tcpbw100.java

=======================================
--- /trunk/Applet/Tcpbw100.java Tue Mar 2 11:13:35 2010
+++ /trunk/Applet/Tcpbw100.java Mon Mar 8 14:34:02 2010
@@ -829,7 +829,10 @@
emailText = "Checking for Middleboxes . . . . . . . . . . . . . . . . . . ";

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected prepare, received something else.\n";
return true;
}
if (msg.type != TEST_PREPARE) {
@@ -879,7 +882,10 @@
s2cspd = ((8.0 * bytes) / 1000) / t;

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected test data, received something else.\n";
return true;
}
if (msg.type != TEST_MSG) {
@@ -918,7 +924,10 @@
in2Socket.close();

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected finalize, received something else.\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
@@ -945,7 +954,10 @@
emailText = "checking for firewalls . . . . . . . . . . . . . . . . . . . ";

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected prepare, received something else.\n";
return true;
}
if (msg.type != TEST_PREPARE) {
@@ -991,7 +1003,10 @@
ctl.send_msg(TEST_MSG, Integer.toString(srvSocket.getLocalPort()).getBytes());

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected port number, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected port number, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected port number, received something else.\n";
return true;
}
if (msg.type != TEST_START) {
@@ -1017,7 +1032,10 @@
}

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected test data, received something else.\n";
return true;
}
if (msg.type != TEST_MSG) {
@@ -1032,7 +1050,10 @@
osfwTest.finalize();

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected finalize, received something else.\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
@@ -1061,7 +1082,10 @@
emailText += "running 10s outbound test (client-to-server [C2S]) . . . . . ";

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected prepare, received something else.\n";
return true;
}
if (msg.type != TEST_PREPARE) {
@@ -1096,7 +1120,10 @@
// wait here for signal from server application
// This signal tells the client to start pumping out data
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected start signal, received something else.\n";
return true;
}
if (msg.type != TEST_START) {
@@ -1142,7 +1169,10 @@
c2sspd = ((8.0 * pkts * lth) / 1000) / t;
/* receive the c2sspd from the server */
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected test data, received something else.\n";
return true;
}
if (msg.type != TEST_MSG) {
@@ -1170,7 +1200,10 @@
pub_c2sspd = sc2sspd;

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected finalize, received something else.\n";
return true;
}
if (msg.type != TEST_FINALIZE) {
@@ -1195,7 +1228,10 @@
emailText += "running 10s inbound test (server-to-client [S2C]) . . . . . . ";

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected prepare, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected prepare, received something else.\n";
return true;
}
if (msg.type != TEST_PREPARE) {
@@ -1228,7 +1264,10 @@

// wait here for signal from server application
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected start signal, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected start signal, received something else.\n";
return true;
}
if (msg.type != TEST_START) {
@@ -1257,7 +1296,10 @@

/* receive the s2cspd from the server */
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected test data, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected test data, received something else.\n";
return true;
}
if (msg.type != TEST_MSG) {
@@ -1312,7 +1354,10 @@
try {
for (;;) {
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected finalize, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected finalize, received something else.\n";
return true;
}
if (msg.type == TEST_FINALIZE) {
@@ -1415,7 +1460,10 @@

for (;;) {
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected wait time, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected wait time, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected wait time, received something else.\n";
failed = true;
return;
}
@@ -1460,7 +1508,10 @@
ff.toBack();

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected hello signal, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected hello signal, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected hello signal, received something else.\n";
failed = true;
return;
}
@@ -1479,7 +1530,10 @@
System.out.println("Server version: " + vVersion.substring(1));

if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected server version info, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected server version info, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected server version info, received something else.\n";
failed = true;
return;
}
@@ -1554,7 +1608,10 @@
try {
for (;;) {
if (ctl.recv_msg(msg) != 0) {
- errmsg = "Protocol error! Expected test results, got: " + new String(msg.body) + "instead\n";
+ //errmsg = "Protocol error! Expected test results, got: " + new String(msg.body) + "instead\n";
+ // XXX JZ: 03/08/2010
+ // Reverting to old error message.
+ errmsg = "Protocol error! Expected test results, received something else.\n";
failed = true;
return;
}

  • [ndt] r308 committed - Reverting protocol messages to r278. Change is due to MLab use...., ndt, 03/08/2010

Archive powered by MHonArc 2.6.16.

Top of Page