Netfilter-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/1] geoip: add quiet flag to xt_geoip_build
@ 2020-05-25 20:05 Philip Prindeville
  2020-05-26 12:59 ` Jan Engelhardt
  0 siblings, 1 reply; 5+ messages in thread
From: Philip Prindeville @ 2020-05-25 20:05 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Jan Engelhardt, Philip Prindeville

From: Philip Prindeville <philipp@redfish-solutions.com>

Conceivably someone might want to run a refresh of the geoip database
from within a script, particularly an unattended script such as a cron
job.  Don't generate output in that case.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
---
 geoip/xt_geoip_build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
index e7ad9bfdcc1e3b617ada77872f9be87e126b885f..84333892e61e463269790580b08ac5c33d994018 100644
--- a/geoip/xt_geoip_build
+++ b/geoip/xt_geoip_build
@@ -17,11 +17,14 @@ my $csv = Text::CSV_XS->new({
 	binary => 1,
 	eol => $/,
 }); # or Text::CSV
+
+my $quiet = 0;
 my $source_dir = ".";
 my $target_dir = ".";
 
 &Getopt::Long::Configure(qw(bundling));
 &GetOptions(
+	"q" => \$quiet,
 	"D=s" => \$target_dir,
 	"S=s" => \$source_dir,
 );
@@ -63,12 +66,12 @@ sub collect
 			$country{$cc}->{pool_v6}->add_range($range);
 		}
 
-		if ($. % 4096 == 0) {
+		if (!$quiet && $. % 4096 == 0) {
 			print STDERR "\r\e[2K$. entries";
 		}
 	}
 
-	print STDERR "\r\e[2K$. entries total\n";
+	print STDERR "\r\e[2K$. entries total\n" unless ($quiet);
 
 	close($fh);
 
@@ -106,7 +109,7 @@ sub writeCountry
 	printf "%5u IPv%s ranges for %s\n",
 		scalar(@ranges),
 		($family == AF_INET ? '4' : '6'),
-		$iso_code;
+		$iso_code unless ($quiet);
 
 	my $file = "$target_dir/".uc($iso_code).".iv".($family == AF_INET ? '4' : '6');
 	if (!open($fh, '>', $file)) {
-- 
2.17.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build
  2020-05-25 20:05 [PATCH 1/1] geoip: add quiet flag to xt_geoip_build Philip Prindeville
@ 2020-05-26 12:59 ` Jan Engelhardt
  2020-07-26 17:32   ` Philip Prindeville
  0 siblings, 1 reply; 5+ messages in thread
From: Jan Engelhardt @ 2020-05-26 12:59 UTC (permalink / raw)
  To: Philip Prindeville; +Cc: netfilter-devel

On Monday 2020-05-25 22:05, Philip Prindeville wrote:

>From: Philip Prindeville <philipp@redfish-solutions.com>
>
>Conceivably someone might want to run a refresh of the geoip database
>from within a script, particularly an unattended script such as a cron
>job.  Don't generate output in that case.

added.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build
  2020-05-26 12:59 ` Jan Engelhardt
@ 2020-07-26 17:32   ` Philip Prindeville
  2020-07-28 12:01     ` Xtables-addons 3.10 (Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build) Jan Engelhardt
  0 siblings, 1 reply; 5+ messages in thread
From: Philip Prindeville @ 2020-07-26 17:32 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel


> On May 26, 2020, at 6:59 AM, Jan Engelhardt <jengelh@inai.de> wrote:
> 
> On Monday 2020-05-25 22:05, Philip Prindeville wrote:
> 
>> From: Philip Prindeville <philipp@redfish-solutions.com>
>> 
>> Conceivably someone might want to run a refresh of the geoip database
>> from within a script, particularly an unattended script such as a cron
>> job.  Don't generate output in that case.
> 
> added.


Thanks.

BTW, when is 3.10 due out?


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Xtables-addons 3.10 (Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build)
  2020-07-26 17:32   ` Philip Prindeville
@ 2020-07-28 12:01     ` Jan Engelhardt
  2020-07-28 22:56       ` Philip Prindeville
  0 siblings, 1 reply; 5+ messages in thread
From: Jan Engelhardt @ 2020-07-28 12:01 UTC (permalink / raw)
  To: Philip Prindeville; +Cc: netfilter-devel

On Sunday 2020-07-26 19:32, Philip Prindeville wrote:
>> On May 26, 2020, at 6:59 AM, Jan Engelhardt <jengelh@inai.de> wrote:
>> On Monday 2020-05-25 22:05, Philip Prindeville wrote:
>
>>> Conceivably someone might want to run a refresh of the geoip database
>>> from within a script, particularly an unattended script such as a cron
>>> job.  Don't generate output in that case.
>
>BTW, when is 3.10 due out?

I have tagged 3.10 and produced the tarballs.
Take note that the homepage etc. has moved to

	https://inai.de/projects/xtables-addons/

Downloads, new git location, and redirects from sf.net
should be all there.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Xtables-addons 3.10 (Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build)
  2020-07-28 12:01     ` Xtables-addons 3.10 (Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build) Jan Engelhardt
@ 2020-07-28 22:56       ` Philip Prindeville
  0 siblings, 0 replies; 5+ messages in thread
From: Philip Prindeville @ 2020-07-28 22:56 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel



> On Jul 28, 2020, at 6:01 AM, Jan Engelhardt <jengelh@inai.de> wrote:
> 
> On Sunday 2020-07-26 19:32, Philip Prindeville wrote:
>>> On May 26, 2020, at 6:59 AM, Jan Engelhardt <jengelh@inai.de> wrote:
>>> On Monday 2020-05-25 22:05, Philip Prindeville wrote:
>> 
>>>> Conceivably someone might want to run a refresh of the geoip database
>>>> from within a script, particularly an unattended script such as a cron
>>>> job.  Don't generate output in that case.
>> 
>> BTW, when is 3.10 due out?
> 
> I have tagged 3.10 and produced the tarballs.
> Take note that the homepage etc. has moved to
> 
> 	https://inai.de/projects/xtables-addons/
> 
> Downloads, new git location, and redirects from sf.net
> should be all there.


Awesome. Thanks!


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-25 20:05 [PATCH 1/1] geoip: add quiet flag to xt_geoip_build Philip Prindeville
2020-05-26 12:59 ` Jan Engelhardt
2020-07-26 17:32   ` Philip Prindeville
2020-07-28 12:01     ` Xtables-addons 3.10 (Re: [PATCH 1/1] geoip: add quiet flag to xt_geoip_build) Jan Engelhardt
2020-07-28 22:56       ` Philip Prindeville

Netfilter-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netfilter-devel/0 netfilter-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netfilter-devel netfilter-devel/ https://lore.kernel.org/netfilter-devel \
		netfilter-devel@vger.kernel.org
	public-inbox-index netfilter-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netfilter-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git