Ports updated

diff --git a/6bed4router.c b/6bed4router.c
index 0329919..f392300 100644 (file)
--- a/6bed4router.c
+++ b/6bed4router.c
@@ -376,6 +376,7 @@ static inline bool is_6bed4 (struct in6_addr *ip6) {
 /* Test if the provided IPv6 address matches the fc64::/16 prefix.
  * If so, the traffic may be bounced using 6bed4 traffic, but it
  * must not be relayed to the native IPv6 side.
+ * TODO: Perhaps allow only configured <netid>, so fc64:<netid>::/32
  */
 static inline bool is_fc64 (struct in6_addr *ip6) {
        return ip6->s6_addr16 [0] == htons (0xfc64);
@@ -391,7 +392,7 @@ bool validate_originator (struct in6_addr *ip6) {
        uint32_t addr;
        //
        // Require non-local top halves to match our v6listen_linklocal address
-       // We will enforce our own fallback address (and fc64:<port>)
+       // We will enforce our own fallback address (and fc64:<netid>::/32)
        if (memcmp (ip6, v6listen_linklocal, 8) != 0) {
                if (memcmp (&v6listen, ip6->s6_addr, 8) != 0) {
                        return false;

diff --git a/nonstd.h.in b/nonstd.h.in
index 70450f9..8b7cb39 100644 (file)
--- a/nonstd.h.in
+++ b/nonstd.h.in
@@ -12,7 +12,7 @@
 #define ND_OPT_DESTINATION_LINKADDR 253
 
 
-#error "Build uses experimental UDP port number 27629 or 0x6bed"
+#error "Build uses experimental UDP port number 25790 or 0x64be"
 
 #define UDP_PORT_6BED4 25788
 
@@ -27,12 +27,12 @@
 #define SERVER_6BED4_IPV4_INT3                 242
 #define SERVER_6BED4_IPV4_BINSTR               "\x91\x64\xbe\xf2"
 
-#define SERVER_6BED4_PORT_TXT                  "25788"
-#define SERVER_6BED4_PORT_BINSTR               "\xbc\x64"
+#define SERVER_6BED4_PORT_TXT                  "25790"
+#define SERVER_6BED4_PORT_BINSTR               "\xbe\x64"
 
-#define SERVER_6BED4_IPV4_PORT_TXT             "145.100.190.242:27629"
+#define SERVER_6BED4_IPV4_PORT_TXT             "145.100.190.242:25790"
 #define SERVER_6BED4_PORT_IPV4_ADDRSTR         "\xbe\x64\x91\x64\xbe\xf2"
-#define SERVER_6BED4_PORT_IPV4_MACSTR          "\xbc\x64\x91\x64\xbe\xf2"
+#define SERVER_6BED4_PORT_IPV4_MACSTR          "\xbe\x64\x91\x64\xbe\xf2"
 
 /* Define LOCAL_OVERRIDES_PORT0 to forcefully detect 6bed4 port 0 as an
  * override to a local address.  This is used when a host uses its own /64

diff --git a/nonstd.h.test b/nonstd.h.test
index b35f87e..e6f2a9d 100644 (file)
--- a/nonstd.h.test
+++ b/nonstd.h.test
@@ -12,7 +12,7 @@
 #define ND_OPT_DESTINATION_LINKADDR 253
 
 
-// #error "Build uses experimental UDP port number 27629 or 0x6bed"
+// #error "Build uses experimental UDP port number 25790 or 0x64be"
 
 #define UDP_PORT_6BED4 25790
 
@@ -30,8 +30,8 @@
 #define SERVER_6BED4_PORT_TXT                  "25790"
 #define SERVER_6BED4_PORT_BINSTR               "\xbe\x64"
 
-#define SERVER_6BED4_IPV4_PORT_TXT             "145.136.0.1:25789"
-#define SERVER_6BED4_PORT_IPV4_ADDRSTR         "\xbc\x64\x91\x88\x00\x01"
+#define SERVER_6BED4_IPV4_PORT_TXT             "145.136.0.1:25790"
+#define SERVER_6BED4_PORT_IPV4_ADDRSTR         "\xbe\x64\x91\x88\x00\x01"
 #define SERVER_6BED4_PORT_IPV4_MACSTR          "\xbe\x64\x91\x88\x00\x01"
 
 /* Define LOCAL_OVERRIDES_PORT0 to forcefully detect 6bed4 port 0 as an