NDT-DEV email list created

Revision: 888
Author:   

Date:     Mon Feb 10 12:07:41 2014 UTC
Log:      Merge applet_109 branch into trunk
http://code.google.com/p/ndt/source/detail?r=888

Modified:
 /trunk
 /trunk/src/web100clt.c

=======================================
--- /trunk/src/web100clt.c      Mon Oct 14 13:20:21 2013 UTC
+++ /trunk/src/web100clt.c      Mon Feb 10 12:07:41 2014 UTC
@@ -766,15 +766,21 @@
     exit(4);
   }
   log_println(5, "Server version: %s", &buff[1]);
-  if (strcmp(&buff[1], VERSION)) {
-    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)
+  if (strlen(buff) > 8) {
+    if (strcmp(&buff[strlen(buff) - 7], "-Web10G") == 0) {
       ServerType = "Web10G";
+      buff[strlen(buff) - 7] = '\0';
+    }
+    else if (strcmp(&buff[strlen(buff) - 7], "-Web100") == 0) {
+      buff[strlen(buff) - 7] = '\0';
+    }
+  }
+
+  log_println(5, "Compare versions. Server:%s Client:%s Compare  
result: %i", &buff[1], VERSION, strcmp(&buff[1], VERSION));
+  if (strcmp(&buff[1], VERSION)) { //older server did not send type server  
at the end
+    log_println(1, "WARNING: NDT server has different version number  
(%s)", &buff[1]);
   }

   // Server must send a message to negotiate the test suite, and this is