* Added further debug to pqistreamer.

* clear mOldNatHole/NatType during netReset.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-29 15:20:40 +00:00
parent 3d71e6338e
commit da0d410b8d
2 changed files with 14 additions and 1 deletions

View File

@ -1783,6 +1783,10 @@ void p3NetMgrIMPL::updateNetStateBox_reset()
RsStackMutex stack(mNetMtx); /****** STACK LOCK MUTEX *******/ RsStackMutex stack(mNetMtx); /****** STACK LOCK MUTEX *******/
mNetStateBox.reset(); mNetStateBox.reset();
mOldNatHole = RSNET_NATHOLE_UNKNOWN;
mOldNatType = RSNET_NATTYPE_UNKNOWN;
} }
} }

View File

@ -683,7 +683,11 @@ continue_packet:
<< (int)(((unsigned char*)block)[0]) << " " << (int)(((unsigned char*)block)[0]) << " "
<< (int)(((unsigned char*)block)[1]) << " " << (int)(((unsigned char*)block)[1]) << " "
<< (int)(((unsigned char*)block)[2]) << " " << (int)(((unsigned char*)block)[2]) << " "
<< (int)(((unsigned char*)block)[3]) << "\n" ; << (int)(((unsigned char*)block)[3]) << " "
<< (int)(((unsigned char*)block)[4]) << " "
<< (int)(((unsigned char*)block)[5]) << " "
<< (int)(((unsigned char*)block)[6]) << " "
<< (int)(((unsigned char*)block)[7]) << "\n" ;
msgout << "\n"; msgout << "\n";
msgout << "Please get your friends to upgrade to the latest version"; msgout << "Please get your friends to upgrade to the latest version";
msgout << "\n"; msgout << "\n";
@ -695,6 +699,11 @@ continue_packet:
std::string msg = msgout.str(); std::string msg = msgout.str();
notify->AddLogMessage(0, RS_SYS_WARNING, title, msg); notify->AddLogMessage(0, RS_SYS_WARNING, title, msg);
std::cerr << "pqistreamer::handle_incoming() ERROR: Read Packet too Big" << std::endl;
std::cerr << msgout.str();
std::cerr << std::endl;
} }
bio->close(); bio->close();
reading_state = reading_state_initial ; // restart at state 1. reading_state = reading_state_initial ; // restart at state 1.