[Flightgear-cvslogs] CVS: source/src/Network generic.cxx, 1.25, 1.26

[Erik H. <eh...@ba...>]

Update of /var/cvs/FlightGear-0.9/source/src/Network
In directory baron.flightgear.org:/tmp/cvs-serv23102

Modified Files:
	generic.cxx 
Log Message:
If more than one packet has arrived in the mean time, process them all.

Index: generic.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/generic.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- generic.cxx	27 Jun 2009 06:47:06 -0000	1.25
+++ generic.cxx	29 Jun 2009 14:23:26 -0000	1.26
@@ -446,32 +446,41 @@
             goto error_out;
         }
     } else if ( get_direction() == SG_IO_IN ) {
-        if (!binary_mode) {
-            if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
-                parse_message();
+        if ( io->get_type() == sgFileType ) {
+            if (!binary_mode) {
+                length = io->readline( buf, FG_MAX_MSG_SIZE );
+                if ( length > 0 ) {
+                    parse_message();
+                } else {
+                    SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
+                    return false;
+                }
             } else {
-                SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
-                return false;
-            }
-        } else {
-            if ( (length = io->read( buf, binary_record_length )) > 0 ) {
-                if (length != binary_record_length) {
+                length = io->read( buf, binary_record_length );
+                if ( length == binary_record_length ) {
+                    parse_message();
+                } else {
                     SG_LOG( SG_IO, SG_ALERT,
                             "Generic protocol: Received binary "
                             "record of unexpected size, expected: "
-                            << binary_record_length << "received: "
+                            << binary_record_length << " but received: "
                             << length);
-                } else {
-                    SG_LOG( SG_IO, SG_DEBUG,
-                           "Generic protocol: received record of " << length <<
-                           " bytes.");
-                    parse_message();
                 }
-            } else {
-                SG_LOG( SG_IO, SG_INFO,
-                        "Generic protocol: Error reading data." );
-                return false;
             }
+        } else {
+            do {
+                if (!binary_mode) {
+                    length = io->readline( buf, FG_MAX_MSG_SIZE );
+                    if ( length > 0 ) {
+                        parse_message();
+                    }
+                } else {
+                    length = io->read( buf, binary_record_length );
+                    if ( length == binary_record_length ) {
+                        parse_message();
+                    }
+                }
+            } while ( length == binary_record_length );
         }
     }
     return true;