[Sipp-commits] SF.net SVN: sipp:[540] sipp/trunk

[<cha...@us...>]

Revision: 540
          http://sipp.svn.sourceforge.net/sipp/?rev=540&view=rev
Author:   charlespwright
Date:     2008-09-25 11:50:51 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Fix: Correct error messages with 3pcc non-extended mode.

Modified Paths:
--------------
    sipp/trunk/scenario.cpp
    sipp/trunk/sipp.cpp

Modified: sipp/trunk/scenario.cpp
===================================================================
--- sipp/trunk/scenario.cpp	2008-09-25 11:32:11 UTC (rev 539)
+++ sipp/trunk/scenario.cpp	2008-09-25 11:50:51 UTC (rev 540)
@@ -977,7 +977,7 @@
 	     strcpy(infos.peer_host, get_peer_addr(peer));
              peers[std::string(peer)] = infos; 
 	   }
-	} else if (twinSippMode) {
+	} else if (extendedTwinSippMode) {
 	  ERROR("You must specify a 'dest' for sendCmd with extended 3pcc mode!");
 	}
 

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2008-09-25 11:32:11 UTC (rev 539)
+++ sipp/trunk/sipp.cpp	2008-09-25 11:50:51 UTC (rev 540)
@@ -1233,9 +1233,6 @@
       case MODE_3PCC_CONTROLLER_A :
         fprintf(f,"----------------------- 3PCC Mode - Controller A side -------------------------" SIPP_ENDL);
         break;
-      case MODE_3PCC_CONTROLLER_B :
-        fprintf(f,"----------------------- 3PCC Mode - Controller B side -------------------------" SIPP_ENDL);
-        break;
       case MODE_3PCC_NONE:
 	fprintf(f,"------ [+|-|*|/]: Adjust rate ---- [q]: Soft exit ---- [p]: Pause traffic -----" SIPP_ENDL);
 	break;
@@ -1248,6 +1245,9 @@
       case MODE_3PCC_A_PASSIVE :
         fprintf(f,"------------------ 3PCC Mode - Controller A side (passive) --------------------" SIPP_ENDL);
         break;
+      case MODE_3PCC_CONTROLLER_B :
+        fprintf(f,"----------------------- 3PCC Mode - Controller B side -------------------------" SIPP_ENDL);
+        break;
       case MODE_MASTER_PASSIVE :
         fprintf(f,"------------------ 3PCC extended mode - Master side (passive) --------------------" SIPP_ENDL);
         break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.