ipcpd: Add broadcast IPCP

This adds a broadcast IPCP that allows us to easily create multicast
applications. The broadcast IPCP accepts flows for "<layer_name>.mc".
A tool, obc (Ouroboros broadcast), is added that sends and reads a
message to a broadcast layer.

Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

3 files changed, 48 insertions, 22 deletions

diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c
index 3d9386ad..861b1521 100644
--- a/src/tools/irm/irm_ipcp_bootstrap.c
+++ b/src/tools/irm/irm_ipcp_bootstrap.c
@@ -51,6 +51,7 @@
 #endif
 
 #define NORMAL                 "normal"
+#define BROADCAST              "broadcast"
 #define UDP                    "udp"
 #define ETH_LLC                "eth-llc"
 #define ETH_DIX                "eth-dix"
@@ -86,7 +87,7 @@ static void usage(void)
                "                name <ipcp name>\n"
                "                layer <layer name>\n"
                "                [type [TYPE]]\n"
-               "where TYPE = {" NORMAL " " LOCAL " "
+               "where TYPE = {" NORMAL " " BROADCAST " " LOCAL " "
                UDP " " ETH_LLC " " ETH_DIX " " RAPTOR "},\n\n"
                "if TYPE == " NORMAL "\n"
                "                [addr <address size> (default: %d)]\n"
@@ -125,7 +126,9 @@ static void usage(void)
                "if TYPE == " RAPTOR "\n"
                "                [hash [ALGORITHM] (default: %s)]\n"
                "where ALGORITHM = {" SHA3_224 " " SHA3_256 " "
-               SHA3_384 " " SHA3_512 "}\n\n",
+               SHA3_384 " " SHA3_512 "}\n"
+               "if TYPE == " BROADCAST "\n"
+               "                [autobind]\n\n",
                DEFAULT_ADDR_SIZE, DEFAULT_EID_SIZE, DEFAULT_TTL,
                FLAT_RANDOM_ADDR_AUTH, LINK_STATE_ROUTING, SIMPLE_PFF,
                SHA3_256, SHA3_256, 0xA000, SHA3_256, SHA3_256, SHA3_256);
