From patchwork Wed May 13 19:33:32 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: 3091 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 49MlGW5v0Dz3xQr for ; Wed, 13 May 2020 19:33:55 +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 49MlGW4qCDz1tW; Wed, 13 May 2020 19:33:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49MlGW3xLQz2yC8; Wed, 13 May 2020 19:33:55 +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 49MlGV5wH9z2y9P for ; Wed, 13 May 2020 19:33:54 +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 49MlGT6FQ9z1KZ for ; Wed, 13 May 2020 19:33:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1589398434; 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=8B3e8Tq1tq3Hxp7v//FYDMbN8DFiiQGCzV0yiOHZllU=; b=4828RUTlWxPL0vUTY/9B8niAMyTDKF9IEXevpoqmMfVmhp2VpBA/BsKRZWtFHDWwftwAkh nu7TD9LkYr8p4FBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1589398434; 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=8B3e8Tq1tq3Hxp7v//FYDMbN8DFiiQGCzV0yiOHZllU=; b=jsXRrGPSof3dlE3IhKRkZMJ+hz5HDl+i30F+Jhjq6juM3sFNSdRwGPR/OTZ40L4oAU/9oe SJPd4dw1a2/pEkREB6sa5CQ9652ZVRpidQR401kxKRLliknI1G2VXgtW3VE5ecCZNonMHL qm35PoTU6wtI6ByutQUNVmliBnIHzW8ktt+iVwgZj9bKHOCT7y5+kIVS73704hqfjlOj5k o22Rg4aYBrwHN7C3U03tkuj/wwfjkg9U7kPPLpKwRkdrm0rNh11B33kYBltfoSny13WKCq 9vwyjsUz9txDgNuzQoFDF+93RJUdAgPitefcjaeBjwlZ/puiD0D/FrPXm8R2Pg== Subject: [PATCH 3/4] location-importer: DELETE "current network" address space To: location@lists.ipfire.org References: <46f10017-357f-fd8a-5dc6-eec8da9941a2@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Wed, 13 May 2020 19:33:32 +0000 MIME-Version: 1.0 In-Reply-To: <46f10017-357f-fd8a-5dc6-eec8da9941a2@ipfire.org> 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: 49MlGW4qCDz1tW X-Spamd-Result: default: False [-4.29 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; BAYES_HAM(-3.00)[99.99%]; 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.982]; 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index 91abf3e..53c5cfe 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -512,10 +512,13 @@ class CLI(object): -- Delete anything that is not global unicast address space DELETE FROM announcements WHERE family(network) = 6 AND NOT network <<= '2000::/3'; + -- DELETE "current network" address space + DELETE FROM announcements WHERE family(network) = 4 AND network <<= '0.0.0.0/8'; + -- DELETE local loopback address space DELETE FROM announcements WHERE family(network) = 4 AND network <<= '127.0.0.0/8'; - -- DELETE RFC1918 address space + -- DELETE RFC 1918 address space DELETE FROM announcements WHERE family(network) = 4 AND network <<= '10.0.0.0/8'; 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';