}
logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
- c->name, c->hostname);
+ c->name, c->hostname);
if(c->allow_request == ID) {
buffer_add(&c->outbuf, buffer, length);
bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
int inlen;
char inbuf[MAXBUFSIZE];
- char *bufp = inbuf, *endp;
- /* 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.
- */
-
- buffer_compact(&c->inbuf, MAXBUFSIZE);
-
- if(sizeof inbuf <= c->inbuf.len) {
- logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
- return false;
- }
-
- inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
+ inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
if(inlen <= 0) {
if(!inlen || !errno) {
logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)",
- c->name, c->hostname);
+ c->name, c->hostname);
} else if(sockwouldblock(sockerrno))
return true;
else
logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s (%s): %s",
- c->name, c->hostname, sockstrerror(sockerrno));
+ c->name, c->hostname, sockstrerror(sockerrno));
return false;
}
if(c->allow_request == ID) {
- endp = memchr(bufp, '\n', inlen);
- if(endp)
- endp++;
- else
- endp = bufp + inlen;
-
- buffer_add(&c->inbuf, bufp, endp - bufp);
-
- inlen -= endp - bufp;
- bufp = endp;
-
- while(c->inbuf.len) {
- char *request = buffer_readline(&c->inbuf);
- if(request) {
- bool result = receive_request(mesh, c, request);
- if(!result)
- return false;
- continue;
- } else {
- break;
- }
+ 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) {
+ fprintf(stderr, "GOT A LITTLE MORE\n");
+ return sptps_receive_data(&c->sptps, buffer_read(&c->inbuf, left), left);
+ } else
+ return true;
}
- return true;
+ if(c->inbuf.len >= sizeof(inbuf)) {
+ logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
+ return false;
+ } else
+ return true;
}
- return sptps_receive_data(&c->sptps, bufp, inlen);
+ return sptps_receive_data(&c->sptps, inbuf, inlen);
}