From 1c4e3e5f24e94aa24fab3c6d39f927250b940e89 Mon Sep 17 00:00:00 2001
From: Kiritow <1362050620@qq.com>
Date: Sun, 9 Sep 2018 16:11:28 +0800
Subject: [PATCH] add a method for init native socket library

Fixed #6
---
 gsock.cpp | 42 ++++++++++++++++++++++++++----------------
 gsock.h   |  3 +++
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/gsock.cpp b/gsock.cpp
index 9d6ee08..7d2b2fe 100644
--- a/gsock.cpp
+++ b/gsock.cpp
@@ -56,27 +56,37 @@ using BYTE = unsigned char;
 #include <stdexcept>
 #include <vector>
 
+int InitNativeSocket()
+{
+	myliblog("sockaddr %d sockaddr_in %d sockaddr_in6 %d\n", sizeof(sockaddr), sizeof(sockaddr_in), sizeof(sockaddr_in6));
+	/// Windows Platform need WinSock2.DLL initialization.
+#ifdef _WIN32
+	WORD wd;
+	WSAData wdt;
+	wd = MAKEWORD(2, 2);
+	int ret = WSAStartup(wd, &wdt);
+
+	myliblog("WSAStartup() Returns: %d\n", ret);
+
+	if (ret < 0)
+	{
+		myliblog("WSAGetLastError: %d\n", WSAGetLastError());
+		return -1;
+	}
+#endif
+
+	return 0;
+}
+
 class _init_winsock2_2_class
 {
 public:
     _init_winsock2_2_class()
     {
-		myliblog("sockaddr %d sockaddr_in %d sockaddr_in6 %d\n", sizeof(sockaddr), sizeof(sockaddr_in), sizeof(sockaddr_in6));
-        /// Windows Platform need WinSock2.DLL initialization.
-#ifdef _WIN32
-        WORD wd;
-        WSAData wdt;
-        wd=MAKEWORD(2,2);
-        int ret=WSAStartup(wd,&wdt);
-
-        myliblog("WSAStartup() Returns: %d\n",ret);
-
-        if(ret<0)
-        {
-            myliblog("WSAGetLastError: %d\n",WSAGetLastError());
-            throw std::runtime_error("Unable to load winsock2.dll. ");
-        }
-#endif
+		if (InitNativeSocket() < 0)
+		{
+			throw std::runtime_error("Unable to Initialize native socket libray.");
+		}
     }
     ~_init_winsock2_2_class()
     {
diff --git a/gsock.h b/gsock.h
index f94c8e0..4d68630 100644
--- a/gsock.h
+++ b/gsock.h
@@ -10,6 +10,8 @@
 #include <string>
 #include <vector>
 
+int InitNativeSocket();
+
 enum
 {
 	GSOCK_OK = 0,
@@ -247,6 +249,7 @@ public:
     // Call handle() to handle events
 	int wait(int timeout);
 
+	// callback: void event_handler(vsock& s,int event)
 	void handle(const std::function<void(vsock&,int)>& callback);
 
     ~epoll();