From 42245f8613b1990aa96cc22ff3d9c1803890e0c1 Mon Sep 17 00:00:00 2001
From: Alistair Buxton <a.j.buxton@gmail.com>
Date: Thu, 5 Apr 2018 19:49:21 +0100
Subject: [PATCH] Remaining breaking changes.

---
 src/lib/barrier/ArgParser.cpp  | 9 ++++++---
 src/lib/ipc/IpcClient.cpp      | 4 ++--
 src/lib/ipc/IpcServer.cpp      | 2 +-
 src/lib/net/NetworkAddress.cpp | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib/barrier/ArgParser.cpp b/src/lib/barrier/ArgParser.cpp
index 20e849cf..4ffc4cc8 100644
--- a/src/lib/barrier/ArgParser.cpp
+++ b/src/lib/barrier/ArgParser.cpp
@@ -117,9 +117,12 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
 
     // exactly one non-option argument (server-address)
     if (i == argc) {
-        LOG((CLOG_PRINT "%s: a server address or name is required" BYE,
-            args.m_pname, args.m_pname));
-        return false;
+        // breaking
+        args.m_barrierAddress = "00:00:00:00:00:00";
+
+        //LOG((CLOG_PRINT "%s: a server address or name is required" BYE,
+        //    args.m_pname, args.m_pname));
+        //return false;
     }
 
     if (checkUnexpectedArgs()) {
diff --git a/src/lib/ipc/IpcClient.cpp b/src/lib/ipc/IpcClient.cpp
index 4eeae5b8..b8723db1 100644
--- a/src/lib/ipc/IpcClient.cpp
+++ b/src/lib/ipc/IpcClient.cpp
@@ -28,7 +28,7 @@
 
 IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer) :
     m_serverAddress(NetworkAddress(IPC_HOST, IPC_PORT)),
-    m_socket(events, socketMultiplexer, IArchNetwork::kINET),
+    m_socket(events, socketMultiplexer, IArchNetwork::kBLUETOOTH),
     m_server(nullptr),
     m_events(events)
 {
@@ -37,7 +37,7 @@ IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer)
 
 IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer, int port) :
     m_serverAddress(NetworkAddress(IPC_HOST, port)),
-    m_socket(events, socketMultiplexer, IArchNetwork::kINET),
+    m_socket(events, socketMultiplexer, IArchNetwork::kBLUETOOTH),
     m_server(nullptr),
     m_events(events)
 {
diff --git a/src/lib/ipc/IpcServer.cpp b/src/lib/ipc/IpcServer.cpp
index e05a913f..bef1aec0 100644
--- a/src/lib/ipc/IpcServer.cpp
+++ b/src/lib/ipc/IpcServer.cpp
@@ -54,7 +54,7 @@ IpcServer::IpcServer(IEventQueue* events, SocketMultiplexer* socketMultiplexer,
 void
 IpcServer::init()
 {
-    m_socket = new TCPListenSocket(m_events, m_socketMultiplexer, IArchNetwork::kINET);
+    m_socket = new TCPListenSocket(m_events, m_socketMultiplexer, IArchNetwork::kBLUETOOTH);
 
     m_clientsMutex = ARCH->newMutex();
     m_address.resolve();
diff --git a/src/lib/net/NetworkAddress.cpp b/src/lib/net/NetworkAddress.cpp
index c395ab03..99ce10b1 100644
--- a/src/lib/net/NetworkAddress.cpp
+++ b/src/lib/net/NetworkAddress.cpp
@@ -45,7 +45,7 @@ NetworkAddress::NetworkAddress(int port) :
     m_port(port)
 {
     checkPort();
-    m_address = ARCH->newAnyAddr(IArchNetwork::kINET);
+    m_address = ARCH->newAnyAddr(IArchNetwork::kBLUETOOTH);
     ARCH->setAddrPort(m_address, m_port);
 }
 
@@ -145,7 +145,7 @@ NetworkAddress::resolve()
         // if hostname is empty then use wildcard address otherwise look
         // up the name.
         if (m_hostname.empty()) {
-            m_address = ARCH->newAnyAddr(IArchNetwork::kINET);
+            m_address = ARCH->newAnyAddr(IArchNetwork::kBLUETOOTH);
         }
         else {
             m_address = ARCH->nameToAddr(m_hostname);