Changeset 5811 in orxonox.OLD

Timestamp:

Nov 28, 2005, 11:00:57 PM (18 years ago)

Author:

patrick

Message:

network: again some changes in the functino arguments order, more test abilities in the network subproject

Location:

branches/network/src

Files:

• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/network_stream.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (2 diffs)

branches/network/src/lib/network/network_manager.cc

@@ -141 +141 @@
   PRINTF(0)("Create a new server socket\n");
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  NetworkStream* netStream = new NetworkStream(sync, port, NET_SERVER);
+  NetworkStream* netStream = new NetworkStream(port, sync, NET_SERVER);
 }
 

branches/network/src/lib/network/network_stream.cc

@@ -62 +62 @@
 
 
-NetworkStream::NetworkStream(Synchronizeable& sync, unsigned int port, NodeType type)
+NetworkStream::NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type)
   : DataStream()
 {

branches/network/src/lib/network/network_stream.h

@@ -31 +31 @@
   NetworkStream();
   NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type);
-  NetworkStream(Synchronizeable& sync, unsigned int port, NodeType type);
+  NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type);
   ~NetworkStream();
 

branches/network/src/subprojects/network/network_unit_test.cc

@@ -166 +166 @@
 
 
+
+/**
+ *
+ * @param argc
+ * @param argv
+ * @return
+ */
+int startServer(int argc, char** argv)
+{
+  if( argc <= 2) {
+    printf(" Wrong arguments try following notations:\n");
+    printf("   --server [port number]\n");
+    return 0;
+  }
+
+  int port = atoi(argv[2]);
+  printf("Starting Server on port %i\n", port);
+
+  NetworkManager* netMan = new NetworkManager();
+  Synchronizeable* ss = new SimpleSync("Server\0");
+
+  //NetworkStream* server = new NetworkStream(port, ss, NET_SERVER);
+  netMan->createServer(*ss, port);
+
+  return 0;
+}
+
+
+int startClient(int argc, char** argv)
+{
+  if( argc < 3) {
+    printf(" Wrong arguments try following notations:\n");
+    printf("   --client [server ip] [port number]\n");
+    printf("   --server [server name] [port number]\n");
+    return 0;
+  }
+
+  char* name = argv[2];
+  int port = atoi(argv[3]);
+  printf("Connecting to %s, on port %i\n", name, port);
+
+  IPaddress ip;
+  int error = SDLNet_ResolveHost(&ip, name, port);
+  //SDLNet_ResolveHost(&ip, "localhost", port);
+  if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
+
+  NetworkManager* netMan = new NetworkManager();
+  Synchronizeable* ss = new SimpleSync("Client\0");
+
+  netMan->establishConnection(ip, *ss);
+
+
+  //NetworkStream* client = new NetworkStream(ip, ss, NET_CLIENT);
+
+
+  delete netMan;
+  delete ss;
+
+  return 0;
+}
+
+
+
 /**
  *
@@ -174 +237 @@
 int main(int argc, char** argv)
 {
+  int i;
   // here the pre-arguments are loaded, these are needed to go either to orxonx itself, Help, or Benchmark.
-  int i;
   for(i = 1; i < argc; ++i)
   {
     //else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
-    if (! strcmp( "--sockettest", argv[i]) || !strcmp("-s", argv[i])) return testSocket(argc, argv);
-    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-f", argv[i])) return testFramework(argc, argv);
+    if (! strcmp( "--sockettest", argv[i]) || !strcmp("-st", argv[i])) return testSocket(argc, argv);
+    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-ft", argv[i])) return testFramework(argc, argv);
+    else if (! strcmp( "--server", argv[i]) || !strcmp("-s", argv[i])) return startServer(argc, argv);
+    else if (! strcmp( "--client", argv[i]) || !strcmp("-c", argv[i])) return startClient(argc, argv);
   }