@@ -250,6 +253,8 @@ int do_bootstrap_ipcp(int     argc,
         if (ipcp_type != NULL) {
                 if (strcmp(ipcp_type, NORMAL) == 0)
                         type = IPCP_NORMAL;
+                else if (strcmp(ipcp_type, BROADCAST) == 0)
+                        type = IPCP_BROADCAST;
                 else if (strcmp(ipcp_type, UDP) == 0)
                         type = IPCP_UDP;
                 else if (strcmp(ipcp_type, ETH_LLC) == 0)
@@ -285,8 +290,9 @@ int do_bootstrap_ipcp(int     argc,
                         }
                         conf.type = ipcps[i].type;
 
-                        if (autobind && conf.type != IPCP_NORMAL) {
-                                printf("Can only bind normal IPCPs, "
+                        if (autobind && (conf.type != IPCP_NORMAL &&
+                                         conf.type != IPCP_BROADCAST)) {
+                                printf("Can not bind this IPCP type,"
                                        "autobind disabled.\n\n");
                                 autobind = false;
                         }
@@ -326,6 +332,8 @@ int do_bootstrap_ipcp(int     argc,
                                 conf.dev = dev;
                                 conf.ethertype = ethertype;
                                 break;
+                        case IPCP_BROADCAST:
+                                /* FALLTHRU */
                         case IPCP_LOCAL:
                                 /* FALLTHRU */
                         case IPCP_RAPTOR:
diff --git a/src/tools/irm/irm_ipcp_create.c b/src/tools/irm/irm_ipcp_create.c
index c8866962..5694eccf 100644
--- a/src/tools/irm/irm_ipcp_create.c
+++ b/src/tools/irm/irm_ipcp_create.c
@@ -44,19 +44,20 @@
 #include "irm_ops.h"
 #include "irm_utils.h"
 
-#define NORMAL  "normal"
-#define UDP     "udp"
-#define ETH_LLC "eth-llc"
-#define ETH_DIX "eth-dix"
-#define LOCAL   "local"
-#define RAPTOR  "raptor"
+#define NORMAL    "normal"
+#define BROADCAST "broadcast"
+#define UDP       "udp"
+#define ETH_LLC   "eth-llc"
+#define ETH_DIX   "eth-dix"
+#define LOCAL     "local"
+#define RAPTOR    "raptor"
 
 static void usage(void)
 {
         printf("Usage: irm ipcp create\n"
                "                name <ipcp name>\n"
                "                type [TYPE]\n\n"
-               "where TYPE = {" NORMAL " " LOCAL " "
+               "where TYPE = {" NORMAL " " BROADCAST " " LOCAL " "
                UDP " " ETH_LLC " " RAPTOR "}\n");
 }
 
@@ -90,6 +91,8 @@ int do_create_ipcp(int     argc,
 
         if (strcmp(ipcp_type, NORMAL) == 0)
                 type = IPCP_NORMAL;
+        else if (strcmp(ipcp_type, BROADCAST) == 0)
+                type = IPCP_BROADCAST;
         else if (strcmp(ipcp_type, UDP) == 0)
                 type = IPCP_UDP;
         else if (strcmp(ipcp_type, LOCAL) == 0)
diff --git a/src/tools/irm/irm_ipcp_enroll.c b/src/tools/irm/irm_ipcp_enroll.c
index c1628af6..5b6caf55 100644
--- a/src/tools/irm/irm_ipcp_enroll.c
+++ b/src/tools/irm/irm_ipcp_enroll.c
@@ -46,30 +46,39 @@
 
 #include <string.h>
 
+#define NORMAL    "normal"
+#define BROADCAST "broadcast"
+
 static void usage(void)
 {
         printf("Usage: irm ipcp enroll\n"
                "                name <ipcp name>\n"
                "                layer <layer to enroll in>\n"
-               "                [autobind]\n");
+               "                [type [TYPE], default = normal]\n"
+               "                [autobind]\n"
+               "where TYPE = {" NORMAL " " BROADCAST "}\n");
 }
 
 int do_enroll_ipcp(int     argc,
                    char ** argv)
 {
-        char *             ipcp     = NULL;
-        char *             layer    = NULL;
+        char *             ipcp      = NULL;
+        char *             layer     = NULL;
         struct ipcp_info * ipcps;
-        pid_t              pid      = -1;
-        ssize_t            len      = 0;
-        int                i        = 0;
-        bool               autobind = false;
+        pid_t              pid       = -1;
+        ssize_t            len       = 0;
+        int                i         = 0;
+        bool               autobind  = false;
         int                cargs;
+        char *             ipcp_type = NORMAL;
+        enum ipcp_type     type      = IPCP_INVALID;
 
         while (argc > 0) {
                 cargs = 2;
                 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, "autobind") == 0) {
@@ -90,14 +99,19 @@ int do_enroll_ipcp(int     argc,
                 return -1;
         }
 
+        if (strcmp(ipcp_type, NORMAL) == 0)
+                type = IPCP_NORMAL;
+        else if (strcmp(ipcp_type, BROADCAST) == 0)
+                type = IPCP_BROADCAST;
+
         len = irm_list_ipcps(&ipcps);
         for (i = 0; i < len; i++)
                 if (wildcard_match(ipcps[i].name, ipcp) == 0 &&
-                    ipcps[i].type == IPCP_NORMAL)
+                    ipcps[i].type == type)
                         pid = ipcps[i].pid;
 
         if (pid < 0) {
-                pid = irm_create_ipcp(ipcp, IPCP_NORMAL);
+                pid = irm_create_ipcp(ipcp, type);
                 if (pid < 0)
                         goto fail;
                 free(ipcps);
@@ -105,7 +119,7 @@ int do_enroll_ipcp(int     argc,
         }
 
         for (i = 0; i < len; i++) {
-                if (ipcps[i].type != IPCP_NORMAL)
+                if (ipcps[i].type != type)
                         continue;
                 if (wildcard_match(ipcps[i].name, ipcp) == 0) {
                         pid = ipcps[i].pid;
@@ -121,7 +135,8 @@ int do_enroll_ipcp(int     argc,
                         }
 
                         if (autobind && irm_bind_process(pid, layer)) {
-                                printf("Failed to bind %d to %s.\n", pid, layer);
+                                printf("Failed to bind %d to %s.\n",
+                                       pid, layer);
                                 goto fail;
                         }
                 }