2 files changed, 4 insertions, 10 deletions

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));