7 files changed, 70 insertions, 31 deletions

diff --git a/DEDICATION b/DEDICATION
new file mode 100644
index 0000000..eca7d99
--- /dev/null
+++ b/DEDICATION
@@ -0,0 +1,2 @@
+This release is dedicated to Felix von Leitner, whose libowfat carried
+opentracker for its first eighteen years.
diff --git a/Mk/release.mk b/Mk/release.mk
index 5c4afe9..e5336e0 100644
--- a/Mk/release.mk
+++ b/Mk/release.mk
@@ -2,7 +2,7 @@
 # In a checkout it is absent and git answers instead. A release is always
 # tagged, so in a tarball both of these are that tag, and the gitweb link
 # is to it. Between releases there is no tag and the version is the commit.
-VERSION=1.0.0
+VERSION=2.0.0
 
 TARBALL_VERSION=test -r .tarball-version && read v < .tarball-version && echo "$$v"
 HAVE_GIT=command -v git >/dev/null && test -d .git
diff --git a/man5/opentracker.conf.5 b/man5/opentracker.conf.5
index 9a836ae..2250fe5 100644
--- a/man5/opentracker.conf.5
+++ b/man5/opentracker.conf.5
@@ -90,7 +90,9 @@ technically sits in a range IANA assigns on request.
 
 A cluster of its own is better served by an address out of 239.192.0.0/14,
 which RFC 2365 sets aside for private use. Packets carry a ttl of 1 either
-way and never leave the local link.
+way and never leave the local link. Must be a valid mulitcast address from
+.Pa 224.0.0.0/4
+.
 .Pp
 .It livesync.cluster.node_ip Ar ip_address
 Specifies one trusted IP address for sync between trackers running in a cluster. Can be added more than once.
