Changeset 5650 in orxonox.OLD for branches/network/src/lib/network

Timestamp:

Nov 20, 2005, 3:39:38 AM (19 years ago)

Author:

patrick

Message:

network: finished the simple_sync program

Location:

branches/network/src/lib/network

Files:

• Makefile.in (modified) (2 diffs)
• network_stream.cc (modified) (1 diff)
• synchronizeable.cc (modified) (2 diffs)
• synchronizeable.h (modified) (1 diff)

branches/network/src/lib/network/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
@@ -15 +15 @@
 @SET_MAKE@
 
+
+SOURCES = $(libORXnet_a_SOURCES)
 
 srcdir = @srcdir@

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

@@ -85 +85 @@
   byte* test = (byte *)data[0]; // obsolete, for debugging only
   int ret = 0;
-  this->synchronizeable->writeByteStream(NULL);
-  ret = this->networkSocket->writeBytes(NULL,1);
-  test = this->synchronizeable->readByteStream();
-  ret = this->networkSocket->readBytes(test,1);
+  
+  byte downData[10];
+  byte upData[10];
+  
+  /* DOWNSTREAM */
+  /* first of all read the synchronizeable's data: */
+  ret = this->synchronizeable->readBytes(downData);
+  /* pass the data to the network socket */
+  ret = this->networkSocket->writeBytes(downData, ret);
+  /* check if there was an error */
+  if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
+  
+  
+  /* UPSTREAM */
+  /* first read 10bytes of data (debug) */
+  ret = this->networkSocket->readBytes(upData, 0);
+  /* error checking: data read? */
+  if( ret != 10) { PRINTF(0)("Error while reading data from the NetworkSocket\n");}
+  /* now pass the data to the sync object */
+  this->synchronizeable->writeBytes(upData, 0);
+  
+  
+
 }
 

branches/network/src/lib/network/synchronizeable.cc

@@ -41 +41 @@
                           \brief write data to NetworkStream
  */
- void Synchronizeable::writeByteStream(byte* data)
+ void Synchronizeable::writeBytes(byte* data, int length)
 {
 
@@ -52 +52 @@
                                  \brief read data from NetworkStream
  */
- byte* Synchronizeable::readByteStream()
+ int Synchronizeable::readBytes(byte* data)
 {
 

branches/network/src/lib/network/synchronizeable.h

@@ -17 +17 @@
                    ~Synchronizeable();
 
- virtual void      writeByteStream(byte* data);
- virtual byte*     readByteStream();
+ virtual void      writeBytes(byte* data, int length);
+ virtual int       readBytes(byte* data);
  virtual void      writeDebug();
  virtual void      readDebug();