From 53be14f76e92d44c6d574f0cc4ffbf5e78cbfdc9 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Tue, 25 Feb 2020 15:50:56 +0900 Subject: [PATCH] Bugfix of #177 Signed-off-by: tomoaki --- MQTTSNGateway/src/linux/udp/SensorNetwork.cpp | 4 ++-- MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MQTTSNGateway/src/linux/udp/SensorNetwork.cpp b/MQTTSNGateway/src/linux/udp/SensorNetwork.cpp index 5ca191d..1b57ff5 100644 --- a/MQTTSNGateway/src/linux/udp/SensorNetwork.cpp +++ b/MQTTSNGateway/src/linux/udp/SensorNetwork.cpp @@ -392,8 +392,8 @@ int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr) fd_set recvfds; int maxSock = 0; - timeout.tv_sec = 0; - timeout.tv_usec = 1000000; // 1 sec + timeout.tv_sec = 1; + timeout.tv_usec = 0; // 1 sec FD_ZERO(&recvfds); FD_SET(_sockfdUnicast, &recvfds); FD_SET(_sockfdMulticast, &recvfds); diff --git a/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp b/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp index 8137a1c..7558d45 100644 --- a/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp +++ b/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp @@ -455,14 +455,13 @@ int UDPPort6::broadcast(const uint8_t* buf, uint32_t length) return 0; } -//TODO: test if this is working properly (GW works, but this function is not completely tested) int UDPPort6::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr) { struct timeval timeout; fd_set recvfds; - timeout.tv_sec = 0; - timeout.tv_usec = 1000000; // 1 sec + timeout.tv_sec = 1; + timeout.tv_usec = 0; // 1 sec FD_ZERO(&recvfds); FD_SET(_sockfdUnicast, &recvfds); @@ -477,7 +476,6 @@ int UDPPort6::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr) return rc; } -//TODO: test if this is working properly (GW works, but this function is not completely tested) int UDPPort6::recvfrom(int sockfd, uint8_t* buf, uint16_t len, uint8_t flags, SensorNetAddress* addr) { sockaddr_in6 sender;