Changeset 6753 in orxonox.OLD for trunk/src/lib/network/synchronizeable.h

Timestamp:

Jan 26, 2006, 1:08:23 AM (18 years ago)

Author:

patrick

Message:

trunk: merged network back to trunk

File:

• trunk/src/lib/network/synchronizeable.h (modified) (6 diffs)

trunk/src/lib/network/synchronizeable.h

@@ -62 +62 @@
 #define SYNCHELP_WRITE_INT(i) { __synchelp_write_n = \
                                 Converter::intToByteArray( i, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
+                                assert( __synchelp_write_n == INTSIZE ); \
                                 if ( __synchelp_write_n <= 0) \
 { \
@@ -71 +72 @@
 #define SYNCHELP_WRITE_FLOAT(f) { __synchelp_write_n = \
                                 Converter::floatToByteArray( f, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
+                                assert( __synchelp_write_n == FLOATSIZE ); \
                                 if ( __synchelp_write_n <= 0) \
 { \
@@ -87 +89 @@
                                 __synchelp_write_i++; \
 }
-#define SYNCHELP_WRITE_STRING(s) { if (s!=NULL) \
+#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 \
+                                assert( __synchelp_write_n == strlen(s)+INTSIZE ); \
+                                } else {\
                                 __synchelp_write_n = \
                                 Converter::stringToByteArray( "", data+__synchelp_write_i, strlen(""), maxLength-__synchelp_write_i ); \
+                                assert( __synchelp_write_n == strlen("")+INTSIZE ); } \
                                 if ( __synchelp_write_n <= 0) \
 { \
@@ -116 +120 @@
                                       return 0; \
 } \
-                                    __synchelp_read_i += Converter::byteArrayToInt( data+__synchelp_read_i, &i );  \
+                                    __synchelp_read_n = Converter::byteArrayToInt( data+__synchelp_read_i, &i );  \
+                                    assert( __synchelp_read_n == INTSIZE ); \
+                                    __synchelp_read_i += __synchelp_read_n; \
 }
 #define SYNCHELP_READ_FLOAT(f)    { \
@@ -124 +130 @@
                                       return 0; \
 } \
-                                    __synchelp_read_i += Converter::byteArrayToFloat( data+__synchelp_read_i, &f );  \
+                                    __synchelp_read_n = Converter::byteArrayToFloat( data+__synchelp_read_i, &f );  \
+                                    assert( __synchelp_read_n == FLOATSIZE ) ;\
+                                    __synchelp_read_i += __synchelp_read_n; \
 }
 #define SYNCHELP_READ_STRING(s,l)    { \
                                     __synchelp_read_n = Converter::byteArrayToString( data+__synchelp_read_i, s, l );  \
+                                    assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\
                                     if ( __synchelp_read_n <0 )  \
 { \
@@ -137 +146 @@
 #define SYNCHELP_READ_STRINGM(s)    { \
                                     __synchelp_read_n = Converter::byteArrayToStringM( data+__synchelp_read_i, s );  \
+                                    assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\
                                     if ( __synchelp_read_n <0 )  \
 { \