From ce8c9cabadf390d21af9b7944ad5ade9bd6ebc92 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Mon, 12 Oct 2020 20:15:39 +0900 Subject: [PATCH] Fix of compile error Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTGWPacket.h | 2 +- MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.h | 1 - MQTTSNGateway/src/linux/Network.cpp | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MQTTSNGateway/src/MQTTGWPacket.h b/MQTTSNGateway/src/MQTTGWPacket.h index 3a4829e..fb2ad86 100644 --- a/MQTTSNGateway/src/MQTTGWPacket.h +++ b/MQTTSNGateway/src/MQTTGWPacket.h @@ -116,7 +116,7 @@ typedef struct unsigned char version; /**< MQTT version number */ } Connect; -#define MQTTPacket_Connect_Initializer {{0}, 0, nullptr, nullptr, nullptr, nullptr, 0, 0} +#define MQTTPacket_Connect_Initializer {{0}, {0}, nullptr, nullptr, nullptr, nullptr, 0, 0} #define MQTTPacket_willOptions_initializer { {'M', 'Q', 'T', 'W'}, 0, {NULL, {0, NULL}}, {NULL, {0, NULL}}, 0, 0 } #define MQTTPacket_connectData_initializer { {'M', 'Q', 'T', 'C'}, 0, 4, {NULL, {0, NULL}}, 60, 1, 0, \ MQTTPacket_willOptions_initializer, {NULL, {0, NULL}}, {NULL, {0, NULL}} } diff --git a/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.h b/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.h index 46bf4f0..53282b3 100644 --- a/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.h +++ b/MQTTSNGateway/src/MQTTSNAggregateConnectionHandler.h @@ -39,7 +39,6 @@ public: private: void sendStoredPublish(Client* client); - char _pbuf[MQTTSNGW_MAX_PACKET_SIZE * 3]; Gateway* _gateway; }; diff --git a/MQTTSNGateway/src/linux/Network.cpp b/MQTTSNGateway/src/linux/Network.cpp index 5c5e88d..842e121 100644 --- a/MQTTSNGateway/src/linux/Network.cpp +++ b/MQTTSNGateway/src/linux/Network.cpp @@ -145,7 +145,11 @@ bool TCPStack::accept(TCPStack& new_socket) int TCPStack::send(const uint8_t* buf, int length) { +#ifdef __APPLE__ + return ::send(_sockfd, buf, length, SO_NOSIGPIPE); +#else return ::send(_sockfd, buf, length, MSG_NOSIGNAL); +#endif } int TCPStack::recv(uint8_t* buf, int len)