Skip to content

Commit

Permalink
Fix build for Windows
Browse files Browse the repository at this point in the history 
* winsock2.h is case sensitive, lower case is required for cross build.
* ws2tcpip.h is required for addrinfo.
* FreeAddrInfo conflicts with existing freeaddrinfo, so rename it.

Signed-off-by: Stefan Weil <[email protected]>
  • Loading branch information
@stweil
stweil committed Apr 24, 2019
1 parent 63448de commit b7bc71e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/viewer/svutil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@

#ifdef _WIN32
#pragma comment(lib, "Ws2_32.lib")
# include <WinSock2.h> // for fd_set, send, ..
# include <winsock2.h> // for fd_set, send, ..
# include <ws2tcpip.h> // for addrinfo
#else
#include <arpa/inet.h>
#include <netdb.h>
Expand Down Expand Up @@ -316,7 +317,7 @@ static std::string ScrollViewCommand(std::string scrollview_path) {


// Platform-independent freeaddrinfo()
static void FreeAddrInfo(struct addrinfo* addr_info) {
static void TessFreeAddrInfo(struct addrinfo* addr_info) {
#if defined(__linux__)
freeaddrinfo(addr_info);
#else
Expand Down Expand Up @@ -352,7 +353,7 @@ static int GetAddrInfoNonLinux(const char* hostname, int port,
#endif

if (name == nullptr) {
FreeAddrInfo(*addr_info);
TessFreeAddrInfo(*addr_info);
*addr_info = nullptr;
return -1;
}
Expand Down Expand Up @@ -441,7 +442,7 @@ SVNetwork::SVNetwork(const char* hostname, int port) {
}
}
}
FreeAddrInfo(addr_info);
TessFreeAddrInfo(addr_info);
}

SVNetwork::~SVNetwork() {
Expand Down

1 comment on commit b7bc71e

@zdenop
Copy link
Contributor

@zdenop zdenop commented on b7bc71e Apr 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

freeaddrinfo and getaddrinfo are available in MSVC so maybe we can get rid of this custom implementations (but I am not sure if it is supported on windows 7). Can you try this patch?

diff --git a/src/viewer/svutil.cpp b/src/viewer/svutil.cpp
index 7e800467..1fcb33a6 100644
--- a/src/viewer/svutil.cpp
+++ b/src/viewer/svutil.cpp
@@ -327,60 +327,6 @@ static void TessFreeAddrInfo(struct addrinfo* addr_info) {
 }
 
 
-// Non-linux version of getaddrinfo()
-#if !defined(__linux__)
-static int GetAddrInfoNonLinux(const char* hostname, int port,
-                               struct addrinfo** addr_info) {
-// Get the host data depending on the OS.
-  struct sockaddr_in* address;
-  *addr_info = new struct addrinfo;
-  memset(*addr_info, 0, sizeof(struct addrinfo));
-  address = new struct sockaddr_in;
-  memset(address, 0, sizeof(struct sockaddr_in));
-
-  (*addr_info)->ai_addr = (struct sockaddr*) address;
-  (*addr_info)->ai_addrlen = sizeof(struct sockaddr);
-  (*addr_info)->ai_family = AF_INET;
-  (*addr_info)->ai_socktype = SOCK_STREAM;
-
-  struct hostent *name;
-#ifdef _WIN32
-  WSADATA wsaData;
-  WSAStartup(MAKEWORD(1, 1), &wsaData);
-  name = gethostbyname(hostname);
-#else
-  name = gethostbyname(hostname);
-#endif
-
-  if (name == nullptr) {
-    TessFreeAddrInfo(*addr_info);
-    *addr_info = nullptr;
-    return -1;
-  }
-
-  // Fill in the appropriate variables to be able to connect to the server.
-  address->sin_family = name->h_addrtype;
-  memcpy(&address->sin_addr.s_addr, name->h_addr_list[0], name->h_length);
-  address->sin_port = htons(port);
-  return 0;
-}
-#endif
-
-
-// Platform independent version of getaddrinfo()
-//   Given a hostname:port, produce an addrinfo struct
-static int GetAddrInfo(const char* hostname, int port,
-                       struct addrinfo** address) {
-#if defined(__linux__)
-  char port_str[40];
-  snprintf(port_str, 40, "%d", port);
-  return getaddrinfo(hostname, port_str, nullptr, address);
-#else
-  return GetAddrInfoNonLinux(hostname, port, address);
-#endif
-}
-
-
 // Set up a connection to a ScrollView on hostname:port.
 SVNetwork::SVNetwork(const char* hostname, int port) {
   msg_buffer_in_ = new char[kMaxMsgSize + 1];
@@ -390,10 +336,23 @@ SVNetwork::SVNetwork(const char* hostname, int port) {
   buffer_ptr_ = nullptr;
 
   struct addrinfo *addr_info = nullptr;
+  char port_str[40];
+  snprintf(port_str, 40, "%d", port);
+#ifdef _WIN32
+  // Initialize Winsock
+  WSADATA wsaData;
+  int iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+  if (iResult != 0) {
+    std::cerr << "WSAStartup failed: " << iResult << std::endl;
+  }
+#endif  // _WIN32
 
-  if (GetAddrInfo(hostname, port, &addr_info) != 0) {
+  if (getaddrinfo(hostname, port_str, nullptr, &addr_info) != 0) {
     std::cerr << "Error resolving name for ScrollView host "
               << std::string(hostname) << ":" << port << std::endl;
+#ifdef _WIN32
+    WSACleanup();
+#endif  // _WIN32
   }
 
   stream_ = socket(addr_info->ai_family, addr_info->ai_socktype,
@@ -442,7 +401,10 @@ SVNetwork::SVNetwork(const char* hostname, int port) {
       }
     }
   }
-  TessFreeAddrInfo(addr_info);
+#ifdef _WIN32
+  // WSACleanup();  // This cause ScrollView windows is not displayed
+#endif  // _WIN32
+  freeaddrinfo(addr_info);
 }
 
 SVNetwork::~SVNetwork() {

I am still wondering why calling WSACleanup at the end of function cause that ScrollView windows is not displayed...

Please sign in to comment.