diff --git a/src/ot_config.c b/src/ot_config.c
index 4064d1b..6b51c61 100644
--- a/src/ot_config.c
+++ b/src/ot_config.c
@@ -320,7 +320,7 @@ static int parse_configfile(char *config_filename) {
         int off     = scan_ip6_port(p, tmpip, &tmpport);
 
         if (!off || !listen_scan_options(p + off, &shared, &workers))
-          goto parse_error;
+          exerr("listen.tcp, listen.udp and listen.tcp_udp want an address, optionally a port and options.");
         if (kind != CONFIG_LISTEN_UDP)
           listen_append(tmpip, tmpport, FLAG_TCP, shared, workers), ++bound;
         if (kind != CONFIG_LISTEN_TCP)
@@ -382,7 +382,7 @@ static int parse_configfile(char *config_filename) {
 #ifdef WANT_SYNC_LIVE
       case CONFIG_LIVESYNC_CLUSTER_GROUP:
         if (!ip_parse(p, tmpip) || livesync_set_group(tmpip) == -1)
-          goto parse_error;
+          exerr("livesync.cluster.group wants a multicast address, out of 224.0.0.0/4.");
         break;
       case CONFIG_LIVESYNC_CLUSTER_NODE_IP:
         if (!scan_ip6_net(p, &tmpnet))
@@ -446,7 +446,7 @@ static void help(char *name) {
   fprintf(stderr, "\nExample:   ./opentracker -i 127.0.0.1 -p 6969 -P 6969 -f ./opentracker.conf -i 10.1.1.23 -p 2710 -p 80\n");
   fprintf(stderr, "           Here -i 127.0.0.1 selects the ip address for the next -p 6969 and -P 6969.\n");
   fprintf(stderr, "           If no port is bound from config file or command line, the last address given\n");
-  fprintf(stderr, "           (or ::1 if none is set) will be used on port 6969.\n");
+  fprintf(stderr, "           is used on port 6969, and every interface if none was given.\n");
 }
 #undef HELPLINE
 
diff --git a/src/ot_socket.c b/src/ot_socket.c
index 79bb01a..b6a1803 100644
--- a/src/ot_socket.c
+++ b/src/ot_socket.c
@@ -263,15 +263,9 @@ static int socket_v4_bind(const ot_ip6 ip, uint16_t port) {
 
 int socket_mcast_join(const ot_ip6 group, const ot_ip6 interface, uint16_t port) {
   struct ip_mreq mreq;
-  ot_ip6         any;
   int            s;
 
-  /* The group is what is listened to, so the socket takes the wildcard and
-     the join names the interface to receive it on */
-  memcpy(any, ip_v4mapped_prefix, sizeof(ip_v4mapped_prefix));
-  memset(any + sizeof(ip_v4mapped_prefix), 0, 4);
-
-  if ((s = socket_v4_bind(any, port)) == -1)
+  if ((s = socket_v4_bind(group, port)) == -1)
     return -1;
 
   memset(&mreq, 0, sizeof(mreq));
diff --git a/tests/integration/test_config.py b/tests/integration/test_config.py
index 1a84fa7..2f6bdc4 100644
--- a/tests/integration/test_config.py
+++ b/tests/integration/test_config.py
@@ -1,7 +1,9 @@
 """Settings the tracker has to accept, and still work with.
 
-An unrecognised key makes opentracker refuse to start, so a test that it
-comes up at all is a test that the key was understood.
+An unrecognised key only warns, so coming up proves nothing on its own and a
+test that cares has to look at what the tracker said. A key that is
+recognised but cannot be parsed is another matter, and for the listen
+statements it stops the tracker.
 """
 
 import unittest
@@ -14,6 +16,7 @@ class TcpWorkers(TrackerTestCase):
 
     def test_the_tracker_serves_with_tcp_workers_asked_for(self):
         self.assertEqual(self.tracker.announce(self.hash_for("tcpworkers"))[b"complete"], 1)
+        self.assertNotIn("Unhandled line", self.tracker.output())
 
 
 class WorkersOnAListenStatement(unittest.TestCase):
@@ -27,3 +30,22 @@ class WorkersOnAListenStatement(unittest.TestCase):
             self.assertEqual(complaints, [], "the tracker reported:\n" + "\n".join(complaints))
         finally:
             tracker._cleanup()
+
+
+class AListenLineThatDoesNotParse(unittest.TestCase):
+    """Warning and carrying on left a tracker that had been told where to
+    listen coming up on its default instead, which is every interface."""
+
+    def refuses(self, line):
+        with self.assertRaises(AssertionError) as caught:
+            Tracker(line)
+        return str(caught.exception)
+
+    def test_an_address_that_is_not_one_stops_the_tracker(self):
+        self.assertIn("want an address", self.refuses("listen.tcp 10.0.0.300:7999\n"))
+
+    def test_so_does_a_port_out_of_range(self):
+        self.assertIn("want an address", self.refuses("listen.udp 127.0.0.1:99999\n"))
+
+    def test_so_does_an_option_it_does_not_know(self):
+        self.assertIn("want an address", self.refuses("listen.tcp 127.0.0.1:7999 wokers=2\n"))
diff --git a/tests/integration/test_livesync.py b/tests/integration/test_livesync.py
index 52e871f..f4cb2db 100644
--- a/tests/integration/test_livesync.py
+++ b/tests/integration/test_livesync.py
@@ -10,7 +10,7 @@ import struct
 import subprocess
 import unittest
 
-from harness import TRACKER, TrackerTestCase
+from harness import TRACKER, Tracker, TrackerTestCase
 
 # enum { OT_SYNC_PEER4, OT_SYNC_PEER6 } in src/ot_livesync.c
 SYNC_PEER4 = 0
@@ -168,6 +168,13 @@ class LiveSyncUnconfigured(TrackerTestCase):
 
 # RFC 2365 sets 239.192.0.0/14 aside for exactly this kind of use
 OWN_GROUP = "239.192.0.7"
+# A group nothing in this suite ever joins. Deliberately not the default one:
+# other trackers here do join that, on ports the harness picks at random, and
+# a socket bound to the wildcard address shares a port's multicast traffic
+# with anything else on the host that has joined the group it is addressed
+# to. Two clusters sharing a host and a port is pathological in the field but
+# routine in a test suite.
+UNJOINED_GROUP = "239.192.0.99"
 
 
 @unittest.skipUnless(has_livesync(), "this build has no WANT_SYNC_LIVE")
@@ -182,27 +189,39 @@ class LiveSyncGroup(TrackerTestCase):
                                    group=OWN_GROUP)
         self.assertTrue(self.tracker.wait_until(lambda: self.tracker.torrent_count() == 1))
 
-    def test_the_default_group_is_left_alone(self):
-        """A cluster that picked its own group should not hear the one every
-        other opentracker is on."""
+    def test_another_group_is_left_alone(self):
+        """A cluster that picked its own group hears nothing from the others."""
         info_hash = self.hash_for("not-our-group")
-        self.tracker.livesync_send(packet(SYNC_PEER4, [(info_hash, peer4("10.1.3.2", 6881, FLAG_SEEDING))]))
+        self.tracker.livesync_send(packet(SYNC_PEER4, [(info_hash, peer4("10.1.3.2", 6881, FLAG_SEEDING))]),
+                                   group=UNJOINED_GROUP)
         self.assertFalse(self.tracker.wait_until(lambda: self.tracker.torrent_count() != 0, timeout=1))
 
 
 @unittest.skipUnless(has_livesync(), "this build has no WANT_SYNC_LIVE")
-class LiveSyncGroupRefused(TrackerTestCase):
-    """A unicast address is not a group. The line is refused like any other
-    bad config line, which leaves the default standing."""
+class LiveSyncGroupRefused(unittest.TestCase):
+    """A cluster that asked for a group of its own must not quietly end up on
+    the one every other opentracker is on, so a line that does not name a
+    group stops the tracker rather than falling back."""
 
-    config = ("livesync.cluster.group 10.0.0.1\n"
-              "livesync.cluster.listen 127.0.0.1:{livesync_port}\n"
-              "livesync.cluster.node_ip 127.0.0.1\n")
+    def start_with(self, group):
+        return Tracker("livesync.cluster.group %s\n"
+                       "livesync.cluster.listen 127.0.0.1:{livesync_port}\n"
+                       "livesync.cluster.node_ip 127.0.0.1\n" % group)
 
-    def test_the_line_is_refused(self):
-        self.assertIn("Parse error", self.tracker.output())
+    def test_a_unicast_address_stops_the_tracker(self):
+        with self.assertRaises(AssertionError) as caught:
+            self.start_with("10.0.0.1")
+        self.assertIn("multicast address", str(caught.exception))
 
-    def test_and_the_default_group_still_works(self):
-        info_hash = self.hash_for("fallback-group")
-        self.tracker.livesync_send(packet(SYNC_PEER4, [(info_hash, peer4("10.1.3.3", 6881, FLAG_SEEDING))]))
-        self.assertTrue(self.tracker.wait_until(lambda: self.tracker.torrent_count() == 1))
+    def test_so_does_something_that_is_not_an_address(self):
+        with self.assertRaises(AssertionError) as caught:
+            self.start_with("not-an-address")
+        self.assertIn("multicast address", str(caught.exception))
+
+    def test_a_group_at_either_end_of_the_range_is_taken(self):
+        for group in ("224.0.0.1", "239.255.255.255"):
+            tracker = self.start_with(group)
+            try:
+                self.assertEqual(tracker.torrent_count(), 0)
+            finally:
+                tracker.stop()