Changeset 6331 in orxonox.OLD for branches/network/src/lib/network/synchronizeable.h

Timestamp:

Dec 29, 2005, 5:37:00 PM (18 years ago)

Author:

rennerc

Message:

synchronizeable: writeBytes now returns int
converter: converts now 0.0f without endless loop

File:

• branches/network/src/lib/network/synchronizeable.h (modified) (9 diffs)

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

@@ -42 +42 @@
  * SYNCHELP_READ_STRINGM(s)  allocates memory for string! you have to free this after
  * SYNCHELP_READ_BYTE(b)
+ * SYNCHELP_READ_N
  *
  *
@@ -86 +87 @@
                                 __synchelp_write_i++; \
 }
-#define SYNCHELP_WRITE_STRING(s) { __synchelp_write_n = \
+#define SYNCHELP_WRITE_STRING(s) { if (s!=NULL) \
+                                __synchelp_write_n = \
                                 Converter::stringToByteArray( s, data+__synchelp_write_i, strlen(s), maxLength-__synchelp_write_i ); \
+                                else \
+                                __synchelp_write_n = \
+                                Converter::stringToByteArray( "", data+__synchelp_write_i, strlen(""), maxLength-__synchelp_write_i ); \
                                 if ( __synchelp_write_n <= 0) \
 { \
@@ -95 +100 @@
                                 __synchelp_write_i += __synchelp_write_n; \
 }
-#define SYNCHELP_WRITE_N __synchelp_write_i
+#define SYNCHELP_WRITE_N        __synchelp_write_i
+#define SYNCHELP_WRITE_FKT(f)   { \
+                                  __synchelp_write_i += \
+                                  f( data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
+                                }
 
 
@@ -105 +114 @@
 { \
                                       PRINTF(1)("There is not enough data to read an int\n");  \
-                                      return; \
+                                      return 0; \
 } \
                                     __synchelp_read_i += Converter::byteArrayToInt( data+__synchelp_read_i, &i );  \
@@ -113 +122 @@
 { \
                                       PRINTF(1)("There is not enough data to read a flaot\n");  \
-                                      return; \
+                                      return 0; \
 } \
                                     __synchelp_read_i += Converter::byteArrayToFloat( data+__synchelp_read_i, &f );  \
@@ -122 +131 @@
 { \
                                       PRINTF(1)("There is not enough data to read string\n");  \
-                                      return; \
+                                      return 0; \
 } \
                                     __synchelp_read_i += __synchelp_read_n; \
@@ -131 +140 @@
 { \
                                       PRINTF(1)("There is not enough data to read string\n");  \
-                                      return; \
+                                      return 0; \
 } \
                                     __synchelp_read_i += __synchelp_read_n; \
@@ -139 +148 @@
 { \
                                       PRINTF(1)("There is not enough data to read a byte\n");  \
-                                      return; \
+                                      return 0; \
 } \
                                     b = data[__synchelp_read_i]; \
                                     __synchelp_read_i ++;  \
 }
+#define SYNCHELP_READ_FKT(f)   { \
+                                  __synchelp_read_i += \
+                                  f( data+__synchelp_read_i, length-__synchelp_read_i, sender); \
+                                  }
+#define SYNCHELP_READ_N           __synchelp_read_i
 
 class NetworkStream;
@@ -154 +168 @@
     ~Synchronizeable();
 
-    virtual void      writeBytes(const byte* data, int length, int sender);
+    virtual int       writeBytes(const byte* data, int length, int sender);
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
     virtual void      writeDebug() const;