diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-05-15 16:25:08 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-05-15 16:25:08 +0000 |
| commit | 1b3079ce9ad79e9c9b267fde3d09b9c8166ed1e5 (patch) | |
| tree | ea57e4a1e634d3b7e7325b61f6dba36d941e03ae /src/lib | |
| parent | 0fc0f3701ef4f504e71eadcc92a93faf1dd33bf4 (diff) | |
| parent | 5d87cec1757c4e1c23ae778f2814363c1e39b43c (diff) | |
| download | ouroboros-1b3079ce9ad79e9c9b267fde3d09b9c8166ed1e5.tar.gz ouroboros-1b3079ce9ad79e9c9b267fde3d09b9c8166ed1e5.zip | |
Merged in sandervrijders/ouroboros/be-routing-policy (pull request #506)
ipcpd: normal: Make routing a policy
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ipcp_config.proto | 7 | ||||
| -rw-r--r-- | src/lib/irm.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index b6c8c303..25516c2c 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -38,9 +38,10 @@ message ipcp_config_msg { optional uint32 addr_auth_type = 6; optional uint32 dt_gam_type = 7; optional uint32 rm_gam_type = 8; + optional uint32 routing_type = 9; // Config for shim UDP - optional uint32 ip_addr = 9; - optional uint32 dns_addr = 10; + optional uint32 ip_addr = 10; + optional uint32 dns_addr = 11; // Config for the shim Ethernet LLC - optional string if_name = 11; + optional string if_name = 12; } diff --git a/src/lib/irm.c b/src/lib/irm.c index d2f85bbf..68202ad9 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -126,6 +126,8 @@ int irm_bootstrap_ipcp(pid_t api, config.dt_gam_type = conf->dt_gam_type; config.has_rm_gam_type = true; config.rm_gam_type = conf->rm_gam_type; + config.has_routing_type = true; + config.routing_type = conf->routing_type; break; case IPCP_SHIM_UDP: config.has_ip_addr = true; |