Merge "netsock: Remove from Asterisk core."

3 files changed, 276 insertions, 1 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 69261f35a..be24ce3b5 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/channels/iax2/include/netsock.h b/channels/iax2/include/netsock.h
new file mode 100644
index 000000000..bd80072f5
--- /dev/null
+++ b/channels/iax2/include/netsock.h
@@ -0,0 +1,74 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ * Kevin P. Fleming <kpfleming@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ * \brief Network socket handling
+ *
+ * \deprecated Use netsock2.h instead
+ */
+
+#ifndef _ASTERISK_NETSOCK_H
+#define _ASTERISK_NETSOCK_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include "asterisk/network.h"
+#include "asterisk/io.h"
+#include "asterisk/netsock2.h"
+
+struct ast_netsock;
+
+struct ast_netsock_list;
+
+struct ast_netsock_list *ast_netsock_list_alloc(void);
+
+int ast_netsock_init(struct ast_netsock_list *list);
+
+struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc,
+				     const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data);
+
+struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc,
+					 struct ast_sockaddr *bindaddr, int tos, int cos, ast_io_cb callback, void *data);
+
+int ast_netsock_release(struct ast_netsock_list *list);
+
+struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list,
+				     struct ast_sockaddr *addr);
+
+/*!
+ * \deprecated Use ast_seq_qos in netsock2.h which properly handles IPv4 and IPv6
+ *             sockets, instead.
+ */
+int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc);
+
+int ast_netsock_sockfd(const struct ast_netsock *ns);
+
+const struct ast_sockaddr *ast_netsock_boundaddr(const struct ast_netsock *ns);
+
+void *ast_netsock_data(const struct ast_netsock *ns);
+
+void ast_netsock_unref(struct ast_netsock *ns);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif /* _ASTERISK_NETSOCK_H */
diff --git a/channels/iax2/netsock.c b/channels/iax2/netsock.c
new file mode 100644
index 000000000..8e2bd0e12
--- /dev/null
+++ b/channels/iax2/netsock.c
@@ -0,0 +1,201 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Kevin P. Fleming <kpfleming@digium.com>
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Network socket handling
+ *
+ * \author Kevin P. Fleming <kpfleming@digium.com>
+ * \author Mark Spencer <markster@digium.com>
+ */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#if !defined (__linux__) && !defined (__GNU__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
+#include <net/if_dl.h>
+#endif
+#endif
+
+#if defined (SOLARIS)
+#include <sys/sockio.h>
+#elif defined(HAVE_GETIFADDRS)
+#include <ifaddrs.h>
+#endif
+
+#include "include/netsock.h"
+#include "asterisk/netsock2.h"
+#include "asterisk/utils.h"
+#include "asterisk/astobj.h"
+
+struct ast_netsock {
+	ASTOBJ_COMPONENTS(struct ast_netsock);
+	struct ast_sockaddr bindaddr;
+	int sockfd;
+	int *ioref;
+	struct io_context *ioc;
+	void *data;
+};
+
+struct ast_netsock_list {
+	ASTOBJ_CONTAINER_COMPONENTS(struct ast_netsock);
+	struct io_context *ioc;
+};
+
+static void ast_netsock_destroy(struct ast_netsock *netsock)
+{
+	ast_io_remove(netsock->ioc, netsock->ioref);
+	close(netsock->sockfd);
+	ast_free(netsock);
+}
+
+struct ast_netsock_list *ast_netsock_list_alloc(void)
+{
+	return ast_calloc(1, sizeof(struct ast_netsock_list));
+}
+
+int ast_netsock_init(struct ast_netsock_list *list)
+{
+	memset(list, 0, sizeof(*list));
+	ASTOBJ_CONTAINER_INIT(list);
+
+	return 0;
+}
+
+int ast_netsock_release(struct ast_netsock_list *list)
+{
+	ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy);
+	ASTOBJ_CONTAINER_DESTROY(list);
+	ast_free(list);
+
+	return 0;
+}
+
+struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, struct ast_sockaddr *addr)
+{
+	struct ast_netsock *sock = NULL;
+
+	ASTOBJ_CONTAINER_TRAVERSE(list, !sock, {
+		ASTOBJ_RDLOCK(iterator);
+		if (!ast_sockaddr_cmp(&iterator->bindaddr, addr)) {
+			sock = iterator;
+		}
+		ASTOBJ_UNLOCK(iterator);
+	});
+
+	return sock;
+}
+
+struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc, struct ast_sockaddr *bindaddr, int tos, int cos, ast_io_cb callback, void *data)
+{
+	int netsocket = -1;
+	int *ioref;
+
+	struct ast_netsock *ns;
+	const int reuseFlag = 1;
+
+	/* Make a UDP socket */
+	netsocket = socket(ast_sockaddr_is_ipv6(bindaddr) ? AST_AF_INET6 : AST_AF_INET, SOCK_DGRAM, IPPROTO_IP);
+
+	if (netsocket < 0) {
+		ast_log(LOG_ERROR, "Unable to create network socket: %s\n", strerror(errno));
+		return NULL;
+	}
+	if (setsockopt(netsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&reuseFlag, sizeof reuseFlag) < 0) {
+		ast_log(LOG_WARNING, "Error setting SO_REUSEADDR on sockfd '%d'\n", netsocket);
+	}
+	if (ast_bind(netsocket, bindaddr)) {
+		ast_log(LOG_ERROR,
+			"Unable to bind to %s: %s\n",
+			ast_sockaddr_stringify(bindaddr),
+			strerror(errno));
+		close(netsocket);
+		return NULL;
+	}
+
+	ast_set_qos(netsocket, tos, cos, "IAX2");
+
+	ast_enable_packet_fragmentation(netsocket);
+
+	if (!(ns = ast_calloc(1, sizeof(*ns)))) {
+		close(netsocket);
+		return NULL;
+	}
+
+	/* Establish I/O callback for socket read */
+	if (!(ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns))) {
+		close(netsocket);
+		ast_free(ns);
+		return NULL;
+	}
+	ASTOBJ_INIT(ns);
+	ns->ioref = ioref;
+	ns->ioc = ioc;
+	ns->sockfd = netsocket;
+	ns->data = data;
+	ast_sockaddr_copy(&ns->bindaddr, bindaddr);
+	ASTOBJ_CONTAINER_LINK(list, ns);
+
+	return ns;
+}
+
+int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc)
+{
+	return ast_set_qos(sockfd, tos, cos, desc);
+}
+
+struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc, const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data)
+{
+	struct ast_sockaddr addr;
+
+	if (ast_sockaddr_parse(&addr, bindinfo, 0)) {
+
+		if (!ast_sockaddr_port(&addr)) {
+			ast_sockaddr_set_port(&addr, defaultport);
+		}
+
+		return ast_netsock_bindaddr(list, ioc, &addr, tos, cos, callback, data);
+	}
+
+	return NULL;
+}
+
+int ast_netsock_sockfd(const struct ast_netsock *ns)
+{
+	return ns ? ns-> sockfd : -1;
+}
+
+const struct ast_sockaddr *ast_netsock_boundaddr(const struct ast_netsock *ns)
+{
+	return &ns->bindaddr;
+}
+
+void *ast_netsock_data(const struct ast_netsock *ns)
+{
+	return ns->data;
+}
+
+void ast_netsock_unref(struct ast_netsock *ns)
+{
+	ASTOBJ_UNREF(ns, ast_netsock_destroy);
+}