#include <libubox/uloop.h>
#include <libubox/avl-cmp.h>
#include <libubox/utils.h>
+#include "cache.h"
#include "interface.h"
#include "util.h"
#include "dns.h"
#include "service.h"
static int
-interface_send_packet4(struct interface *iface, struct iovec *iov, int iov_len)
+interface_send_packet4(struct interface *iface, struct sockaddr_in *to, 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;
pkti = (struct in_pktinfo*) CMSG_DATA(cmsg);
pkti->ipi_ifindex = iface->ifindex;
- a.sin_addr.s_addr = inet_addr(MCAST_ADDR);
+ if (iface->multicast) {
+ a.sin_addr.s_addr = inet_addr(MCAST_ADDR);
+ if (to)
+ fprintf(stderr, "Ignoring IPv4 address for multicast interface\n");
+ } else {
+ a.sin_addr.s_addr = to->sin_addr.s_addr;
+ }
return sendmsg(fd, &m, 0);
}
static int
-interface_send_packet6(struct interface *iface, struct iovec *iov, int iov_len)
+interface_send_packet6(struct interface *iface, struct sockaddr_in6 *to, struct iovec *iov, int iov_len)
{
static size_t cmsg_data[( CMSG_SPACE(sizeof(struct in6_pktinfo)) / sizeof(size_t)) + 1];
static struct sockaddr_in6 a;
pkti = (struct in6_pktinfo*) CMSG_DATA(cmsg);
pkti->ipi6_ifindex = iface->ifindex;
- inet_pton(AF_INET6, MCAST_ADDR6, &a.sin6_addr);
+ if (iface->multicast) {
+ inet_pton(AF_INET6, MCAST_ADDR6, &a.sin6_addr);
+ if (to)
+ fprintf(stderr, "Ignoring IPv6 address for multicast interface\n");
+ } else {
+ a.sin6_addr = to->sin6_addr;
+ }
return sendmsg(fd, &m, 0);
}
int
-interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len)
+interface_send_packet(struct interface *iface, struct sockaddr *to, struct iovec *iov, int iov_len)
{
+ if (!iface->multicast && !to) {
+ fprintf(stderr, "No IP address specified for unicast interface\n");
+ errno = EINVAL;
+ return -1;
+ }
+
if (debug > 1) {
fprintf(stderr, "TX ipv%d: %s\n", iface->v6 * 2 + 4, iface->name);
fprintf(stderr, " multicast: %d\n", iface->multicast);
}
if (iface->v6)
- return interface_send_packet6(iface, iov, iov_len);
+ return interface_send_packet6(iface, (struct sockaddr_in6 *)to, iov, iov_len);
- return interface_send_packet4(iface, iov, iov_len);
+ return interface_send_packet4(iface, (struct sockaddr_in *)to, iov, iov_len);
}
static void interface_close(struct interface *iface)
static void interface_free(struct interface *iface)
{
+ uloop_timeout_cancel(&iface->reconnect);
interface_close(iface);
free(iface);
}
}
}
- if (ttl != 255)
- return;
-
if (debug > 1) {
char buf[256];
fprintf(stderr, "RX ipv4: %s\n", iface->name);
fprintf(stderr, " multicast: %d\n", iface->multicast);
inet_ntop(AF_INET, &from.sin_addr, buf, 256);
- fprintf(stderr, " src %s:%d\n", buf, from.sin_port);
+ fprintf(stderr, " src %s:%d\n", buf, ntohs(from.sin_port));
inet_ntop(AF_INET, &inp->ipi_spec_dst, buf, 256);
fprintf(stderr, " dst %s\n", buf);
inet_ntop(AF_INET, &inp->ipi_addr, buf, 256);
if (inp->ipi_ifindex != iface->ifindex)
fprintf(stderr, "invalid iface index %d != %d\n", ifindex, iface->ifindex);
else if (!interface_valid_src((void *) &iface->v4_addr, (void *) &iface->v4_netmask, (void *) &from.sin_addr, 4))
- dns_handle_packet(iface, (struct sockaddr *) &from, from.sin_port, buffer, len);
+ dns_handle_packet(iface, (struct sockaddr *) &from, ntohs(from.sin_port), buffer, len);
}
static void
}
}
- if (ttl != 255)
- return;
-
if (debug > 1) {
char buf[256];
fprintf(stderr, "RX ipv6: %s\n", iface->name);
fprintf(stderr, " multicast: %d\n", iface->multicast);
inet_ntop(AF_INET6, &from.sin6_addr, buf, 256);
- fprintf(stderr, " src %s:%d\n", buf, from.sin6_port);
+ fprintf(stderr, " src %s:%d\n", buf, ntohs(from.sin6_port));
inet_ntop(AF_INET6, &inp->ipi6_addr, buf, 256);
fprintf(stderr, " dst %s\n", buf);
}
if (inp->ipi6_ifindex != iface->ifindex)
fprintf(stderr, "invalid iface index %d != %d\n", ifindex, iface->ifindex);
else if (!interface_valid_src((void *) &iface->v6_addr, (void *) &iface->v6_netmask, (void *) &from.sin6_addr, 16))
- dns_handle_packet(iface, (struct sockaddr *) &from, from.sin6_port, buffer, len);
+ dns_handle_packet(iface, (struct sockaddr *) &from, ntohs(from.sin6_port), buffer, len);
}
static int
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));
+ fprintf(stderr, "failed to join multicast group: %m\n");
close(fd);
fd = -1;
return -1;
setsockopt(fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq));
if (setsockopt(fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
- fprintf(stderr, "failed to join multicast group: %s\n", strerror(errno));
+ fprintf(stderr, "failed to join multicast group: %m\n");
close(fd);
fd = -1;
return -1;
reconnect_socket4(struct uloop_timeout *timeout)
{
struct interface *iface = container_of(timeout, struct interface, reconnect);
+ int ttl = 255;
int yes = 1;
iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK | USOCK_IPV4ONLY,
(iface->multicast) ? (iface->mcast_addr) : (iface->v4_addrs), "5353");
if (iface->fd.fd < 0) {
- fprintf(stderr, "failed to add listener %s: %s\n", iface->mcast_addr, strerror(errno));
+ fprintf(stderr, "failed to add listener %s: %m\n", iface->mcast_addr);
goto retry;
}
if (setsockopt(iface->fd.fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0)
fprintf(stderr, "ioctl failed: SO_REUSEADDR\n");
+ if (setsockopt(iface->fd.fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) < 0)
+ fprintf(stderr, "ioctl failed: IP_TTL\n");
+
if (setsockopt(iface->fd.fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0)
fprintf(stderr, "ioctl failed: IP_RECVTTL\n");
uloop_fd_add(&iface->fd, ULOOP_READ);
if (iface->multicast) {
- dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR, 1);
+ dns_send_question(iface, NULL, C_DNS_SD, TYPE_PTR, 0);
announce_init(iface);
}
snprintf(mcast_addr, sizeof(mcast_addr), "%s%%%s", (iface->multicast) ? (iface->mcast_addr) : (iface->v6_addrs), iface->name);
iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK | USOCK_IPV6ONLY, mcast_addr, "5353");
if (iface->fd.fd < 0) {
- fprintf(stderr, "failed to add listener %s: %s\n", mcast_addr, strerror(errno));
+ fprintf(stderr, "failed to add listener %s: %m\n", mcast_addr);
goto retry;
}
uloop_fd_add(&iface->fd, ULOOP_READ);
if (iface->multicast) {
- dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR, 1);
+ dns_send_question(iface, NULL, C_DNS_SD, TYPE_PTR, 0);
announce_init(iface);
}
if (node_old) {
iface = container_of(node_old, struct interface, node);
+ cache_cleanup(iface);
interface_free(iface);
}
vlist_for_each_element(&interfaces, iface, node)
if (iface->fd.fd > 0 && iface->multicast) {
- service_announce(iface, 0);
- service_reply_a(iface, 0);
+ dns_reply_a(iface, NULL, 0);
+ service_announce_services(iface, NULL, 0);
}
vlist_for_each_element(&interfaces, iface, node)
interface_close(iface);
projects / project / mdnsd.git / blobdiff