Skip to content

DTLS Protocol Support #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

DTLS Protocol Support #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4f34b67
DTLS Protocol Support
mestery Mar 27, 2020
dda7740
Add DTLS functional test
mestery Mar 28, 2020
83cd2c4
DTLS test: Make hostname part of test struct
mestery Mar 29, 2020
27c7975
Open UDP listeners
dlundquist Mar 28, 2020
fa0c373
poc: "accept" UDP connections
dlundquist Mar 28, 2020
4d1a6b5
Add socket type to buffer and connection structs
mestery Mar 29, 2020
b3e4c2f
Fix dtls hostname checks for bad tests
mestery Mar 29, 2020
9058c98
Update .gitignore to ignore .DS_Store on a Mac
mestery Apr 1, 2020
6df5d51
abort_message in Protocol should be unsigned char
mestery Apr 1, 2020
c29a10f
Remove tests which fail from Makefile.am
mestery Apr 1, 2020
4b56c9f
Update buffer module to work with UDP datagrams
mestery Apr 1, 2020
94138dd
Simplify datagram processing in buffer code
mestery Apr 2, 2020
80287ea
buffer: rework datagram buffers
dlundquist Apr 2, 2020
d8b644e
buffer: Correct buffer_coalesce
mestery Apr 3, 2020
008f19e
buffer: Make buffer_coalesce more intelligent
mestery Apr 3, 2020
6c35206
connection: Read data after accepting dgram socket
mestery Apr 3, 2020
4c77d6d
Address code review comments
mestery Apr 4, 2020
ee0660b
IPv6: Compile on macOS
mestery Apr 9, 2020
b127c72
Fix issue with buffer coalesse and buffer_push
aldickin May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ INSTALL
sniproxy-*.tar.gz
tags
test-driver
.DS_Store
6 changes: 5 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ sniproxy_SOURCES = sniproxy.c \
table.c \
table.h \
tls.c \
tls.h
tls.h \
dtls.c \
dtls.h \
sni.c \
sni.h

sniproxy_LDADD = $(LIBEV_LIBS) $(LIBPCRE_LIBS) $(LIBUDNS_LIBS)
6 changes: 4 additions & 2 deletions src/binder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ static int parse_ancillary_data(struct msghdr *);


struct binder_request {
int type;
size_t address_len;
struct sockaddr address[];
};
Expand Down Expand Up @@ -82,7 +83,7 @@ start_binder() {
}

