-From c3db2d05b19323c98ccc546aadb5886f2177f245 Mon Sep 17 00:00:00 2001
-From: cbuchter <Chris_Buchter@cable.comcast.com>
-Date: Mon, 21 Mar 2016 16:59:46 +0000
-Subject: [PATCH] Patch for nopoll including changes for ipMgr
-
----
- src/nopoll_conn.c               | 281 +++++++++++++++++++++++++++++++++++-----
- src/nopoll_conn.h               |  24 +++-
- src/nopoll_ctx.c                |  17 ++-
- src/nopoll_ctx.h                |   4 +
- src/nopoll_decl.h               |   7 +-
- src/nopoll_log.c                |   6 +
- src/nopoll_loop.c               |  93 ++++++++++++-
- src/nopoll_loop.h               |   2 +
- src/nopoll_private.h            |  11 +-
- test/nopoll-regression-client.c |  88 ++++++-------
- 10 files changed, 442 insertions(+), 91 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 601744f..32d043e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -23,7 +23,11 @@ libnopoll_la_SOURCES     = \
- 	nopoll_io.c \
- 	nopoll_msg.c \
- 	nopoll_win32.c \
--	nopoll_conn_opts.c
-+	nopoll_conn_opts.c \
-+	nopoll_hostname_validation.c \
-+	nopoll_inet_pton.c \
-+	nopoll_strcase.c \
-+	nopoll_hostcheck.c 
- 
- libnopollinclude_HEADERS = \
- 	nopoll.h \
-@@ -39,7 +43,11 @@ libnopollinclude_HEADERS = \
- 	nopoll_io.h \
- 	nopoll_msg.h \
- 	nopoll_win32.h \
--	nopoll_conn_opts.h
-+	nopoll_conn_opts.h \
-+	nopoll_hostname_validation.h \
-+	nopoll_inet_pton.h \
-+	nopoll_strcase.h \
-+	nopoll_hostcheck.h 
- 
- libnopoll_la_LDFLAGS = -no-undefined -export-symbols-regex '^(nopoll|__nopoll|_nopoll).*'
- 
-diff --git a/src/nopoll.h b/src/nopoll.h
-index c483e4b..3ef08da 100644
---- a/src/nopoll.h
-+++ b/src/nopoll.h
-@@ -57,6 +57,7 @@ BEGIN_C_DECLS
- #include <nopoll_listener.h>
- #include <nopoll_io.h>
- #include <nopoll_loop.h>
-+#include <nopoll_hostname_validation.h>
- 
- /** 
-  * \addtogroup nopoll_module
 diff --git a/src/nopoll_conn.c b/src/nopoll_conn.c
-index 8612bfd..4131e2a 100644
+index 8612bfd..cd6f9da 100644
 --- a/src/nopoll_conn.c
 +++ b/src/nopoll_conn.c
-@@ -48,7 +48,8 @@
+@@ -48,7 +48,7 @@
  
  #include <nopoll_conn.h>
  #include <nopoll_private.h>
 -
-+#include <nopoll_hostname_validation.h>
 +#include <pthread.h>
  #if defined(NOPOLL_OS_UNIX)
  # include <netinet/tcp.h>
  #endif
-@@ -193,6 +194,37 @@ nopoll_bool                 nopoll_conn_set_sock_tcp_nodelay   (NOPOLL_SOCKET so
+@@ -193,6 +193,37 @@ nopoll_bool                 nopoll_conn_set_sock_tcp_nodelay   (NOPOLL_SOCKET so
  	return nopoll_true;
  } /* end */
  

 
 	printf ("Test 04-b: sending was quick as possible to flood local buffers..\n");
 	
@@ -709,14 +825,14 @@ nopoll_bool test_04b (void) {
 	nopoll_conn_close (conn);
 
 	/* call to create a connection */

 	/* shutdown connection here */
 	if (conn->session != NOPOLL_INVALID_SOCKET) {
 	        shutdown (conn->session, SHUT_RDWR);
@@ -1819,6 +2008,32 @@ void __nopoll_pack_content (char * buffer, int start, int bytes)
 	return;
 }
 
