From c8efd420daed1cae3c46877847aaf05a5b9deb66 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Jun 2014 22:20:33 +0200
Subject: [PATCH] make interface_socket_setup static

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 interface.c | 103 ++++++++++++++++++++++++++++++------------------------------
 interface.h |   1 -
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/interface.c b/interface.c
index b5022a7..01aeaa7 100644
--- a/interface.c
+++ b/interface.c
@@ -110,57 +110,8 @@ read_socket(struct uloop_fd *u, unsigned int events)
 	dns_handle_packet(iface, buffer, len);
 }
 
-static void
-reconnect_socket(struct uloop_timeout *timeout)
-{
-	struct interface *iface = container_of(timeout, struct interface, reconnect);
-
-	iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
-	if (iface->fd.fd < 0) {
-		fprintf(stderr, "failed to add listener: %s\n", strerror(errno));
-		goto retry;
-	}
-
-	if (interface_socket_setup(iface)) {
-		iface->fd.fd = -1;
-		goto retry;
-	}
-
-	uloop_fd_add(&iface->fd, ULOOP_READ);
-	dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR);
-	announce_init(iface);
-	return;
-
-retry:
-	uloop_timeout_set(timeout, 1000);
-}
-
-
-static void interface_start(struct interface *iface)
-{
-	iface->fd.cb = read_socket;
-	iface->reconnect.cb = reconnect_socket;
-	uloop_timeout_set(&iface->reconnect, 100);
-}
-
-static void
-iface_update_cb(struct vlist_tree *tree, struct vlist_node *node_new,
-		struct vlist_node *node_old)
-{
-	struct interface *iface;
-
-	if (node_old) {
-		iface = container_of(node_old, struct interface, node);
-		interface_free(iface);
-	}
-
-	if (node_new) {
-		iface = container_of(node_new, struct interface, node);
-		interface_start(iface);
-	}
-}
-
-int interface_socket_setup(struct interface *iface)
+static int
+interface_socket_setup(struct interface *iface)
 {
 	struct ip_mreqn mreq;
 	uint8_t ttl = 255;
@@ -213,6 +164,56 @@ int interface_socket_setup(struct interface *iface)
 	return 0;
 }
 
+static void
+reconnect_socket(struct uloop_timeout *timeout)
+{
+	struct interface *iface = container_of(timeout, struct interface, reconnect);
+
+	iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
+	if (iface->fd.fd < 0) {
+		fprintf(stderr, "failed to add listener: %s\n", strerror(errno));
+		goto retry;
+	}
+
+	if (interface_socket_setup(iface)) {
+		iface->fd.fd = -1;
+		goto retry;
+	}
+
+	uloop_fd_add(&iface->fd, ULOOP_READ);
+	dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR);
+	announce_init(iface);
+	return;
+
+retry:
+	uloop_timeout_set(timeout, 1000);
+}
+
+
+static void interface_start(struct interface *iface)
+{
+	iface->fd.cb = read_socket;
+	iface->reconnect.cb = reconnect_socket;
+	uloop_timeout_set(&iface->reconnect, 100);
+}
+
+static void
+iface_update_cb(struct vlist_tree *tree, struct vlist_node *node_new,
+		struct vlist_node *node_old)
+{
+	struct interface *iface;
+
+	if (node_old) {
+		iface = container_of(node_old, struct interface, node);
+		interface_free(iface);
+	}
+
+	if (node_new) {
+		iface = container_of(node_new, struct interface, node);
+		interface_start(iface);
+	}
+}
+
 static const char*
 get_iface_ipv4(const char *ifname)
 {
diff --git a/interface.h b/interface.h
index b9ecd8a..5250e96 100644
--- a/interface.h
+++ b/interface.h
@@ -39,6 +39,5 @@ struct interface {
 
 int interface_add(const char *name);
 int interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len);
-int interface_socket_setup(struct interface *iface);
 
 #endif
-- 
2.11.0