GitHub/paho.mqtt-sn.embedded-c
1
0
Fork 0
mirror of https://github.com/eclipse/paho.mqtt-sn.embedded-c.git synced 2025-12-15 16:36:52 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix of #177

Browse Source 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2020-02-25 15:50:56 +09:00
parent 6a8cdba186
commit 53be14f76e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MQTTSNGateway/src/linux/udp/SensorNetwork.cpp
View File

@@ -392,8 +392,8 @@ int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
fd_set recvfds; fd_set recvfds;
int maxSock = 0; int maxSock = 0;
timeout.tv_sec = 0; timeout.tv_sec = 1;
timeout.tv_usec = 1000000; // 1 sec timeout.tv_usec = 0; // 1 sec
FD_ZERO(&recvfds); FD_ZERO(&recvfds);
FD_SET(_sockfdUnicast, &recvfds); FD_SET(_sockfdUnicast, &recvfds);
FD_SET(_sockfdMulticast, &recvfds); FD_SET(_sockfdMulticast, &recvfds);

6
MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp
View File

@@ -455,14 +455,13 @@ int UDPPort6::broadcast(const uint8_t* buf, uint32_t length)
return 0; 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) int UDPPort6::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
{ {
struct timeval timeout; struct timeval timeout;
fd_set recvfds; fd_set recvfds;
timeout.tv_sec = 0; timeout.tv_sec = 1;
timeout.tv_usec = 1000000; // 1 sec timeout.tv_usec = 0; // 1 sec
FD_ZERO(&recvfds); FD_ZERO(&recvfds);
FD_SET(_sockfdUnicast, &recvfds); FD_SET(_sockfdUnicast, &recvfds);
@@ -477,7 +476,6 @@ int UDPPort6::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
return rc; 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) int UDPPort6::recvfrom(int sockfd, uint8_t* buf, uint16_t len, uint8_t flags, SensorNetAddress* addr)
{ {
sockaddr_in6 sender; sockaddr_in6 sender;