Fixed build on Mac.

CMakeLists.txt

@@ -114,6 +114,9 @@ ExternalProject_Add(cJSON
     GIT_REPOSITORY https://github.com/DaveGamble/cJSON.git
     GIT_TAG "aafb64a1c549b7b927e339df6d35b1d5059dc235"
     CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    CMAKE_ARGS += -DCMAKE_MACOSX_RPATH=true
+endif()
 )
 add_library(libcJSON STATIC SHARED IMPORTED)
 add_dependencies(libcJSON cJSON)

src/CMakeLists.txt

@@ -31,7 +31,6 @@ target_link_libraries (parodus
     -lmsgpackc
     -ltrower-base64
     -lnopoll
-    -luuid
     -lm
     -lcimplog
     -lssl
@@ -40,9 +39,13 @@ target_link_libraries (parodus
     -lcjson
     -lcjwt
     -lpthread
-    -lrt
     )
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+target_link_libraries (parodus -luuid)
+target_link_libraries (parodus rt)
+endif()
+
 if (FEATURE_DNS_QUERY)
 target_link_libraries (parodus -lucresolv -lresolv)
 endif (FEATURE_DNS_QUERY)

src/ParodusInternal.h

@@ -30,7 +30,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sys/sysinfo.h>
 #include <pthread.h>
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -99,7 +98,7 @@ char* getWebpaConveyHeader();
 #ifdef __cplusplus
 }
 #endif
-    
+
 
 #endif
 

src/connection.c

@@ -47,6 +47,7 @@ static noPollConnOpts * createConnOpts (char * extra_headers, bool secure);
 static noPollConn * nopoll_tls_common_conn (noPollCtx  * ctx,char * serverAddr,char *serverPort,char * extra_headers,unsigned int *fallback);
 static char* build_extra_headers( const char *auth, const char *device_id,
                                   const char *user_agent, const char *convey );
+static noPollSslProtocol get_nopoll_tls_protocol(void);
 static void toggleIPFlag (unsigned int *ptrFallback);
 static noPollConn * __internal_fallbackConn(noPollCtx  * ctx,noPollConnOpts * opts,char * serverAddr,char *serverPort,char * extra_headers,unsigned int *fallback);
 
@@ -501,16 +502,18 @@ static noPollConn * __internal_fallbackConn(noPollCtx  * ctx,noPollConnOpts * op
 static noPollConnOpts * createConnOpts (char * extra_headers, bool secure)
 {
     noPollConnOpts * opts;
+    noPollSslProtocol protocol = NOPOLL_METHOD_TLSV1_2;
 
     opts = nopoll_conn_opts_new ();
+    protocol = get_nopoll_tls_protocol();
     if(secure) 
 	{
 	    if(strlen(get_parodus_cfg()->cert_path) > 0)
             {
                 nopoll_conn_opts_set_ssl_certs(opts, NULL, NULL, NULL, get_parodus_cfg()->cert_path);
             }
 	    nopoll_conn_opts_ssl_peer_verify (opts, nopoll_true);
-	    nopoll_conn_opts_set_ssl_protocol (opts, NOPOLL_METHOD_TLSV1_2);
+	    nopoll_conn_opts_set_ssl_protocol (opts, protocol);
 	}
 	nopoll_conn_opts_set_interface (opts,get_parodus_cfg()->webpa_interface_used);	
 	nopoll_conn_opts_set_extra_headers (opts,extra_headers); 
@@ -528,3 +531,16 @@ void close_and_unref_connection(noPollConn *conn)
     }
 }
 
+static noPollSslProtocol get_nopoll_tls_protocol( void )
+{
+    noPollSslProtocol _protocol;
+#if defined(NOPOLL_HAVE_TLSv12_ENABLED)
+    _protocol = NOPOLL_METHOD_TLSV1_2;
+#elif defined(NOPOLL_HAVE_TLSv11_ENABLED)
+    _protocol = NOPOLL_METHOD_TLSV1_1;
+#elif defined(NOPOLL_HAVE_TLSv10_ENABLED)
+    _protocol = NOPOLL_METHOD_TLSV1;
+#endif
+    return _protocol;
+}
+

src/string_helpers.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-#include "string.h"
+#include <string.h>
 
 /*----------------------------------------------------------------------------*/
 /*                                   Macros                                   */

src/time.h

@@ -18,8 +18,8 @@
 #include <stdint.h>
 #include <time.h>
 
-#ifndef _TIME_H_ 
-#define _TIME_H_
+#ifndef __TIME_H__ 
+#define __TIME_H__
 
 #ifdef __cplusplus
 extern "C" {