From: Corey Farrell <git@cfware.com>
Date: Mon, 18 Dec 2017 20:00:35 +0000 (-0500)
Subject: netsock: Remove from Asterisk core.
X-Git-Tag: 16.0.0-rc1~514^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=064c74e4af81b986474e8e234d656d9d3be40196;p=thirdparty%2Fasterisk.git

netsock: Remove from Asterisk core.

This moves netsock.c / netsock.h to the chan_iax2 module.  netsock.h has
been marked deprecated since 13.0.0, chan_iax2 is the only remaining
user.

Change-Id: I28c6578043bac18de5ea608e136acec4f83d5dd3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 69261f35ac..be24ce3b5f 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -99,7 +99,6 @@
 #include "asterisk/localtime.h"
 #include "asterisk/dnsmgr.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/netsock.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/astobj2.h"
@@ -122,6 +121,7 @@
 #include "iax2/include/provision.h"
 #include "iax2/include/codec_pref.h"
 #include "iax2/include/format_compatibility.h"
+#include "iax2/include/netsock.h"
 
 #include "jitterbuf.h"
 
diff --git a/include/asterisk/netsock.h b/channels/iax2/include/netsock.h
similarity index 100%
rename from include/asterisk/netsock.h
rename to channels/iax2/include/netsock.h
diff --git a/main/netsock.c b/channels/iax2/netsock.c
similarity index 99%
rename from main/netsock.c
rename to channels/iax2/netsock.c
index 91f7e73141..8e2bd0e122 100644
--- a/main/netsock.c
+++ b/channels/iax2/netsock.c
@@ -43,7 +43,7 @@
 #include <ifaddrs.h>
 #endif
 
-#include "asterisk/netsock.h"
+#include "include/netsock.h"
 #include "asterisk/netsock2.h"
 #include "asterisk/utils.h"
 #include "asterisk/astobj.h"