rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remaining breaking changes.

This commit is contained in:
Alistair Buxton 2018-04-05 19:49:21 +01:00
parent c7ab51ba99
commit 42245f8613
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/barrier/ArgParser.cpp
View File

@ -117,9 +117,12 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
// exactly one non-option argument (server-address) // exactly one non-option argument (server-address)
if (i == argc) { if (i == argc) {
LOG((CLOG_PRINT "%s: a server address or name is required" BYE, // breaking
args.m_pname, args.m_pname)); args.m_barrierAddress = "00:00:00:00:00:00";
return false;
//LOG((CLOG_PRINT "%s: a server address or name is required" BYE,
// args.m_pname, args.m_pname));
//return false;
} }
if (checkUnexpectedArgs()) { if (checkUnexpectedArgs()) {

4
src/lib/ipc/IpcClient.cpp
View File

@ -28,7 +28,7 @@
IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer) : IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer) :
m_serverAddress(NetworkAddress(IPC_HOST, IPC_PORT)), m_serverAddress(NetworkAddress(IPC_HOST, IPC_PORT)),
m_socket(events, socketMultiplexer, IArchNetwork::kINET), m_socket(events, socketMultiplexer, IArchNetwork::kBLUETOOTH),
m_server(nullptr), m_server(nullptr),
m_events(events) m_events(events)
{ {
@ -37,7 +37,7 @@ IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer)
IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer, int port) : IpcClient::IpcClient(IEventQueue* events, SocketMultiplexer* socketMultiplexer, int port) :
m_serverAddress(NetworkAddress(IPC_HOST, port)), m_serverAddress(NetworkAddress(IPC_HOST, port)),
m_socket(events, socketMultiplexer, IArchNetwork::kINET), m_socket(events, socketMultiplexer, IArchNetwork::kBLUETOOTH),
m_server(nullptr), m_server(nullptr),
m_events(events) m_events(events)
{ {

2
src/lib/ipc/IpcServer.cpp
View File

@ -54,7 +54,7 @@ IpcServer::IpcServer(IEventQueue* events, SocketMultiplexer* socketMultiplexer,
void void
IpcServer::init() 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_clientsMutex = ARCH->newMutex();
m_address.resolve(); m_address.resolve();

4
src/lib/net/NetworkAddress.cpp
View File

@ -45,7 +45,7 @@ NetworkAddress::NetworkAddress(int port) :
m_port(port) m_port(port)
{ {
checkPort(); checkPort();
m_address = ARCH->newAnyAddr(IArchNetwork::kINET); m_address = ARCH->newAnyAddr(IArchNetwork::kBLUETOOTH);
ARCH->setAddrPort(m_address, m_port); ARCH->setAddrPort(m_address, m_port);
} }
@ -145,7 +145,7 @@ NetworkAddress::resolve()
// if hostname is empty then use wildcard address otherwise look // if hostname is empty then use wildcard address otherwise look
// up the name. // up the name.
if (m_hostname.empty()) { if (m_hostname.empty()) {
m_address = ARCH->newAnyAddr(IArchNetwork::kINET); m_address = ARCH->newAnyAddr(IArchNetwork::kBLUETOOTH);
} }
else { else {
m_address = ARCH->nameToAddr(m_hostname); m_address = ARCH->nameToAddr(m_hostname);