Remove unnecessary IPV6_RECVPKTINFO setsockopt

diff --git a/src/fping.c b/src/fping.c
index abaebf7f3f3eca6383f8f375c1088515ca9c0a24..83c806b91c7cc14911b966154e070a74fb672735 100644 (file)
--- a/src/fping.c
+++ b/src/fping.c
@@ -607,7 +607,7 @@ int main(int argc, char **argv)
               }
 #ifdef IPV6
               if (socket6 >= 0) {
-                  socket_set_outgoing_iface_ipv6(socket6, optparse_state.optarg);
+                  socket_set_outgoing_iface_ipv6(optparse_state.optarg);
               }
 #endif
 #else

diff --git a/src/fping.h b/src/fping.h
index 7cdcf6a12eba7e620d95e0c2a840e2c82e2acf58..36f129106750b2badec04e42861c90dc4afaa9c9 100644 (file)
--- a/src/fping.h
+++ b/src/fping.h
@@ -134,7 +134,7 @@ void socket_set_src_addr_ipv4(int s, struct in_addr *src_addr, int *ident);
 int  socket_sendto_ping_ipv4(int s, struct sockaddr *saddr, socklen_t saddr_len, uint16_t icmp_seq, uint16_t icmp_id, uint8_t icmp_proto);
 #ifdef IPV6
 int  open_ping_socket_ipv6(int *socktype);
-void socket_set_outgoing_iface_ipv6(int s, const char *iface_name);
+void socket_set_outgoing_iface_ipv6(const char *iface_name);
 void init_ping_buffer_ipv6(size_t ping_data_size);
 void socket_set_src_addr_ipv6(int s, struct in6_addr *src_addr, int *ident);
 int  socket_sendto_ping_ipv6(int s, struct sockaddr *saddr, socklen_t saddr_len, uint16_t icmp_seq, uint16_t icmp_id);

diff --git a/src/socket6.c b/src/socket6.c
index 70eeb4ccaf58f089fb30e1b01927db3cf1cf476a..cc77ef7b8e06842a7c9705aea0a576dfeca82888 100644 (file)
--- a/src/socket6.c
+++ b/src/socket6.c
@@ -100,7 +100,7 @@ int open_ping_socket_ipv6(int *socktype)
     return s;
 }
 
-void socket_set_outgoing_iface_ipv6(int s, const char *iface_name)
+void socket_set_outgoing_iface_ipv6(const char *iface_name)
 {
     unsigned int idx = if_nametoindex(iface_name);
     if (idx == 0) {
@@ -108,12 +108,6 @@ void socket_set_outgoing_iface_ipv6(int s, const char *iface_name)
         exit(1);
     }
     outgoing_iface_idx_ipv6 = (int)idx;
-
-    int on = 1;
-    if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on)) < 0) {
-        perror("setsockopt IPV6_RECVPKTINFO");
-        exit(1);
-    }
 }
 
 void init_ping_buffer_ipv6(size_t ping_data_size)