Merged in sandervrijders/ouroboros/be-llc (pull request #123)

ipcpd: Adds a shim over IEEE 802.2 over IEEE 802.3

2 files changed, 17 insertions, 11 deletions

diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 81b39406..0657710e 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -23,15 +23,16 @@
 #ifndef OUROBOROS_CONFIG
 #define OUROBOROS_CONFIG
 
-#define PROJECT_NAME       "@CMAKE_PROJECT_NAME@"
-#define PROJECT_VERSION    "@PACKAGE_VERSION@"
-#define INSTALL_DIR        "@CMAKE_INSTALL_PREFIX@"
-#define _POSIX_C_SOURCE    199506L
-#define IPCP_SHIM_UDP_EXEC "@IPCP_SHIM_UDP_TARGET@"
-#define IPCP_NORMAL_EXEC   "@IPCP_NORMAL_TARGET@"
-#define IPCP_LOCAL_EXEC    "@IPCP_LOCAL_TARGET@"
-#define AP_MAX_FLOWS       256
-#define DU_BUFF_HEADSPACE  128
-#define DU_BUFF_TAILSPACE  0
+#define PROJECT_NAME           "@CMAKE_PROJECT_NAME@"
+#define PROJECT_VERSION        "@PACKAGE_VERSION@"
+#define INSTALL_DIR            "@CMAKE_INSTALL_PREFIX@"
+#define _POSIX_C_SOURCE        199506L
+#define IPCP_SHIM_UDP_EXEC     "@IPCP_SHIM_UDP_TARGET@"
+#define IPCP_SHIM_ETH_LLC_EXEC "@IPCP_SHIM_ETH_LLC_TARGET@"
+#define IPCP_NORMAL_EXEC       "@IPCP_NORMAL_TARGET@"
+#define IPCP_LOCAL_EXEC        "@IPCP_LOCAL_TARGET@"
+#define AP_MAX_FLOWS           256
+#define DU_BUFF_HEADSPACE      128
+#define DU_BUFF_TAILSPACE      0
 
 #endif
diff --git a/include/ouroboros/dif_config.h b/include/ouroboros/dif_config.h
index 78554ec9..20e86cd1 100644
--- a/include/ouroboros/dif_config.h
+++ b/include/ouroboros/dif_config.h
@@ -29,7 +29,8 @@
 enum ipcp_type {
         IPCP_NORMAL = 0,
         IPCP_LOCAL,
-        IPCP_SHIM_UDP
+        IPCP_SHIM_UDP,
+        IPCP_SHIM_ETH_LLC
 };
 
 struct dif_config {
@@ -57,6 +58,10 @@ struct dif_config {
                         uint32_t ip_addr;
                         uint32_t dns_addr;
                 };
+                /* Shim Ethernet LLC */
+                struct {
+                        char * if_name;
+                };
         };
 };