sam_oneal/dial-reference
1
0
Fork 0
mirror of https://github.com/Netflix/dial-reference.git synced 2026-06-08 02:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile DIAL client and server for macOS.

Browse Source 
Changes:
* Added method to get mac and ip address for OSX. Current Linux method
of query via SIOCGIFCONF doesn't work. Added code to read via getifaddrs() API.
* Put non OSX specific code under #ifdef flags.
* Removed few linker libraries which are not required (lcares and lrt).
* Fixed many warnings.

Tested on: OSX 10.12
This commit is contained in:
Chintan Parikh
2017-12-26 14:20:12 -08:00
parent fc267fac62
commit ac3e488924
11 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/DialConformance.h
View File

@@ -65,7 +65,6 @@ public:
string &outputFile );
private:
DialConformance();
DialServer* _pServer;
static DialConformance* sConformance;
DialClientInput _input;

4
client/DialDiscovery.h
View File

@@ -28,6 +28,7 @@
#include "DialServer.h"
#include <map>
#include <pthread.h>
using namespace std;
@@ -82,9 +83,6 @@ private:
void cleanServerList();
void resetDiscovery();
pthread_t _mcastThread;
pthread_t _responseThread;
typedef map<string, DialServer*> ServerMap;
ServerMap mServerMap;

2
client/DialServer.cpp
View File

@@ -226,7 +226,7 @@ int DialServer::getStatus(
if (!status) return 0;
ATRACE("Body: %s\n", responseBody.c_str());
unsigned found = responseBody.find("href=");
size_t found = responseBody.find("href=");
if( found != string::npos )
{
// The start of href is after href= and the quote

2
client/main.cpp
View File

@@ -136,7 +136,7 @@ static void runConformance()
else
{
printf("DIAL server not found\n");
printf("%Zu available server(s): \n", list.size());
printf("%zu available server(s): \n", list.size());
printServerList(list);
}
}

2
client/makefile
View File

@@ -8,7 +8,7 @@ OBJS := main.cpp DialServer.cpp DialDiscovery.cpp DialConformance.cpp DialClient
# You may not need all these libraries. This example uses a build of curl that needs crypto, ssl, cares, and zlib
dialclient: $(OBJS) ${includes}
$(CC) -Wall -Werror -g $(OBJS) $(INCLUDES) $(LDFLAGS) -ldl -lpthread -lcurl -lz -lcrypto -lssl -lcares -o dialclient
$(CC) -Wall -Werror -g $(OBJS) $(INCLUDES) $(LDFLAGS) -ldl -lpthread -lcurl -lz -lcrypto -lssl -o dialclient
dialclient_debug: $(OBJS) ${includes}
$(CC) -DDEBUG -Wall -Werror -g $(OBJS) $(INCLUDES) $(LDFLAGS) -ldl -lpthread -lcurl -lz -lcrypto -lssl -lcares -o dialclient_debug