int
bind_socket(const struct sockaddr *addr, size_t addr_len) {
bind_socket(int type, const struct sockaddr *addr, size_t addr_len) {
struct binder_request *request;
struct msghdr msg;
struct iovec iov[1];
Expand All @@ -99,6 +100,7 @@ bind_socket(const struct sockaddr *addr, size_t addr_len) {
if (request_len > sizeof(data_buf))
fatal("bind_socket: request length %zu exceeds buffer", request_len);
request = (struct binder_request *)data_buf;
request->type = type;
request->address_len = addr_len;
memcpy(&request->address, addr, addr_len);

Expand Down Expand Up @@ -159,7 +161,7 @@ binder_main(int sockfd) {

struct binder_request *req = (struct binder_request *)buffer;

int fd = socket(req->address[0].sa_family, SOCK_STREAM, 0);
int fd = socket(req->address[0].sa_family, req->type, 0);
if (fd < 0) {
memset(buffer, 0, sizeof(buffer));
snprintf(buffer, sizeof(buffer), "socket(): %s", strerror(errno));
Expand Down
2 changes: 1 addition & 1 deletion src/binder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <sys/socket.h>

void start_binder();
int bind_socket(const struct sockaddr *, size_t);
int bind_socket(int type, const struct sockaddr *, size_t);
void stop_binder();

#endif
186 changes: 138 additions & 48 deletions src/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h> /* malloc */
#include <string.h> /* memcpy */
#include <stdint.h> /* uint16_t */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
Expand All @@ -38,25 +39,30 @@

#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define NOT_POWER_OF_2(x) (x == 0 || (x & (x - 1)))
#define ALIGN_16BIT(x) ((x + 1) & ~((typeof(x))1))

/* REMOVE */
#define DBG_DUMP(x, y) if (x->type == SOCK_DGRAM) y


static const size_t BUFFER_MAX_SIZE = 1024 * 1024 * 1024;


static size_t setup_write_iov(const struct Buffer *, struct iovec *, size_t);
static size_t setup_read_iov(const struct Buffer *, struct iovec *, size_t);
static size_t setup_write_iov(const struct Buffer *, struct iovec [2], size_t);
static size_t setup_read_iov(const struct Buffer *, struct iovec [2], size_t);
static inline void advance_write_position(struct Buffer *, size_t);
static inline void advance_read_position(struct Buffer *, size_t);


struct Buffer *
new_buffer(size_t size, struct ev_loop *loop) {
new_buffer(int type, size_t size, struct ev_loop *loop) {
if (NOT_POWER_OF_2(size))
return NULL;
struct Buffer *buf = malloc(sizeof(struct Buffer));
if (buf == NULL)
return NULL;

buf->type = type;
buf->size_mask = size - 1;
buf->len = 0;
buf->head = 0;
Expand Down Expand Up @@ -98,6 +104,15 @@ buffer_resize(struct Buffer *buf, size_t new_size) {
return (ssize_t)buf->len;
}

ssize_t
buffer_copy_data(struct Buffer *src, struct Buffer *dst, size_t len)
{
/* Raw copy the entire buffer */
memcpy(src->buffer, dst->buffer, len);

return 0;
}

void
free_buffer(struct Buffer *buf) {
if (buf == NULL)
Expand All @@ -109,39 +124,50 @@ free_buffer(struct Buffer *buf) {

ssize_t
buffer_recv(struct Buffer *buffer, int sockfd, int flags, struct ev_loop *loop) {
struct msghdr msg = { 0 };

return buffer_recvmsg(buffer, sockfd, &msg, flags, loop);
}

ssize_t
buffer_recvmsg(struct Buffer *buffer, int sockfd, struct msghdr *msg,
int flags, struct ev_loop *loop) {
/* coalesce when reading into an empty buffer */
if (buffer->len == 0)
buffer->head = 0;

struct iovec iov[2];
struct msghdr msg = {
.msg_iov = iov,
.msg_iovlen = setup_write_iov(buffer, iov, 0)
};
msg->msg_iov = iov;
msg->msg_iovlen = setup_write_iov(buffer, iov, 0);

ssize_t bytes = recvmsg(sockfd, &msg, flags);
ssize_t bytes = recvmsg(sockfd, msg, flags);

buffer->last_recv = ev_now(loop);

if (bytes > 0)
if (bytes >= 0)
advance_write_position(buffer, (size_t)bytes);

return bytes;
}

ssize_t
buffer_send(struct Buffer *buffer, int sockfd, int flags, struct ev_loop *loop) {
struct msghdr msg = { 0 };

return buffer_sendmsg(buffer, sockfd, &msg, flags, loop);
}

ssize_t
buffer_sendmsg(struct Buffer *buffer, int sockfd, struct msghdr *msg, int flags, struct ev_loop *loop) {
struct iovec iov[2];
struct msghdr msg = {
.msg_iov = iov,
.msg_iovlen = setup_read_iov(buffer, iov, 0)
};
msg->msg_iov = iov;
msg->msg_iovlen = setup_read_iov(buffer, iov, 0);

ssize_t bytes = sendmsg(sockfd, &msg, flags);
ssize_t bytes = sendmsg(sockfd, msg, flags);

buffer->last_send = ev_now(loop);

if (bytes > 0)
if (bytes >= 0)
advance_read_position(buffer, (size_t)bytes);

return bytes;
Expand All @@ -160,7 +186,7 @@ buffer_read(struct Buffer *buffer, int fd) {
size_t iov_len = setup_write_iov(buffer, iov, 0);
ssize_t bytes = readv(fd, iov, iov_len);

if (bytes > 0)
if (bytes >= 0)
advance_write_position(buffer, (size_t)bytes);

return bytes;
Expand All @@ -175,7 +201,7 @@ buffer_write(struct Buffer *buffer, int fd) {
size_t iov_len = setup_read_iov(buffer, iov, 0);
ssize_t bytes = writev(fd, iov, iov_len);

if (bytes > 0)
if (bytes >= 0)
advance_read_position(buffer, (size_t)bytes);

return bytes;
Expand All @@ -190,30 +216,65 @@ buffer_write(struct Buffer *buffer, int fd) {
size_t
buffer_coalesce(struct Buffer *buffer, const void **dst) {
size_t buffer_tail = (buffer->head + buffer->len) & buffer->size_mask;
size_t head = buffer->head;

if (buffer_tail <= buffer->head) {
if (buffer_tail >= buffer->head) {
/* buffer not wrapped */
if (buffer->type == SOCK_DGRAM)
head += sizeof(uint16_t);
if (dst != NULL)
*dst = &buffer->buffer[buffer->head];
*dst = &buffer->buffer[head];

return buffer->len;
} else {
/* buffer wrapped */
size_t len = buffer->len;
char *temp = malloc(len);
if (temp != NULL) {
buffer_pop(buffer, temp, len);
assert(buffer->len == 0);

buffer_push(buffer, temp, len);
assert(buffer->head == 0);
assert(buffer->len == len);

free(temp);
if (buffer->type == SOCK_STREAM) {
/* buffer wrapped */
size_t len = buffer->len;
char *temp = malloc(len);
if (temp != NULL) {
buffer_pop(buffer, temp, len);
assert(buffer->len == 0);

buffer_push(buffer, temp, len);
assert(buffer->head == 0);
assert(buffer->len == len);

free(temp);
}
} else { /* SOCK_DGRAM */
/* buffer wrapped */
size_t len = buffer->len;
char temp[len];
size_t bytes = 0, total = 0, dgram_size;
struct Buffer *newbuf = new_buffer(SOCK_DGRAM, buffer_size(buffer), EV_DEFAULT);

if (temp != NULL && newbuf != NULL) {
do {
/* Read each datagram, one at a time, and populate in new buffer */
bytes = buffer_pop(buffer, temp, sizeof(temp));
dgram_size = ALIGN_16BIT(bytes) + HDR_LEN(buffer);
total += dgram_size;
assert(buffer->len == len - total);
buffer_push(newbuf, temp, bytes);
assert(newbuf->len == total);
} while (bytes != 0 && total < len);

/* Copy the data across */
memcpy(buffer->buffer, newbuf->buffer, len);
buffer->head = newbuf->head;
buffer->len = newbuf->len;

free_buffer(newbuf);
}
}

if (dst != NULL)
*dst = buffer->buffer;
if (dst != NULL) {
if (buffer->type == SOCK_DGRAM) {
*dst = buffer->buffer+sizeof(uint16_t);
} else {
*dst = buffer->buffer;
}
}

return buffer->len;
}
Expand Down Expand Up @@ -255,7 +316,7 @@ buffer_push(struct Buffer *dst, const void *src, size_t len) {
if (dst->len == 0)
dst->head = 0;

if (buffer_size(dst) - dst->len < len)
if (buffer_size(dst) - dst->len < len + HDR_LEN(dst))
return 0; /* insufficient room */

size_t iov_len = setup_write_iov(dst, iov, len);
Expand All @@ -277,18 +338,23 @@ buffer_push(struct Buffer *dst, const void *src, size_t len) {
* returns the number of entries setup
*/
static size_t
setup_write_iov(const struct Buffer *buffer, struct iovec *iov, size_t len) {
size_t room = buffer_size(buffer) - buffer->len;
setup_write_iov(const struct Buffer *buffer, struct iovec iov[2], size_t len) {
size_t headroom = buffer->type == SOCK_DGRAM ? sizeof(uint16_t) : 0;
size_t room = buffer_size(buffer) - buffer->len - headroom;

if (room == 0) /* trivial case: no room */
return 0;

if (buffer->type == SOCK_DGRAM
&& room < len) /* Complete writes only for dgram */
return 0;

size_t write_len = room;
/* Allow caller to specify maximum length */
if (len != 0)
write_len = MIN(room, len);

size_t start = (buffer->head + buffer->len) & buffer->size_mask;
size_t start = (buffer->head + buffer->len + headroom) & buffer->size_mask;

if (start + write_len <= buffer_size(buffer)) {
iov[0].iov_base = buffer->buffer + start;
Expand Down Expand Up @@ -319,16 +385,25 @@ setup_write_iov(const struct Buffer *buffer, struct iovec *iov, size_t len) {
}

static size_t
setup_read_iov(const struct Buffer *buffer, struct iovec *iov, size_t len) {
setup_read_iov(const struct Buffer *buffer, struct iovec iov[2], size_t len) {
if (buffer->len == 0)
return 0;

size_t read_len = buffer->len;
if (len != 0)
read_len = MIN(len, buffer->len);
size_t read_len;
if (buffer->type == SOCK_DGRAM) {
assert(buffer->head % sizeof(uint16_t) == 0);
read_len = *(uint16_t *)&buffer->buffer[buffer->head];
} else {
read_len = buffer->len;
if (len != 0)
read_len = MIN(len, buffer->len);
}

if (buffer->head + read_len <= buffer_size(buffer)) {
iov[0].iov_base = buffer->buffer + buffer->head;
size_t start = (buffer->head + HDR_LEN(buffer)) & buffer->size_mask;
size_t end = (start + read_len) & buffer->size_mask;

if (! end || start < end) {
iov[0].iov_base = buffer->buffer + start;
iov[0].iov_len = read_len;

/* assert iov are within bounds, non-zero length and non-overlapping */
Expand All @@ -338,8 +413,8 @@ setup_read_iov(const struct Buffer *buffer, struct iovec *iov, size_t len) {

return 1;
} else {
iov[0].iov_base = buffer->buffer + buffer->head;
iov[0].iov_len = buffer_size(buffer) - buffer->head;
iov[0].iov_base = buffer->buffer + start;
iov[0].iov_len = buffer_size(buffer) - start;
iov[1].iov_base = buffer->buffer;
iov[1].iov_len = read_len - iov[0].iov_len;

Expand All @@ -357,13 +432,28 @@ setup_read_iov(const struct Buffer *buffer, struct iovec *iov, size_t len) {

static inline void
advance_write_position(struct Buffer *buffer, size_t offset) {
buffer->len += offset;
if (buffer->type == SOCK_DGRAM) {
uint16_t *dgram_len = (uint16_t *)&buffer->buffer[
(buffer->head + buffer->len) & buffer->size_mask];

*dgram_len = (uint16_t)offset;
buffer->len += sizeof(uint16_t) + ALIGN_16BIT(offset);
} else {
buffer->len += offset;
}
buffer->rx_bytes += offset;
}

static inline void
advance_read_position(struct Buffer *buffer, size_t offset) {
buffer->head = (buffer->head + offset) & buffer->size_mask;
buffer->len -= offset;
if (buffer->type == SOCK_DGRAM) {
buffer->head = (buffer->head + sizeof(uint16_t) + ALIGN_16BIT(offset))
& buffer->size_mask;

buffer->len -= sizeof(uint16_t) + ALIGN_16BIT(offset);
} else {
buffer->head = (buffer->head + offset) & buffer->size_mask;
buffer->len -= offset;
}
buffer->tx_bytes += offset;
}
Loading