From 7fc598dc654d6c87b4575b6a608a018015d91eb2 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Fri, 24 Feb 2017 10:19:32 +0900 Subject: [PATCH] BugFix: Issue #47 'START_BYTE' was not declared Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTSNGateway.h | 2 +- MQTTSNGateway/src/linux/Network.cpp | 8 ++++++++ MQTTSNGateway/src/linux/xbee/SensorNetwork.h | 7 ++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/MQTTSNGateway/src/MQTTSNGateway.h b/MQTTSNGateway/src/MQTTSNGateway.h index 48f237a..3f6af96 100644 --- a/MQTTSNGateway/src/MQTTSNGateway.h +++ b/MQTTSNGateway/src/MQTTSNGateway.h @@ -25,7 +25,7 @@ namespace MQTTSNGW /*================================= * Starting prompt ==================================*/ -#define GATEWAY_VERSION " * Version: 0.9.6" +#define GATEWAY_VERSION " * Version: 0.9.7" #define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway" #define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse" diff --git a/MQTTSNGateway/src/linux/Network.cpp b/MQTTSNGateway/src/linux/Network.cpp index ba3069c..7c10ffa 100644 --- a/MQTTSNGateway/src/linux/Network.cpp +++ b/MQTTSNGateway/src/linux/Network.cpp @@ -290,7 +290,15 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co { SSL_load_error_strings(); SSL_library_init(); + +#if ( OPENSSL_VERSION_NUMBER >= 0x10100000L ) _ctx = SSL_CTX_new(TLS_client_method()); +#elif ( OPENSSL_VERSION_NUMBER >= 0x10001000L ) + _ctx = SSL_CTX_new(TLSv1_client_method()); +#else + _ctx = SSL_CTX_new(SSLv23_client_method()); +#endif + if (_ctx == 0) { ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); diff --git a/MQTTSNGateway/src/linux/xbee/SensorNetwork.h b/MQTTSNGateway/src/linux/xbee/SensorNetwork.h index 202f08b..24b8752 100644 --- a/MQTTSNGateway/src/linux/xbee/SensorNetwork.h +++ b/MQTTSNGateway/src/linux/xbee/SensorNetwork.h @@ -40,9 +40,10 @@ namespace MQTTSNGW #define XMIT_STATUS_TIME_OVER 5000 -#define ESCAPE 0x7d -#define XON 0x11 -#define XOFF 0x13 +#define START_BYTE 0x7e +#define ESCAPE 0x7d +#define XON 0x11 +#define XOFF 0x13 /*=========================================== Class SerialPort