eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Volker Fischer 2006-02-26 12:18:37 +00:00
parent b6bc2c9564
commit c19794c7ce
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/protocol.cpp
View File

@ -97,10 +97,6 @@ bool CProtocol::ParseMessage ( const CVector<unsigned char>& vecbyData,
CVector<uint8_t> vecData; CVector<uint8_t> vecData;
// TEST
qDebug ( "parser entered" );
// convert unsigned char in uint8_t, TODO convert all buffers in uint8_t // convert unsigned char in uint8_t, TODO convert all buffers in uint8_t
CVector<uint8_t> vecbyDataConv ( iNumBytes ); CVector<uint8_t> vecbyDataConv ( iNumBytes );
for ( int i = 0; i < iNumBytes; i++ ) { for ( int i = 0; i < iNumBytes; i++ ) {
@ -178,11 +174,6 @@ bool CProtocol::ParseMessageFrame ( const CVector<uint8_t>& vecIn,
} }
// TEST
qDebug ( "min length ok" );
// decode header ----- // decode header -----
iCurPos = 0; // start from beginning iCurPos = 0; // start from beginning
@ -196,20 +187,11 @@ qDebug ( "min length ok" );
iLenBy = static_cast<int> ( GetValFromStream ( vecIn, iCurPos, 2 ) ); iLenBy = static_cast<int> ( GetValFromStream ( vecIn, iCurPos, 2 ) );
// make sure the length is correct // make sure the length is correct
qDebug ( "iLenBy: %d / iVecInLenByte: %d" );
if ( iLenBy != iVecInLenByte - MESS_LEN_WITHOUT_DATA_BYTE ) if ( iLenBy != iVecInLenByte - MESS_LEN_WITHOUT_DATA_BYTE )
{ {
return false; // return error code return false; // return error code
} }
// TEST
qDebug ( "overall length ok" );
// now check CRC ----- // now check CRC -----
CCRC CRCObj; CCRC CRCObj;
@ -228,11 +210,8 @@ qDebug ( "overall length ok" );
} }
// TEST
qDebug ( "CRC ok" );
// decode data ----- // decode data -----
vecData.Init ( iLenBy );
iCurPos = MESS_HEADER_LENGTH_BYTE; // start from beginning of data iCurPos = MESS_HEADER_LENGTH_BYTE; // start from beginning of data
for ( i = 0; i < iLenBy; i++ ) for ( i = 0; i < iLenBy; i++ )
{ {