-int receive_meta(connection_t *cl)
-{
- int x, l = sizeof(x);
- int oldlen, i;
- int lenin = 0;
- char inbuf[MAXBUFSIZE];
- char *bufp;
-cp
- if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
- {
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
- cl->name, cl->hostname);
- return -1;
- }
- if(x)
- {
- syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
- cl->name, cl->hostname, strerror(x));
- return -1;
- }
-
- if(cl->status.decryptin)
- bufp = inbuf;
- else
- bufp = cl->buffer + cl->buflen;
-
- lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
-
- if(lenin<=0)
- {
- if(errno==EINTR)
- return 0;
- if(errno==0)
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- cl->name, cl->hostname);
- }
- else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- cl->name, cl->hostname);
- return -1;
- }
-
- if(cl->status.decryptin)
- {
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
- }
-
- oldlen = cl->buflen;
- cl->buflen += lenin;
-
- for(;;)
- {
- cl->reqlen = 0;
-
- for(i = oldlen; i < cl->buflen; i++)
- {
- if(cl->buffer[i] == '\n')
- {
- cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
- cl->reqlen = i + 1;
- break;
- }
- }
-
- if(cl->reqlen)
- {
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
- cl->name, cl->hostname, cl->buffer);
-
- if(receive_request(cl))
- return -1;
-
- cl->buflen -= cl->reqlen;
- memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
- oldlen = 0;
- }
- else
- {
- break;
- }
- }
-
- if(cl->buflen >= MAXBUFSIZE)
- {
- syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
- cl->name, cl->hostname);
- return -1;
- }
-
- cl->last_ping_time = time(NULL);
-cp
- return 0;
+bool receive_meta(connection_t *c) {
+ int oldlen, i, result;
+ int lenin, lenout, reqlen;
+ bool decrypted = false;
+ char inbuf[MAXBUFSIZE];
+
+ /* 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(sockwouldblock(sockerrno))
+ return true;
+ else
+ logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
+ c->name, c->hostname, sockstrerror(sockerrno));
+
+ return false;
+ }
+
+ oldlen = c->buflen;
+ c->buflen += lenin;
+
+ while(lenin > 0) {
+ /* Decrypt */
+
+ if(c->status.decryptin && !decrypted) {
+ result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
+ if(!result || lenout != lenin) {
+ logger(LOG_ERR, "Error while decrypting metadata from %s (%s): %s",
+ c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ }
+ memcpy(c->buffer + oldlen, inbuf, lenin);
+ decrypted = true;
+ }
+
+ /* Are we receiving a TCPpacket? */
+
+ if(c->tcplen) {
+ if(c->tcplen <= c->buflen) {
+ if(!c->node) {
+ if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+ if(c->buffer[0] == 0 && c->buffer[1] == 0x5a) {
+ logger(LOG_DEBUG, "Proxy request granted");
+ } else {
+ logger(LOG_ERR, "Proxy request rejected");
+ return false;
+ }
+ } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+ if(c->buffer[0] != 5) {
+ logger(LOG_ERR, "Invalid response from proxy server");
+ return false;
+ }
+ if(c->buffer[1] == (char)0xff) {
+ logger(LOG_ERR, "Proxy request rejected: unsuitable authentication method");
+ return false;
+ }
+ if(c->buffer[2] != 5) {
+ logger(LOG_ERR, "Invalid response from proxy server");
+ return false;
+ }
+ if(c->buffer[3] == 0) {
+ logger(LOG_DEBUG, "Proxy request granted");
+ } else {
+ logger(LOG_DEBUG, "Proxy request rejected");
+ return false;
+ }
+ } else {
+ logger(LOG_ERR, "c->tcplen set but c->node is NULL!");
+ abort();
+ }
+ } else {
+ if(c->allow_request == ALL) {
+ receive_tcppacket(c, c->buffer, c->tcplen);
+ } else {
+ logger(LOG_ERR, "Got unauthorized TCP packet from %s (%s)", c->name, c->hostname);
+ return false;
+ }
+ }
+
+ c->buflen -= c->tcplen;
+ lenin -= c->tcplen - oldlen;
+ 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 - oldlen;
+ 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;
+ }
+
+ return true;