From d830d95720e41b3374dd1edda04ef1ea4272967d Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sun, 13 Aug 2017 00:22:37 +0200 Subject: proxy renamed to vconn --- code/vconn/Makefile | 13 ++ code/vconn/vconn.c | 533 ++++++++++++++++++++++++++++++++++++++++++++++++++++ code/vconn/vconn.h | 22 +++ 3 files changed, 568 insertions(+) create mode 100644 code/vconn/Makefile create mode 100644 code/vconn/vconn.c create mode 100644 code/vconn/vconn.h (limited to 'code/vconn') diff --git a/code/vconn/Makefile b/code/vconn/Makefile new file mode 100644 index 0000000..0292b0d --- /dev/null +++ b/code/vconn/Makefile @@ -0,0 +1,13 @@ +CFLAGS = -I../core -pthread -O3 $(PIC) + +obj = vconn.o + + +%.o: %.c %.h + $(CC) $(CFLAGS) -c $< + +all: $(obj) + $(AR) rcs libecpvconn.a $(obj) + +clean: + rm -f *.o *.a \ No newline at end of file diff --git a/code/vconn/vconn.c b/code/vconn/vconn.c new file mode 100644 index 0000000..97ced70 --- /dev/null +++ b/code/vconn/vconn.c @@ -0,0 +1,533 @@ +#include "core.h" +#include "vconn.h" + +#include + +#ifdef ECP_WITH_PTHREAD +static pthread_mutex_t key_perma_mutex; +static pthread_mutex_t key_next_mutex; +#endif + +static void *key_perma_table; +static void *key_next_table; + +static unsigned char key_null[ECP_ECDH_SIZE_KEY] = { 0 }; + +static ECPConnHandler handler_f; +static ECPConnHandler handler_b; + +static int vconn_create(ECPConnection *conn, unsigned char *payload, size_t size) { + ECPContext *ctx = conn->sock->ctx; + ECPVConnIn *conn_v = (ECPVConnIn *)conn; + int rv = ECP_OK; + + if (conn->out) return ECP_ERR; + if (conn->type != ECP_CTYPE_VCONN) return ECP_ERR; + if (size < 2*ECP_ECDH_SIZE_KEY) return ECP_ERR; + + conn_v->key_next_curr = 0; + memset(conn_v->key_next, 0, sizeof(conn_v->key_next)); + memset(conn_v->key_out, 0, sizeof(conn_v->key_out)); + memcpy(conn_v->key_next[conn_v->key_next_curr], payload, ECP_ECDH_SIZE_KEY); + memcpy(conn_v->key_out, payload+ECP_ECDH_SIZE_KEY, ECP_ECDH_SIZE_KEY); + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_next_mutex); +#endif +#ifdef ECP_WITH_HTABLE + rv = ctx->ht.init ? ctx->ht.insert(key_next_table, conn_v->key_next[conn_v->key_next_curr], conn) : ECP_ERR; +#endif +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&key_next_mutex); +#endif + + return rv; +} + +static void vconn_destroy(ECPConnection *conn) { + ECPContext *ctx = conn->sock->ctx; + ECPVConnIn *conn_v = (ECPVConnIn *)conn; + + if (conn->out) return; + if (conn->type != ECP_CTYPE_VCONN) return; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_next_mutex); + pthread_mutex_lock(&conn->mutex); +#endif +#ifdef ECP_WITH_HTABLE + if (ctx->ht.init) { + int i; + for (i=0; ikey_next[i], key_null, ECP_ECDH_SIZE_KEY)) ctx->ht.remove(key_next_table, conn_v->key_next[i]); + } + } +#endif +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); + pthread_mutex_unlock(&key_next_mutex); +#endif +} + +static ssize_t _vconn_send_open(ECPConnection *conn) { + ECPVConnection *conn_v = (ECPVConnection *)conn; + ECPConnection *conn_next = conn_v->next; + unsigned char payload[ECP_SIZE_PLD(0)]; + + if (conn_next == NULL) return ECP_ERR; + + ecp_pld_set_type(payload, ECP_MTYPE_KGET_REQ); + return ecp_pld_send_wkey(conn_next, ECP_ECDH_IDX_PERMA, ECP_ECDH_IDX_INV, payload, sizeof(payload)); +} + +static ssize_t _vconn_retry_kget(ECPConnection *conn, ECPTimerItem *ti) { + if (conn->parent == NULL) return ECP_ERR; + + return _vconn_send_open(conn->parent); +} + +static ssize_t vconn_open(ECPConnection *conn) { + int rv = ECP_OK; + ECPTimerItem ti; + ECPVConnection *conn_v = (ECPVConnection *)conn; + ECPConnection *conn_next = conn_v->next; + + rv = ecp_timer_item_init(&ti, conn_next, ECP_MTYPE_KGET_REP, 3, 3000); + if (rv) return rv; + + ti.retry = _vconn_retry_kget; + rv = ecp_timer_push(&ti); + if (rv) return rv; + + return _vconn_send_open(conn); +} + +static ssize_t vconn_handle_open(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, ssize_t size) { + if (conn->type != ECP_CTYPE_VCONN) return ECP_ERR; + + if (mtype & ECP_MTYPE_FLAG_REP) { + if (!conn->out) return ECP_ERR; + if (size < 0) { + ecp_conn_handler_msg_t *handler = NULL; + while (conn->type == ECP_CTYPE_VCONN) { + ECPVConnection *conn_v = (ECPVConnection *)conn; + conn = conn_v->next; + } + handler = conn->sock->ctx->handler[conn->type] ? conn->sock->ctx->handler[conn->type]->msg[ECP_MTYPE_OPEN] : NULL; + return handler ? handler(conn, seq, mtype, msg, size) : size; + } + + return ecp_conn_handle_open(conn, seq, mtype, msg, size); + } else { + ECPContext *ctx = conn->sock->ctx; + ECPVConnIn *conn_v = (ECPVConnIn *)conn; + int rv = ECP_OK; + unsigned char ctype = 0; + + if (conn->out) return ECP_ERR; + if (size < 0) return size; + if (size < 1+2*ECP_ECDH_SIZE_KEY) return ECP_ERR; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_next_mutex); + pthread_mutex_lock(&conn->mutex); +#endif + + ctype = msg[0]; + msg++; + + if (!ecp_conn_is_open(conn)) conn->flags |= ECP_CONN_FLAG_OPEN; + if (memcmp(conn_v->key_next[conn_v->key_next_curr], msg, ECP_ECDH_SIZE_KEY)) { + conn_v->key_next_curr = (conn_v->key_next_curr + 1) % ECP_MAX_NODE_KEY; +#ifdef ECP_WITH_HTABLE + if (ctx->ht.init) { + if (memcmp(conn_v->key_next[conn_v->key_next_curr], key_null, ECP_ECDH_SIZE_KEY)) ctx->ht.remove(key_next_table, conn_v->key_next[conn_v->key_next_curr]); + rv = ctx->ht.insert(key_next_table, conn_v->key_next[conn_v->key_next_curr], conn); + } else { + rv = ECP_ERR; + } +#endif + if (!rv) memcpy(conn_v->key_next[conn_v->key_next_curr], msg, ECP_ECDH_SIZE_KEY); + } + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); + pthread_mutex_unlock(&key_next_mutex); +#endif + + if (rv) return rv; + + return 1+2*ECP_ECDH_SIZE_KEY; + } + + return ECP_ERR; +} + +static ssize_t vconn_handle_relay(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, ssize_t size) { + ECPContext *ctx = conn->sock->ctx; + ECPConnection *conn_out = NULL; + ECPVConnIn *conn_v = (ECPVConnIn *)conn; + unsigned char *payload = NULL; + ssize_t rv; + + if (conn->out) return ECP_ERR; + if (conn->type != ECP_CTYPE_VCONN) return ECP_ERR; + + if (size < 0) return size; + if (size < ECP_MIN_PKT) return ECP_ERR_MIN_PKT; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_perma_mutex); +#endif +#ifdef ECP_WITH_HTABLE + conn_out = ctx->ht.init ? ctx->ht.search(key_perma_table, conn_v->key_out) : NULL; +#endif + if (conn_out) { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn_out->mutex); +#endif + conn_out->refcount++; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn_out->mutex); +#endif + } +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&key_perma_mutex); +#endif + + if (conn_out == NULL) return ECP_ERR; + + payload = msg - ECP_SIZE_MSG_HDR; + ecp_pld_set_type(payload, ECP_MTYPE_EXEC); + rv = ecp_pld_send(conn_out, payload, ECP_SIZE_MSG_HDR+size); + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn_out->mutex); +#endif + conn_out->refcount--; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn_out->mutex); +#endif + + if (rv < 0) return rv; + return size; +} + +static int vlink_insert(ECPConnection *conn) { + int rv = ECP_OK; + ECPContext *ctx = conn->sock->ctx; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_perma_mutex); +#endif +#ifdef ECP_WITH_HTABLE + rv = ctx->ht.init ? ctx->ht.insert(key_perma_table, ctx->cr.dh_pub_get_buf(&conn->node.public), conn) : ECP_OK; +#endif +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&key_perma_mutex); +#endif + + return rv; +} + +static void vlink_remove(ECPConnection *conn) { + ECPContext *ctx = conn->sock->ctx; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_perma_mutex); +#endif +#ifdef ECP_WITH_HTABLE + if (ctx->ht.init) ctx->ht.remove(key_perma_table, ctx->cr.dh_pub_get_buf(&conn->node.public)); +#endif +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&key_perma_mutex); +#endif +} + +static int vlink_create(ECPConnection *conn, unsigned char *payload, size_t size) { + ECPContext *ctx = conn->sock->ctx; + + if (conn->out) return ECP_ERR; + if (conn->type != ECP_CTYPE_VLINK) return ECP_ERR; + + // XXX should verify perma_key + if (size < ECP_ECDH_SIZE_KEY) return ECP_ERR; + ctx->cr.dh_pub_from_buf(&conn->node.public, payload); + + return vlink_insert(conn); +} + +static void vlink_destroy(ECPConnection *conn) { + ECPContext *ctx = conn->sock->ctx; + + if (conn->out) return; + if (conn->type != ECP_CTYPE_VLINK) return; + + vlink_remove(conn); +} + +static ssize_t _vlink_send_open(ECPConnection *conn, ECPTimerItem *ti) { + ECPSocket *sock = conn->sock; + ECPContext *ctx = sock->ctx; + unsigned char payload[ECP_SIZE_PLD(ECP_ECDH_SIZE_KEY+1)]; + unsigned char *buf = ecp_pld_get_buf(payload); + int rv = ECP_OK; + + // XXX server should verify perma_key + ecp_pld_set_type(payload, ECP_MTYPE_OPEN_REQ); + buf[0] = conn->type; + memcpy(buf+1, ctx->cr.dh_pub_get_buf(&sock->key_perma.public), ECP_ECDH_SIZE_KEY); + + return ecp_pld_send(conn, payload, sizeof(payload)); +} + +static ssize_t vlink_open(ECPConnection *conn) { + return ecp_timer_send(conn, _vlink_send_open, ECP_MTYPE_OPEN_REP, 3, 500); +} + +static void vlink_close(ECPConnection *conn) { + vlink_remove(conn); +} + +static ssize_t vlink_handle_open(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, ssize_t size) { + ssize_t rv; + int is_open; + + if (conn->type != ECP_CTYPE_VLINK) return ECP_ERR; + + if (size < 0) return size; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn->mutex); +#endif + is_open = ecp_conn_is_open(conn); +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); +#endif + + rv = ecp_conn_handle_open(conn, seq, mtype, msg, size); + if (rv < 0) return rv; + + if (mtype & ECP_MTYPE_FLAG_REP) { + if (!conn->out) return ECP_ERR; + if (!is_open) { + int rv = vlink_insert(conn); + if (rv) return rv; + } + return rv; + } else { + if (conn->out) return ECP_ERR; + if (size < rv+ECP_ECDH_SIZE_KEY) return ECP_ERR; + + msg += rv; + + // XXX should verify perma_key + return rv+ECP_ECDH_SIZE_KEY; + } + + return ECP_ERR; +} + +static ssize_t vlink_handle_relay(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, ssize_t size) { + ECPContext *ctx = conn->sock->ctx; + unsigned char *payload = NULL; + ssize_t rv; + + if (conn->type != ECP_CTYPE_VLINK) return ECP_ERR; + + if (size < 0) return size; + if (size < ECP_MIN_PKT) return ECP_ERR_MIN_PKT; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&key_next_mutex); +#endif +#ifdef ECP_WITH_HTABLE + conn = ctx->ht.init ? ctx->ht.search(key_next_table, msg+ECP_SIZE_PROTO+1) : NULL; +#endif + if (conn) { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn->mutex); +#endif + conn->refcount++; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); +#endif + } +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&key_next_mutex); +#endif + + if (conn == NULL) return ECP_ERR; + + payload = msg - ECP_SIZE_MSG_HDR; + ecp_pld_set_type(payload, ECP_MTYPE_EXEC); + rv = ecp_pld_send(conn, payload, ECP_SIZE_MSG_HDR+size); + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn->mutex); +#endif + conn->refcount--; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); +#endif + + if (rv < 0) return rv; + return size; +} + +static ssize_t vconn_set_msg(ECPConnection *conn, unsigned char *pld_out, size_t pld_out_size, unsigned char *pld_in, size_t pld_in_size) { + if ((conn->type == ECP_CTYPE_VCONN) && conn->out) { + unsigned char mtype = ecp_pld_get_type(pld_in); + if ((mtype == ECP_MTYPE_OPEN_REQ) || (mtype == ECP_MTYPE_KGET_REQ)) { + ECPVConnection *conn_v = (ECPVConnection *)conn; + ECPContext *ctx = conn->sock->ctx; + ECPConnection *conn_next = conn_v->next; + unsigned char *buf = NULL; + int rv; + + if (pld_out_size < ECP_SIZE_MSG_HDR+2+2*ECP_ECDH_SIZE_KEY) return ECP_ERR; + if (conn_next == NULL) return ECP_ERR; + + ecp_pld_set_type(pld_out, ECP_MTYPE_OPEN_REQ); + buf = ecp_pld_get_buf(pld_out); + + buf[0] = ECP_CTYPE_VCONN; + rv = ecp_conn_dhkey_get_curr(conn_next, NULL, buf+1); + if (rv) return rv; + + memcpy(buf+1+ECP_ECDH_SIZE_KEY, ctx->cr.dh_pub_get_buf(&conn_next->node.public), ECP_ECDH_SIZE_KEY); + buf[1+2*ECP_ECDH_SIZE_KEY] = ECP_MTYPE_RELAY; + + return ECP_SIZE_MSG_HDR+2+2*ECP_ECDH_SIZE_KEY; + } + } + + ecp_pld_set_type(pld_out, ECP_MTYPE_RELAY); + return ECP_SIZE_MSG_HDR; +} + + +static ssize_t vconn_pack(ECPConnection *conn, unsigned char *packet, size_t pkt_size, unsigned char s_idx, unsigned char c_idx, unsigned char *payload, size_t payload_size, ECPNetAddr *addr, ecp_seq_t *seq, int *rbuf_idx) { + ECPContext *ctx = conn->sock->ctx; + + if (conn->parent) { + unsigned char payload_[ECP_MAX_PLD]; + ssize_t rv, hdr_size = vconn_set_msg(conn->parent, payload_, sizeof(payload_), payload, payload_size); + if (hdr_size < 0) return hdr_size; + + rv = ecp_conn_pack(conn, payload_+hdr_size, ECP_MAX_PLD-hdr_size, s_idx, c_idx, payload, payload_size, NULL, seq, rbuf_idx); + if (rv < 0) return rv; + + return vconn_pack(conn->parent, packet, pkt_size, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, payload_, rv+hdr_size, addr, NULL, NULL); + } else { + return ecp_conn_pack(conn, packet, pkt_size, s_idx, c_idx, payload, payload_size, addr, seq, rbuf_idx); + } +} + +static ssize_t vconn_pack_raw(ECPSocket *sock, ECPConnection *parent, unsigned char *packet, size_t pkt_size, unsigned char s_idx, unsigned char c_idx, ecp_dh_public_t *public, ecp_aead_key_t *shsec, unsigned char *nonce, ecp_seq_t seq, unsigned char *payload, size_t payload_size, ECPNetAddr *addr) { + ECPContext *ctx = sock->ctx; + + if (parent) { + unsigned char payload_[ECP_MAX_PLD]; + ssize_t rv, hdr_size = vconn_set_msg(parent, payload_, sizeof(payload_), payload, payload_size); + if (hdr_size < 0) return hdr_size; + + rv = ecp_pack(ctx, payload_+hdr_size, ECP_MAX_PLD-hdr_size, s_idx, c_idx, public, shsec, nonce, seq, payload, payload_size); + if (rv < 0) return rv; + + return vconn_pack(parent, packet, pkt_size, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, payload_, rv+hdr_size, addr, NULL, NULL); + } else { + return ecp_pack(ctx, packet, pkt_size, s_idx, c_idx, public, shsec, nonce, seq, payload, payload_size); + } +} + +int ecp_ctx_vconn_init(ECPContext *ctx) { + int rv; + + rv = ecp_conn_handler_init(&handler_f); + if (rv) return rv; + + handler_f.conn_create = vconn_create; + handler_f.conn_destroy = vconn_destroy; + handler_f.conn_open = vconn_open; + handler_f.msg[ECP_MTYPE_OPEN] = vconn_handle_open; + handler_f.msg[ECP_MTYPE_EXEC] = ecp_conn_handle_exec; + handler_f.msg[ECP_MTYPE_RELAY] = vconn_handle_relay; + ctx->handler[ECP_CTYPE_VCONN] = &handler_f; + + rv = ecp_conn_handler_init(&handler_b); + if (rv) return rv; + + handler_b.conn_create = vlink_create; + handler_b.conn_destroy = vlink_destroy; + handler_b.conn_open = vlink_open; + handler_b.conn_close = vlink_close; + handler_b.msg[ECP_MTYPE_OPEN] = vlink_handle_open; + handler_b.msg[ECP_MTYPE_EXEC] = ecp_conn_handle_exec; + handler_b.msg[ECP_MTYPE_RELAY] = vlink_handle_relay; + ctx->handler[ECP_CTYPE_VLINK] = &handler_b; + + ctx->pack = vconn_pack; + ctx->pack_raw = vconn_pack_raw; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_init(&key_perma_mutex, NULL); + pthread_mutex_init(&key_next_mutex, NULL); +#endif + +#ifdef ECP_WITH_HTABLE + if (ctx->ht.init) { + key_perma_table = ctx->ht.create(ctx); + key_next_table = ctx->ht.create(ctx); + } +#endif + + return ECP_OK; +} + +int ecp_vconn_init(ECPConnection *conn, ECPNode *conn_node, ECPVConnection vconn[], ECPNode vconn_node[], int size) { + ECPSocket *sock = conn->sock; + int i, rv; + + rv = ecp_conn_init(conn, conn_node); + if (rv) return rv; + + conn->parent = (ECPConnection *)&vconn[size-1]; + for (i=0; i