fly/flightgear
1
0
Fork 0
Code Activity

If more than one packet has arrived in the mean time, process them all.

Browse source
This commit is contained in:
ehofman 2009-06-29 14:23:26 +00:00 committed by Tim Moore
parent 6c65a26ddf
commit 0dfd7b8024
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/Network/generic.cxx
View file

@ -446,32 +446,41 @@ bool FGGeneric::process() {
goto error_out; goto error_out;
} }
} else if ( get_direction() == SG_IO_IN ) { } else if ( get_direction() == SG_IO_IN ) {
if (!binary_mode) { if ( io->get_type() == sgFileType ) {
if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) { if (!binary_mode) {
parse_message(); 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 { } else {
SG_LOG( SG_IO, SG_ALERT, "Error reading data." ); length = io->read( buf, binary_record_length );
return false; if ( length == binary_record_length ) {
} parse_message();
} else { } else {
if ( (length = io->read( buf, binary_record_length )) > 0 ) {
if (length != binary_record_length) {
SG_LOG( SG_IO, SG_ALERT, SG_LOG( SG_IO, SG_ALERT,
"Generic protocol: Received binary " "Generic protocol: Received binary "
"record of unexpected size, expected: " "record of unexpected size, expected: "
<< binary_record_length << "received: " << binary_record_length << " but received: "
<< length); << 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; return true;