From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 15 Sep 2016 15:03:54 +0000 (-0400)
Subject: Merge pull request #623 in SNORT/snort3 from tcp_connector_UT_osx to master
X-Git-Tag: 3.0.0-233~263^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b19afaedb3e9d5ebab70fcff13ca8aac5f25834b;p=thirdparty%2Fsnort3.git

Merge pull request #623 in SNORT/snort3 from tcp_connector_UT_osx to master

Squashed commit of the following:

commit a64e28d02f5d75c75528d61936e99a3052254f20
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Sep 15 09:42:45 2016 -0400

    Fix tcp_connector_test for OSX build.
---

diff --git a/src/connectors/tcp_connector/test/tcp_connector_test.cc b/src/connectors/tcp_connector/test/tcp_connector_test.cc
index 1e4a2270f..25148bbbd 100644
--- a/src/connectors/tcp_connector/test/tcp_connector_test.cc
+++ b/src/connectors/tcp_connector/test/tcp_connector_test.cc
@@ -31,6 +31,12 @@
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
+#ifdef MACOS
+#define __THROW
+#define __SOCKADDR_ARG          struct sockaddr*
+#define __CONST_SOCKADDR_ARG    const struct sockaddr*
+#endif
+
 extern const BaseApi* tcp_connector;
 ConnectorApi* tcpc_api = nullptr;
 
@@ -89,7 +95,7 @@ int poll (struct pollfd* fds, nfds_t nfds, int)
 
     if ( s_poll_undesirable )
     {
-        fds[0].revents |= POLLRDHUP;
+        fds[0].revents |= POLLHUP;
         return 1;
     }