move files around

CMakeLists.txt

@@ -24,6 +24,7 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXSocket.h
     ixwebsocket/IXWebSocket.h
     ixwebsocket/IXWebSocketTransport.h
+    ixwebsocket/IXWebSocketSendInfo.h
     ixwebsocket/IXWebSocketPerMessageDeflate.h
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
     ixwebsocket/IXWebSocketHttpHeaders.h

examples/satori_publisher/CMakeLists.txt

@@ -18,11 +18,12 @@ option(USE_TLS "Add TLS support" ON)
 add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
 
 include_directories(satori_publisher ${OPENSSL_PREFIX}/include)
+include_directories(satori_publisher .)
 
 add_executable(satori_publisher 
-  base64.cpp
   jsoncpp/jsoncpp.cpp
-  IXHMac.cpp
+  ixcrypto/IXHMac.cpp
+  ixcrypto/IXBase64.cpp
   IXSatoriConnection.cpp
   satori_publisher.cpp)
 

examples/satori_publisher/IXSatoriConnection.cpp

@@ -5,7 +5,7 @@
  */
 
 #include "IXSatoriConnection.h"
-#include "IXHMac.h"
+#include <ixcrypto/IXHMac.h>
 
 #include <algorithm>
 #include <stdexcept>
@@ -13,7 +13,7 @@
 #include <cassert>
 #include <cstring>
 
-namespace ix
+namespace
 {
     bool parseJson(const std::string& str, Json::Value& value)
     {

examples/satori_publisher/IXSatoriConnection.h

@@ -12,7 +12,7 @@
 #include <thread>
 #include <unordered_map>
 
-#include "jsoncpp/json/json.h"
+#include <jsoncpp/json/json.h>
 #include <ixwebsocket/IXWebSocket.h>
 #include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
 

examples/satori_publisher/ixcrypto/IXBase64.cpp

@@ -25,7 +25,7 @@
  
  */
 
-#include "base64.h"
+#include "IXBase64.h"
     
 namespace ix
 {

examples/satori_publisher/ixcrypto/IXHMac.cpp

@@ -4,7 +4,7 @@
  *  Copyright (c) 2018 Machine Zone. All rights reserved.
  */
 #include "IXHMac.h"
-#include "base64.h"
+#include "IXBase64.h"
 
 #include <openssl/hmac.h>