From 30513e7a89cc2f9283458100dea298770c7d18de Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Fri, 7 Jun 2019 17:13:13 +0300 Subject: refactor server/client discovery to use TLVs. Signed-off-by: Gediminas Jakutis --- src/device/device_network.cpp | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'src/device/device_network.cpp') diff --git a/src/device/device_network.cpp b/src/device/device_network.cpp index f2456d9..1810852 100644 --- a/src/device/device_network.cpp +++ b/src/device/device_network.cpp @@ -22,7 +22,8 @@ #include #include #include "device_network.h" -#include "net.h" +#include "utils.h" +#include "tlv.h" static struct netstate { WiFiUDP udp; @@ -73,17 +74,31 @@ size_t udp_get_data(char *buf, size_t size) void discover_client(const int port) { IPAddress bcastip(255, 255, 255, 255); - char buffer[32] = {0}; + char buffer[128] = {0}; + struct tlv field; + struct tlv_packet pack; + size_t expected_s; + + tlv_init(&field, HEARTBEAT); + field.data = strdup(heartbeat_device); + field.head.size = sizeof(heartbeat_device); + tlv_packet_init(&pack); + tlv_pack(&pack, &field); + tlv_packet_finalize(&pack); + tlv_destroy(&field); do { udp_init_packet_expaddr(bcastip, port); - udp_push(servermagic, sizeof(servermagic)); + udp_push(pack.data, pack.cursor + 1); udp_flush(); delay(5); + + expected_s = sizeof(field.head) + sizeof(heartbeat_server); while (state.udp.parsePacket()) { - if (state.udp.available() >= sizeof(clientmagic)) { - state.udp.read(buffer, sizeof(clientmagic)); - if (!(strcmp(clientmagic, buffer))) { + if (state.udp.available() >= expected_s) { + state.udp.read(buffer, sizeof(buffer)); + tlv_get(buffer, &field, NULL); + if (field.head.type == HEARTBEAT && !(strcmp(heartbeat_server, field.data))) { state.daemon_ip = state.udp.remoteIP(); ++state.acquired; } @@ -91,6 +106,8 @@ void discover_client(const int port) } delay(95); } while (!state.acquired); + + tlv_packet_destroy(&pack); } IPAddress *get_daemon_address(void) -- cgit v1.2.3