Damien Frost / WebSocketClient

Simple websocket client based on the original with a few added features such as: - setBaud() - set the baud rate for the communication - Initialize() - mimics the constructor - chaged read() to readmsg() to avoid confusion with other functions

Dependents:   IoT_Ex BatteryModelTester BatteryModelTester

Fork of WebSocketClient by Samuel Mokrani

Websocket.cpp@20:ae675d49fa7f, 2016-06-28 (annotated)

Committer:
defrost
Date:
Tue Jun 28 16:22:40 2016 +0000
Revision:
20:ae675d49fa7f
Parent:
19:aa3d163e457e
Child:
21:420b83755885
- Added debugging statements

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 3:9589afa4712e 1 #include "Websocket.h"
samux 3:9589afa4712e 2
samux 7:4567996414a5 3 #define MAX_TRY_WRITE 20
samux 7:4567996414a5 4 #define MAX_TRY_READ 10
samux 3:9589afa4712e 5
defrost 19:aa3d163e457e 6 // #define DEBUG
defrost 20:ae675d49fa7f 7 #define WARNMESSAGES
defrost 20:ae675d49fa7f 8 #define ERRMESSAGES
defrost 15:9df4ffc6ce48 9 #define INFOMESSAGES
defrost 20:ae675d49fa7f 10
defrost 15:9df4ffc6ce48 11 #ifdef DEBUG
defrost 20:ae675d49fa7f 12 #define DBG(x, ...) pc.printf("[WebSocket : DBG] "x"\r\n", ##__VA_ARGS__);
defrost 20:ae675d49fa7f 13 #else
defrost 20:ae675d49fa7f 14 #define DBG(x, ...)
defrost 20:ae675d49fa7f 15 #endif
defrost 20:ae675d49fa7f 16
defrost 20:ae675d49fa7f 17 #ifdef WARNMESSAGES
defrost 15:9df4ffc6ce48 18 #define WARN(x, ...) pc.printf("[WebSocket : WARN] "x"\r\n", ##__VA_ARGS__);
defrost 20:ae675d49fa7f 19 #else
defrost 20:ae675d49fa7f 20 #define WARN(x, ...)
defrost 20:ae675d49fa7f 21 #endif
defrost 20:ae675d49fa7f 22
defrost 20:ae675d49fa7f 23 #ifdef ERRMESSAGES
defrost 15:9df4ffc6ce48 24 #define ERR(x, ...) pc.printf("[WebSocket : ERR] "x"\r\n", ##__VA_ARGS__);
samux 3:9589afa4712e 25 #else
samux 3:9589afa4712e 26 #define ERR(x, ...)
samux 3:9589afa4712e 27 #endif
samux 3:9589afa4712e 28
defrost 15:9df4ffc6ce48 29 #ifdef INFOMESSAGES
defrost 15:9df4ffc6ce48 30 #define INFO(x, ...) pc.printf("[WebSocket : INFO] "x"\r\n", ##__VA_ARGS__);
defrost 15:9df4ffc6ce48 31 #else
defrost 15:9df4ffc6ce48 32 #define INFO(x, ...)
defrost 15:9df4ffc6ce48 33 #endif
samux 3:9589afa4712e 34
samux 3:9589afa4712e 35 Websocket::Websocket(char * url) {
samux 3:9589afa4712e 36 fillFields(url);
samux 3:9589afa4712e 37 socket.set_blocking(false, 400);
samux 3:9589afa4712e 38 }
samux 3:9589afa4712e 39
defrost 11:85bff70bab45 40 Websocket::Websocket() {
defrost 11:85bff70bab45 41
defrost 11:85bff70bab45 42 }
defrost 11:85bff70bab45 43
defrost 11:85bff70bab45 44 void Websocket::Initialize(char * url){
defrost 11:85bff70bab45 45 fillFields(url);
defrost 11:85bff70bab45 46 socket.set_blocking(false, 400);
defrost 11:85bff70bab45 47 }
defrost 11:85bff70bab45 48
defrost 15:9df4ffc6ce48 49 void Websocket::setBaud(int baudrate){
defrost 15:9df4ffc6ce48 50 socket.setBaud(baudrate);
defrost 15:9df4ffc6ce48 51 return;
defrost 15:9df4ffc6ce48 52 }
defrost 15:9df4ffc6ce48 53
samux 3:9589afa4712e 54 void Websocket::fillFields(char * url) {
donatien 6:86e89a0369b9 55 int ret = parseURL(url, scheme, sizeof(scheme), host, sizeof(host), &port, path, sizeof(path));
donatien 6:86e89a0369b9 56 if(ret)
donatien 6:86e89a0369b9 57 {
donatien 6:86e89a0369b9 58 ERR("URL parsing failed; please use: \"ws://ip-or-domain[:port]/path\"");
donatien 6:86e89a0369b9 59 return;
donatien 6:86e89a0369b9 60 }
samux 3:9589afa4712e 61
donatien 6:86e89a0369b9 62 if(port == 0) //TODO do handle WSS->443
donatien 6:86e89a0369b9 63 {
donatien 6:86e89a0369b9 64 port = 80;
donatien 6:86e89a0369b9 65 }
donatien 6:86e89a0369b9 66
donatien 6:86e89a0369b9 67 if(strcmp(scheme, "ws"))
donatien 6:86e89a0369b9 68 {
donatien 6:86e89a0369b9 69 ERR("Wrong scheme, please use \"ws\" instead");
donatien 6:86e89a0369b9 70 }
donatien 6:86e89a0369b9 71 }
samux 3:9589afa4712e 72
donatien 6:86e89a0369b9 73 int Websocket::parseURL(const char* url, char* scheme, size_t maxSchemeLen, char* host, size_t maxHostLen, uint16_t* port, char* path, size_t maxPathLen) //Parse URL
donatien 6:86e89a0369b9 74 {
donatien 6:86e89a0369b9 75 char* schemePtr = (char*) url;
donatien 6:86e89a0369b9 76 char* hostPtr = (char*) strstr(url, "://");
donatien 6:86e89a0369b9 77 if(hostPtr == NULL)
donatien 6:86e89a0369b9 78 {
donatien 6:86e89a0369b9 79 WARN("Could not find host");
donatien 6:86e89a0369b9 80 return -1; //URL is invalid
donatien 6:86e89a0369b9 81 }
donatien 6:86e89a0369b9 82
donatien 6:86e89a0369b9 83 if( maxSchemeLen < hostPtr - schemePtr + 1 ) //including NULL-terminating char
donatien 6:86e89a0369b9 84 {
donatien 6:86e89a0369b9 85 WARN("Scheme str is too small (%d >= %d)", maxSchemeLen, hostPtr - schemePtr + 1);
donatien 6:86e89a0369b9 86 return -1;
donatien 6:86e89a0369b9 87 }
donatien 6:86e89a0369b9 88 memcpy(scheme, schemePtr, hostPtr - schemePtr);
donatien 6:86e89a0369b9 89 scheme[hostPtr - schemePtr] = '\0';
donatien 6:86e89a0369b9 90
donatien 6:86e89a0369b9 91 hostPtr+=3;
donatien 6:86e89a0369b9 92
donatien 6:86e89a0369b9 93 size_t hostLen = 0;
samux 3:9589afa4712e 94
donatien 6:86e89a0369b9 95 char* portPtr = strchr(hostPtr, ':');
donatien 6:86e89a0369b9 96 if( portPtr != NULL )
donatien 6:86e89a0369b9 97 {
donatien 6:86e89a0369b9 98 hostLen = portPtr - hostPtr;
donatien 6:86e89a0369b9 99 portPtr++;
donatien 6:86e89a0369b9 100 if( sscanf(portPtr, "%hu", port) != 1)
donatien 6:86e89a0369b9 101 {
donatien 6:86e89a0369b9 102 WARN("Could not find port");
donatien 6:86e89a0369b9 103 return -1;
donatien 6:86e89a0369b9 104 }
donatien 6:86e89a0369b9 105 }
donatien 6:86e89a0369b9 106 else
donatien 6:86e89a0369b9 107 {
donatien 6:86e89a0369b9 108 *port=0;
donatien 6:86e89a0369b9 109 }
donatien 6:86e89a0369b9 110 char* pathPtr = strchr(hostPtr, '/');
donatien 6:86e89a0369b9 111 if( hostLen == 0 )
donatien 6:86e89a0369b9 112 {
donatien 6:86e89a0369b9 113 hostLen = pathPtr - hostPtr;
donatien 6:86e89a0369b9 114 }
samux 3:9589afa4712e 115
donatien 6:86e89a0369b9 116 if( maxHostLen < hostLen + 1 ) //including NULL-terminating char
donatien 6:86e89a0369b9 117 {
donatien 6:86e89a0369b9 118 WARN("Host str is too small (%d >= %d)", maxHostLen, hostLen + 1);
donatien 6:86e89a0369b9 119 return -1;
donatien 6:86e89a0369b9 120 }
donatien 6:86e89a0369b9 121 memcpy(host, hostPtr, hostLen);
donatien 6:86e89a0369b9 122 host[hostLen] = '\0';
samux 3:9589afa4712e 123
donatien 6:86e89a0369b9 124 size_t pathLen;
donatien 6:86e89a0369b9 125 char* fragmentPtr = strchr(hostPtr, '#');
donatien 6:86e89a0369b9 126 if(fragmentPtr != NULL)
donatien 6:86e89a0369b9 127 {
donatien 6:86e89a0369b9 128 pathLen = fragmentPtr - pathPtr;
donatien 6:86e89a0369b9 129 }
donatien 6:86e89a0369b9 130 else
donatien 6:86e89a0369b9 131 {
donatien 6:86e89a0369b9 132 pathLen = strlen(pathPtr);
donatien 6:86e89a0369b9 133 }
donatien 6:86e89a0369b9 134
donatien 6:86e89a0369b9 135 if( maxPathLen < pathLen + 1 ) //including NULL-terminating char
donatien 6:86e89a0369b9 136 {
donatien 6:86e89a0369b9 137 WARN("Path str is too small (%d >= %d)", maxPathLen, pathLen + 1);
donatien 6:86e89a0369b9 138 return -1;
donatien 6:86e89a0369b9 139 }
donatien 6:86e89a0369b9 140 memcpy(path, pathPtr, pathLen);
donatien 6:86e89a0369b9 141 path[pathLen] = '\0';
donatien 6:86e89a0369b9 142
donatien 6:86e89a0369b9 143 return 0;
samux 3:9589afa4712e 144 }
samux 3:9589afa4712e 145
samux 3:9589afa4712e 146
samux 3:9589afa4712e 147 bool Websocket::connect() {
samux 3:9589afa4712e 148 char cmd[200];
samux 3:9589afa4712e 149
donatien 6:86e89a0369b9 150 while (socket.connect(host, port) < 0) {
donatien 6:86e89a0369b9 151 ERR("Unable to connect to (%s) on port (%d)", host, port);
samux 3:9589afa4712e 152 wait(0.2);
donatien 6:86e89a0369b9 153 return false;
samux 3:9589afa4712e 154 }
defrost 12:0979caf96fa6 155 INFO("TCP/IP Connection established, upgrading protocol...");
samux 3:9589afa4712e 156 // sent http header to upgrade to the ws protocol
donatien 6:86e89a0369b9 157 sprintf(cmd, "GET %s HTTP/1.1\r\n", path);
samux 3:9589afa4712e 158 write(cmd, strlen(cmd));
donatien 6:86e89a0369b9 159
donatien 6:86e89a0369b9 160 sprintf(cmd, "Host: %s:%d\r\n", host, port);
samux 3:9589afa4712e 161 write(cmd, strlen(cmd));
samux 3:9589afa4712e 162
samux 3:9589afa4712e 163 sprintf(cmd, "Upgrade: WebSocket\r\n");
samux 3:9589afa4712e 164 write(cmd, strlen(cmd));
samux 3:9589afa4712e 165
samux 3:9589afa4712e 166 sprintf(cmd, "Connection: Upgrade\r\n");
samux 3:9589afa4712e 167 write(cmd, strlen(cmd));
samux 3:9589afa4712e 168
samux 3:9589afa4712e 169 sprintf(cmd, "Sec-WebSocket-Key: L159VM0TWUzyDxwJEIEzjw==\r\n");
samux 3:9589afa4712e 170 write(cmd, strlen(cmd));
samux 3:9589afa4712e 171
samux 3:9589afa4712e 172 sprintf(cmd, "Sec-WebSocket-Version: 13\r\n\r\n");
samux 3:9589afa4712e 173 int ret = write(cmd, strlen(cmd));
samux 3:9589afa4712e 174 if (ret != strlen(cmd)) {
samux 3:9589afa4712e 175 close();
samux 3:9589afa4712e 176 ERR("Could not send request");
samux 3:9589afa4712e 177 return false;
samux 3:9589afa4712e 178 }
samux 3:9589afa4712e 179
samux 3:9589afa4712e 180 ret = read(cmd, 200, 100);
samux 3:9589afa4712e 181 if (ret < 0) {
samux 3:9589afa4712e 182 close();
samux 3:9589afa4712e 183 ERR("Could not receive answer\r\n");
samux 3:9589afa4712e 184 return false;
samux 3:9589afa4712e 185 }
samux 3:9589afa4712e 186
samux 3:9589afa4712e 187 cmd[ret] = '\0';
samux 3:9589afa4712e 188 DBG("recv: %s\r\n", cmd);
samux 3:9589afa4712e 189
samux 3:9589afa4712e 190 if ( strstr(cmd, "DdLWT/1JcX+nQFHebYP+rqEx5xI=") == NULL ) {
samux 3:9589afa4712e 191 ERR("Wrong answer from server, got \"%s\" instead\r\n", cmd);
samux 3:9589afa4712e 192 do {
samux 3:9589afa4712e 193 ret = read(cmd, 200, 100);
samux 3:9589afa4712e 194 if (ret < 0) {
samux 3:9589afa4712e 195 ERR("Could not receive answer\r\n");
samux 3:9589afa4712e 196 return false;
samux 3:9589afa4712e 197 }
samux 3:9589afa4712e 198 cmd[ret] = '\0';
defrost 12:0979caf96fa6 199 DBG("%s",cmd);
samux 3:9589afa4712e 200 } while (ret > 0);
samux 3:9589afa4712e 201 close();
samux 3:9589afa4712e 202 return false;
samux 3:9589afa4712e 203 }
samux 3:9589afa4712e 204
defrost 12:0979caf96fa6 205 INFO("\r\n\thost: %s\r\n\tpath: %s\r\n\tport: %d\r\n\r\n", host, path, port);
samux 3:9589afa4712e 206 return true;
samux 3:9589afa4712e 207 }
samux 3:9589afa4712e 208
samux 4:466f90b7849a 209 int Websocket::sendLength(uint32_t len, char * msg) {
samux 3:9589afa4712e 210
samux 3:9589afa4712e 211 if (len < 126) {
samux 4:466f90b7849a 212 msg[0] = len | (1<<7);
samux 3:9589afa4712e 213 return 1;
samux 3:9589afa4712e 214 } else if (len < 65535) {
samux 4:466f90b7849a 215 msg[0] = 126 | (1<<7);
samux 4:466f90b7849a 216 msg[1] = (len >> 8) & 0xff;
samux 4:466f90b7849a 217 msg[2] = len & 0xff;
samux 3:9589afa4712e 218 return 3;
samux 3:9589afa4712e 219 } else {
samux 4:466f90b7849a 220 msg[0] = 127 | (1<<7);
samux 3:9589afa4712e 221 for (int i = 0; i < 8; i++) {
samux 4:466f90b7849a 222 msg[i+1] = (len >> i*8) & 0xff;
samux 3:9589afa4712e 223 }
samux 3:9589afa4712e 224 return 9;
samux 3:9589afa4712e 225 }
samux 3:9589afa4712e 226 }
samux 3:9589afa4712e 227
samux 3:9589afa4712e 228 int Websocket::readChar(char * pC, bool block) {
samux 3:9589afa4712e 229 return read(pC, 1, 1);
samux 3:9589afa4712e 230 }
samux 3:9589afa4712e 231
samux 4:466f90b7849a 232 int Websocket::sendOpcode(uint8_t opcode, char * msg) {
samux 4:466f90b7849a 233 msg[0] = 0x80 | (opcode & 0x0f);
samux 4:466f90b7849a 234 return 1;
samux 3:9589afa4712e 235 }
samux 3:9589afa4712e 236
samux 4:466f90b7849a 237 int Websocket::sendMask(char * msg) {
samux 3:9589afa4712e 238 for (int i = 0; i < 4; i++) {
samux 4:466f90b7849a 239 msg[i] = 0;
samux 3:9589afa4712e 240 }
samux 3:9589afa4712e 241 return 4;
samux 3:9589afa4712e 242 }
samux 3:9589afa4712e 243
samux 3:9589afa4712e 244 int Websocket::send(char * str) {
samux 4:466f90b7849a 245 char msg[strlen(str) + 15];
samux 4:466f90b7849a 246 int idx = 0;
samux 4:466f90b7849a 247 idx = sendOpcode(0x01, msg);
samux 4:466f90b7849a 248 idx += sendLength(strlen(str), msg + idx);
samux 4:466f90b7849a 249 idx += sendMask(msg + idx);
samux 4:466f90b7849a 250 memcpy(msg+idx, str, strlen(str));
samux 4:466f90b7849a 251 int res = write(msg, idx + strlen(str));
samux 3:9589afa4712e 252 return res;
samux 3:9589afa4712e 253 }
samux 3:9589afa4712e 254
samux 3:9589afa4712e 255
defrost 13:152b70450615 256 bool Websocket::readmsg(char * message) {
samux 3:9589afa4712e 257 int i = 0;
samux 3:9589afa4712e 258 uint32_t len_msg;
samux 3:9589afa4712e 259 char opcode = 0;
samux 3:9589afa4712e 260 char c;
samux 3:9589afa4712e 261 char mask[4] = {0, 0, 0, 0};
samux 3:9589afa4712e 262 bool is_masked = false;
samux 3:9589afa4712e 263 Timer tmr;
samux 3:9589afa4712e 264
samux 3:9589afa4712e 265 // read the opcode
samux 3:9589afa4712e 266 tmr.start();
samux 3:9589afa4712e 267 while (true) {
samux 3:9589afa4712e 268 if (tmr.read() > 3) {
samux 3:9589afa4712e 269 DBG("timeout ws\r\n");
samux 3:9589afa4712e 270 return false;
samux 3:9589afa4712e 271 }
donatien 5:bb09d7a6c92f 272
donatien 5:bb09d7a6c92f 273 if(!socket.is_connected())
donatien 5:bb09d7a6c92f 274 {
donatien 5:bb09d7a6c92f 275 WARN("Connection was closed by server");
donatien 5:bb09d7a6c92f 276 return false;
donatien 5:bb09d7a6c92f 277 }
samux 3:9589afa4712e 278
samux 3:9589afa4712e 279 socket.set_blocking(false, 1);
samux 3:9589afa4712e 280 if (socket.receive(&opcode, 1) != 1) {
samux 3:9589afa4712e 281 socket.set_blocking(false, 2000);
samux 3:9589afa4712e 282 return false;
samux 3:9589afa4712e 283 }
samux 3:9589afa4712e 284
samux 3:9589afa4712e 285 socket.set_blocking(false, 2000);
samux 3:9589afa4712e 286
samux 3:9589afa4712e 287 if (opcode == 0x81)
samux 3:9589afa4712e 288 break;
samux 3:9589afa4712e 289 }
defrost 12:0979caf96fa6 290 DBG("opcode: 0x%X", opcode);
samux 3:9589afa4712e 291
samux 3:9589afa4712e 292 readChar(&c);
samux 3:9589afa4712e 293 len_msg = c & 0x7f;
samux 3:9589afa4712e 294 is_masked = c & 0x80;
samux 3:9589afa4712e 295 if (len_msg == 126) {
samux 3:9589afa4712e 296 readChar(&c);
samux 3:9589afa4712e 297 len_msg = c << 8;
samux 3:9589afa4712e 298 readChar(&c);
samux 3:9589afa4712e 299 len_msg += c;
samux 3:9589afa4712e 300 } else if (len_msg == 127) {
samux 3:9589afa4712e 301 len_msg = 0;
samux 3:9589afa4712e 302 for (int i = 0; i < 8; i++) {
samux 3:9589afa4712e 303 readChar(&c);
samux 3:9589afa4712e 304 len_msg += (c << (7-i)*8);
samux 3:9589afa4712e 305 }
samux 3:9589afa4712e 306 }
samux 3:9589afa4712e 307
samux 3:9589afa4712e 308 if (len_msg == 0) {
samux 3:9589afa4712e 309 return false;
samux 3:9589afa4712e 310 }
defrost 12:0979caf96fa6 311 DBG("length: %d", len_msg);
samux 3:9589afa4712e 312
samux 3:9589afa4712e 313 if (is_masked) {
samux 3:9589afa4712e 314 for (i = 0; i < 4; i++)
samux 3:9589afa4712e 315 readChar(&c);
samux 3:9589afa4712e 316 mask[i] = c;
samux 3:9589afa4712e 317 }
defrost 12:0979caf96fa6 318
defrost 12:0979caf96fa6 319 DBG("Done readChar.");
samux 3:9589afa4712e 320
samux 3:9589afa4712e 321 int nb = read(message, len_msg, len_msg);
defrost 12:0979caf96fa6 322 DBG("Done nb:%d = read(message:%s, len_msg:%d, len_msg:%d)", nb, message, len_msg, len_msg);
samux 3:9589afa4712e 323 if (nb != len_msg)
samux 3:9589afa4712e 324 return false;
samux 3:9589afa4712e 325
samux 3:9589afa4712e 326 for (i = 0; i < len_msg; i++) {
samux 3:9589afa4712e 327 message[i] = message[i] ^ mask[i % 4];
samux 3:9589afa4712e 328 }
samux 3:9589afa4712e 329
samux 3:9589afa4712e 330 message[len_msg] = '\0';
defrost 12:0979caf96fa6 331 DBG("Websocket::read() returning true, message:%s", message);
samux 3:9589afa4712e 332 return true;
samux 3:9589afa4712e 333 }
samux 3:9589afa4712e 334
samux 3:9589afa4712e 335 bool Websocket::close() {
samux 3:9589afa4712e 336 if (!is_connected())
samux 3:9589afa4712e 337 return false;
samux 3:9589afa4712e 338
samux 3:9589afa4712e 339 int ret = socket.close();
samux 3:9589afa4712e 340 if (ret < 0) {
samux 3:9589afa4712e 341 ERR("Could not disconnect");
samux 3:9589afa4712e 342 return false;
samux 3:9589afa4712e 343 }
samux 3:9589afa4712e 344 return true;
samux 3:9589afa4712e 345 }
samux 3:9589afa4712e 346
samux 3:9589afa4712e 347 bool Websocket::is_connected() {
samux 3:9589afa4712e 348 return socket.is_connected();
samux 3:9589afa4712e 349 }
samux 3:9589afa4712e 350
donatien 6:86e89a0369b9 351 char* Websocket::getPath() {
samux 3:9589afa4712e 352 return path;
samux 3:9589afa4712e 353 }
samux 3:9589afa4712e 354
samux 3:9589afa4712e 355 int Websocket::write(char * str, int len) {
samux 3:9589afa4712e 356 int res = 0, idx = 0;
samux 3:9589afa4712e 357
samux 3:9589afa4712e 358 for (int j = 0; j < MAX_TRY_WRITE; j++) {
donatien 5:bb09d7a6c92f 359
donatien 5:bb09d7a6c92f 360 if(!socket.is_connected())
donatien 5:bb09d7a6c92f 361 {
donatien 5:bb09d7a6c92f 362 WARN("Connection was closed by server");
donatien 5:bb09d7a6c92f 363 break;
donatien 5:bb09d7a6c92f 364 }
samux 3:9589afa4712e 365
samux 3:9589afa4712e 366 if ((res = socket.send_all(str + idx, len - idx)) == -1)
samux 3:9589afa4712e 367 continue;
samux 3:9589afa4712e 368
samux 3:9589afa4712e 369 idx += res;
samux 3:9589afa4712e 370
samux 3:9589afa4712e 371 if (idx == len)
samux 3:9589afa4712e 372 return len;
samux 3:9589afa4712e 373 }
defrost 10:fc40c56e8a3c 374 WARN("Websocket::write.idx on exit: %d", idx);
samux 3:9589afa4712e 375 return (idx == 0) ? -1 : idx;
samux 3:9589afa4712e 376 }
samux 3:9589afa4712e 377
samux 3:9589afa4712e 378 int Websocket::read(char * str, int len, int min_len) {
samux 3:9589afa4712e 379 int res = 0, idx = 0;
samux 3:9589afa4712e 380
samux 3:9589afa4712e 381 for (int j = 0; j < MAX_TRY_WRITE; j++) {
samux 3:9589afa4712e 382
samux 3:9589afa4712e 383 if ((res = socket.receive_all(str + idx, len - idx)) == -1)
samux 3:9589afa4712e 384 continue;
samux 3:9589afa4712e 385 idx += res;
defrost 12:0979caf96fa6 386 DBG("In read(* str, len, min_len), res = %d, idx = %d", res, idx);
samux 3:9589afa4712e 387 if (idx == len || (min_len != -1 && idx > min_len))
samux 3:9589afa4712e 388 return idx;
samux 3:9589afa4712e 389 }
samux 3:9589afa4712e 390
samux 3:9589afa4712e 391 return (idx == 0) ? -1 : idx;
samux 3:9589afa4712e 392 }