* change setsocktopt for IP_TTL to use an int instead of an uin8_t for compatibility...

[catta] / avahi-core / socket.c

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index ef7bca062d89d6b4927a90b361fabc36cf908f55..ef421c9f2218ce944cb882d856f3da2f97374db6 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -147,9 +147,28 @@ int avahi_mdns_mcast_join_ipv6(int fd, int idx, int join) {
     return 0;
 }
 
-static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
+static int reuseaddr(int fd) {
     int yes;
     
+    yes = 1;
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno));
+        return -1;
+    }
+    
+#ifdef SO_REUSEPORT
+    yes = 1;
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno));
+        return -1;
+    }
+#endif
+    
+    return 0;
+}
+
+static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
+    
     assert(fd >= 0);
     assert(sa);
     assert(l > 0);
@@ -165,12 +184,9 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
                        sa->sa_family == AF_INET ? "IPv4" : "IPv6");
 
         /* Try again, this time with SO_REUSEADDR set */
-        yes = 1;
-        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
-            avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno));
+        if (reuseaddr(fd) < 0)
             return -1;
-        }
-
+        
         if (bind(fd, sa, l) < 0) {
             avahi_log_warn("bind() failed: %s", strerror(errno));
             return -1;
@@ -181,49 +197,103 @@ static int bind_with_warn(int fd, const struct sockaddr *sa, socklen_t l) {
          * user may run other mDNS implementations if he really
          * wants. */
         
-        yes = 1;
-        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
-            avahi_log_warn("SO_REUSEADDR failed: %s", strerror(errno));
+        if (reuseaddr(fd) < 0)
             return -1;
-        }
     }
 
     return 0;
 }
 
-static int ip_pktinfo (int fd, int yes)
-{
-    int ret = -1;
-
+static int ipv4_pktinfo(int fd) {
+    int yes;
+    
 #ifdef IP_PKTINFO
-    if ((ret = setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes))) < 0) {
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IP_PKTINFO failed: %s", strerror(errno));
+        return -1;
     }
 #else
+    
 #ifdef IP_RECVINTERFACE
-    if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof (yes))) < 0) {
+    yes = 1;
+    if (setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IP_RECVINTERFACE failed: %s", strerror(errno));
+        return -1;
     }
-#else
-#ifdef IP_RECVIF
-    if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof (yes))) < 0) {
+#elif defined(IP_RECVIF)
+    yes = 1;
+    if (setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IP_RECVIF failed: %s", strerror(errno));
+        return -1;
     }
-#endif /* IP_RECVIF */
-#endif /* IP_RECVINTERFACE */
-#if defined (IP_RECVDSTADDR) /* && !defined(solaris) */
-    if ((ret = setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof (yes))) < 0) {
+#endif
+    
+#ifdef IP_RECVDSTADDR
+    yes = 1;
+    if (setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof(yes)) < 0) {
         avahi_log_warn("IP_RECVDSTADDR failed: %s", strerror(errno));
+        return -1;
     }
-#endif /* IP_RECVDSTADDR */
+#endif
+    
 #endif /* IP_PKTINFO */
 
-    return (ret);
+#ifdef IP_RECVTTL
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno));
+        return -1;
+    }
+#endif
+
+    return 0;
+}
+
+static int ipv6_pktinfo(int fd) {
+    int yes;
+    
+#ifdef IPV6_RECVPKTINFO
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno));
+        return -1;
+    }
+#elif defined(IPV6_PKTINFO)
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
+        return -1;
+    }
+#endif
+
+#ifdef IPV6_RECVHOPS
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno));
+        return -1;
+    }
+#elif defined(IPV6_RECVHOPLIMIT)
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
+        return -1;
+    }
+#elif defined(IPV6_HOPLIMIT)
+    yes = 1;
+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
+        avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
+        return -1;
+    }
+#endif
+
+    return 0;
 }
 
 int avahi_open_socket_ipv4(int no_reuse) {
     struct sockaddr_in local;
-    int fd = -1, ttl, yes, r;
+    int fd = -1, r, ittl;
+    uint8_t ttl, cyes;
         
     if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
         avahi_log_warn("socket() failed: %s", strerror(errno));
@@ -236,14 +306,14 @@ int avahi_open_socket_ipv4(int no_reuse) {
         goto fail;
     }
 
-    ttl = 255;
-    if (setsockopt(fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) < 0) {
+    ittl = 255;
+    if (setsockopt(fd, IPPROTO_IP, IP_TTL, &ittl, sizeof(ittl)) < 0) {
         avahi_log_warn("IP_TTL failed: %s", strerror(errno));
         goto fail;
     }
     
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
+    cyes = 1;
+    if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &cyes, sizeof(cyes)) < 0) {
         avahi_log_warn("IP_MULTICAST_LOOP failed: %s", strerror(errno));
         goto fail;
     }
