read timeout

Author: 林兴

rclientpp/core/async_socket_client.cpp

@@ -118,6 +118,7 @@ namespace rcpp {
 
 	int AsyncSocketClient::write(const char* buf, int len, int timeoutms)
 	{
+		//int written_len = 0;
 		int written_len = write(buf, len);
 		if (written_len == len)
 		{
@@ -150,7 +151,7 @@ namespace rcpp {
 	int AsyncSocketClient::read(char* buf, int len, int timeoutms)
 	{
 		int readlen = read(buf, len);
-		if (readlen > 0)
+		if (readlen >= 0)
 		{
 			return readlen;
 		}
@@ -167,7 +168,7 @@ namespace rcpp {
 		{
 			_err_code = ret;
 			printf("read, select socket select timeout\n");
-			return 0;
+			return -1;
 		}
 		if (FD_ISSET(_sockfd, &_rfds))
 		{

rclientpp/core/rclient.cpp

@@ -265,11 +265,16 @@ std::shared_ptr<BaseValue> RClient::get_results(int& ret_code)
 READ_DATA:
 	//int len = sockets::Read(_sockfd, (void*)_bufptr->write_ptr(), _bufptr->writable_size());
 	int len = _aclient->read(_bufptr->write_ptr(), _bufptr->writable_size(), _read_timeout);
-	if (len <= 0)
+	if (len == 0)
 	{
 		ret_code = TCP_CONNECTION_ERROR;
 		return nullptr;
 	}
+	else if (len == -1)
+	{
+		ret_code = TCP_TIMEOUT;
+		return nullptr;
+	}
 	_bufptr->has_written(len);
 	char* text = _bufptr->read_ptr();
 	size_t old_pos = _bufptr->get_read_off();