X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fsocket.c;h=842d09a62f251a3f54bd6526cc65fad4c678bed8;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=1b1f2fdec454f4f9a4de025ddeff09159b48a02a;hpb=9962a048634c590db23a00db1d01daada779844c;p=catta

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 1b1f2fd..842d09a 100644
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -84,7 +84,7 @@ static void ipv6_address_to_sockaddr(struct sockaddr_in6 *ret_sa, const AvahiIPv
     memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
 }
 
-int avahi_mdns_mcast_join_ipv4 (int index, int fd) {
+int avahi_mdns_mcast_join_ipv4(gint fd, gint idx) {
     struct ip_mreqn mreq; 
     struct sockaddr_in sa;
 
@@ -92,7 +92,7 @@ int avahi_mdns_mcast_join_ipv4 (int index, int fd) {
  
     memset(&mreq, 0, sizeof(mreq));
     mreq.imr_multiaddr = sa.sin_addr;
-    mreq.imr_ifindex = index;
+    mreq.imr_ifindex = idx;
  
     if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
         avahi_log_warn("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
@@ -102,7 +102,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(gint fd, gint idx) {
     struct ipv6_mreq mreq6; 
     struct sockaddr_in6 sa6;
 
@@ -110,7 +110,7 @@ int avahi_mdns_mcast_join_ipv6 (int index, int fd) {
 
     memset(&mreq6, 0, sizeof(mreq6));
     mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
-    mreq6.ipv6mr_interface = index;
+    mreq6.ipv6mr_interface = idx;
 
     if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
         avahi_log_warn("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
@@ -120,7 +120,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(gint fd, gint idx) {
     struct ip_mreqn mreq; 
     struct sockaddr_in sa;
     
@@ -128,7 +128,7 @@ int avahi_mdns_mcast_leave_ipv4 (int index, int fd) {
  
     memset(&mreq, 0, sizeof(mreq));
     mreq.imr_multiaddr = sa.sin_addr;
-    mreq.imr_ifindex = index;
+    mreq.imr_ifindex = idx;
  
     if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
         avahi_log_warn("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
@@ -138,7 +138,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(gint fd, gint idx) {
     struct ipv6_mreq mreq6; 
     struct sockaddr_in6 sa6;
 
@@ -146,7 +146,7 @@ int avahi_mdns_mcast_leave_ipv6 (int index, int fd) {
 
     memset(&mreq6, 0, sizeof(mreq6));
     mreq6.ipv6mr_multiaddr = sa6.sin6_addr;
-    mreq6.ipv6mr_interface = index;
+    mreq6.ipv6mr_interface = idx;
 
     if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
         avahi_log_warn("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
@@ -487,7 +487,7 @@ AvahiDnsPacket* avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in *ret_sa,
     if (ret_sa->sin_addr.s_addr == INADDR_ANY) {
         /* Linux 2.4 behaves very strangely sometimes! */
 
-        avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l); 
+        /*avahi_hexdump(AVAHI_DNS_PACKET_DATA(p), l); */
         goto fail;
     }