* Rework some Browsing/Resolving stuff

[catta] / avahi-core / socket.c

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index e59c78a6fd4167ef17ff5319a5d323ccfe461161..b9e1b71ff3b385f4d2b1b55317ffcc191aa1e2dd 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -61,8 +61,29 @@ static void mdns_mcast_group_ipv6(struct sockaddr_in6 *ret_sa) {
     inet_pton(AF_INET6, "ff02::fb", &ret_sa->sin6_addr);
 }
 
-int avahi_mdns_mcast_join_ipv4 (int index, int fd)
-{
+static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, guint16 port) {
+    g_assert(ret_sa);
+    g_assert(a);
+    g_assert(port > 0);
+
+    memset(ret_sa, 0, sizeof(struct sockaddr_in));
+    ret_sa->sin_family = AF_INET;
+    ret_sa->sin_port = htons(port);
+    memcpy(&ret_sa->sin_addr, a, sizeof(AvahiIPv4Address));
+}
+
+static void ipv6_address_to_sockaddr(struct sockaddr_in6 *ret_sa, const AvahiIPv6Address *a, guint16 port) {
+    g_assert(ret_sa);
+    g_assert(a);
+    g_assert(port > 0);
+
+    memset(ret_sa, 0, sizeof(struct sockaddr_in6));
+    ret_sa->sin6_family = AF_INET6;
+    ret_sa->sin6_port = htons(port);
+    memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
+}
+
+int avahi_mdns_mcast_join_ipv4 (int index, int fd) {
     struct ip_mreqn mreq; 
     struct sockaddr_in sa;
 
@@ -80,8 +101,7 @@ int avahi_mdns_mcast_join_ipv4 (int index, int fd)
     return 0;
 }
 
-int avahi_mdns_mcast_join_ipv6 (int index, int fd)
-{
+int avahi_mdns_mcast_join_ipv6 (int index, int fd) {
     struct ipv6_mreq mreq6; 
     struct sockaddr_in6 sa6;
 
@@ -99,8 +119,7 @@ int avahi_mdns_mcast_join_ipv6 (int index, int fd)
     return 0;
 }
 
-int avahi_mdns_mcast_leave_ipv4 (int index, int fd)
-{
+int avahi_mdns_mcast_leave_ipv4 (int index, int fd) {
     struct ip_mreqn mreq; 
     struct sockaddr_in sa;
     
@@ -118,8 +137,7 @@ int avahi_mdns_mcast_leave_ipv4 (int index, int fd)
     return 0;
 }
 
-int avahi_mdns_mcast_leave_ipv6 (int index, int fd)
-{
+int avahi_mdns_mcast_leave_ipv6 (int index, int fd) {
     struct ipv6_mreq mreq6; 
     struct sockaddr_in6 sa6;
 
@@ -313,7 +331,7 @@ static gint sendmsg_loop(gint fd, struct msghdr *msg, gint flags) {
     return 0;
 }
 
-gint avahi_send_dns_packet_ipv4(gint fd, gint interface, AvahiDnsPacket *p) {
+gint avahi_send_dns_packet_ipv4(gint fd, gint interface, AvahiDnsPacket *p, const AvahiIPv4Address *a, guint16 port) {
     struct sockaddr_in sa;
     struct msghdr msg;
     struct iovec io;
@@ -324,8 +342,12 @@ gint avahi_send_dns_packet_ipv4(gint fd, gint interface, AvahiDnsPacket *p) {
     g_assert(fd >= 0);
     g_assert(p);
     g_assert(avahi_dns_packet_check_valid(p) >= 0);
+    g_assert(!a || port > 0);
 
-    mdns_mcast_group_ipv4(&sa);
+    if (!a)
+        mdns_mcast_group_ipv4(&sa);
+    else
+        ipv4_address_to_sockaddr(&sa, a, port);
 
     memset(&io, 0, sizeof(io));
     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
@@ -352,7 +374,7 @@ gint avahi_send_dns_packet_ipv4(gint fd, gint interface, AvahiDnsPacket *p) {
     return sendmsg_loop(fd, &msg, MSG_DONTROUTE);
 }
 
-gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p) {
+gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p, const AvahiIPv6Address *a, guint16 port) {
     struct sockaddr_in6 sa;
     struct msghdr msg;
     struct iovec io;
@@ -364,7 +386,10 @@ gint avahi_send_dns_packet_ipv6(gint fd, gint interface, AvahiDnsPacket *p) {
     g_assert(p);
     g_assert(avahi_dns_packet_check_valid(p) >= 0);
 
-    mdns_mcast_group_ipv6(&sa);
+    if (!a)
+        mdns_mcast_group_ipv6(&sa);
+    else
+        ipv6_address_to_sockaddr(&sa, a, port);
 
     memset(&io, 0, sizeof(io));
     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
@@ -395,7 +420,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
     AvahiDnsPacket *p= NULL;
     struct msghdr msg;
     struct iovec io;
-    uint8_t aux[64];
+    uint8_t aux[1024];
     ssize_t l;
     struct cmsghdr *cmsg;
     gboolean found_ttl = FALSE, found_iface = FALSE;
@@ -419,25 +444,42 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
     msg.msg_controllen = sizeof(aux);
     msg.msg_flags = 0;
     
-    if ((l = recvmsg(fd, &msg, 0)) < 0)
+    if ((l = recvmsg(fd, &msg, 0)) < 0) {
+        g_warning("recvmsg(): %s\n", strerror(errno));
         goto fail;
+    }
 
+    if (ret_sa->sin_addr.s_addr == INADDR_ANY) {
+        /* Linux 2.4 behaves very strangely sometimes! */
+        goto fail;
+    }
+    
+    g_assert(!(msg.msg_flags & MSG_CTRUNC));
+    g_assert(!(msg.msg_flags & MSG_TRUNC));
     p->size = (size_t) l;
     
     *ret_ttl = 0;
+
+/*     avahi_hexdump(msg.msg_control, msg.msg_controllen); */
         
-    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg,cmsg)) {
-        if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) {
-            *ret_ttl = *(uint8_t *) CMSG_DATA(cmsg);
-            found_ttl = TRUE;
-        }
+    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+
+/*         avahi_hexdump(CMSG_DATA(cmsg), cmsg->cmsg_len - sizeof(struct cmsghdr)); */
+        
+        if (cmsg->cmsg_level == SOL_IP) {
             
-        if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO) {
-            *ret_iface = ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex;
-            found_iface = TRUE;
+            if (cmsg->cmsg_type == IP_TTL) {
+                *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
+                found_ttl = TRUE;
+            } else if (cmsg->cmsg_type == IP_PKTINFO) {
+                *ret_iface = (gint) ((struct in_pktinfo*) CMSG_DATA(cmsg))->ipi_ifindex;
+                found_iface = TRUE;
+            }
         }
     }
 
+/*     g_message("ttl=%u iface=%i", *ret_ttl, *ret_iface); */
+
     g_assert(found_iface);
     g_assert(found_ttl);
 
@@ -487,7 +529,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6 *ret_sa,
 
     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
         if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) {
-            *ret_ttl = *(uint8_t *) CMSG_DATA(cmsg);
+            *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
             found_ttl = TRUE;
         }