geoip: apply consistent style to xt_geoip_build

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

doc/changelog.txt

@@ -1,6 +1,8 @@
 
 HEAD
 ====
+Enhancements:
+- support for Linux up to 4.15
 
 
 v2.14 (2017-11-22)

extensions/compat_xtables.h

@@ -93,4 +93,8 @@ static inline struct net *par_net(const struct xt_action_param *par)
 #endif
 }
 
+#ifndef NF_CT_ASSERT
+#	define NF_CT_ASSERT(x)	WARN_ON(!(x))
+#endif
+
 #endif /* _XTABLES_COMPAT_H */

extensions/pknock/xt_pknock.c

@@ -357,11 +357,18 @@ has_logged_during_this_minute(const struct peer *peer)
  *
  * @r: rule
  */
-static void
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-peer_gc(unsigned long r)
+static void peer_gc(struct timer_list *tl)
+#else
+static void peer_gc(unsigned long r)
+#endif
 {
 	unsigned int i;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+	struct xt_pknock_rule *rule = from_timer(rule, tl, timer);
+#else
 	struct xt_pknock_rule *rule = (struct xt_pknock_rule *)r;
+#endif
 	struct peer *peer;
 	struct list_head *pos, *n;
 
@@ -469,9 +476,13 @@ add_rule(struct xt_pknock_mtinfo *info)
 	if (rule->peer_head == NULL)
 		goto out;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+	timer_setup(&rule->timer, peer_gc, 0);
+#else
 	init_timer(&rule->timer);
 	rule->timer.function	= peer_gc;
 	rule->timer.data	= (unsigned long)rule;
+#endif
 
 	rule->status_proc = proc_create_data(info->rule_name, 0, pde,
 	                    &pknock_proc_ops, rule);

geoip/xt_geoip_build

@@ -8,23 +8,45 @@ use IO::Handle;
 use Text::CSV_XS; # or trade for Text::CSV
 use strict;
 
+my $le32 = pack("V", 0x10000000);
+my $be32 = pack("N", 0x10000000);
+my $u32 = undef;
+
+sub wantBE { return !$u32 || $u32 eq $be32; }
+sub wantLE { return !$u32 || $u32 eq $le32; }
+
 my $csv = Text::CSV_XS->new({
 	allow_whitespace => 1,
 	binary => 1,
 	eol => $/,
 }); # or Text::CSV
 my $target_dir = ".";
+my $native_only = 0;
 
 &Getopt::Long::Configure(qw(bundling));
 &GetOptions(
 	"D=s" => \$target_dir,
+	"n"   => \$native_only,
 );
 
 if (!-d $target_dir) {
 	print STDERR "Target directory $target_dir does not exist.\n";
 	exit 1;
 }
-foreach (qw(LE BE)) {
+my @dbs = qw(LE BE);
+if ($native_only) {
+	$u32 = pack("L", 0x10000000);
+	if ($u32 eq $le32) {
+		@dbs = qw(LE);
+	} elsif ($u32 eq $be32) {
+		@dbs = qw(BE);
+	} else {
+		print STDERRR "Cannot determine endianness.\n";
+		exit 1;
+	}
+}
+
+foreach (@dbs) {
 	my $dir = "$target_dir/$_";
 	if (!-e $dir && !mkdir($dir)) {
 		print STDERR "Could not mkdir $dir: $!\n";
@@ -80,11 +102,18 @@ sub dump_one
 		scalar(@{$country->{pool_v6}}),
 		$iso_code, $country->{name};
 
+	if (wantLE) {
 		$file = "$target_dir/LE/".uc($iso_code).".iv6";
 		if (!open($fh_le, "> $file")) {
 			print STDERR "Error opening $file: $!\n";
 			exit 1;
 		}
+		foreach my $range (@{$country->{pool_v6}}) {
+			print $fh_le &ip6_swap($range->[0]), &ip6_swap($range->[1]);
+		}
+		close $fh_le;
+	}
+	if (wantBE) {
 		$file = "$target_dir/BE/".uc($iso_code).".iv6";
 		if (!open($fh_be, "> $file")) {
 			print STDERR "Error opening $file: $!\n";
@@ -92,32 +121,37 @@ sub dump_one
 		}
 		foreach my $range (@{$country->{pool_v6}}) {
 			print $fh_be $range->[0], $range->[1];
-		print $fh_le &ip6_swap($range->[0]), &ip6_swap($range->[1]);
 		}
-	close $fh_le;
 		close $fh_be;
+	}
 
 	printf "%5u IPv4 ranges for %s %s\n",
 		scalar(@{$country->{pool_v4}}),
 		$iso_code, $country->{name};
 
+	if (wantLE) {
 		$file = "$target_dir/LE/".uc($iso_code).".iv4";
 		if (!open($fh_le, "> $file")) {
 			print STDERR "Error opening $file: $!\n";
 			exit 1;
 		}
+		foreach my $range (@{$country->{pool_v4}}) {
+			print $fh_le pack("VV", $range->[0], $range->[1]);
+		}
+		close $fh_le;
+	}
+	if (wantBE) {
 		$file = "$target_dir/BE/".uc($iso_code).".iv4";
 		if (!open($fh_be, "> $file")) {
 			print STDERR "Error opening $file: $!\n";
 			exit 1;
 		}
 		foreach my $range (@{$country->{pool_v4}}) {
-		print $fh_le pack("VV", $range->[0], $range->[1]);
 			print $fh_be pack("NN", $range->[0], $range->[1]);
 		}
-	close $fh_le;
 		close $fh_be;
 	}
+}
 
 sub ip6_pack
 {