From 13015f9a8d2b6b982d7d84e62943fbba15aee05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C5=ABnas=20Ma=C5=BEeikis?= Date: Wed, 22 May 2019 10:49:08 +0300 Subject: Protocol: switched files to C++ and did minor fixes. The code has a chance to compile now. No changes to actual build files yet. --- src/device/protocol_device.c | 101 ---------------------------------------- src/device/protocol_device.ino | 102 +++++++++++++++++++++++++++++++++++++++++ src/device/udp.ino | 50 ++++++++++---------- 3 files changed, 127 insertions(+), 126 deletions(-) delete mode 100755 src/device/protocol_device.c create mode 100755 src/device/protocol_device.ino (limited to 'src/device') diff --git a/src/device/protocol_device.c b/src/device/protocol_device.c deleted file mode 100755 index 5910546..0000000 --- a/src/device/protocol_device.c +++ /dev/null @@ -1,101 +0,0 @@ -#include "net.h" -#include "protocol.h" -#include "protocol_private.h" -#include "protocol_device_private.h" -#include "settings.h" -#include -#include -#include - -#define READ_AS(type, from) (*((type*)(from))) - -static struct connection_t connection; - -cd_t protocol_init(void) -{ - connection.is_live = 1; - connection.nd = net_init(setting_port()); - return 0; -} - -int clear_data(cd_t cd) -{ - int ret = 0; - if (cd >= MAX_CONNECTIONS) { - ret = E_IVALID_DESCRIPTOR; - } else { - connection.inp_crs = 0; - } - return ret; -} - -static int push_bytes(cd_t cd, char *data, size_t size) -{ - int ret = 0; - - if (cd >= MAX_CONNECTIONS) { - ret = E_IVALID_DESCRIPTOR; - } else if (connection.outp_crs + size >= sizeof(connection.outp_buf)) { - ret = E_PACKET_OVERFLOW; - } else { - memcpy(connection.outp_buf, data, size); - connection.outp_crs += size; - } - return ret; -} - -static int push_tlv_header(cd_t cd, enum tlv_type type, size_t size) -{ - int ret = 0; - - if (cd >= MAX_CONNECTIONS) { - errno = E_IVALID_DESCRIPTOR; - ret = NULL; - } else if (connection.outp_crs >= MAX_PACKET_SIZE_IN) { - errno = E_TLV_OVERFLOW; - ret = NULL; - } else { - READ_AS(enum tlv_type, connection.outp_buf + connection.outp_crs) - = type; - connection.outp_crs += sizeof(enum tlv_type); - READ_AS(size_t, connection.outp_buf + connection.outp_crs) = size; - connection.outp_crs += sizeof(size_t); - } - return ret; -} - -struct tlv * get_tlv(cd_t cd) -{ - struct tlv *ret = &connection.next_tlv; - size_t offset = connection.inp_crs; - char *data = connection.inp_buf; - - if (cd >= MAX_CONNECTIONS) { - errno = E_IVALID_DESCRIPTOR; - ret = NULL; - } else if (offset >= MAX_PACKET_SIZE_IN) { - errno = E_TLV_OVERFLOW; - ret = NULL; - } else { - ret->type = READ_AS(enum tlv_type, data + offset); - offset += sizeof(enum tlv_type); - ret->length = READ_AS(size_t, data + offset); - offset += sizeof(size_t); - ret->data = data + offset; - connection.inp_crs = offset; - } - return ret; -} - -int flush_data(cd_t cd) -{ - return 0; -} - -int get_last_data(cd_t cd) -{ - if (cd >= MAX_CONNECTIONS) { - return E_IVALID_DESCRIPTOR; - } - net_getlastdata(connection.nd, connection.inp_buf); -} diff --git a/src/device/protocol_device.ino b/src/device/protocol_device.ino new file mode 100755 index 0000000..218ca85 --- /dev/null +++ b/src/device/protocol_device.ino @@ -0,0 +1,102 @@ +#include "net.h" +#include "protocol.h" +#include "protocol_private.h" +#include "protocol_device_private.h" +#include "settings.h" +#include "udp.h" +#include +#include +#include + +#define READ_AS(type, from) (*((type*)(from))) + +static struct connection_t connection; + +cd_t protocol_init(void) +{ + connection.is_live = 1; + connection.nd = net_init(setting_port()); + return 0; +} + +int clear_data(cd_t cd) +{ + int ret = 0; + if (cd >= MAX_CONNECTIONS) { + ret = E_IVALID_DESCRIPTOR; + } else { + connection.inp_crs = 0; + } + return ret; +} + +static int push_bytes(cd_t cd, char *data, size_t size) +{ + int ret = 0; + + if (cd >= MAX_CONNECTIONS) { + ret = E_IVALID_DESCRIPTOR; + } else if (connection.outp_crs + size >= sizeof(connection.outp_buf)) { + ret = E_PACKET_OVERFLOW; + } else { + memcpy(connection.outp_buf, data, size); + connection.outp_crs += size; + } + return ret; +} + +static int push_tlv_header(cd_t cd, enum tlv_type type, size_t size) +{ + int ret = 0; + + if (cd >= MAX_CONNECTIONS) { + errno = E_IVALID_DESCRIPTOR; + ret = NULL; + } else if (connection.outp_crs >= MAX_PACKET_SIZE_IN) { + errno = E_TLV_OVERFLOW; + ret = NULL; + } else { + READ_AS(enum tlv_type, connection.outp_buf + connection.outp_crs) + = type; + connection.outp_crs += sizeof(enum tlv_type); + READ_AS(size_t, connection.outp_buf + connection.outp_crs) = size; + connection.outp_crs += sizeof(size_t); + } + return ret; +} + +struct tlv * get_tlv(cd_t cd) +{ + struct tlv *ret = &connection.next_tlv; + size_t offset = connection.inp_crs; + char *data = connection.inp_buf; + + if (cd >= MAX_CONNECTIONS) { + errno = E_IVALID_DESCRIPTOR; + ret = NULL; + } else if (offset >= MAX_PACKET_SIZE_IN) { + errno = E_TLV_OVERFLOW; + ret = NULL; + } else { + ret->type = READ_AS(enum tlv_type, data + offset); + offset += sizeof(enum tlv_type); + ret->length = READ_AS(size_t, data + offset); + offset += sizeof(size_t); + ret->data = data + offset; + connection.inp_crs = offset; + } + return ret; +} + +int flush_data(cd_t cd) +{ + return 0; +} + +int get_last_data(cd_t cd) +{ + if (cd >= MAX_CONNECTIONS) { + return E_IVALID_DESCRIPTOR; + } + net_getlastdata(connection.nd, connection.inp_buf); +} diff --git a/src/device/udp.ino b/src/device/udp.ino index 3074b65..b88f314 100755 --- a/src/device/udp.ino +++ b/src/device/udp.ino @@ -1,25 +1,25 @@ -#include "udp.h" -#include -#include - -static char udppacketbuffer[32] = {0}; -static char *udppacketcursor = NULL; - -void udp_init_packet(IPAddress ip, const int port) -{ - Udp.beginPacket(ip, port); - memset(udppacketbuffer, 0, sizeof(udppacketbuffer)); - udppacketcursor = udppacketbuffer; -} - -void udp_push(const void * const data, const size_t size) -{ - memcpy(udppacketcursor, data, size); - udppacketcursor += size; -} - -int udp_flush(void) -{ - Udp.write((const uint8_t *) udppacketbuffer, udppacketcursor - udppacketbuffer); - return Udp.endPacket(); -} +#include "udp.h" +#include +#include + +static char udppacketbuffer[32] = {0}; +static char *udppacketcursor = NULL; + +void udp_init_packet(IPAddress ip, const int port) +{ + Udp.beginPacket(ip, port); + memset(udppacketbuffer, 0, sizeof(udppacketbuffer)); + udppacketcursor = udppacketbuffer; +} + +void udp_push(const void * const data, const size_t size) +{ + memcpy(udppacketcursor, data, size); + udppacketcursor += size; +} + +int udp_flush(void) +{ + Udp.write((const uint8_t *) udppacketbuffer, udppacketcursor - udppacketbuffer); + return Udp.endPacket(); +} -- cgit v1.2.3