From f2bc5ddbeca144fa79208a5ac6a029da6ed5c10c Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Thu, 31 Mar 2022 13:09:12 +0200 Subject: vconn bugfix --- ecp/src/ecp/Makefile | 7 +- ecp/src/ecp/common.mk | 41 +++ ecp/src/ecp/core.c | 269 +++++++++------- ecp/src/ecp/core.h | 32 +- ecp/src/ecp/dir/Makefile | 6 +- ecp/src/ecp/ext.h | 15 + ecp/src/ecp/tr.h | 4 +- ecp/src/ecp/vconn/vconn.c | 555 ++++++++++++++++++++------------- ecp/src/ecp/vconn/vconn.h | 24 +- ecp/src/platform/fe310/platform.mk | 2 +- ecp/src/platform/fe310/platform_obj.mk | 1 - ecp/src/platform/fe310/transport.c | 69 ++-- ecp/src/platform/fe310/transport.h | 2 +- ecp/src/platform/posix/platform.mk | 2 +- ecp/src/platform/posix/platform_obj.mk | 1 - ecp/src/platform/posix/transport.c | 23 +- 16 files changed, 649 insertions(+), 404 deletions(-) delete mode 100644 ecp/src/platform/fe310/platform_obj.mk delete mode 100644 ecp/src/platform/posix/platform_obj.mk (limited to 'ecp/src') diff --git a/ecp/src/ecp/Makefile b/ecp/src/ecp/Makefile index c403829..af65ee0 100644 --- a/ecp/src/ecp/Makefile +++ b/ecp/src/ecp/Makefile @@ -1,11 +1,9 @@ include common.mk -obj = core.o timer.o -subdirs = crypto $(platform_dir) +obj += core.o timer.o +subdirs += crypto $(platform_dir) build_dir = ../../build-$(platform) -include $(platform_dir)/platform_obj.mk - %.o: %.c $(CC) $(CFLAGS) -c $< @@ -21,6 +19,7 @@ all: $(obj) install: all mkdir -p $(build_dir) + rm -f $(build_dir)/*.a install libecp.a $(build_dir) install crypto/libecpcr.a $(build_dir) install $(platform_dir)/libecptm.a $(build_dir) diff --git a/ecp/src/ecp/common.mk b/ecp/src/ecp/common.mk index 4c511f8..fbc935a 100644 --- a/ecp/src/ecp/common.mk +++ b/ecp/src/ecp/common.mk @@ -5,4 +5,45 @@ src_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..) platform_dir = $(abspath $(src_dir)/platform/$(platform)) include $(platform_dir)/platform.mk +include $(platform_dir)/features.mk CFLAGS += -I$(src_dir)/ecp -I$(platform_dir) + +ifeq ($(with_dirsrv),yes) +with_dir = yes +endif + +ifeq ($(with_pthread),yes) +CFLAGS += -DECP_WITH_PTHREAD=1 +endif + +ifeq ($(with_htable),yes) +CFLAGS += -DECP_WITH_HTABLE=1 +subdirs += htable +endif + +ifeq ($(with_vconn),yes) +CFLAGS += -DECP_WITH_VCONN=1 +subdirs += vconn +endif + +ifeq ($(with_rbuf),yes) +CFLAGS += -DECP_WITH_RBUF=1 +subdirs += ext +endif + +ifeq ($(with_msgq),yes) +CFLAGS += -DECP_WITH_MSGQ=1 +endif + +ifeq ($(with_dir),yes) +CFLAGS += -DECP_WITH_DIR=1 +subdirs += dir +endif + +ifeq ($(with_dirsrv),yes) +CFLAGS += -DECP_WITH_DIRSRV=1 +endif + +ifeq ($(with_debug),yes) +CFLAGS += -DECP_DEBUG=1 +endif diff --git a/ecp/src/ecp/core.c b/ecp/src/ecp/core.c index 3cb236f..536efff 100644 --- a/ecp/src/ecp/core.c +++ b/ecp/src/ecp/core.c @@ -24,6 +24,15 @@ #include "ht.h" #endif +int ecp_dhkey_gen(ECPDHKey *key) { + int rv; + + rv = ecp_ecdh_mkpair(&key->public, &key->private); + if (rv) return rv; + + key->valid = 1; + return ECP_OK; +} int ecp_ctx_init(ECPContext *ctx, ecp_err_handler_t handle_err, ecp_dir_handler_t handle_dir, ecp_conn_alloc_t conn_alloc, ecp_conn_free_t conn_free) { int rv; @@ -71,13 +80,19 @@ int ecp_node_init(ECPNode *node, ecp_ecdh_public_t *public, void *addr) { return ECP_OK; } -int ecp_dhkey_gen(ECPDHKey *key) { +void ecp_node_set_pub(ECPNode *node, ecp_ecdh_public_t *public) { + ECPDHPub *key = &node->key_perma; + + memcpy(&key->public, public, sizeof(key->public)); + key->valid = 1; +} + +int ecp_node_set_addr(ECPNode *node, void *addr) { int rv; - rv = ecp_ecdh_mkpair(&key->public, &key->private); - if (rv) return rv; + rv = ecp_tr_addr_set(&node->addr, addr); + if (rv) return ECP_ERR_NET_ADDR; - key->valid = 1; return ECP_OK; } @@ -127,31 +142,43 @@ static int conn_table_insert(ECPConnection *conn) { int i, rv = ECP_OK; if (ecp_conn_is_outb(conn)) { - if (!ecp_conn_is_open(conn)) rv = ecp_ht_insert(sock->conn_table.addrs, &conn->remote.addr, conn); - if (rv) return rv; + if (ecp_conn_is_root(conn) && !ecp_conn_is_open(conn)) { + rv = ecp_ht_insert(sock->conn_table.addrs, &conn->remote.addr, conn); + if (rv) return rv; + } for (i=0; ikey[i].valid) rv = ecp_ht_insert(sock->conn_table.keys, &conn->key[i].public, conn); - if (rv) { - int j; - - for (j=0; jkey[j].valid) ecp_ht_remove(sock->conn_table.keys, &conn->key[j].public); + if (conn->key[i].valid) { + rv = ecp_ht_insert(sock->conn_table.keys, &conn->key[i].public, conn); + if (rv) { + int j; + + for (j=0; jkey[j].valid) { + ecp_ht_remove(sock->conn_table.keys, &conn->key[j].public); + } + } + if (ecp_conn_is_root(conn) && !ecp_conn_is_open(conn)) { + ecp_ht_remove(sock->conn_table.addrs, &conn->remote.addr); + } + return rv; } - if (!ecp_conn_is_open(conn)) ecp_ht_remove(sock->conn_table.addrs, &conn->remote.addr); - return rv; } } } else { for (i=0; irkey[i].valid) rv = ecp_ht_insert(sock->conn_table.keys, &conn->rkey[i].public, conn); - if (rv) { - int j; - - for (j=0; jrkey[j].valid) ecp_ht_remove(sock->conn_table.keys, &conn->rkey[j].public); + if (conn->rkey[i].valid) { + rv = ecp_ht_insert(sock->conn_table.keys, &conn->rkey[i].public, conn); + if (rv) { + int j; + + for (j=0; jrkey[j].valid) { + ecp_ht_remove(sock->conn_table.keys, &conn->rkey[j].public); + } + } + return rv; } - return rv; } } } @@ -171,12 +198,18 @@ static void conn_table_remove(ECPConnection *conn) { #ifdef ECP_WITH_HTABLE if (ecp_conn_is_outb(conn)) { for (i=0; ikey[i].valid) ecp_ht_remove(sock->conn_table.keys, &conn->key[i].public); + if (conn->key[i].valid) { + ecp_ht_remove(sock->conn_table.keys, &conn->key[i].public); + } + } + if (ecp_conn_is_root(conn) && !ecp_conn_is_open(conn)) { + ecp_ht_remove(sock->conn_table.addrs, &conn->remote.addr); } - if (!ecp_conn_is_open(conn)) ecp_ht_remove(sock->conn_table.addrs, &conn->remote.addr); } else { for (i=0; irkey[i].valid) ecp_ht_remove(sock->conn_table.keys, &conn->rkey[i].public); + if (conn->rkey[i].valid) { + ecp_ht_remove(sock->conn_table.keys, &conn->rkey[i].public); + } } } #else @@ -202,7 +235,13 @@ static void conn_table_remove_addr(ECPConnection *conn) { #endif } -static ECPConnection *conn_table_search(ECPSocket *sock, unsigned char c_idx, ecp_ecdh_public_t *c_public, ecp_tr_addr_t *addr) { +static ECPConnection *conn_table_search(ECPSocket *sock, unsigned char c_idx, ecp_ecdh_public_t *c_public, ecp_tr_addr_t *addr, ECPConnection *parent) { +#ifdef ECP_WITH_VCONN + if ((c_public == NULL) && parent) { + return parent->next; + } +#endif + #ifdef ECP_WITH_HTABLE if (c_public) { return ecp_ht_search(sock->conn_table.keys, c_public); @@ -217,27 +256,33 @@ static ECPConnection *conn_table_search(ECPSocket *sock, unsigned char c_idx, ec if (c_public) { if (ecp_conn_is_outb(conn)) { - if (c_idx >= ECP_MAX_CONN_KEY) return ECP_ERR_ECDH_IDX; + if (c_idx >= ECP_MAX_CONN_KEY) return NULL; for (i=0; iconn_table.size; i++) { conn = sock->conn_table.arr[i]; - if (conn->key[c_idx].valid && ecp_ecdh_pub_eq(c_public, &conn->key[c_idx].public)) return conn; + if (conn->key[c_idx].valid && ecp_ecdh_pub_eq(c_public, &conn->key[c_idx].public)) { + return conn; + } } } else { - unsigned char *_c_idx; + unsigned char _c_idx; - if (c_idx & ~ECP_ECDH_IDX_MASK) return ECP_ERR_ECDH_IDX; + if (c_idx & ~ECP_ECDH_IDX_MASK) return NULL; _c_idx = c_idx % ECP_MAX_NODE_KEY; for (i=0; iconn_table.size; i++) { conn = sock->conn_table.arr[i]; - if (conn->rkey[_c_idx].valid && ecp_ecdh_pub_eq(c_public, &conn->rkey[_c_idx].public)) return conn; + if (conn->rkey[_c_idx].valid && ecp_ecdh_pub_eq(c_public, &conn->rkey[_c_idx].public)) { + return conn; + } } } } else if (addr) { for (i=0; iconn_table.size; i++) { conn = sock->conn_table.arr[i]; - if (ecp_conn_is_outb(conn) && ecp_tr_addr_eq(&conn->remote.addr, addr)) return conn; + if (ecp_conn_is_root(conn) && ecp_conn_is_outb(conn) && ecp_tr_addr_eq(&conn->remote.addr, addr)) { + return conn; + } } } @@ -399,51 +444,6 @@ int ecp_cookie_verify(ECPSocket *sock, unsigned char *cookie, unsigned char *pub return ECP_ERR_COOKIE; } -ECPConnection *ecp_sock_keys_search(ECPSocket *sock, ecp_ecdh_public_t *public) { - ECPConnection *conn; - -#ifdef ECP_WITH_PTHREAD - pthread_mutex_lock(&sock->conn_table.mutex); -#endif - - conn = ecp_ht_search(sock->conn_table.keys, public); - if (conn) ecp_conn_refcount_inc(conn); - -#ifdef ECP_WITH_PTHREAD - pthread_mutex_unlock(&sock->conn_table.mutex); -#endif - - return conn; -} - -int ecp_sock_keys_insert(ECPSocket *sock, ecp_ecdh_public_t *public, ECPConnection *conn) { - int rv; - -#ifdef ECP_WITH_PTHREAD - pthread_mutex_lock(&sock->conn_table.mutex); -#endif - - rv = ecp_ht_insert(sock->conn_table.keys, public, conn); - -#ifdef ECP_WITH_PTHREAD - pthread_mutex_unlock(&sock->conn_table.mutex); -#endif - - return rv; -} - -void ecp_sock_keys_remove(ECPSocket *sock, ecp_ecdh_public_t *public) { -#ifdef ECP_WITH_PTHREAD - pthread_mutex_lock(&sock->conn_table.mutex); -#endif - - ecp_ht_remove(sock->conn_table.keys, public); - -#ifdef ECP_WITH_PTHREAD - pthread_mutex_unlock(&sock->conn_table.mutex); -#endif -} - static int conn_dhkey_new(ECPConnection *conn, unsigned char idx, ECPDHKey *key) { ECPSocket *sock = conn->sock; @@ -498,7 +498,7 @@ static ECPDHKey *conn_dhkey_get(ECPConnection *conn, unsigned char idx) { static ECPDHPub *conn_dhkey_get_remote(ECPConnection *conn, unsigned char idx) { ECPDHPub *key = NULL; - if (ecp_conn_is_outb(conn) && (idx == ECP_ECDH_IDX_PERMA)) { + if (idx == ECP_ECDH_IDX_PERMA) { key = &conn->remote.key_perma; } else if ((idx & ECP_ECDH_IDX_MASK) == idx) { key = &conn->rkey[idx % ECP_MAX_NODE_KEY]; @@ -668,7 +668,6 @@ void ecp_conn_init(ECPConnection *conn, ECPSocket *sock, unsigned char ctype) { void ecp_conn_reinit(ECPConnection *conn) { conn->flags = 0; - conn->key_curr = ECP_ECDH_IDX_INV; conn->key_next = ECP_ECDH_IDX_INV; conn->rkey_curr = ECP_ECDH_IDX_INV; memset(&conn->key, 0, sizeof(conn->key)); @@ -772,16 +771,22 @@ int ecp_conn_init_inb(ECPConnection *conn, ECPConnection *parent, unsigned char int ecp_conn_init_outb(ECPConnection *conn, ECPNode *node) { ECPDHKey key; + unsigned char key_curr; int rv; + if (conn->key_curr == ECP_ECDH_IDX_INV) { + key_curr = 0; + } else { + key_curr = (conn->key_curr + 1) % ECP_MAX_CONN_KEY; + } rv = ecp_dhkey_gen(&key); if (rv) return rv; - rv = conn_dhkey_new(conn, 0, &key); + rv = conn_dhkey_new(conn, key_curr, &key); if (rv) return rv; if (node) conn->remote = *node; - conn->key_curr = 0; + conn->key_curr = key_curr; return ECP_OK; } @@ -913,7 +918,9 @@ void ecp_conn_refcount_inc(ECPConnection *conn) { #ifdef ECP_WITH_PTHREAD pthread_mutex_lock(&conn->mutex); #endif + conn->refcount++; + #ifdef ECP_WITH_PTHREAD pthread_mutex_unlock(&conn->mutex); #endif @@ -926,9 +933,11 @@ void ecp_conn_refcount_dec(ECPConnection *conn) { #ifdef ECP_WITH_PTHREAD pthread_mutex_lock(&conn->mutex); #endif + conn->refcount--; refcount = conn->refcount; is_reg = ecp_conn_is_reg(conn); + #ifdef ECP_WITH_PTHREAD pthread_mutex_unlock(&conn->mutex); #endif @@ -971,21 +980,44 @@ int ecp_conn_dhkey_new(ECPConnection *conn) { return ECP_OK; } -int ecp_conn_dhkey_get(ECPSocket *sock, unsigned char idx, ECPDHKey *key) { +int ecp_conn_dhkey_get(ECPConnection *conn, unsigned char idx, ECPDHKey *key) { int rv = ECP_OK; #ifdef ECP_WITH_PTHREAD - pthread_mutex_lock(&sock->mutex); + pthread_mutex_lock(&conn->mutex); #endif if (idx < ECP_MAX_CONN_KEY) { - *key = sock->key[idx]; + *key = conn->key[idx]; } else { rv = ECP_ERR_ECDH_IDX; } #ifdef ECP_WITH_PTHREAD - pthread_mutex_unlock(&sock->mutex); + pthread_mutex_unlock(&conn->mutex); +#endif + + if (!rv && !key->valid) rv = ECP_ERR_ECDH_IDX; + return rv; +} + +int ecp_conn_dhkey_get_remote(ECPConnection *conn, unsigned char idx, ECPDHPub *key) { + int rv = ECP_OK; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&conn->mutex); +#endif + + if (idx == ECP_ECDH_IDX_PERMA) { + *key = conn->remote.key_perma; + } else if ((idx & ECP_ECDH_IDX_MASK) == idx) { + *key = conn->rkey[idx % ECP_MAX_NODE_KEY]; + } else { + rv = ECP_ERR_ECDH_IDX; + } + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); #endif if (!rv && !key->valid) rv = ECP_ERR_ECDH_IDX; @@ -1213,16 +1245,16 @@ ssize_t ecp_send_init_req(ECPConnection *conn) { return _send_ireq(conn, &ti); } -ssize_t ecp_handle_init_req(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char *public_buf, ecp_aead_key_t *shkey) { +ssize_t ecp_handle_init_req(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char c_idx, unsigned char *public_buf, ecp_aead_key_t *shkey) { ssize_t rv; - rv = ecp_send_init_rep(sock, parent, addr, public_buf, shkey); + rv = ecp_send_init_rep(sock, parent, addr, c_idx, public_buf, shkey); if (rv < 0) return rv; return 0; } -ssize_t ecp_send_init_rep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char *public_buf, ecp_aead_key_t *shkey) { +ssize_t ecp_send_init_rep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char c_idx, unsigned char *public_buf, ecp_aead_key_t *shkey) { ECPBuffer packet; ECPBuffer payload; ECPPktMeta pkt_meta; @@ -1251,12 +1283,12 @@ ssize_t ecp_send_init_rep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t ecp_sock_get_nonce(sock, &nonce); pkt_meta.cookie = NULL; - pkt_meta.public = NULL; pkt_meta.shkey = shkey; pkt_meta.nonce = &nonce; pkt_meta.ntype = ECP_NTYPE_INB; - pkt_meta.s_idx = 0xf; - pkt_meta.c_idx = 0xf; + pkt_meta.public = (ecp_ecdh_public_t *)public_buf; + pkt_meta.s_idx = ECP_ECDH_IDX_PERMA; + pkt_meta.c_idx = c_idx; rv = ecp_pld_send_irep(sock, parent, addr, &packet, &pkt_meta, &payload, ECP_SIZE_PLD(1+ECP_SIZE_ECDH_PUB+ECP_SIZE_COOKIE, ECP_MTYPE_INIT_REP), 0); return rv; @@ -1324,15 +1356,15 @@ ssize_t ecp_write_open_req(ECPConnection *conn, ECPBuffer *payload) { if (vbox) { ECPSocket *sock = conn->sock; ECPDHKey key; - ECPDHPub *remote_key; + ECPDHPub remote_key; ecp_ecdh_public_t public; ecp_aead_key_t vbox_shkey; ecp_nonce_t vbox_nonce; - remote_key = &conn->remote.key_perma; + _rv = ECP_OK; if (payload->size < ECP_SIZE_PLD(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ)) _rv = ECP_ERR_SIZE; - if (!_rv && !remote_key->valid) _rv = ECP_ERR; if (!_rv) _rv = ecp_sock_dhkey_get(sock, ECP_ECDH_IDX_PERMA, &key); + if (!_rv) _rv = ecp_conn_dhkey_get_remote(conn, ECP_ECDH_IDX_PERMA, &remote_key); if (!_rv) _rv = ecp_conn_dhkey_get_pub(conn, NULL, &public, 0); if (_rv) return _rv; @@ -1343,9 +1375,10 @@ ssize_t ecp_write_open_req(ECPConnection *conn, ECPBuffer *payload) { ecp_nonce2buf(msg, &vbox_nonce); msg += ECP_SIZE_NONCE; - ecp_ecdh_shkey(&vbox_shkey, &remote_key->public, &key.private); + ecp_ecdh_shkey(&vbox_shkey, &remote_key.public, &key.private); rv = ecp_aead_enc(msg, payload->size - (msg - payload->buffer), (unsigned char *)&public, ECP_SIZE_ECDH_PUB, &vbox_shkey, &vbox_nonce, ECP_NTYPE_VBOX); if (rv < 0) return rv; + rv += ECP_SIZE_ECDH_PUB + ECP_SIZE_NONCE; } return ECP_SIZE_PLD(2+rv, ECP_MTYPE_OPEN_REQ); @@ -1354,8 +1387,8 @@ ssize_t ecp_write_open_req(ECPConnection *conn, ECPBuffer *payload) { ssize_t ecp_send_open_req(ECPConnection *conn, unsigned char *cookie) { ECPBuffer packet; ECPBuffer payload; - unsigned char pkt_buf[ECP_SIZE_PKT_BUF_WCOOKIE(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)]; - unsigned char pld_buf[ECP_SIZE_PLD_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)]; + unsigned char pkt_buf[ECP_SIZE_PKT_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_COOKIE]; + unsigned char pld_buf[ECP_SIZE_PLD_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_COOKIE]; ssize_t rv; packet.buffer = pkt_buf; @@ -1500,12 +1533,14 @@ ssize_t ecp_handle_open(ECPConnection *conn, unsigned char mtype, unsigned char if (ecp_conn_is_inb(conn)) { ssize_t _rv; + ecp_tr_release(bufs->packet, 1); + _rv = ecp_send_open_rep(conn); if (_rv < 0) { ecp_conn_close(conn); return _rv; } - } else { + } else if (ecp_conn_is_root(conn)) { ecp_conn_remove_addr(conn); } return rsize; @@ -1563,7 +1598,7 @@ ssize_t ecp_send_keyx_rep(ECPConnection *conn) { return rv; } -ssize_t ecp_handle_keyx(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size) { +ssize_t ecp_handle_keyx(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *bufs) { ssize_t rv; int _rv; @@ -1579,6 +1614,8 @@ ssize_t ecp_handle_keyx(ECPConnection *conn, unsigned char mtype, unsigned char } else { if (ecp_conn_is_outb(conn)) return ECP_ERR; + ecp_tr_release(bufs->packet, 1); + rv = ecp_send_keyx_rep(conn); if (rv < 0) return rv; } @@ -1595,7 +1632,7 @@ ssize_t ecp_msg_handle(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, case ECP_MTYPE_KEYX_REQ: case ECP_MTYPE_KEYX_REP: - return ecp_handle_keyx(conn, mtype, msg, msg_size); + return ecp_handle_keyx(conn, mtype, msg, msg_size, bufs); default: return ecp_ext_msg_handle(conn, seq, mtype, msg, msg_size, bufs); @@ -1696,7 +1733,7 @@ ssize_t ecp_unpack(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, pthread_mutex_lock(&sock->conn_table.mutex); #endif - conn = conn_table_search(sock, c_idx, (ecp_ecdh_public_t *)public_buf, addr); + conn = conn_table_search(sock, c_idx, (ecp_ecdh_public_t *)public_buf, addr, parent); #ifdef ECP_WITH_PTHREAD if (conn) pthread_mutex_lock(&conn->mutex); @@ -1827,7 +1864,13 @@ ssize_t ecp_unpack(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, switch (mtype) { case ECP_MTYPE_INIT_REQ: { - rv = ecp_handle_init_req(sock, parent, addr, public_buf, &shkey); + unsigned char _public_buf[ECP_SIZE_ECDH_PUB]; + + /* we should release incoming packet before sending reply packet */ + memcpy(_public_buf, public_buf, sizeof(_public_buf)); + ecp_tr_release(bufs->packet, 1); + + rv = ecp_handle_init_req(sock, parent, addr, c_idx, _public_buf, &shkey); if (rv < 0) return rv; rv += hdr_size; @@ -1873,6 +1916,9 @@ ssize_t ecp_unpack(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, switch (mtype) { case ECP_MTYPE_INIT_REP: { + /* we should release incoming packet before sending reply packet */ + ecp_tr_release(bufs->packet, 1); + rv = ecp_handle_init_rep(conn, msg, msg_size); if (rv < 0) goto unpack_err; @@ -2112,17 +2158,14 @@ static ssize_t _pack_conn(ECPConnection *conn, ECPBuffer *packet, unsigned char nonce = conn->nonce_out; conn->nonce_out++; } -#ifdef ECP_WITH_VCONN - if ((conn->parent == NULL) && addr) *addr = conn->remote.addr; -#else - if (addr) *addr = conn->remote.addr; -#endif + if (ecp_conn_is_root(conn) && addr) *addr = conn->remote.addr; pack_conn_fin: #ifdef ECP_WITH_PTHREAD pthread_mutex_unlock(&conn->mutex); #endif + if (rv) return rv; pkt_meta.cookie = cookie; @@ -2135,15 +2178,21 @@ pack_conn_fin: return _pack(packet, &pkt_meta, payload, pld_size); } -ssize_t ecp_pack(ECPConnection *parent, ECPBuffer *packet, ECPPktMeta *pkt_meta, ECPBuffer *payload, size_t pld_size, ecp_tr_addr_t *addr) { +ssize_t ecp_pack_irep(ECPConnection *parent, ECPBuffer *packet, ECPPktMeta *pkt_meta, ECPBuffer *payload, size_t pld_size, ecp_tr_addr_t *addr) { ssize_t rv; + if (parent == NULL) { + pkt_meta->public = NULL; + pkt_meta->c_idx = 0xf; + pkt_meta->s_idx = 0xf; + } + rv = _pack(packet, pkt_meta, payload, pld_size); if (rv < 0) return rv; #ifdef ECP_WITH_VCONN if (parent) { - rv = ecp_vconn_pack_parent(parent, packet, payload, rv, addr); + rv = ecp_vconn_pack_parent(parent, payload, packet, rv, addr); } #endif @@ -2158,7 +2207,7 @@ ssize_t ecp_pack_conn(ECPConnection *conn, ECPBuffer *packet, unsigned char s_id #ifdef ECP_WITH_VCONN if (conn->parent) { - rv = ecp_vconn_pack_parent(conn->parent, packet, payload, rv, addr); + rv = ecp_vconn_pack_parent(conn->parent, payload, packet, rv, addr); } #endif @@ -2291,7 +2340,7 @@ ssize_t ecp_pld_send_irep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t ecp_tr_addr_t _addr; ssize_t rv; - rv = ecp_pack(parent, packet, pkt_meta, payload, pld_size, addr ? NULL : &_addr); + rv = ecp_pack_irep(parent, packet, pkt_meta, payload, pld_size, addr ? NULL : &_addr); if (rv < 0) return rv; rv = ecp_pkt_send(sock, packet, rv, flags, NULL, addr ? addr : &_addr); diff --git a/ecp/src/ecp/core.h b/ecp/src/ecp/core.h index 6fb165f..85fc453 100644 --- a/ecp/src/ecp/core.h +++ b/ecp/src/ecp/core.h @@ -73,17 +73,20 @@ #else #define ECP_SIZE_PLD_BUF(X,T,C) (ECP_SIZE_PLD(X,T)) #endif - -#define ECP_SIZE_PKT_BUF(X,T,C) (ECP_SIZE_PLD_BUF(X,T,C)+ECP_SIZE_PKT_HDR+ECP_SIZE_AEAD_TAG) -#define ECP_SIZE_PKT_BUF_WCOOKIE(X,T,C) (ECP_SIZE_PKT_BUF(X,T,C)+ECP_SIZE_COOKIE) +#define ECP_SIZE_PKT_BUF(X,T,C) (ECP_SIZE_PKT_HDR+ECP_SIZE_PLD_BUF(X,T,C)+ECP_SIZE_AEAD_TAG) #ifdef ECP_WITH_VCONN #define ECP_SIZE_PLD_BUF_IREP(X,T,P) (ECP_SIZE_PLD(X,T)+((P) ? ((P)->pcount+1)*(ECP_SIZE_PKT_HDR+ECP_SIZE_MTYPE+ECP_SIZE_AEAD_TAG) : 0)) #else #define ECP_SIZE_PLD_BUF_IREP(X,T,P) (ECP_SIZE_PLD(X,T)) #endif +#define ECP_SIZE_PKT_BUF_IREP(X,T,P) (ECP_SIZE_PKT_HDR+ECP_SIZE_PLD_BUF_IREP(X,T,P)+ECP_SIZE_AEAD_TAG) -#define ECP_SIZE_PKT_BUF_IREP(X,T,P) (ECP_SIZE_PLD_BUF_IREP(X,T,P)+ECP_SIZE_PKT_HDR-ECP_SIZE_ECDH_PUB+ECP_SIZE_AEAD_TAG) +#ifdef ECP_WITH_VCONN +#define ecp_conn_is_root(C) ((C)->parent == NULL) +#else +#define ecp_conn_is_root(C) 1 +#endif #define ECP_SEND_TRIES 3 #define ECP_SEND_TIMEOUT 500 @@ -302,11 +305,15 @@ typedef struct ECPConnection { #endif } ECPConnection; +int ecp_dhkey_gen(ECPDHKey *key); + int ecp_init(ECPContext *ctx); int ecp_ctx_init(ECPContext *ctx, ecp_err_handler_t handle_err, ecp_dir_handler_t handle_dir, ecp_conn_alloc_t conn_alloc, ecp_conn_free_t conn_free); int ecp_ctx_set_handler(ECPContext *ctx, ECPConnHandler *handler, unsigned char ctype); + int ecp_node_init(ECPNode *node, ecp_ecdh_public_t *public, void *addr); -int ecp_dhkey_gen(ECPDHKey *key); +void ecp_node_set_pub(ECPNode *node, ecp_ecdh_public_t *public); +int ecp_node_set_addr(ECPNode *node, void *addr); int ecp_sock_init(ECPSocket *sock, ECPContext *ctx, ECPDHKey *key); int ecp_sock_create(ECPSocket *sock, ECPContext *ctx, ECPDHKey *key); @@ -321,10 +328,6 @@ void ecp_sock_get_nonce(ECPSocket *sock, ecp_nonce_t *nonce); int ecp_cookie_gen(ECPSocket *sock, unsigned char *cookie, unsigned char *public_buf); int ecp_cookie_verify(ECPSocket *sock, unsigned char *cookie, unsigned char *public_buf); -ECPConnection *ecp_sock_keys_search(ECPSocket *sock, ecp_ecdh_public_t *public); -int ecp_sock_keys_insert(ECPSocket *sock, ecp_ecdh_public_t *public, ECPConnection *conn); -void ecp_sock_keys_remove(ECPSocket *sock, ecp_ecdh_public_t *public); - int ecp_conn_alloc(ECPSocket *sock, unsigned char ctype, ECPConnection **_conn); void ecp_conn_free(ECPConnection *conn); @@ -354,7 +357,8 @@ void ecp_conn_refcount_inc(ECPConnection *conn); void ecp_conn_refcount_dec(ECPConnection *conn); int ecp_conn_dhkey_new(ECPConnection *conn); -int ecp_conn_dhkey_get(ECPSocket *sock, unsigned char idx, ECPDHKey *key); +int ecp_conn_dhkey_get(ECPConnection *conn, unsigned char idx, ECPDHKey *key); +int ecp_conn_dhkey_get_remote(ECPConnection *conn, unsigned char idx, ECPDHPub *key); int ecp_conn_dhkey_get_pub(ECPConnection *conn, unsigned char *idx, ecp_ecdh_public_t *public, int will_send); int ecp_conn_dhkey_set_pub(ECPConnection *conn, unsigned char idx, ecp_ecdh_public_t *public); void ecp_conn_dhkey_set_curr(ECPConnection *conn); @@ -367,8 +371,8 @@ ecp_dir_handler_t ecp_get_dir_handler(ECPConnection *conn); void ecp_err_handle(ECPConnection *conn, unsigned char mtype, int err); ssize_t ecp_send_init_req(ECPConnection *conn); -ssize_t ecp_handle_init_req(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char *public_buf, ecp_aead_key_t *shkey); -ssize_t ecp_send_init_rep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char *public_buf, ecp_aead_key_t *shkey); +ssize_t ecp_handle_init_req(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char c_idx, unsigned char *public_buf, ecp_aead_key_t *shkey); +ssize_t ecp_send_init_rep(ECPSocket *sock, ECPConnection *parent, ecp_tr_addr_t *addr, unsigned char c_idx, unsigned char *public_buf, ecp_aead_key_t *shkey); ssize_t ecp_handle_init_rep(ECPConnection *conn, unsigned char *msg, size_t msg_size); ssize_t ecp_write_open_req(ECPConnection *conn, ECPBuffer *payload); ssize_t ecp_send_open_req(ECPConnection *conn, unsigned char *cookie); @@ -378,7 +382,7 @@ ssize_t ecp_handle_open(ECPConnection *conn, unsigned char mtype, unsigned char ssize_t ecp_send_keyx_req(ECPConnection *conn); ssize_t ecp_send_keyx_rep(ECPConnection *conn); -ssize_t ecp_handle_keyx(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size); +ssize_t ecp_handle_keyx(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *bufs); ssize_t ecp_msg_handle(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *bufs); ssize_t ecp_pld_handle_one(ECPConnection *conn, ecp_seq_t seq, unsigned char *payload, size_t pld_size, ECP2Buffer *bufs); @@ -392,7 +396,7 @@ ssize_t ecp_pkt_send(ECPSocket *sock, ECPBuffer *packet, size_t pkt_size, unsign void ecp_nonce2buf(unsigned char *b, ecp_nonce_t *n); void ecp_buf2nonce(ecp_nonce_t *n, unsigned char *b); int ecp_pkt_get_seq(unsigned char *pkt, size_t pkt_size, ecp_seq_t *s); -ssize_t ecp_pack(ECPConnection *parent, ECPBuffer *packet, ECPPktMeta *pkt_meta, ECPBuffer *payload, size_t pld_size, ecp_tr_addr_t *addr); +ssize_t ecp_pack_irep(ECPConnection *parent, ECPBuffer *packet, ECPPktMeta *pkt_meta, ECPBuffer *payload, size_t pld_size, ecp_tr_addr_t *addr); ssize_t ecp_pack_conn(ECPConnection *conn, ECPBuffer *packet, unsigned char s_idx, unsigned char c_idx, unsigned char *cookie, ecp_nonce_t *nonce, ECPBuffer *payload, size_t pld_size, ecp_tr_addr_t *addr); int ecp_pld_get_type(unsigned char *pld, size_t pld_size, unsigned char *mtype); diff --git a/ecp/src/ecp/dir/Makefile b/ecp/src/ecp/dir/Makefile index 9da375b..9283144 100644 --- a/ecp/src/ecp/dir/Makefile +++ b/ecp/src/ecp/dir/Makefile @@ -1,6 +1,10 @@ include ../common.mk -obj = dir.o dir_srv.o +obj = dir.o + +ifeq ($(with_dirsrv),yes) +obj += dir_srv.o +endif %.o: %.c diff --git a/ecp/src/ecp/ext.h b/ecp/src/ecp/ext.h index 811b6d1..995cf15 100644 --- a/ecp/src/ecp/ext.h +++ b/ecp/src/ecp/ext.h @@ -1,3 +1,5 @@ +#ifdef ECP_WITH_RBUF + int ecp_ext_err_handle(ECPConnection *conn, unsigned char mtype, int err); int ecp_ext_conn_open(ECPConnection *conn); void ecp_ext_conn_destroy(ECPConnection *conn); @@ -6,3 +8,16 @@ ssize_t ecp_ext_pld_store(ECPConnection *conn, ecp_seq_t seq, unsigned char *pay ssize_t ecp_ext_pld_handle(ECPConnection *conn, ecp_seq_t seq, unsigned char *payload, size_t pld_size, ECP2Buffer *bufs); ssize_t ecp_ext_pld_send(ECPConnection *conn, ECPBuffer *payload, size_t pld_size, ECPBuffer *packet, size_t pkt_size, unsigned char flags, ECPTimerItem *ti, ecp_tr_addr_t *addr); ssize_t ecp_ext_msg_send(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECPBuffer *packet, ECPBuffer *payload); + +#else + +#define ecp_ext_err_handle(c,t,e) (ECP_PASS) +#define ecp_ext_conn_open(c) (ECP_OK) +#define ecp_ext_conn_destroy(c) ; +#define ecp_ext_msg_handle(c,s,t,m,sz,b) (0) +#define ecp_ext_pld_store(c,s,p,sz,b) (0) +#define ecp_ext_pld_handle(c,s,p,sz,b) (0) +#define ecp_ext_pld_send(c,p1,sz1,p2,sz2,f,t,a) (0) +#define ecp_ext_msg_send(c,t,m,sz,p1,p2) (0) + +#endif \ No newline at end of file diff --git a/ecp/src/ecp/tr.h b/ecp/src/ecp/tr.h index 5037b07..263577c 100644 --- a/ecp/src/ecp/tr.h +++ b/ecp/src/ecp/tr.h @@ -4,8 +4,6 @@ int ecp_tr_addr_eq(ecp_tr_addr_t *addr1, ecp_tr_addr_t *addr2); int ecp_tr_addr_set(ecp_tr_addr_t *addr, void *addr_s); int ecp_tr_open(ECPSocket *sock, void *addr_s); void ecp_tr_close(ECPSocket *sock); -ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ecp_tr_addr_t *addr, unsigned char flags); +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t pkt_size, ecp_tr_addr_t *addr, unsigned char flags); ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int timeout); void ecp_tr_release(ECPBuffer *packet, unsigned char more); -void ecp_tr_flag_set(unsigned char flags); -void ecp_tr_flag_clear(unsigned char flags); diff --git a/ecp/src/ecp/vconn/vconn.c b/ecp/src/ecp/vconn/vconn.c index bbed3c3..23e0466 100644 --- a/ecp/src/ecp/vconn/vconn.c +++ b/ecp/src/ecp/vconn/vconn.c @@ -3,79 +3,35 @@ #include -#include "vconn.h" - -ssize_t ecp_vconn_send_open_req(ECPConnection *conn, unsigned char *cookie) { - if (conn->type == ECP_CTYPE_VCONN) { - ECPDHPub *key; - ECPBuffer packet; - ECPBuffer payload; - unsigned char pkt_buf[ECP_SIZE_PKT_BUF_WCOOKIE(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT)]; - unsigned char pld_buf[ECP_SIZE_PLD_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT)]; - unsigned char *msg; - unsigned char *_pld_buf; - size_t _pld_size; - ssize_t rv; - - if (conn->next == NULL) return ECP_ERR; - - key = &conn->next->remote.key_perma; - if (!key->valid) return ECP_ERR; - - packet.buffer = pkt_buf; - packet.size = sizeof(pkt_buf); - payload.buffer = pld_buf; - payload.size = sizeof(pld_buf); - - rv = ecp_write_open_req(conn, &payload); - if (rv < 0) return rv; +#ifdef ECP_WITH_HTABLE +#include +#endif - _pld_buf = payload.buffer + rv; - _pld_size = payload.size - rv; +#include "vconn.h" - ecp_pld_set_type(_pld_buf, _pld_size, ECP_MTYPE_NEXT); - msg = ecp_pld_get_msg(_pld_buf, _pld_size); - memcpy(msg, &key->public, ECP_SIZE_ECDH_PUB); - rv = ecp_pld_send_wcookie(conn, &packet, &payload, rv+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT), 0, cookie); - return rv; - } else { - return ecp_send_open_req(conn, cookie); - } -} +#ifdef ECP_WITH_HTABLE -static void insert_key_next(ECPConnection *conn, unsigned char idx, ecp_ecdh_public_t *public) { +static int insert_key_next(ECPConnection *conn, unsigned char c_idx, ecp_ecdh_public_t *public) { + ECPSocket *sock = conn->sock; ECPVConn *_conn = (ECPVConn *)conn; - ecp_ecdh_public_t to_remove; - unsigned char c_idx; - int do_insert = 0, do_remove = 0; - - if (idx == ECP_ECDH_IDX_INV) return; + ECPDHPub *key = NULL; + int rv = ECP_OK; - c_idx = (idx & 0x0F); - if (c_idx & ~ECP_ECDH_IDX_MASK) return; + if (c_idx & ~ECP_ECDH_IDX_MASK) return ECP_ERR_ECDH_IDX; #ifdef ECP_WITH_PTHREAD pthread_mutex_lock(&conn->mutex); #endif if (c_idx != _conn->key_next_curr) { - ECPDHPub *key; unsigned char _c_idx; _c_idx = c_idx % ECP_MAX_NODE_KEY; key = &_conn->key_next[_c_idx]; - if (!key->valid || (memcmp(public, &key->public, sizeof(key->public)) != 0)) { - if (key->valid) { - memcpy(&to_remove, &key->public, sizeof(key->public)); - do_remove = 1; - } - memcpy(&key->public, public, sizeof(key->public)); - key->valid = 1; - - _conn->key_next_curr = c_idx; - do_insert = 1; + if (key->valid && (memcmp(public, &key->public, sizeof(key->public)) == 0)) { + key = NULL; } } @@ -83,164 +39,162 @@ static void insert_key_next(ECPConnection *conn, unsigned char idx, ecp_ecdh_pub pthread_mutex_unlock(&conn->mutex); #endif - if (do_remove) ecp_sock_keys_remove(conn->sock, &to_remove); - if (do_insert) ecp_sock_keys_insert(conn->sock, public, conn); + if (key) { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); + pthread_mutex_lock(&conn->mutex); +#endif + + if (key->valid) { + ecp_ht_remove(sock->conn_table.keys, &key->public); + key->valid = 0; + } + memcpy(&key->public, public, sizeof(key->public)); + rv = ecp_ht_insert(sock->conn_table.keys, &key->public, conn); + if (!rv) { + key->valid = 1; + _conn->key_next_curr = c_idx; + } + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif + } + + return rv; } static ssize_t handle_next(ECPConnection *conn, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { - ECPConnection *conn_next; + ECPSocket *sock = conn->sock; if (msg_size < ECP_SIZE_ECDH_PUB) return ECP_ERR_SIZE; + if (ecp_conn_is_outb(conn)) return ECP_ERR; - conn_next = ecp_sock_keys_search(conn->sock, (ecp_ecdh_public_t *)msg); - if (conn_next == NULL) return ECP_ERR; - - conn->next = conn_next; - - return ECP_SIZE_ECDH_PUB; -} +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); +#endif -static ssize_t handle_exec(ECPConnection *conn, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { - ECPBuffer *packet; + conn->next = ecp_ht_search(sock->conn_table.keys, (ecp_ecdh_public_t *)msg); + if (conn->next) ecp_conn_refcount_inc(conn->next); - if (b == NULL) return ECP_ERR; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif - packet = b->packet; - if (packet->size < msg_size) return ECP_ERR_SIZE; + if (conn->next == NULL) return ECP_ERR; - memcpy(packet->buffer, msg, msg_size); - return ecp_pkt_handle(conn->sock, conn, NULL, b, msg_size); + return ECP_SIZE_ECDH_PUB; } static ssize_t handle_relay(ECPConnection *conn, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { - ECPBuffer payload; + ECPSocket *sock = conn->sock; ECPConnection *conn_next; + ECPBuffer payload; + unsigned char idx, _idx; + unsigned char s_idx, c_idx; + size_t _msg_size = msg_size; ssize_t rv; + int _rv; if (msg_size < ECP_MIN_PKT) return ECP_ERR_SIZE; - if (conn->type == ECP_CTYPE_VCONN) { - if (ecp_conn_is_outb(conn)) return ECP_ERR; - conn_next = conn->next; - insert_key_next(conn, msg[ECP_SIZE_PROTO], (ecp_ecdh_public_t *)(msg+ECP_SIZE_PROTO+1)); - } else if (conn->type == ECP_CTYPE_VLINK) { - conn_next = ecp_sock_keys_search(conn->sock, (ecp_ecdh_public_t *)(msg+ECP_SIZE_PROTO+1)); - } + idx = msg[ECP_SIZE_PROTO]; + if (idx == ECP_ECDH_IDX_INV) return ECP_ERR_ECDH_IDX; - if (conn_next == NULL) return ECP_ERR; + switch (conn->type) { + /* forward message */ + case ECP_CTYPE_VCONN: { + if (ecp_conn_is_outb(conn)) return ECP_ERR; - payload.buffer = msg - ECP_SIZE_MTYPE; - payload.size = b->payload->size - (payload.buffer - b->payload->buffer); - - ecp_pld_set_type(payload.buffer, payload.size, ECP_MTYPE_EXEC); - rv = ecp_pld_send(conn_next, b->packet, &payload, ECP_SIZE_MTYPE + msg_size, ECP_SEND_FLAG_REPLY); - - if (conn->type == ECP_CTYPE_VLINK) { - ecp_conn_refcount_dec(conn_next); - } - - if (rv < 0) return rv; - return msg_size; -} - -ssize_t ecp_vconn_pack_parent(ECPConnection *conn, ECPBuffer *packet, ECPBuffer *payload, size_t pkt_size, ecp_tr_addr_t *addr) { - unsigned char *msg; - size_t hdr_size; - int rv; + conn_next = conn->next; + if (conn_next) { + _idx = (idx & 0x0F); - rv = ecp_pld_set_type(payload->buffer, payload->size, ECP_MTYPE_RELAY); - if (rv) return rv; + _rv = insert_key_next(conn, _idx, (ecp_ecdh_public_t *)(msg+ECP_SIZE_PROTO+1)); + if (_rv) return _rv; + } - msg = ecp_pld_get_msg(payload->buffer, payload->size); - if (msg == NULL) return ECP_ERR; + break; + } - hdr_size = msg - payload->buffer; - if (payload->size < pkt_size+hdr_size) return ECP_ERR_SIZE; + /* back message */ + case ECP_CTYPE_VLINK: { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); +#endif - memcpy(msg, packet->buffer, pkt_size); - return ecp_pack_conn(conn, packet, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, NULL, NULL, payload, pkt_size+hdr_size, addr); -} + conn_next = ecp_ht_search(sock->conn_table.keys, (ecp_ecdh_public_t *)(msg+ECP_SIZE_PROTO+1)); + if (conn_next) ecp_conn_refcount_inc(conn_next); -int ecp_vconn_handle_open(ECPConnection *conn, ECP2Buffer *b) { - if (conn->type == ECP_CTYPE_VCONN) { - if (ecp_conn_is_outb(conn)) { - if (conn->next) { - int rv; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif - rv = ecp_conn_open(conn->next, NULL); - if (rv) ecp_err_handle(conn->next, ECP_MTYPE_INIT_REQ, rv); + _idx = (idx & 0xF0) >> 4; + if (conn_next && (_idx == ECP_ECDH_IDX_PERMA)) { + /* this is init reply */ + msg[ECP_SIZE_PROTO] = ECP_ECDH_IDX_INV; + memmove(msg+ECP_SIZE_PROTO+1, msg+ECP_SIZE_PROTO+1+ECP_SIZE_ECDH_PUB, msg_size-(ECP_SIZE_PROTO+1+ECP_SIZE_ECDH_PUB)); + _msg_size -= ECP_SIZE_ECDH_PUB; } - } - } else if (conn->type == ECP_CTYPE_VLINK) { - ECPDHPub *key = &conn->remote.key_perma; - if (key->valid) { - int rv; - - rv = ecp_sock_keys_insert(conn->sock, &key->public, conn); - if (rv) return rv; + break; } - } - return ECP_OK; -} - -void ecp_vconn_handle_close(ECPConnection *conn) { - if (conn->type == ECP_CTYPE_VCONN) { - if (ecp_conn_is_inb(conn)) { - ecp_vconn_destroy_inb((ECPVConn *)conn); - } - } else if (conn->type == ECP_CTYPE_VLINK) { - ECPDHPub *key = &conn->remote.key_perma; + default: + return ECP_ERR_CTYPE; - if (key->valid) { - ecp_sock_keys_remove(conn->sock, &key->public); - } } -} -ssize_t ecp_vconn_handle_msg(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { - switch (mtype) { - case ECP_MTYPE_NEXT: - return handle_next(conn, msg, msg_size, b); + if (conn_next == NULL) return ECP_ERR; - case ECP_MTYPE_EXEC: - return handle_exec(conn, msg, msg_size, b); + payload.buffer = msg - ECP_SIZE_MTYPE; + payload.size = b->payload->size - (payload.buffer - b->payload->buffer); - case ECP_MTYPE_RELAY: - return handle_relay(conn, msg, msg_size, b); + ecp_pld_set_type(payload.buffer, payload.size, ECP_MTYPE_EXEC); + rv = ecp_pld_send(conn_next, b->packet, &payload, ECP_SIZE_MTYPE + _msg_size, ECP_SEND_FLAG_REPLY); - default: - return ECP_ERR_MTYPE; + if (conn->type == ECP_CTYPE_VLINK) { + ecp_conn_refcount_dec(conn_next); } + + if (rv < 0) return rv; + return msg_size; } -int ecp_vconn_create_inb(ECPVConn *conn, ECPSocket *sock) { - ECPConnection *_conn = &conn->b; - int rv; +#endif /* ECP_WITH_HTABLE */ - rv = ecp_conn_create_inb(_conn, sock, ECP_CTYPE_VCONN); - if (rv) return rv; +static ssize_t handle_exec(ECPConnection *conn, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { + ECPBuffer *packet; - memset(conn->key_next, 0, sizeof(conn->key_next)); - conn->key_next_curr = ECP_ECDH_IDX_INV; + if (b == NULL) return ECP_ERR; - return ECP_OK; + packet = b->packet; + if (packet->size < msg_size) return ECP_ERR_SIZE; + + memcpy(packet->buffer, msg, msg_size); + return ecp_pkt_handle(conn->sock, conn, NULL, b, msg_size); } -void ecp_vconn_destroy_inb(ECPVConn *conn) { - ECPConnection *_conn = &conn->b; - int i; +ssize_t ecp_vconn_pack_parent(ECPConnection *conn, ECPBuffer *payload, ECPBuffer *packet, size_t pkt_size, ecp_tr_addr_t *addr) { + unsigned char *msg; + size_t hdr_size; + ssize_t rv; + int _rv; - for (i=0; ibuffer, payload->size, ECP_MTYPE_RELAY); + if (_rv) return _rv; - key = &conn->key_next[i]; - if (key->valid) { - ecp_sock_keys_remove(_conn->sock, &key->public); - } - } - if (_conn->next) ecp_conn_refcount_dec(_conn->next); + msg = ecp_pld_get_msg(payload->buffer, payload->size); + if (msg == NULL) return ECP_ERR; + + hdr_size = msg - payload->buffer; + if (payload->size < pkt_size+hdr_size) return ECP_ERR_SIZE; + + memcpy(msg, packet->buffer, pkt_size); + rv = ecp_pack_conn(conn, packet, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, NULL, NULL, payload, pkt_size+hdr_size, addr); + return rv; } static int vconn_create(ECPConnection vconn[], ecp_ecdh_public_t keys[], size_t vconn_size, ECPSocket *sock) { @@ -249,7 +203,7 @@ static int vconn_create(ECPConnection vconn[], ecp_ecdh_public_t keys[], size_t int rv; key.valid = 1; - for (i=0; i= ECP_MAX_PARENT) return ECP_ERR_MAX_PARENT; + if (pcount > ECP_MAX_PARENT) return ECP_ERR_MAX_PARENT; rv = vconn_create(vconn, keys, vconn_size, conn->sock); if (rv) return rv; @@ -289,6 +243,50 @@ int ecp_vconn_create(ECPConnection vconn[], ecp_ecdh_public_t keys[], size_t vco return ECP_OK; } +#ifdef ECP_WITH_HTABLE + +int ecp_vconn_create_inb(ECPVConn *conn, ECPSocket *sock) { + ECPConnection *_conn = &conn->b; + int rv; + + rv = ecp_conn_create_inb(_conn, sock, ECP_CTYPE_VCONN); + if (rv) return rv; + + memset(conn->key_next, 0, sizeof(conn->key_next)); + conn->key_next_curr = ECP_ECDH_IDX_INV; + + return ECP_OK; +} + +void ecp_vconn_destroy(ECPConnection *conn) { + ECPSocket *sock = conn->sock; + ECPVConn *_conn = (ECPVConn *)conn; + int i; + + if (ecp_conn_is_outb(conn)) return; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); +#endif + + for (i=0; ikey_next[i]; + if (key->valid) { + ecp_ht_remove(sock->conn_table.keys, &key->public); + } + } + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif + + if (conn->next) ecp_conn_refcount_dec(conn->next); +} + +#endif /* ECP_WITH_HTABLE */ + int ecp_vconn_open(ECPConnection *conn, ECPNode *node) { ECPConnection *vconn0; int rv; @@ -307,64 +305,195 @@ int ecp_vconn_open(ECPConnection *conn, ECPNode *node) { return rv; } -/* -int ecp_vconn_create_parent(ECPConnection *conn, ECPNode *conn_node, ECPVConnOut vconn[], ECPNode vconn_node[], int size) { +static int vconn_handle_open(ECPConnection *conn) { + int rv = ECP_OK; + + if (ecp_conn_is_outb(conn) && conn->next) { + rv = ecp_conn_open(conn->next, NULL); + if (rv) ecp_err_handle(conn->next, ECP_MTYPE_INIT_REQ, rv); + } + + return rv;; +} + +int ecp_vlink_create(ECPConnection *conn, ECPSocket *sock) { + int rv; + + rv = ecp_conn_create(conn, sock, ECP_CTYPE_VLINK); + if (!rv) ecp_conn_set_flags(conn, ECP_CONN_FLAG_VBOX); + return rv; +} + +#ifdef ECP_WITH_HTABLE + +int ecp_vlink_create_inb(ECPConnection *conn, ECPSocket *sock) { + int rv; + + rv = ecp_conn_create_inb(conn, sock, ECP_CTYPE_VLINK); + if (!rv) ecp_conn_set_flags(conn, ECP_CONN_FLAG_VBOX); + return rv; +} + +void ecp_vlink_destroy(ECPConnection *conn) { ECPSocket *sock = conn->sock; - int i, j, rv; + ECPDHPub *key = &conn->remote.key_perma; - conn->parent = (ECPConnection *)&vconn[size-1]; - conn->pcount = size; - for (i=0; ivalid) { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); +#endif - if (i == 0) { - vconn[i].b.parent = NULL; - } else { - vconn[i].b.parent = (ECPConnection *)&vconn[i-1]; - } - vconn[i].b.pcount = i; + ecp_ht_remove(sock->conn_table.keys, &key->public); + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif + } +} + +static int vlink_handle_open(ECPConnection *conn) { + ECPSocket *sock = conn->sock; + ECPDHPub *key; + int rv = ECP_OK; + + key = &conn->remote.key_perma; - if (i == size - 1) { - vconn[i].next = conn; - } else { - vconn[i].next = (ECPConnection *)&vconn[i+1]; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&sock->conn_table.mutex); + pthread_mutex_lock(&conn->mutex); +#endif + + if (key->valid) { + ECPConnection *_conn; + + /* check for duplicates */ + _conn = ecp_ht_search(sock->conn_table.keys, &key->public); + if (_conn) { +#ifdef ECP_WITH_PTHREAD + pthread_mutex_lock(&_conn->mutex); +#endif + + _conn->remote.key_perma.valid = 0; + +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&_conn->mutex); +#endif + + ecp_ht_remove(sock->conn_table.keys, &key->public); } + rv = ecp_ht_insert(sock->conn_table.keys, &key->public, conn); } - return ECP_OK; +#ifdef ECP_WITH_PTHREAD + pthread_mutex_unlock(&conn->mutex); + pthread_mutex_unlock(&sock->conn_table.mutex); +#endif + + return rv; } -int ecp_vconn_open(ECPConnection *conn, ECPNode *conn_node, ECPVConnOut vconn[], ECPNode vconn_node[], int size) { +#endif /* ECP_WITH_HTABLE */ + +int ecp_vconn_handle_open(ECPConnection *conn, ECP2Buffer *b) { int rv; - ssize_t _rv; - rv = ecp_conn_create_outb(conn, conn_node); - if (rv) return rv; + switch (conn->type) { + case ECP_CTYPE_VCONN: + rv = vconn_handle_open(conn); + break; - rv = ecp_conn_insert(conn); - if (rv) { - ecp_conn_destroy(conn); - return rv; + case ECP_CTYPE_VLINK: +#ifdef ECP_WITH_HTABLE + rv = vlink_handle_open(conn); +#else + rv = ECP_OK; +#endif + break; + + default: + rv = ECP_ERR_CTYPE; + break; } - rv = ecp_vconn_create_parent(conn, conn_node, vconn, vconn_node, size); - if (rv) { - ecp_conn_close(conn); - return rv; + return rv; +} + +void ecp_vconn_handle_close(ECPConnection *conn) { + switch (conn->type) { +#ifdef ECP_WITH_HTABLE + case ECP_CTYPE_VCONN: + ecp_vconn_destroy(conn); + break; + + case ECP_CTYPE_VLINK: + ecp_vlink_destroy(conn); + break; +#endif } +} - _rv = ecp_timer_send((ECPConnection *)&vconn[0], _vconn_send_kget, ECP_MTYPE_KGET_REP, 3, 500); - if (_rv < 0) return _rv; +ssize_t ecp_vconn_handle_msg(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { + ssize_t rv; - return ECP_OK; + switch (mtype) { +#ifdef ECP_WITH_HTABLE + case ECP_MTYPE_NEXT: + rv = handle_next(conn, msg, msg_size, b); + break; + + case ECP_MTYPE_RELAY: + rv = handle_relay(conn, msg, msg_size, b); + break; +#endif + + case ECP_MTYPE_EXEC: + rv = handle_exec(conn, msg, msg_size, b); + break; + + default: + rv = ECP_ERR_MTYPE; + break; + } + + return rv; +} + +ssize_t ecp_vconn_send_open_req(ECPConnection *conn, unsigned char *cookie) { + if (conn->type == ECP_CTYPE_VCONN) { + ECPDHPub key_next; + ECPBuffer packet; + ECPBuffer payload; + unsigned char pkt_buf[ECP_SIZE_PKT_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_COOKIE+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT)]; + unsigned char pld_buf[ECP_SIZE_PLD_BUF(2+ECP_SIZE_VBOX, ECP_MTYPE_OPEN_REQ, conn)+ECP_SIZE_COOKIE+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT)]; + unsigned char *msg; + unsigned char *_pld_buf; + size_t _pld_size; + ssize_t rv; + int _rv; + + if (conn->next == NULL) return ECP_ERR; + + _rv = ecp_conn_dhkey_get_remote(conn->next, ECP_ECDH_IDX_PERMA, &key_next); + if (_rv) return _rv; + + packet.buffer = pkt_buf; + packet.size = sizeof(pkt_buf); + payload.buffer = pld_buf; + payload.size = sizeof(pld_buf); + + rv = ecp_write_open_req(conn, &payload); + if (rv < 0) return rv; + + _pld_buf = payload.buffer + rv; + _pld_size = payload.size - rv; + + ecp_pld_set_type(_pld_buf, _pld_size, ECP_MTYPE_NEXT); + msg = ecp_pld_get_msg(_pld_buf, _pld_size); + memcpy(msg, &key_next.public, ECP_SIZE_ECDH_PUB); + + rv = ecp_pld_send_wcookie(conn, &packet, &payload, rv+ECP_SIZE_PLD(ECP_SIZE_ECDH_PUB, ECP_MTYPE_NEXT), 0, cookie); + return rv; + } else { + return ecp_send_open_req(conn, cookie); + } } -*/ \ No newline at end of file diff --git a/ecp/src/ecp/vconn/vconn.h b/ecp/src/ecp/vconn/vconn.h index eec13d4..9e2749f 100644 --- a/ecp/src/ecp/vconn/vconn.h +++ b/ecp/src/ecp/vconn/vconn.h @@ -12,14 +12,22 @@ typedef struct ECPVConn { unsigned char key_next_curr; } ECPVConn; -ssize_t ecp_vconn_send_open_req(ECPConnection *conn, unsigned char *cookie); -ssize_t ecp_vconn_pack_parent(ECPConnection *conn, ECPBuffer *packet, ECPBuffer *payload, size_t pkt_size, ecp_tr_addr_t *addr); -int ecp_vconn_handle_open(ECPConnection *conn, ECP2Buffer *b); -void ecp_vconn_handle_close(ECPConnection *conn); -ssize_t ecp_vconn_handle_msg(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b); - -int ecp_vconn_create_inb(ECPVConn *conn, ECPSocket *sock); -void ecp_vconn_destroy_inb(ECPVConn *conn); +ssize_t ecp_vconn_pack_parent(ECPConnection *conn, ECPBuffer *payload, ECPBuffer *packet, size_t pkt_size, ecp_tr_addr_t *addr); int ecp_vconn_create(ECPConnection vconn[], ecp_ecdh_public_t keys[], size_t vconn_size, ECPConnection *conn); +#ifdef ECP_WITH_HTABLE +int ecp_vconn_create_inb(ECPVConn *conn, ECPSocket *sock); +void ecp_vconn_destroy(ECPConnection *conn); +#endif int ecp_vconn_open(ECPConnection *conn, ECPNode *node); + +int ecp_vlink_create(ECPConnection *conn, ECPSocket *sock); +#ifdef ECP_WITH_HTABLE +int ecp_vlink_create_inb(ECPConnection *conn, ECPSocket *sock); +void ecp_vlink_destroy(ECPConnection *conn); +#endif + +int ecp_vconn_handle_open(ECPConnection *conn, ECP2Buffer *b); +void ecp_vconn_handle_close(ECPConnection *conn); +ssize_t ecp_vconn_handle_msg(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b); +ssize_t ecp_vconn_send_open_req(ECPConnection *conn, unsigned char *cookie); diff --git a/ecp/src/platform/fe310/platform.mk b/ecp/src/platform/fe310/platform.mk index 0230f29..0ab0065 100644 --- a/ecp/src/platform/fe310/platform.mk +++ b/ecp/src/platform/fe310/platform.mk @@ -1,3 +1,3 @@ fe310_dir = $(abspath $(src_dir)/../../fw/fe310) include $(fe310_dir)/platform.mk -CFLAGS += -I$(fe310_dir) -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -D__FE310__ +CFLAGS += -I$(fe310_dir) -D__FE310__ diff --git a/ecp/src/platform/fe310/platform_obj.mk b/ecp/src/platform/fe310/platform_obj.mk deleted file mode 100644 index 52e4bb1..0000000 --- a/ecp/src/platform/fe310/platform_obj.mk +++ /dev/null @@ -1 +0,0 @@ -subdirs += vconn diff --git a/ecp/src/platform/fe310/transport.c b/ecp/src/platform/fe310/transport.c index b551c51..2640ecf 100644 --- a/ecp/src/platform/fe310/transport.c +++ b/ecp/src/platform/fe310/transport.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -7,43 +8,42 @@ #include #include -static unsigned char _flags = 0; - ECPSocket *_ecp_tr_sock = NULL; +unsigned char pld_buf[ECP_MAX_PLD]; static void packet_handler(unsigned char type, unsigned char *buffer, uint16_t len) { - ecp_tr_addr_t addr; - ECP2Buffer bufs; ECPBuffer packet; ECPBuffer payload; - unsigned char pld_buf[ECP_MAX_PLD]; + ecp_tr_addr_t addr; + ssize_t rv; bufs.packet = &packet; bufs.payload = &payload; packet.buffer = buffer+EOS_SOCK_SIZE_UDP_HDR; - packet.size = ECP_MAX_PKT; + packet.size = EOS_NET_MTU-EOS_SOCK_SIZE_UDP_HDR; payload.buffer = pld_buf; payload.size = ECP_MAX_PLD; - if ((buffer == NULL) || (len < EOS_SOCK_SIZE_UDP_HDR)) { + if (len < EOS_SOCK_SIZE_UDP_HDR) { eos_net_free(buffer, 0); return; } - eos_sock_getfrom(buffer, &addr); - ssize_t rv = ecp_pkt_handle(_ecp_tr_sock, &addr, NULL, &bufs, len-EOS_SOCK_SIZE_UDP_HDR); + eos_sock_recvfrom(buffer, len, NULL, 0, &addr); + + rv = ecp_pkt_handle(_ecp_tr_sock, NULL, &addr, &bufs, len-EOS_SOCK_SIZE_UDP_HDR); #ifdef ECP_DEBUG if (rv < 0) { - char b[16]; - puts("ERR:"); - puts(itoa(rv, b, 10)); - puts("\n"); + printf("RCV ERR:%d\n", rv); } #endif - if (bufs.packet->buffer) eos_net_free(buffer, 0); - eos_net_release(); + if (bufs.packet->buffer) { + eos_net_free(buffer, 0); + } else { + eos_net_release(); + } } int ecp_tr_init(ECPContext *ctx) { @@ -66,38 +66,43 @@ int ecp_tr_addr_set(ecp_tr_addr_t *addr, void *addr_s) { } int ecp_tr_open(ECPSocket *sock, void *addr_s) { - sock->sock = eos_sock_open_udp(packet_handler); + sock->sock = eos_sock_open_udp(packet_handler, NULL); if (sock->sock < 0) { sock->sock = 0; - return ECP_ERR_SEND; + return ECP_ERR; } _ecp_tr_sock = sock; + return ECP_OK; } void ecp_tr_close(ECPSocket *sock) { - eos_sock_close(sock->sock); + eos_sock_close(sock->sock, NULL); _ecp_tr_sock = NULL; } -ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ecp_tr_addr_t *addr, unsigned char flags) { +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t pkt_size, ecp_tr_addr_t *addr, unsigned char flags) { unsigned char *buf = NULL; + int reply; int rv; - flags |= _flags; - if (packet && packet->buffer) { - if (flags & ECP_SEND_FLAG_REPLY) { + reply = 0; + if (flags & ECP_SEND_FLAG_REPLY) { + if (flags & ECP_SEND_FLAG_MORE) return ECP_ERR; + if (packet->buffer) { buf = packet->buffer-EOS_SOCK_SIZE_UDP_HDR; packet->buffer = NULL; - } else { - buf = eos_net_alloc(); - memcpy(buf+EOS_SOCK_SIZE_UDP_HDR, packet->buffer, msg_size); + reply = 1; } + } else { + buf = eos_net_alloc(); } if (buf == NULL) return ECP_ERR; - rv = eos_sock_sendto(sock->sock, buf, msg_size+EOS_SOCK_SIZE_UDP_HDR, flags & ECP_SEND_FLAG_MORE, addr); + + rv = eos_sock_sendto_async(sock->sock, reply ? NULL : packet->buffer, pkt_size, addr, buf, !!(flags & ECP_SEND_FLAG_MORE)); if (rv) return ECP_ERR_SEND; - return msg_size; + + return pkt_size; } ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int timeout) { @@ -105,18 +110,10 @@ ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int } void ecp_tr_release(ECPBuffer *packet, unsigned char more) { - if (packet && packet->buffer) { + if (packet->buffer) { eos_net_free(packet->buffer-EOS_SOCK_SIZE_UDP_HDR, more); packet->buffer = NULL; } else if (!more) { eos_net_release(); } } - -void ecp_tr_flag_set(unsigned char flags) { - _flags |= flags; -} - -void ecp_tr_flag_clear(unsigned char flags) { - _flags &= ~flags; -} diff --git a/ecp/src/platform/fe310/transport.h b/ecp/src/platform/fe310/transport.h index 213ca11..1e0c526 100644 --- a/ecp/src/platform/fe310/transport.h +++ b/ecp/src/platform/fe310/transport.h @@ -1,4 +1,4 @@ #include -typedef EOSNetAddr ecp_tr_addr_t; +typedef struct EOSNetAddr ecp_tr_addr_t; typedef int ecp_tr_sock_t; diff --git a/ecp/src/platform/posix/platform.mk b/ecp/src/platform/posix/platform.mk index 9dcfe37..8932ac4 100644 --- a/ecp/src/platform/posix/platform.mk +++ b/ecp/src/platform/posix/platform.mk @@ -1,2 +1,2 @@ -CFLAGS += -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIR -DECP_WITH_DIRSRV -DECP_WITH_MSGQ=1 -DECP_DEBUG=1 +CFLAGS += -O3 LDFLAGS += -lm -pthread diff --git a/ecp/src/platform/posix/platform_obj.mk b/ecp/src/platform/posix/platform_obj.mk deleted file mode 100644 index 56a76c3..0000000 --- a/ecp/src/platform/posix/platform_obj.mk +++ /dev/null @@ -1 +0,0 @@ -subdirs += htable vconn ext dir diff --git a/ecp/src/platform/posix/transport.c b/ecp/src/platform/posix/transport.c index 30822b6..ebfbc7b 100644 --- a/ecp/src/platform/posix/transport.c +++ b/ecp/src/platform/posix/transport.c @@ -9,7 +9,7 @@ #include #include -#define ADDR_S_MAX 32 +#define MAX_ADDR_STR 32 int ecp_tr_init(ECPContext *ctx) { return ECP_OK; @@ -28,13 +28,13 @@ int ecp_tr_addr_eq(ecp_tr_addr_t *addr1, ecp_tr_addr_t *addr2) { int ecp_tr_addr_set(ecp_tr_addr_t *addr, void *addr_s) { int rv; - char addr_c[ADDR_S_MAX]; + char addr_c[MAX_ADDR_STR]; char *colon = NULL; char *endptr = NULL; uint16_t hport; memset(addr_c, 0, sizeof(addr_c)); - strncpy(addr_c, addr_s, ADDR_S_MAX-1); + strncpy(addr_c, addr_s, sizeof(addr_c)-1); colon = strchr(addr_c, ':'); if (colon == NULL) return -1; *colon = '\0'; @@ -51,12 +51,14 @@ int ecp_tr_addr_set(ecp_tr_addr_t *addr, void *addr_s) { int ecp_tr_open(ECPSocket *sock, void *addr_s) { struct sockaddr_in _myaddr; + int rv; memset((char *)&_myaddr, 0, sizeof(_myaddr)); _myaddr.sin_family = AF_INET; if (addr_s) { ecp_tr_addr_t addr; - int rv = ecp_tr_addr_set(&addr, addr_s); + + rv = ecp_tr_addr_set(&addr, addr_s); if (rv) return rv; memcpy((void *)&_myaddr.sin_addr, addr.host, sizeof(addr.host)); @@ -69,11 +71,12 @@ int ecp_tr_open(ECPSocket *sock, void *addr_s) { sock->sock = socket(PF_INET, SOCK_DGRAM, 0); if (sock->sock < 0) return sock->sock; - int rv = bind(sock->sock, (struct sockaddr *)&_myaddr, sizeof(_myaddr)); + rv = bind(sock->sock, (struct sockaddr *)&_myaddr, sizeof(_myaddr)); if (rv < 0) { close(sock->sock); return rv; } + return ECP_OK; } @@ -81,14 +84,14 @@ void ecp_tr_close(ECPSocket *sock) { close(sock->sock); } -ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ecp_tr_addr_t *addr, unsigned char flags) { +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t pkt_size, ecp_tr_addr_t *addr, unsigned char flags) { struct sockaddr_in servaddr; memset((void *)&servaddr, 0, sizeof(servaddr)); servaddr.sin_family = AF_INET; servaddr.sin_port = addr->port; memcpy((void *)&servaddr.sin_addr, addr->host, sizeof(addr->host)); - return sendto(sock->sock, packet->buffer, msg_size, 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); + return sendto(sock->sock, packet->buffer, pkt_size, 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); } ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int timeout) { @@ -97,8 +100,9 @@ ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int struct pollfd fds[] = { {sock->sock, POLLIN, 0} }; + int rv; - int rv = poll(fds, 1, timeout); + rv = poll(fds, 1, timeout); memset((void *)&servaddr, 0, sizeof(servaddr)); if (rv == 1) { ssize_t recvlen = recvfrom(sock->sock, packet->buffer, packet->size, 0, (struct sockaddr *)&servaddr, &addrlen); @@ -111,9 +115,8 @@ ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ecp_tr_addr_t *addr, int } return recvlen; } + return ECP_ERR_TIMEOUT; } void ecp_tr_release(ECPBuffer *packet, unsigned char more) {} -void ecp_tr_flag_set(unsigned char flags) {} -void ecp_tr_flag_clear(unsigned char flags) {} -- cgit v1.2.3