diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-14 15:03:28 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-14 15:03:28 +0200 |
| commit | 1a3b2987f2948d63b3febebbf00d2412de8d739a (patch) | |
| tree | b0c6a730d0c6773f76ad7e7eb187ff58562b3b13 /src/lib | |
| parent | 6271d09bdd17114c3095b7e819a7bcded14f26a5 (diff) | |
| parent | b294a556569b25ea6e201a004f06496bcbc944e0 (diff) | |
| download | ouroboros-1a3b2987f2948d63b3febebbf00d2412de8d739a.tar.gz ouroboros-1a3b2987f2948d63b3febebbf00d2412de8d739a.zip | |
Merged in sandervrijders/ouroboros/be-llc (pull request #123)
ipcpd: Adds a shim over IEEE 802.2 over IEEE 802.3
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dif_config.proto | 2 | ||||
| -rw-r--r-- | src/lib/ipcp.c | 2 | ||||
| -rw-r--r-- | src/lib/irm.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/dif_config.proto b/src/lib/dif_config.proto index 05b35ea7..dbdf19e5 100644 --- a/src/lib/dif_config.proto +++ b/src/lib/dif_config.proto @@ -14,4 +14,6 @@ message dif_config_msg { // Config for shim UDP optional uint32 ip_addr = 12; optional uint32 dns_addr = 13; + // Config for the shim Ethernet LLC + optional string if_name = 14; }
\ No newline at end of file diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 16fb67af..89756235 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -125,6 +125,8 @@ pid_t ipcp_create(char * ipcp_name, exec_name = IPCP_NORMAL_EXEC; else if (ipcp_type == IPCP_SHIM_UDP) exec_name = IPCP_SHIM_UDP_EXEC; + else if (ipcp_type == IPCP_SHIM_ETH_LLC) + exec_name = IPCP_SHIM_ETH_LLC_EXEC; else if (ipcp_type == IPCP_LOCAL) exec_name = IPCP_LOCAL_EXEC; else diff --git a/src/lib/irm.c b/src/lib/irm.c index 7c87f034..ff5c3237 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -139,6 +139,9 @@ int irm_bootstrap_ipcp(instance_name_t * api, break; case IPCP_LOCAL: break; + case IPCP_SHIM_ETH_LLC: + config.if_name = conf->if_name; + break; default: return -1; } |