From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 25 Jan 2019 12:08:24 +0000 (+0000)
Subject: Merge branches 'mdw/knock' and 'mdw/ipv6' into bleeding
X-Git-Tag: 1.5.0~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/4a3882945f605704ede113a9fe98cd19a92363a7

Merge branches 'mdw/knock' and 'mdw/ipv6' into bleeding

* mdw/knock:
  Add notion of `ephemeral' associations and a goodbye protocol.
  Add new `knock' protocol.
  server/{keyexch,peer}.c: Maybe key-exchange messages come out of the blue.
  server/keyexch.c (kx_message): Squish vertically.
  server/keyexch.c: Abstract out the common message-handling behaviour.
  server/keymgmt.c: Track and find keys by their 32-bit IDs.
  server/test.c: Add a program to assist unit tests.
  server/servutil.c: Add utilities for plain asymmetric encryption.
  server/servutil.c: Add utilities for simple leaky-bucket rate limiting.
  server/keyexch.c: Rename kx_init => kx_setup.
  server/: Augment challenges to allow a payload.
  server/chal.c: Capture `master->algs.bulk' in a variable.
  server/chal.c: Rename bulk => bchal.
  server/: Expose and enhance the bulk-key-derivation protocol.

* mdw/ipv6: (64 commits)
  contrib/greet.in: Accept IPv6 addresses.
  contrib/tripe-ipif.in: Fixing for IPv6.
  svc/conntrack.in: Add IPv6 support.
  svc/conntrack.in: Split out a base class from `InetAddress'.
  svc/conntrack.in: Contemplate multiple address families.
  svc/conntrack.in: Allow multiple networks in a peer pattern.
  svc/conntrack.in (kickpeers): Refactor and reformat the search loop.
  svc/conntrack.in (kickpeers): Rename `map' variable.
  svc/conntrack.in: Process peer patterns in order.
  svc/conntrack.in: Maintain config groups in a dictionary.
  svc/conntrack.in: Make an `InetAddress' class to do address wrangling.
  svc/conntrack.in: Factor out network parsing.
  svc/conntrack.in: Gather address hacking functions into a new section.
  svc/conntrack.in: Introduce a function for parsing address strings.
  svc/conntrack.in (strmask): Consistently return a string object.
  svc/conntrack.in: Fix netmask parsing.
  svc/conntrack.in: Leave time for network configuration to settle.
  svc/conntrack.in: Hoist `netupdown' above `kickpeers'.
  server/, mon/: Introduce transport of TrIPE over IPv6.
  server/addrmap.c (hash): Visually tighten the arithmetic.
  ...
---

4a3882945f605704ede113a9fe98cd19a92363a7
diff --cc mon/tripemon.in
index 8666575a,1c70d1ff..11ee6dc0
--- a/mon/tripemon.in
+++ b/mon/tripemon.in
@@@ -1055,10 -1063,15 +1063,15 @@@ class AddPeerDialog (MyDialog)
      table = GridPacker()
      me.vbox.pack_start(table, True, True, 0)
      me.e_name = table.labelled('Name',
 -                               ValidatingEntry(r'^[^\s.:]+$', '', 16),
 +                               ValidatingEntry(r'^[^\s:]+$', '', 16),
                                 width = 3)
+     me.l_af = table.labelled('Family', combo_box_text(),
+                              newlinep = True, width = 3)
+     for af in me.AFS:
+       me.l_af.append_text(af)
+     me.l_af.set_active(0)
      me.e_addr = table.labelled('Address',
-                                ValidatingEntry(r'^[a-zA-Z0-9.-]+$', '', 24),
+                                ValidatingEntry(r'^[a-zA-Z0-9.-:]+$', '', 24),
                                 newlinep = True)
      me.e_port = table.labelled('Port',
                                 ValidatingEntry(numericvalidate(0, 65535),
diff --cc server/Makefile.am
index 2a1ff28a,1e6d71bc..f569b455
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@@ -25,10 -25,10 +25,11 @@@
  include $(top_srcdir)/vars.am
  
  sbin_PROGRAMS		 =
 +noinst_PROGRAMS		 =
  man_MANS		 =
  
- LDADD			 = $(libtripe) $(libpriv) $(catacomb_LIBS)
+ LDADD			 = $(libtripe) $(libpriv) \
+ 				$(catacomb_LIBS) $(ADNS_LIBS)
  
  ###--------------------------------------------------------------------------
  ### The main server.