- int x, l = sizeof(x);
- int oldlen, i;
- int lenin, reqlen;
- int decrypted = 0;
- char inbuf[MAXBUFSIZE];
-cp
- if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
- {
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, c->socket,
- c->name, c->hostname);
- return -1;
- }
- if(x)
- {
- syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- c->name, c->hostname, strerror(x));
- return -1;
- }
-
- /* Strategy:
- - Read as much as possible from the TCP socket in one go.
- - Decrypt it.
- - Check if a full request is in the input buffer.
- - If yes, process request and remove it from the buffer,
- then check again.
- - If not, keep stuff in buffer and exit.
- */
-
- lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
-
- if(lenin<=0)
- {
- if(lenin==0)
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- c->name, c->hostname);
- }
- else
- if(errno==EINTR)
- return 0;
- else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- c->name, c->hostname);
-
- return -1;
- }
-
- oldlen = c->buflen;
- c->buflen += lenin;
-
- while(lenin)
- {
- /* Decrypt */
-
- if(c->status.decryptin && !decrypted)
- {
- EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
- memcpy(c->buffer + oldlen, inbuf, lenin);
- decrypted = 1;
- }
-
- /* Are we receiving a TCPpacket? */
-
- if(c->tcplen)
- {
- if(c->tcplen <= c->buflen)
- {
- receive_tcppacket(c, c->buffer, c->tcplen);
-
- c->buflen -= c->tcplen;
- lenin -= c->tcplen;
- memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
- oldlen = 0;
- c->tcplen = 0;
- continue;
- }
- else
- {
- break;
- }
- }
-
- /* Otherwise we are waiting for a request */
-
- reqlen = 0;
-
- for(i = oldlen; i < c->buflen; i++)
- {
- if(c->buffer[i] == '\n')
- {
- c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
- reqlen = i + 1;
- break;
- }
- }
-
- if(reqlen)
- {
- if(receive_request(c))
- return -1;
-
- c->buflen -= reqlen;
- lenin -= reqlen;
- memmove(c->buffer, c->buffer + reqlen, c->buflen);
- oldlen = 0;
- continue;
- }
- else
- {
- break;
- }
- }
-
- if(c->buflen >= MAXBUFSIZE)
- {
- syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
- c->name, c->hostname);
- return -1;
- }
-
- c->last_ping_time = time(NULL);
-cp
- return 0;
+ int x;
+ socklen_t l = sizeof(x);
+ int oldlen, i;
+ int lenin, reqlen;
+ bool decrypted = false;
+ char inbuf[MAXBUFSIZE];
+
+ cp();
+
+ /* Strategy:
+ - Read as much as possible from the TCP socket in one go.
+ - Decrypt it.
+ - Check if a full request is in the input buffer.
+ - If yes, process request and remove it from the buffer,
+ then check again.
+ - If not, keep stuff in buffer and exit.
+ */
+
+ lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+
+ if(lenin <= 0) {
+ if(!lenin || !errno) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ c->name, c->hostname);
+ } else if(errno == EINTR)
+ return true;
+ else
+ logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
+ c->name, c->hostname, strerror(errno));
+
+ return false;
+ }
+
+ oldlen = c->buflen;
+ c->buflen += lenin;
+
+ while(lenin) {
+ /* Decrypt */
+
+ if(c->status.decryptin && !decrypted) {
+ EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+ memcpy(c->buffer + oldlen, inbuf, lenin);
+ decrypted = true;
+ }
+
+ /* Are we receiving a TCPpacket? */
+
+ if(c->tcplen) {
+ if(c->tcplen <= c->buflen) {
+ receive_tcppacket(c, c->buffer, c->tcplen);
+
+ c->buflen -= c->tcplen;
+ lenin -= c->tcplen;
+ memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
+ oldlen = 0;
+ c->tcplen = 0;
+ continue;
+ } else {
+ break;
+ }
+ }
+
+ /* Otherwise we are waiting for a request */
+
+ reqlen = 0;
+
+ for(i = oldlen; i < c->buflen; i++) {
+ if(c->buffer[i] == '\n') {
+ c->buffer[i] = '\0'; /* replace end-of-line by end-of-string so we can use sscanf */
+ reqlen = i + 1;
+ break;
+ }
+ }
+
+ if(reqlen) {
+ c->reqlen = reqlen;
+ if(!receive_request(c))
+ return false;
+
+ c->buflen -= reqlen;
+ lenin -= reqlen;
+ memmove(c->buffer, c->buffer + reqlen, c->buflen);
+ oldlen = 0;
+ continue;
+ } else {
+ break;
+ }
+ }
+
+ if(c->buflen >= MAXBUFSIZE) {
+ logger(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+ c->name, c->hostname);
+ return false;
+ }
+
+ c->last_ping_time = now;
+
+ return true;