diff options
| author | Othmar Gsenger <otti@anytun.org> | 2008-02-28 23:00:50 +0000 |
|---|---|---|
| committer | Othmar Gsenger <otti@anytun.org> | 2008-02-28 23:00:50 +0000 |
| commit | 8d43427ce9fcfacf72e2065419a85ae4c71e7cfb (patch) | |
| tree | 90111e0f2ba2890894901738b5edd813636b7e35 | |
| parent | test (diff) | |
sync final fix
| -rw-r--r-- | syncClientSocket.cpp | 13 | ||||
| -rw-r--r-- | syncClientSocket.h | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/syncClientSocket.cpp b/syncClientSocket.cpp index 9cd7bda..8d5b37d 100644 --- a/syncClientSocket.cpp +++ b/syncClientSocket.cpp @@ -14,7 +14,7 @@ SyncClientSocket::SyncClientSocket(ISocketHandler& h,ConnectionList & cl) -:TcpSocket(h),cl_(cl),missing_chars(-1) +:TcpSocket(h),cl_(cl),missing_chars(-1),buffer_size_(0) { // initial connection timeout setting and number of retries SetConnectTimeout(12); @@ -46,11 +46,12 @@ void SyncClientSocket::OnRawData(const char *buf,size_t len) { std::cout << buf[index]; iss_ << buf[index]; + buffer_size_++; } - while (iss_.good()) + while (1) { - cLog.msg(Log::PRIO_NOTICE) << "string size " << iss_.str().size() << " casted size" << static_cast<int32_t>(iss_.str().size()); - if(missing_chars==-1 && iss_.str().size()>5) + cLog.msg(Log::PRIO_NOTICE) << "string size " << iss_.str().size() << " casted size" << static_cast<int32_t>(iss_.str().size()) << std::endl; + if(missing_chars==-1 && buffer_size_>5) { char * buffer = new char [6+1]; iss_.read(buffer,6); @@ -59,8 +60,9 @@ void SyncClientSocket::OnRawData(const char *buf,size_t len) tmp>>missing_chars; cLog.msg(Log::PRIO_NOTICE) << "recieved sync inforamtaion length from " << GetRemoteHostname() <<" "<<tmp.str()<<"bytes of data"<< std::endl; delete buffer; + buffer_size_-=6; } else - if(missing_chars>0 && missing_chars<=static_cast<int32_t>(iss_.str().size())) + if(missing_chars>0 && missing_chars<=buffer_size_) { char * buffer = new char [missing_chars+1]; iss_.read(buffer,missing_chars); @@ -72,6 +74,7 @@ void SyncClientSocket::OnRawData(const char *buf,size_t len) ia >> scom; missing_chars=-1; delete buffer; + buffer_size_-=missing_chars; } else break; } diff --git a/syncClientSocket.h b/syncClientSocket.h index e85b7cf..ea2c11c 100644 --- a/syncClientSocket.h +++ b/syncClientSocket.h @@ -27,6 +27,7 @@ private: ConnectionList & cl_; std::stringstream iss_; int32_t missing_chars; + int32_t buffer_size_; }; |