File iputils-remove-bogus-check-required-for-2.4.9-k... of Package iputils

Overview Repositories Revisions Requests Users Attributes Meta

File iputils-remove-bogus-check-required-for-2.4.9-kernels.patch of Package iputils (Revision 5d7912ae35934d5a9acd68386c0e3770)

Currently displaying revision 5d7912ae35934d5a9acd68386c0e3770 , Show latest

From 5bb0f0a8b0ed6f111a329c0d6911dfa516ab1d42 Mon Sep 17 00:00:00 2001
From: Noah Meyerhans <noahm@debian.org>
Date: Fri, 18 Apr 2014 15:47:29 +0200
Subject: [PATCH] remove bogus check required for < 2.4.9 kernels

Debian bug: #709052
---
 ping.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/ping.c b/ping.c
index b9d649531621..f9f4a28f5dc1 100644
--- a/ping.c
+++ b/ping.c
@@ -654,17 +654,6 @@ int receive_error_msg()
 
 		acknowledge(ntohs(icmph.un.echo.sequence));
 
-		if (!working_recverr) {
-			struct icmp_filter filt;
-			working_recverr = 1;
-			/* OK, it works. Add stronger filter. */
-			filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
-				      (1<<ICMP_REDIRECT)|
-				      (1<<ICMP_ECHOREPLY));
-			if (setsockopt(icmp_sock, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt)) == -1)
-				perror("\rWARNING: setsockopt(ICMP_FILTER)");
-		}
-
 		net_errors++;
 		nerrors++;
 		if (options & F_QUIET)
@@ -820,19 +809,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
 					     icp->type != ICMP_SOURCE_QUENCH);
 				if (error_pkt) {
 					acknowledge(ntohs(icp1->un.echo.sequence));
-					if (working_recverr) {
-						return 0;
-					} else {
-						static int once;
-						/* Sigh, IP_RECVERR for raw socket
-						 * was broken until 2.4.9. So, we ignore
-						 * the first error and warn on the second.
-						 */
-						if (once++ == 1)
-							fprintf(stderr, "\rWARNING: kernel is not very fresh, upgrade is recommended.\n");
-						if (once == 1)
-							return 0;
-					}
+					return 0;
 				}
 				nerrors+=error_pkt;
 				if (options&F_QUIET)
-- 
2.3.5

Places

File iputils-remove-bogus-check-required-for-2.4.9-kernels.patch of Package iputils (Revision 5d7912ae35934d5a9acd68386c0e3770)

Places