@@ -260,16 +330,8 @@ int avahi_open_socket_ipv4(int no_reuse) {
     if (r < 0)
         goto fail;
 
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno));
-        goto fail;
-    }
-
-    yes = 1;
-    if (ip_pktinfo (fd, yes) < 0) {
+    if (ipv4_pktinfo (fd) < 0)
          goto fail;
-    }
 
     if (avahi_set_cloexec(fd) < 0) {
         avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));
@@ -292,7 +354,8 @@ fail:
 
 int avahi_open_socket_ipv6(int no_reuse) {
     struct sockaddr_in6 sa, local;
-    int fd = -1, ttl, yes, r;
+    int fd = -1, yes, r;
+    int ttl;
 
     mdns_mcast_group_ipv6(&sa);
         
@@ -337,39 +400,8 @@ int avahi_open_socket_ipv6(int no_reuse) {
     if (r < 0)
         goto fail;
 
-#ifdef IPV6_RECVHOPS
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno));
-        goto fail;
-    }
-#elif IPV6_RECVHOPLIMIT
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
-        goto fail;
-    }
-#elif IPV6_HOPLIMIT
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
-        goto fail;
-    }
-#endif
-
-#ifdef IPV6_RECVPKTINFO
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno));
+    if (ipv6_pktinfo(fd) < 0)
         goto fail;
-    }
-#elif IPV6_PKTINFO
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
-        goto fail;
-    }
-#endif
     
     if (avahi_set_cloexec(fd) < 0) {
         avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));
@@ -440,28 +472,30 @@ int avahi_send_dns_packet_ipv4(int fd, int interface, AvahiDnsPacket *p, const A
     msg.msg_iov = &io;
     msg.msg_iovlen = 1;
     msg.msg_flags = 0;
+    msg.msg_control = NULL;
+    msg.msg_controllen = 0;
 
 #ifdef IP_PKTINFO
     if (interface >= 0) {
+        struct in_pktinfo *pkti;
+        
         memset(cmsg_data, 0, sizeof(cmsg_data));
         cmsg = (struct cmsghdr*) cmsg_data;
         cmsg->cmsg_len = sizeof(cmsg_data);
         cmsg->cmsg_level = IPPROTO_IP;
-       {
-         struct in_pktinfo *pkti;
+        cmsg->cmsg_type = IP_PKTINFO;
+
+        pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
+        pkti->ipi_ifindex = interface;
 
-         cmsg->cmsg_type = IP_PKTINFO;
-         pkti = (struct in_pktinfo*) (cmsg_data + sizeof(struct cmsghdr));
-         pkti->ipi_ifindex = interface;
-       }
         msg.msg_control = cmsg_data;
         msg.msg_controllen = sizeof(cmsg_data);
-    } else {
-        msg.msg_control = NULL;
-        msg.msg_controllen = 0;
     }
 #endif
 
+    /** FIXME: We need some code to set the outgoing interface here if
+     * IP_PKTINFO is not available */
+    
     return sendmsg_loop(fd, &msg, 0);
 }
 
@@ -522,7 +556,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A
     uint8_t aux[1024];
     ssize_t l;
     struct cmsghdr *cmsg;
-    int found_ttl = 0, found_iface = 0, found_addr = 0;
+    int found_iface = 0, found_addr = 0;
     int ms;
 
     assert(fd >= 0);
@@ -568,61 +602,65 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in *ret_sa, A
     p->size = (size_t) l;
 
     if (ret_ttl)
-        *ret_ttl = 0;
-
+        *ret_ttl = 255;
+    
     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-
