-int receive_meta(connection_t *cl)
-{
- int x, l = sizeof(x);
- int oldlen, i;
- int lenin, reqlen;
- int decrypted = 0;
- char inbuf[MAXBUFSIZE];
-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;
- }
-
- /* 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(cl->meta_socket, cl->buffer + cl->buflen, MAXBUFSIZE - cl->buflen);
-
- if(lenin<=0)
- {
- if(lenin==0)
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
- cl->name, cl->hostname);
- }
- else
- if(errno==EINTR)
- return 0;
- else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- cl->name, cl->hostname);
-
- return -1;
- }
-
- oldlen = cl->buflen;
- cl->buflen += lenin;
-
- while(lenin)
- {
- /* Decrypt */
-
- if(cl->status.decryptin && !decrypted)
- {
- EVP_DecryptUpdate(cl->cipher_inctx, inbuf, &lenin, cl->buffer + oldlen, lenin);
- memcpy(cl->buffer + oldlen, inbuf, lenin);
- decrypted = 1;
- }
-
- /* Are we receiving a TCPpacket? */
-
- if(cl->tcplen)
- {
- if(cl->tcplen <= cl->buflen)
- {
- receive_tcppacket(cl, cl->buffer, cl->tcplen);
-
- cl->buflen -= cl->tcplen;
- lenin -= cl->tcplen;
- memmove(cl->buffer, cl->buffer + cl->tcplen, cl->buflen);
- oldlen = 0;
- cl->tcplen = 0;
- continue;
- }
- else
- {
- break;
- }
- }
-
- /* Otherwise we are waiting for a request */
-
- 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 */
- reqlen = i + 1;
- break;
- }
- }
-
- if(reqlen)
- {
- if(receive_request(cl))
- return -1;
-
- cl->buflen -= reqlen;
- lenin -= reqlen;
- memmove(cl->buffer, cl->buffer + reqlen, cl->buflen);
- oldlen = 0;
- continue;
- }
- 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(meshlink_handle_t *mesh, connection_t *c) {
+ int inlen;
+ char inbuf[MAXBUFSIZE];
+
+ inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
+
+ if(inlen <= 0) {
+ if(!inlen || !errno) {
+ logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+ } else if(sockwouldblock(sockerrno)) {
+ return true;
+ } else {
+ logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
+ }
+
+ return false;
+ }
+
+ if(c->allow_request == ID) {
+ buffer_add(&c->inbuf, inbuf, inlen);
+
+ char *request = buffer_readline(&c->inbuf);
+
+ if(request) {
+ if(!receive_request(mesh, c, request) || c->allow_request == ID) {
+ return false;
+ }
+
+ int left = c->inbuf.len - c->inbuf.offset;
+
+ if(left > 0) {
+ return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
+ } else {
+ return true;
+ }
+ }
+
+ if(c->inbuf.len >= sizeof(inbuf)) {
+ logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ return sptps_receive_data(&c->sptps, inbuf, inlen);