emgauwa/controller-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add: msgpack as binn replacement

Browse source
This commit is contained in:
Tobias Reisinger 2020-04-24 01:33:48 +02:00
parent 5b9f2aa49b
commit 61e025343d
11 changed files with 13650 additions and 4331 deletions
handlers
discovery.c

39
handlers/discovery.c
View file

@ -13,7 +13,7 @@
#include <logger.h>
#include <handlers.h>
#include <helpers.h>
#include <binn.h>
#include <mpack.h>
#include <enums.h>
void
@ -37,36 +37,53 @@ handler_discovery(int fd, controller_t *controller)
return;
}
binn *map = binn_map();
char* payload;
size_t payload_size;
mpack_writer_t writer;
mpack_writer_init_growable(&writer, &payload, &payload_size);
binn_map_set_blob(map, DISCOVERY_MAPPING_ID, &controller->id, sizeof(uuid_t));
binn_map_set_str(map, DISCOVERY_MAPPING_NAME, controller->name);
binn_map_set_uint32(map, DISCOVERY_MAPPING_COMMAND_PORT, controller->command_port);
binn_map_set_uint8(map, DISCOVERY_MAPPING_RELAY_COUNT, controller->relay_count);
mpack_start_map(&writer, 2);
mpack_write_uint(&writer, DISCOVERY_MAPPING_ID);
mpack_write_bin(&writer, (char*)controller->id, sizeof(uuid_t));
mpack_write_uint(&writer, DISCOVERY_MAPPING_COMMAND_PORT);
mpack_write_u16(&writer, controller->command_port);
mpack_write_uint(&writer, DISCOVERY_MAPPING_RELAY_COUNT);
mpack_write_u8(&writer, controller->relay_count);
mpack_write_uint(&writer, COMMAND_MAPPING_PERIODS_COUNT);
mpack_write_cstr(&writer, controller->name);
mpack_finish_map(&writer);
void *payload = binn_ptr(map);
size_t payload_size = binn_size(map);
// finish writing
if(mpack_writer_destroy(&writer) != mpack_ok)
{
LOG_ERROR("error writing discovery answer payload");
return;
}
int fd_answer = helper_connect_tcp_server(inet_ntoa(si_other.sin_addr), discovery_answer_port);
if(fd_answer == -1)
{
LOG_ERROR("error during connecting");
binn_free(map);
free(payload);
return;
}
if((bytes_transferred = send(fd_answer, &payload_size, sizeof(payload_size), 0)) <= 0)
{
LOG_ERROR("error during sending");
binn_free(map);
free(payload);
close(fd_answer);
return;
}
if((bytes_transferred = send(fd_answer, payload, payload_size, 0)) <= 0)
{
LOG_ERROR("error during sending");
binn_free(map);
free(payload);
close(fd_answer);
return;
}
free(payload);
close(fd_answer);
}