From e847716076df6ddabb60054a59d1c2d212cdabf7 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Mon, 12 Nov 2018 17:56:59 -0800
Subject: [PATCH] move files around

---
 CMakeLists.txt                                               | 1 +
 examples/satori_publisher/CMakeLists.txt                     | 5 +++--
 examples/satori_publisher/IXSatoriConnection.cpp             | 4 ++--
 examples/satori_publisher/IXSatoriConnection.h               | 2 +-
 .../satori_publisher/{base64.cpp => ixcrypto/IXBase64.cpp}   | 2 +-
 examples/satori_publisher/{base64.h => ixcrypto/IXBase64.h}  | 0
 examples/satori_publisher/{ => ixcrypto}/IXHMac.cpp          | 2 +-
 examples/satori_publisher/{ => ixcrypto}/IXHMac.h            | 0
 8 files changed, 9 insertions(+), 7 deletions(-)
 rename examples/satori_publisher/{base64.cpp => ixcrypto/IXBase64.cpp} (99%)
 rename examples/satori_publisher/{base64.h => ixcrypto/IXBase64.h} (100%)
 rename examples/satori_publisher/{ => ixcrypto}/IXHMac.cpp (96%)
 rename examples/satori_publisher/{ => ixcrypto}/IXHMac.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d748e00e..95902f28 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/examples/satori_publisher/CMakeLists.txt b/examples/satori_publisher/CMakeLists.txt
index 9b19d13f..23d50df1 100644
--- a/examples/satori_publisher/CMakeLists.txt
+++ b/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)
 
diff --git a/examples/satori_publisher/IXSatoriConnection.cpp b/examples/satori_publisher/IXSatoriConnection.cpp
index 404b1a69..cd649144 100644
--- a/examples/satori_publisher/IXSatoriConnection.cpp
+++ b/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)
     {
diff --git a/examples/satori_publisher/IXSatoriConnection.h b/examples/satori_publisher/IXSatoriConnection.h
index 4041d305..8b80b550 100644
--- a/examples/satori_publisher/IXSatoriConnection.h
+++ b/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>
 
diff --git a/examples/satori_publisher/base64.cpp b/examples/satori_publisher/ixcrypto/IXBase64.cpp
similarity index 99%
rename from examples/satori_publisher/base64.cpp
rename to examples/satori_publisher/ixcrypto/IXBase64.cpp
index a0c02e68..abe9c8ba 100644
--- a/examples/satori_publisher/base64.cpp
+++ b/examples/satori_publisher/ixcrypto/IXBase64.cpp
@@ -25,7 +25,7 @@
  
  */
 
-#include "base64.h"
+#include "IXBase64.h"
     
 namespace ix
 {
diff --git a/examples/satori_publisher/base64.h b/examples/satori_publisher/ixcrypto/IXBase64.h
similarity index 100%
rename from examples/satori_publisher/base64.h
rename to examples/satori_publisher/ixcrypto/IXBase64.h
diff --git a/examples/satori_publisher/IXHMac.cpp b/examples/satori_publisher/ixcrypto/IXHMac.cpp
similarity index 96%
rename from examples/satori_publisher/IXHMac.cpp
rename to examples/satori_publisher/ixcrypto/IXHMac.cpp
index e06e5e13..f905b9df 100644
--- a/examples/satori_publisher/IXHMac.cpp
+++ b/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>
 
diff --git a/examples/satori_publisher/IXHMac.h b/examples/satori_publisher/ixcrypto/IXHMac.h
similarity index 100%
rename from examples/satori_publisher/IXHMac.h
rename to examples/satori_publisher/ixcrypto/IXHMac.h