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. --- include/udp.h | 4 +- src/common/protocol.c | 153 ----------------------------------------- src/common/protocol.cpp | 153 +++++++++++++++++++++++++++++++++++++++++ src/device/protocol_device.c | 101 --------------------------- src/device/protocol_device.ino | 102 +++++++++++++++++++++++++++ src/device/udp.ino | 50 +++++++------- 6 files changed, 282 insertions(+), 281 deletions(-) delete mode 100644 src/common/protocol.c create mode 100644 src/common/protocol.cpp delete mode 100755 src/device/protocol_device.c create mode 100755 src/device/protocol_device.ino diff --git a/include/udp.h b/include/udp.h index 9b3f785..358e585 100755 --- a/include/udp.h +++ b/include/udp.h @@ -5,8 +5,8 @@ #include static const int com_port = 6996; -extern IPAddress ip; /* Daemon IP */ -extern WiFiUDP Udp; +IPAddress ip; /* Daemon IP */ +WiFiUDP Udp; extern void discover_client(const int port); extern void udp_init_packet(IPAddress ip, const int port); diff --git a/src/common/protocol.c b/src/common/protocol.c deleted file mode 100644 index dc0f532..0000000 --- a/src/common/protocol.c +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Usurpataion --- clinet-server protocol implementation. - * - * Copyright (C) 2019 Ramūnas Mažeikis - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/** - * Common parts of protocol implementation. Handling of anything that actually - * deals with connection descriptor has to be implemented by device and daemon - * separately. - */ - -#include "protocol.h" -#include "protocol_private.h" -#include "net.h" -#include -#include -#include - -#define READ_AS(from, type) (*(type*)(from)) - -int push_data(cd_t connection, const char *data, enum tlv_type type) -{ - int ret = E_UNKNOWN_TYPE; - switch (type) { - case TEXT: - ret = push_string(connection, data); - break; - case FPI1: - ret = push_fpi1(connection, data); - break; - case TIMESTAMP: - ret = push_timestamp(connection, data); - break; - case REQUEST: - ret = push_request(connection, data); - break; - case REPLY: - ret = push_reply(connection, data); - break; - case UUID: - ret = push_uuid(connection, data); - break; - } - return ret; -} - -static int push_string(cd_t connection, char *str) -{ - int ret = 0; - size_t size = strlen(str); - - ret |= push_tlv_header(connection, TEXT, size); - ret |= push_bytes(connection, str, size); - return ret; -} - -static int push_fpi1(cd_t connection, char *num) -{ - return push_tlv_header(connection, FPI1, sizeof(fpi1_t)) - | push_bytes(connection, num, sizeof(fpi1_t)); -} - -static int push_timestamp(cd_t connection, char *data) -{ - return push_tlv_header(connection, TIMESTAMP, sizeof(time_t)) - | push_bytes(connection, data, sizeof(time_t)); -} - -static int push_request(cd_t connection, char *data) -{ - return push_tlv_header(connection, REQUEST, sizeof(msg_idx_t)) - | push_bytes(connection, data, sizeof(msg_idx_t)); -} - -static int push_reply(cd_t connection, char *data) -{ - int ret = 0; - size_t msglen = strlen(data + sizeof(msg_idx_t)); - ret |= push_tlv_header(connection, REPLY, msglen + sizeof(msg_idx_t)); - ret |= push_bytes(connection, data, msglen); - return ret; -} - -static int push_uuid(cd_t connection, char *data) -{ - return push_tlv_header(connection, UUID, sizeof(uuid_t)) - | push_bytes(connection, data, sizeof(uuid_t)); -} - -size_t tlv_count(const struct packet_data * const packet) -{ - size_t cursor = 0; - size_t length = 0; - size_t ret = 0; - - while (cursor < packet->packet_size) { - cursor += sizeof(enum tlv_type); - length = READ_AS(packet->data + cursor, enum tlv_type); - cursor += sizeof(size_t) + length; - ret++; - } - if (cursor != packet->packet_size) { - errno = E_TLV_OVERFLOW; - } - return ret; -} - -size_t get_tlvs( const struct packet_data * const data, - const struct tlv *buf, - size_t buf_size) -{ - size_t tlvs_read = 0; - size_t cursor = 0; - - while (cursor < data->packet_size && tlvs_read <= buf_size) { - cursor += parse_tlv(data->data, cursor, buf + tlvs_read); - tlvs_read++; - } - - if (cursor > data->packet_size) { - errno = E_TLV_OVERFLOW; - } - - return tlvs_read; -} - -size_t parse_tlv(char *data, size_t cursor, struct tlv *t) -{ - char *begin = data + cursor; - - t->type = READ_TLV_TYPE(data + cursor); - cursor += sizeof(enum tlv_type); - t->length += READ_SIZE_T(data + cursor); - data += sizeof(size_t); - t->data = data + cursor; - - return data + cursor - begin + 1UL; -} diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp new file mode 100644 index 0000000..dc0f532 --- /dev/null +++ b/src/common/protocol.cpp @@ -0,0 +1,153 @@ +/* + * Usurpataion --- clinet-server protocol implementation. + * + * Copyright (C) 2019 Ramūnas Mažeikis + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * Common parts of protocol implementation. Handling of anything that actually + * deals with connection descriptor has to be implemented by device and daemon + * separately. + */ + +#include "protocol.h" +#include "protocol_private.h" +#include "net.h" +#include +#include +#include + +#define READ_AS(from, type) (*(type*)(from)) + +int push_data(cd_t connection, const char *data, enum tlv_type type) +{ + int ret = E_UNKNOWN_TYPE; + switch (type) { + case TEXT: + ret = push_string(connection, data); + break; + case FPI1: + ret = push_fpi1(connection, data); + break; + case TIMESTAMP: + ret = push_timestamp(connection, data); + break; + case REQUEST: + ret = push_request(connection, data); + break; + case REPLY: + ret = push_reply(connection, data); + break; + case UUID: + ret = push_uuid(connection, data); + break; + } + return ret; +} + +static int push_string(cd_t connection, char *str) +{ + int ret = 0; + size_t size = strlen(str); + + ret |= push_tlv_header(connection, TEXT, size); + ret |= push_bytes(connection, str, size); + return ret; +} + +static int push_fpi1(cd_t connection, char *num) +{ + return push_tlv_header(connection, FPI1, sizeof(fpi1_t)) + | push_bytes(connection, num, sizeof(fpi1_t)); +} + +static int push_timestamp(cd_t connection, char *data) +{ + return push_tlv_header(connection, TIMESTAMP, sizeof(time_t)) + | push_bytes(connection, data, sizeof(time_t)); +} + +static int push_request(cd_t connection, char *data) +{ + return push_tlv_header(connection, REQUEST, sizeof(msg_idx_t)) + | push_bytes(connection, data, sizeof(msg_idx_t)); +} + +static int push_reply(cd_t connection, char *data) +{ + int ret = 0; + size_t msglen = strlen(data + sizeof(msg_idx_t)); + ret |= push_tlv_header(connection, REPLY, msglen + sizeof(msg_idx_t)); + ret |= push_bytes(connection, data, msglen); + return ret; +} + +static int push_uuid(cd_t connection, char *data) +{ + return push_tlv_header(connection, UUID, sizeof(uuid_t)) + | push_bytes(connection, data, sizeof(uuid_t)); +} + +size_t tlv_count(const struct packet_data * const packet) +{ + size_t cursor = 0; + size_t length = 0; + size_t ret = 0; + + while (cursor < packet->packet_size) { + cursor += sizeof(enum tlv_type); + length = READ_AS(packet->data + cursor, enum tlv_type); + cursor += sizeof(size_t) + length; + ret++; + } + if (cursor != packet->packet_size) { + errno = E_TLV_OVERFLOW; + } + return ret; +} + +size_t get_tlvs( const struct packet_data * const data, + const struct tlv *buf, + size_t buf_size) +{ + size_t tlvs_read = 0; + size_t cursor = 0; + + while (cursor < data->packet_size && tlvs_read <= buf_size) { + cursor += parse_tlv(data->data, cursor, buf + tlvs_read); + tlvs_read++; + } + + if (cursor > data->packet_size) { + errno = E_TLV_OVERFLOW; + } + + return tlvs_read; +} + +size_t parse_tlv(char *data, size_t cursor, struct tlv *t) +{ + char *begin = data + cursor; + + t->type = READ_TLV_TYPE(data + cursor); + cursor += sizeof(enum tlv_type); + t->length += READ_SIZE_T(data + cursor); + data += sizeof(size_t); + t->data = data + cursor; + + return data + cursor - begin + 1UL; +} 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