[Csp-commits] svn:csp r1087 - trunk/CSP/CSPSim/Bin

[<sv...@ww...>]

Author: wolverine
Date: 2004-06-27 17:56:03 -0700 (Sun, 27 Jun 2004)
New Revision: 1087

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
Log:
Networking changes

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1087

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2004-06-28 00:55:41 UTC (rev 1086)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2004-06-28 00:56:03 UTC (rev 1087)
@@ -49,7 +49,7 @@
 	print "              --slog=level    set the simdata logging level"
 	print "              --dump-data     show the contents of sim.dar"
 	print "              --client-node   run networking test client node"
-	print "              --server-node   run networking test server node"
+	print "              --echo-server-node   run networking test echo server node"
 	print "              --help          help message"
 
 
@@ -146,15 +146,18 @@
 	print
 	
 def runClientNode(args):
-	print "Starting Test Client Node..."
+	print "CSPSim.py - runClientNode - Starting Test Client Node..."
+	print "CSPSim.py - runClientNode - calling loadCSP"
 	loadCSP()
+	print "CSPSim.py - runClientNode - calling CSP.ClientNode"
 	app = CSP.ClientNode()
+	print "CSPSim.py - runClientNode - calling app.run"
 	app.run()
 
-def runServerNode(args):
-	print "Starting Test Server Node..."
+def runEchoServerNode(args):
+	print "Starting Test Echo Server Node..."
 	loadCSP()
-	app = CSP.ServerNode()
+	app = CSP.EchoServerNode()
 	app.run()
 
 def loadSimData():
@@ -262,8 +265,8 @@
 			other_args.append(arg)
 		elif arg == '--client-node':
 			action = runClientNode
-		elif arg == '--server-node':
-			action = runServerNode
+		elif arg == '--echo-server-node':
+			action = runEchoServerNode
 		elif arg == '--pause':
 			pause = 1
 		elif arg in ("--help", "-h", "-help"):