chiark / gitweb /
server/: Post-merge fixup. bleeding
authorMark Wooding <mdw@distorted.org.uk>
Wed, 11 Oct 2017 01:02:39 +0000 (02:02 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 25 Jan 2019 12:08:31 +0000 (12:08 +0000)
commit56c76774f4077c83e975d51c3488f43e54390b5c
treec95bad0c63da3c175501ac9cf40e07c02d5c9e99
parent4a3882945f605704ede113a9fe98cd19a92363a7
server/: Post-merge fixup.

There's a slightly nasty semantic conflict between the two branches:
mdw/knock introduces a new function which sends a packet to an address
which might not belong to a registered peer, and mdw/ipv6 means that
this now has to cope with multiple address families.  The mess is
surprisingly limited, all things considered.
server/peer.c
server/tripe-admin.5.in