X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=interface.c;h=712d3c520ca810e2bbb2f7982c4b451051e9a01f;hp=41e0dafd14399d50ad605e2936895ae0e665223a;hb=4059fe10c18e7ea7309198741f18cf71c6afc911;hpb=30c8631e52fcc309042f88e4cd93ee587968c1b6 diff --git a/interface.c b/interface.c index 41e0daf..712d3c5 100644 --- a/interface.c +++ b/interface.c @@ -27,6 +27,8 @@ #include #include +#include +#include #include #include #include "interface.h" @@ -34,16 +36,11 @@ #include "dns.h" #include "announce.h" -struct interface *cur_iface = NULL; - int interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len) { static size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1]; - static struct sockaddr_in a = { - .sin_family = AF_INET, - .sin_port = htons(MCAST_PORT), - }; + static struct sockaddr_in a; static struct msghdr m = { .msg_name = (struct sockaddr *) &a, .msg_namelen = sizeof(a), @@ -54,6 +51,8 @@ interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len) struct cmsghdr *cmsg; int fd = iface->fd.fd; + a.sin_family = AF_INET; + a.sin_port = htons(MCAST_PORT); m.msg_iov = iov; m.msg_iovlen = iov_len; @@ -71,59 +70,61 @@ interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len) return sendmsg(fd, &m, 0); } -static void interface_free(struct interface *iface) +static void interface_close(struct interface *iface) { - if (cur_iface == iface) - cur_iface = NULL; + if (iface->fd.fd < 0) + return; announce_free(iface); - if (iface->fd.fd >= 0) { - uloop_fd_delete(&iface->fd); - close(iface->fd.fd); - } - free(iface); + uloop_fd_delete(&iface->fd); + close(iface->fd.fd); + iface->fd.fd = -1; } -static void interface_start(struct interface *iface) +static void interface_free(struct interface *iface) { - cur_iface = iface; + interface_close(iface); + free(iface); } static void -iface_update_cb(struct vlist_tree *tree, struct vlist_node *node_new, - struct vlist_node *node_old) +read_socket(struct uloop_fd *u, unsigned int events) { - struct interface *iface; - - if (node_old) { - iface = container_of(node_old, struct interface, node); - interface_free(iface); + struct interface *iface = container_of(u, struct interface, fd); + static uint8_t buffer[8 * 1024]; + int len; + + if (u->eof) { + interface_close(iface); + uloop_timeout_set(&iface->reconnect, 1000); + return; } - if (node_new) { - iface = container_of(node_new, struct interface, node); - interface_start(iface); + len = read(u->fd, buffer, sizeof(buffer)); + if (len < 1) { + fprintf(stderr, "read failed: %s\n", strerror(errno)); + return; } + + dns_handle_packet(iface, buffer, len); } -int interface_socket_setup(struct interface *iface) +static int +interface_socket_setup(struct interface *iface) { struct ip_mreqn mreq; uint8_t ttl = 255; int yes = 1; int no = 0; struct sockaddr_in sa = { 0 }; - struct in_addr in; int fd = iface->fd.fd; - 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_address.s_addr = iface->v4_addr.s_addr; mreq.imr_multiaddr = sa.sin_addr; mreq.imr_ifindex = iface->ifindex; @@ -159,52 +160,100 @@ int interface_socket_setup(struct interface *iface) return 0; } -static const char* -get_iface_ipv4(const char *ifname) +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 int +get_iface_ipv4(struct interface *iface) { - static char buffer[INET_ADDRSTRLEN]; + struct sockaddr_in *sin; struct ifreq ir; - const char *ret; - int sock; + int sock, ret = -1; sock = socket(AF_INET, SOCK_DGRAM, 0); if (sock < 0) - return NULL; + return -1; memset(&ir, 0, sizeof(struct ifreq)); - strncpy(ir.ifr_name, ifname, sizeof(ir.ifr_name)); + strncpy(ir.ifr_name, iface->name, sizeof(ir.ifr_name)); - if (ioctl(sock, SIOCGIFADDR, &ir) < 0) - return NULL; + ret = ioctl(sock, SIOCGIFADDR, &ir); + if (ret < 0) + goto out; - ret = inet_ntop(AF_INET, &((struct sockaddr_in *) &ir.ifr_addr)->sin_addr, buffer, sizeof(buffer)); - close(sock); + sin = (struct sockaddr_in *) &ir.ifr_addr; + memcpy(&iface->v4_addr, &sin->sin_addr, sizeof(iface->v4_addr)); +out: + close(sock); return ret; } int interface_add(const char *name) { struct interface *iface; - const char *ip_str; - char *name_buf, *ip_buf; - - ip_str = get_iface_ipv4(name); - if (!ip_str) - return -1; + char *name_buf; iface = calloc_a(sizeof(*iface), - &name_buf, strlen(name) + 1, - &ip_buf, strlen(ip_str) + 1); + &name_buf, strlen(name) + 1); iface->name = strcpy(name_buf, name); - iface->ip = strcpy(ip_buf, ip_str); iface->ifindex = if_nametoindex(name); iface->fd.fd = -1; if (iface->ifindex <= 0) goto error; + if (get_iface_ipv4(iface)) + goto error; + vlist_add(&interfaces, &iface->node, name); return 0;