}
static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, guint16 port) {
}
static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, guint16 port) {
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
memset(&mreq, 0, sizeof(mreq));
mreq.imr_multiaddr = sa.sin_addr;
if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
memset(&mreq6, 0, sizeof(mreq6));
mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
}
gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p, const AvahiIPv6Address *a, guint16 port) {
}
gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p, const AvahiIPv6Address *a, guint16 port) {
-AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, gint *ret_iface, guint8* ret_ttl) {
+AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa, AvahiIPv4Address *ret_dest_address, gint *ret_iface, guint8* ret_ttl) {
/* Linux 2.4 behaves very strangely sometimes! */
avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l);
/* Linux 2.4 behaves very strangely sometimes! */
avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l);
- *ret_iface = (gint) ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex;
+ struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
+ *ret_iface = (gint) i->ipi_ifindex;
+ ret_dest_address->address = i->ipi_addr.s_addr;
-AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa, gint *ret_iface, guint8* ret_ttl) {
+AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa, AvahiIPv6Address *ret_dest_address, gint *ret_iface, guint8* ret_ttl) {
- *ret_iface = ((struct in6_pktinfo*) CMSG_DATA(cmsg))->ipi6_ifindex;
+ struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg);
+ *ret_iface = i->ipi6_ifindex;
+ memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);