lib: Replace shim IPCPs with points of attachment

Removes the UDP and Ethernet shim IPCPs. The unicast and broadcast
IPCPs can now directly attach to a "legacy" socket. We adopt Saltzer's
Point-of-Attachment terminology, also advocated in Day's "Patterns in
Network Architecture". The "poa" component manages these
PoA's with one management thread, one link monitoring thread and one
thread per attached point.

For Ethernet PoA's the irm connect and enroll can resolve the
destination IPCP or Layer name with a broadcast name query over the
attached PoAs (first reply wins). UDP PoA's require a destination IP
address or FQDN.

attach to a local endpoint (required both server and client side):

 irm ipcp poa attach name a udp 10.0.0.1
 irm ipcp poa attach name a udp 10.0.0.1:3435
 irm ipcp poa attach name a udp [::1]:3435
 irm ipcp poa attach name a eth dev eth0
 irm ipcp poa attach name a eth dev eth0 ethertype 0xA000

release a PoA (refused while it carries a flow):

 irm ipcp poa detach name a udp 10.0.0.1:3435
 irm ipcp poa detach name a eth eth0

list an IPCP's PoAs:

 irm ipcp poa list name a

connect to a peer, by name or at an address:

 irm ipcp connect name b dst a
 irm ipcp connect name b dst a eth
 irm ipcp connect name b dst a eth dev eth0
 irm ipcp connect name b dst a udp 10.0.0.1:3435
 irm ipcp connect name b dst a udp peer.example.com:3435

disconnect by peer name, no address:

 irm ipcp disconnect name b dst a
 irm ipcp disconnect name b dst a component mgmt

enroll has the same shape as connect:

 irm ipcp enroll name b layer lr autobind
 irm ipcp enroll name b layer lr autobind eth dev eth0
 irm ipcp enroll name b layer lr autobind udp 10.0.0.1:3435

the IRMd config file attaches PoAs and names peers the same way:

 udp = [ "10.0.0.1", "10.0.0.1:3436" ]
 eth = [ "eth0", {dev="eth1", ethertype=0xA007} ]

 enrol={dst="LAN", eth={dev="eth0"}}
 conn=[{dst="lan3", eth={}}, {dst="lan4", udp="10.0.0.1:3435"}]

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

1 files changed, 55 insertions, 3 deletions

diff --git a/src/tools/irm/irm_ipcp_enroll.c b/src/tools/irm/irm_ipcp_enroll.c
index 350b536e..54fed022 100644
--- a/src/tools/irm/irm_ipcp_enroll.c
+++ b/src/tools/irm/irm_ipcp_enroll.c
@@ -44,6 +44,7 @@
 #include "irm_ops.h"
 #include "irm_utils.h"
 
+#include <arpa/inet.h>
 #include <string.h>
 
 #define UNICAST    "unicast"
@@ -57,7 +58,10 @@ static void usage(void)
                "                [dst <destination to enroll with>]\n"
                "                [type [TYPE], default = " UNICAST "]\n"
                "                [autobind]\n"
-               "where TYPE in {" UNICAST " " BROADCAST "}\n");
+               "                [udp [UDP_PEER]]\n"
+               "                [eth [dev <device>] [ethertype <ethertype>]]\n"
+               "where TYPE in {" UNICAST " " BROADCAST "}\n"
+               "and UDP_PEER is <IP address or host>[:<port>]\n");
 }
 
 static int get_layer_name(const char * ipcp,
@@ -86,6 +90,12 @@ int do_enroll_ipcp(int     argc,
         char *                  ipcp      = NULL;
         char *                  layer     = NULL;
         char *                  dst       = NULL;
+        char *                  udpstr    = NULL;
+        char *                  devstr    = NULL;
+        uint16_t                ethertype = POA_ETHERTYPE;
+        bool                    eth       = false;
+        struct poa_addr         addr;
+        struct poa_addr *       pa        = NULL;
         struct ipcp_list_info * ipcps;
         pid_t                   pid       = -1;
         ssize_t                 len       = 0;
@@ -97,14 +107,37 @@ int do_enroll_ipcp(int     argc,
 
         while (argc > 0) {
                 cargs = 2;
+                if (strcmp(*argv, "eth") == 0)
+                        cargs = 1;
+                else if (matches(*argv, "autobind") == 0)
+                        cargs = 1;
+
+                if (argc < cargs) {
+                        usage();
+                        return -1;
+                }
+
                 if (matches(*argv, "name") == 0) {
                         ipcp = *(argv + 1);
                 } else if (matches(*argv, "type") == 0) {
                         ipcp_type = *(argv + 1);
                 } else if (matches(*argv, "layer") == 0) {
                         layer = *(argv + 1);
-                } else if (matches(*argv, "dst") == 0) {
+                } else if (strcmp(*argv, "dst") == 0) {
                         dst = *(argv + 1);
+                } else if (strcmp(*argv, "udp") == 0) {
+                        udpstr = *(argv + 1);
+                } else if (strcmp(*argv, "dev") == 0) {
+                        devstr = *(argv + 1);
+                } else if (strcmp(*argv, "ethertype") == 0) {
+                        if (parse_ethertype(*(argv + 1), &ethertype) < 0) {
+                                printf("Invalid ethertype: \"%s\".\n",
+                                       *(argv + 1));
+                                return -1;
+                        }
+                } else if (strcmp(*argv, "eth") == 0) {
+                        eth = true;
+                        cargs = 1;
                 } else if (matches(*argv, "autobind") == 0) {
                         autobind = true;
                         cargs = 1;
@@ -126,6 +159,25 @@ int do_enroll_ipcp(int     argc,
         if (dst == NULL)
                 dst = layer;
 
+        memset(&addr, 0, sizeof(addr));
+
+        if (udpstr != NULL) {
+                if (poa_addr_set_udp(&addr, udpstr) < 0)
+                        return -1;
+                pa = &addr;
+        }
+
+        if (eth) {
+                if (udpstr != NULL) {
+                        printf("Enroll via udp or eth, not both.\n");
+                        return -1;
+                }
+
+                if (poa_addr_set_eth(&addr, devstr, ethertype) < 0)
+                        return -1;
+                pa = &addr;
+        }
+
         if (strcmp(ipcp_type, UNICAST) == 0)
                 type = IPCP_UNICAST;
         else if (strcmp(ipcp_type, BROADCAST) == 0)
@@ -155,7 +207,7 @@ int do_enroll_ipcp(int     argc,
 
                 pid = ipcps[i].pid;
 
-                if (irm_enroll_ipcp(pid, dst)) {
+                if (irm_enroll_ipcp(pid, dst, pa) < 0) {
                         printf("Failed to enroll IPCP.\n");
                         goto fail;
                 }