[Asterisk-code-review] netsock: Remove from Asterisk core. (asterisk[master])

Corey Farrell asteriskteam at digium.com
Mon Dec 18 14:49:53 CST 2017


Corey Farrell has uploaded this change for review. ( https://gerrit.asterisk.org/7628


Change subject: netsock: Remove from Asterisk core.
......................................................................

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
---
M channels/chan_iax2.c
R channels/iax2/include/netsock.h
R channels/iax2/netsock.c
3 files changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/28/7628/1

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 69261f3..be24ce3 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 98%
rename from main/netsock.c
rename to channels/iax2/netsock.c
index 91f7e73..8e2bd0e 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"

-- 
To view, visit https://gerrit.asterisk.org/7628
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28c6578043bac18de5ea608e136acec4f83d5dd3
Gerrit-Change-Number: 7628
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171218/7533bdb8/attachment-0001.html>


More information about the asterisk-code-review mailing list