Changeset 5614 in orxonox.OLD

Timestamp:

Nov 16, 2005, 4:45:12 PM (18 years ago)

Author:

rennerc

Message:

network_socket: changed argument types

Location:

branches/network

Files:

• Makefile.am (modified) (1 diff)
• src/lib/network/Makefile.in (modified) (4 diffs)
• src/lib/network/network_socket.cc (modified) (2 diffs)
• src/lib/network/network_socket.h (modified) (1 diff)

branches/network/Makefile.am

@@ -28 +28 @@
 include doc/documentation.am
 endif
-<<<<<<< .mine
-_SOURCES = network_protocol.cc
-=======
-_SOURCES = network_manager.cc
->>>>>>> .r5589

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

@@ -57 +57 @@
         network_manager.$(OBJEXT) network_socket.$(OBJEXT) \
         connection_monitor.$(OBJEXT) network_stream.$(OBJEXT) \
-        data_stream.$(OBJEXT)
+        data_stream.$(OBJEXT) network_protocol.$(OBJEXT)
 libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -190 +190 @@
                       connection_monitor.cc \
                       network_stream.cc \
-                      data_stream.cc
+                      data_stream.cc \
+                      network_protocol.cc
 
 noinst_HEADERS = synchronizeable.h \
@@ -197 +198 @@
                  connection_monitor.h \
                  network_stream.h \
-                 data_stream.h
+                 data_stream.h \
+                 network_protocol.h
 
 all: all-am
@@ -249 +251 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_stream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_protocol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_socket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_stream.Po@am__quote@

branches/network/src/lib/network/network_socket.cc

@@ -102 +102 @@
   * warnings
   */
-void NetworkSocket::writeBytes(byte* data)
+int NetworkSocket::writeBytes(byte* data, int length)
 {
 }
@@ -113 +113 @@
   * From outside, the thread shouldn't be accessible at all.
   */
-byte* NetworkSocket::readBytes()
+int NetworkSocket::readBytes(byte * data, int length)
 {
 }

branches/network/src/lib/network/network_socket.h

@@ -35 +35 @@
   void listen(unsigned int port);
   void disconnectServer();
-  void writeBytes(byte* data);
-  byte* readBytes();
+  int writeBytes(byte * data, int length);
+  int readBytes(byte * data, int length);
 
 };