From patchwork Wed May 13 19:33:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3090 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49MlG83yM0z3xQr for ; Wed, 13 May 2020 19:33:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49MlG82wRCzht; Wed, 13 May 2020 19:33:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49MlG80shyz2y9P; Wed, 13 May 2020 19:33:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49MlG65Wdyz2y9P for ; Wed, 13 May 2020 19:33:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49MlG56PGBzht for ; Wed, 13 May 2020 19:33:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1589398414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oLTt/cn/3ofcHSCM61Uw0/+fBjrRU1g2d3Sm7ChtxpM=; b=zYtGflAT9FDd1GNDDl7umfBp4alzWkVIuOdUjivL8FUNd7afUZR3/STtAIK+IfUxcDqZWE 9uFoTxzq1wT5klCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1589398414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oLTt/cn/3ofcHSCM61Uw0/+fBjrRU1g2d3Sm7ChtxpM=; b=QRmQhOdjp1q7pQtE8KteMzrb1sD+MFCTZgI9FJ7bA1s8drW0zMBBgVgJhfktyR+zFx30O6 wUzVQKQspqJSREsL1OfwD3Qe88y2qegYvdOIB/64I7oL46GA0zgQxM4zQVVXs2Upj1Yb8W x0MzU5biTJ7aeB+rEDECs8mPDKVRGX2GVm7kkvgZ5ovn6PxpJfQZPuHxNEo4LcoUFfDCSR IoGccuZOr/Y3NvuPg4zgU4ru+iqVhci8LEApw1n9wYW/Rql8pA754gs0BIZSquDklRH+Eq 92mQ7GOpq4RvH5sUY5pCM5UhwYSiHFaIBIzji7Rr7xjS4VxP9f41fQChgasAjQ== Subject: [PATCH 2/4] location-importer: DELETE other unroutable IPv4 networks To: location@lists.ipfire.org References: From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <46f10017-357f-fd8a-5dc6-eec8da9941a2@ipfire.org> Date: Wed, 13 May 2020 19:33:13 +0000 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-BeenThere: location@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: location-bounces@lists.ipfire.org Sender: "Location" Authentication-Results: mail01.ipfire.org; none X-Rspamd-Queue-Id: 49MlG82wRCzht X-Spamd-Result: default: False [-4.28 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; BAYES_HAM(-3.00)[99.97%]; FROM_HAS_DN(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[location@lists.ipfire.org]; TO_DN_NONE(0.00)[]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM(-0.98)[-0.977]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[peter.mueller@ipfire.org,location-bounces@lists.ipfire.org]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mail01.haj.ipfire.org Signed-off-by: Peter Müller --- src/python/location-importer.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index c751332..91abf3e 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -520,6 +520,22 @@ class CLI(object): DELETE FROM announcements WHERE family(network) = 4 AND network <<= '172.16.0.0/12'; DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.168.0.0/16'; + -- DELETE test, benchmark and documentation address space + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.0.0.0/24'; + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.0.2.0/24'; + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '198.18.0.0/15'; + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '198.51.100.0/24'; + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '203.0.113.0/24'; + + -- DELETE CGNAT address space (RFC 6598) + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '100.64.0.0/10'; + + -- DELETE link local address space + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '169.254.0.0/16'; + + -- DELETE IPv6 to IPv4 (6to4) address space + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '192.88.99.0/24'; + -- Delete networks that are too small to be in the global routing table DELETE FROM announcements WHERE family(network) = 6 AND masklen(network) > 48; DELETE FROM announcements WHERE family(network) = 4 AND masklen(network) > 24;