#include "utils.h"
#include "xalloc.h"
+bool send_meta_sptps(void *handle, const char *buffer, size_t length) {
+ connection_t *c = handle;
+
+ if(!c) {
+ logger(LOG_ERR, "send_meta_sptps() called with NULL pointer!");
+ abort();
+ }
+
+ logger(LOG_DEBUG, "send_meta_sptps(%s, %p, %zu)", c->name, buffer, length);
+
+ buffer_add(&c->outbuf, buffer, length);
+ event_add(&c->outevent, NULL);
+
+ return true;
+}
+
bool send_meta(connection_t *c, const char *buffer, int length) {
if(!c) {
logger(LOG_ERR, "send_meta() called with NULL pointer!");
ifdebug(META) logger(LOG_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
c->name, c->hostname);
+ if(c->protocol_minor >= 2)
+ return sptps_send_record(&c->sptps, 0, buffer, length);
+
/* Add our data to buffer */
if(c->status.encryptout) {
- char outbuf[length];
size_t outlen = length;
- if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) {
+ if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
logger(LOG_ERR, "Error while encrypting metadata to %s (%s)",
c->name, c->hostname);
return false;
}
-
- ifdebug(META) logger(LOG_DEBUG, "Encrypted write %p %p %p %d", c, c->buffer, outbuf, length);
- bufferevent_write(c->buffer, (void *)outbuf, length);
- ifdebug(META) logger(LOG_DEBUG, "Done.");
+
} else {
- ifdebug(META) logger(LOG_DEBUG, "Unencrypted write %p %p %p %d", c, c->buffer, buffer, length);
- bufferevent_write(c->buffer, (void *)buffer, length);
- ifdebug(META) logger(LOG_DEBUG, "Done.");
+ buffer_add(&c->outbuf, buffer, length);
}
+ event_add(&c->outevent, NULL);
+
return true;
}
}
}
+bool receive_meta_sptps(void *handle, uint8_t type, const char *data, uint16_t length) {
+ connection_t *c = handle;
+
+ if(!c) {
+ logger(LOG_ERR, "receive_meta_sptps() called with NULL pointer!");
+ abort();
+ }
+
+ logger(LOG_DEBUG, "receive_meta_sptps(%s, %d, %p, %hu)", c->name, type, data, length);
+
+ if(type == SPTPS_HANDSHAKE) {
+ if(c->allow_request == ACK)
+ return send_ack(c);
+ else
+ return true;
+ }
+
+ if(!data)
+ return true;
+
+ /* Are we receiving a TCPpacket? */
+
+ if(c->tcplen) {
+ if(length != c->tcplen)
+ return false;
+ receive_tcppacket(c, data, length);
+ c->tcplen = 0;
+ return true;
+ }
+
+ /* Otherwise we are waiting for a request */
+
+ return receive_request(c, data);
+}
+
bool receive_meta(connection_t *c) {
- size_t inlen;
+ int inlen;
char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp;
- If not, keep stuff in buffer and exit.
*/
- inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+ buffer_compact(&c->inbuf, MAXBUFSIZE);
+
+ if(sizeof inbuf <= c->inbuf.len) {
+ logger(LOG_ERR, "Input buffer full for %s (%s)", c->name, c->hostname);
+ return false;
+ }
+
+ inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
if(inlen <= 0) {
if(!inlen || !errno) {
}
do {
+ if(c->protocol_minor >= 2) {
+ logger(LOG_DEBUG, "Receiving %d bytes of SPTPS data", inlen);
+ return sptps_receive_data(&c->sptps, bufp, inlen);
+ }
+
if(!c->status.decryptin) {
endp = memchr(bufp, '\n', inlen);
if(endp)
else
endp = bufp + inlen;
- evbuffer_add(c->buffer->input, bufp, endp - bufp);
+ buffer_add(&c->inbuf, bufp, endp - bufp);
inlen -= endp - bufp;
bufp = endp;
} else {
size_t outlen = inlen;
- ifdebug(META) logger(LOG_DEBUG, "Received encrypted %zu bytes", inlen);
- evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
+ ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", inlen);
- if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {
+ if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
logger(LOG_ERR, "Error while decrypting metadata from %s (%s)",
c->name, c->hostname);
return false;
}
- c->buffer->input->off += inlen;
inlen = 0;
}
- while(c->buffer->input->off) {
+ while(c->inbuf.len) {
/* Are we receiving a TCPpacket? */
if(c->tcplen) {
- if(c->tcplen <= c->buffer->input->off) {
- receive_tcppacket(c, (char *)c->buffer->input->buffer, c->tcplen);
- evbuffer_drain(c->buffer->input, c->tcplen);
+ char *tcpbuffer = buffer_read(&c->inbuf, c->tcplen);
+ if(tcpbuffer) {
+ receive_tcppacket(c, tcpbuffer, c->tcplen);
c->tcplen = 0;
continue;
} else {
/* Otherwise we are waiting for a request */
- char *request = evbuffer_readline(c->buffer->input);
+ char *request = buffer_readline(&c->inbuf);
if(request) {
bool result = receive_request(c, request);
- free(request);
if(!result)
return false;
continue;