move signal_setup() to main.c

[project/mdnsd.git] / util.c

diff --git a/util.c b/util.c
index 1708a40..e68e9c9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -33,22 +33,11 @@
 #include "dns.h"
 #include "util.h"
 
+uint8_t mdns_buf[MDNS_BUF_LEN];
 int debug = 0;
-struct uloop_fd listener;
 
-static void
-signal_shutdown(int signal)
-{
-       uloop_end();
-}
-
-void
-signal_setup(void)
-{
-       signal(SIGPIPE, SIG_IGN);
-       signal(SIGTERM, signal_shutdown);
-       signal(SIGKILL, signal_shutdown);
-}
+char mdns_hostname[HOSTNAME_LEN];
+char mdns_hostname_local[HOSTNAME_LEN + 6];
 
 uint32_t
 rand_time_delta(uint32_t t)
@@ -73,119 +62,22 @@ rand_time_delta(uint32_t t)
        return val;
 }
 
-const char*
-get_iface_ipv4(const char *ifname)
+void get_hostname(void)
 {
-       static char buffer[INET_ADDRSTRLEN];
-       struct ifreq ir;
-       const char *ret;
-       int sock;
-
-       sock = socket(AF_INET, SOCK_DGRAM, 0);
-       if (sock < 0)
-               return NULL;
-
-       memset(&ir, 0, sizeof(struct ifreq));
-
-       strncpy(ir.ifr_name, ifname, sizeof(ir.ifr_name));
-
-       if (ioctl(sock, SIOCGIFADDR, &ir) < 0)
-               return NULL;
-
-       ret = inet_ntop(AF_INET, &((struct sockaddr_in *) &ir.ifr_addr)->sin_addr, buffer, sizeof(buffer));
-       close(sock);
-
-       return ret;
-}
-
-int
-get_iface_index(const char *ifname)
-{
-       struct ifreq ir;
-       int sock;
-
-       sock = socket(AF_INET, SOCK_DGRAM, 0);
-       if (sock < 0)
-               return 0;
+       struct utsname utsname;
 
-       memset(&ir, 0, sizeof(struct ifreq));
-
-       strncpy(ir.ifr_name, ifname, sizeof(ir.ifr_name));
-
-       if (ioctl(sock, SIOCGIFINDEX, &ir) < 0)
-               return 0;
-
-       close(sock);
-
-       return ir.ifr_ifindex;
-}
-
-char*
-get_hostname(void)
-{
-       static struct utsname utsname;
+       mdns_hostname[0] = 0;
+       mdns_hostname_local[0] = 0;
 
        if (uname(&utsname) < 0)
-               return NULL;
-
-       return utsname.nodename;
-}
-
-int
-socket_setup(int fd, const char *ip)
-{
-       struct ip_mreqn mreq;
-       uint8_t ttl = 255;
-       int yes = 1;
-       int no = 0;
-       struct sockaddr_in sa = { 0 };
-       struct in_addr in;
-
-       inet_aton(iface_ip, &in);
-
-       sa.sin_family = AF_INET;
-       sa.sin_port = htons(MCAST_PORT);
-       inet_pton(AF_INET, MCAST_ADDR, &sa.sin_addr);
-
-       memset(&mreq, 0, sizeof(mreq));
-       mreq.imr_address.s_addr = in.s_addr;
-       mreq.imr_multiaddr = sa.sin_addr;
-       mreq.imr_ifindex = iface_index;
-
-       if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0)
-               fprintf(stderr, "ioctl failed: IP_MULTICAST_TTL\n");
-
-       if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0)
-               fprintf(stderr, "ioctl failed: SO_REUSEADDR\n");
-
-       /* Some network drivers have issues with dropping membership of
-        * mcast groups when the iface is down, but don't allow rejoining
-        * when it comes back up. This is an ugly workaround
-        * -- this was copied from avahi --
-        */
-       setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq));
-
-       if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-               fprintf(stderr, "failed to join multicast group: %s\n", strerror(errno));
-               close(fd);
-               fd = -1;
-               return -1;
-       }
-
-       if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0)
-               fprintf(stderr, "ioctl failed: IP_RECVTTL\n");
-
-       if (setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0)
-               fprintf(stderr, "ioctl failed: IP_PKTINFO\n");
-
-       if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &no, sizeof(no)) < 0)
-               fprintf(stderr, "ioctl failed: IP_MULTICAST_LOOP\n");
+               return;
 
-       return 0;
+       snprintf(mdns_hostname, sizeof(mdns_hostname), "%s", utsname.nodename);
+       snprintf(mdns_hostname_local, sizeof(mdns_hostname_local), "%s.local", utsname.nodename);
 }
 
 void*
-memdup(void *d, int l)
+memdup(const void *d, int l)
 {
        void *r = malloc(l);
        if (!r)