+        
         if (cmsg->cmsg_level == IPPROTO_IP) {
-         switch (cmsg->cmsg_type) {
+            switch (cmsg->cmsg_type) {
 #ifdef IP_RECVTTL
-         case IP_RECVTTL:
+                case IP_RECVTTL:
 #endif
-         case IP_TTL:
-           if (ret_ttl)
-             *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
-           found_ttl = 1;
-           break;
+                case IP_TTL:
+                    if (ret_ttl)
+                        *ret_ttl = (uint8_t) (*(int *) CMSG_DATA(cmsg));
+
+                    break;
+
 #ifdef IP_PKTINFO
-         case IP_PKTINFO:
-           {
-             struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
-             
-             if (ret_iface)
-               *ret_iface = (int) i->ipi_ifindex;
-             
-             if (ret_dest_address)
-               ret_dest_address->address = i->ipi_addr.s_addr;
-             found_addr = found_iface = 1;
-           }
-           break;
-#elif IP_RECVIF
-         case IP_RECVIF:
-           {
-             struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg);
-
-             if (ret_iface)
-               *ret_iface = (int) sdl->sdl_index;
-             found_iface = 1;
-           }
-           break;
-#endif 
+                case IP_PKTINFO: {
+                    struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg);
+                    
+                    if (ret_iface)
+                        *ret_iface = (int) i->ipi_ifindex;
+                    
+                    if (ret_dest_address)
+                        ret_dest_address->address = i->ipi_addr.s_addr;
+                    
+                    found_addr = found_iface = 1;
+
+                    break;
+                }
+#elif defined(IP_RECVIF)
+                case IP_RECVIF: {
+                    struct sockaddr_dl *sdl = (struct sockaddr_dl *) CMSG_DATA (cmsg);
+                    
+                    if (ret_iface)
+                        *ret_iface = (int) sdl->sdl_index;
+                    
+                    found_iface = 1;
+                    break;
+                }
+#endif
+            
 #ifdef IP_RECVDSTADDR
-         case IP_RECVDSTADDR:
-           if (ret_dest_address)
-             memcpy (&ret_dest_address->address, CMSG_DATA (cmsg), 4);
-           found_addr = 1;
-           break;
+                case IP_RECVDSTADDR:
+                    if (ret_dest_address)
+                        memcpy(&ret_dest_address->address, CMSG_DATA (cmsg), 4);
+                    found_addr = 1;
+                    break;
+                    
 #endif
-         default:
-           avahi_log_warn("Unhandled cmsg_type : %d",cmsg->cmsg_type);
-           break;
-         }
+                    
+                default:
+                    avahi_log_warn("Unhandled cmsg_type : %d", cmsg->cmsg_type);
+                    break;
+            }
         }
     }
 
     assert(found_iface);
     assert(found_addr);
-    assert(found_ttl);
 
     return p;
 
@@ -698,6 +736,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6 *ret_sa,
 
             if (ret_dest_address)
                 memcpy(ret_dest_address->address, i->ipi6_addr.s6_addr, 16);
+            
             found_iface = 1;
         }
     }
@@ -716,7 +755,7 @@ fail:
 
 int avahi_open_unicast_socket_ipv4(void) {
     struct sockaddr_in local;
-    int fd = -1, yes;
+    int fd = -1;
         
     if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
         avahi_log_warn("socket() failed: %s", strerror(errno));
@@ -731,14 +770,7 @@ int avahi_open_unicast_socket_ipv4(void) {
         goto fail;
     }
 
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IP, IP_RECVTTL, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IP_RECVTTL failed: %s", strerror(errno));
-        goto fail;
-    }
-
-    yes = 1;
-    if (ip_pktinfo (fd, yes) < 0) {
+    if (ipv4_pktinfo(fd) < 0) {
          goto fail;
     }
 
@@ -763,7 +795,7 @@ fail:
 
 int avahi_open_unicast_socket_ipv6(void) {
     struct sockaddr_in6 local;
-    int fd = -1, yes;
+    int fd = -1;
         
     if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
         avahi_log_warn("socket() failed: %s", strerror(errno));
@@ -778,39 +810,8 @@ int avahi_open_unicast_socket_ipv6(void) {
         goto fail;
     }
 
-#ifdef IPV6_RECVHOPS
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPS, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVHOPS failed: %s", strerror(errno));
+    if (ipv6_pktinfo(fd) < 0)
         goto fail;
-    }
-#elif IPV6_RECVHOPLIMIT
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVHOPLIMIT failed: %s", strerror(errno));
-        goto fail;
-    }
-#elif IPV6_HOPLIMIT
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_HOPLIMIT failed: %s", strerror(errno));
-        goto fail;
-    }
-#endif
-
-#ifdef IPV6_RECVPKTINFO
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_RECVPKTINFO failed: %s", strerror(errno));
-        goto fail;
-    }
-#elif IPV6_PKTINFO
-    yes = 1;
-    if (setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &yes, sizeof(yes)) < 0) {
-        avahi_log_warn("IPV6_PKTINFO failed: %s", strerror(errno));
-        goto fail;
-    }
-#endif
     
     if (avahi_set_cloexec(fd) < 0) {
         avahi_log_warn("FD_CLOEXEC failed: %s", strerror(errno));