From b308fea62e0093934a3a464ab29d3c7a6593d136 Mon Sep 17 00:00:00 2001
From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Mon, 18 Jan 2016 10:10:16 +0100
Subject: [PATCH] FWUp: Don't put /32 after IP address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ensure the inet→text conversion in build_fwup_sets.pl doesn't produce
/32 at the end, as ucollect master doesn't handle that.
---
src/master/dbscripts/build_fwup_sets.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/master/dbscripts/build_fwup_sets.pl b/src/master/dbscripts/build_fwup_sets.pl
index fcfe72a1..12069b0b 100755
--- a/src/master/dbscripts/build_fwup_sets.pl
+++ b/src/master/dbscripts/build_fwup_sets.pl
@@ -59,7 +59,7 @@ sub fake_set_generate($$$) {
direction = 'I'
GROUP BY remote_address) AS counts
WHERE counts.rcount > ? AND counts.count > ?)", undef, $keep_router_limit, $keep_packet_limit);
- $dbh->do("INSERT INTO fwup_addresses (set, epoch, version, add, address) SELECT ?, ?, ?, false, address FROM delete_candidates", undef, $setname, $max_epoch, $version);
+ $dbh->do("INSERT INTO fwup_addresses (set, epoch, version, add, address) SELECT ?, ?, ?, false, HOST(address) FROM delete_candidates", undef, $setname, $max_epoch, $version);
$dbh->do('DROP TABLE delete_candidates');
# How many elements are needed in the set?
--
GitLab