diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-09-20 12:17:54 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-09-20 12:17:54 +0000 |
| commit | 0934aa0242f0d61f2b8f7311402cf009b88f1ca6 (patch) | |
| tree | 6b28d7f1fd7407d88c17c5a34b068e72748d7dff /src/lib | |
| parent | 1f723a8a2a02b4657f1d286f98f714895e15a5d8 (diff) | |
| parent | 2c7e3030edb84abae14042f7a1a22b44255324be (diff) | |
| download | ouroboros-0934aa0242f0d61f2b8f7311402cf009b88f1ca6.tar.gz ouroboros-0934aa0242f0d61f2b8f7311402cf009b88f1ca6.zip | |
Merged in sandervrijders/ouroboros/be-pff (pull request #604)
ipcpd: normal: Make PFF policy-based
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 96226653..aa2803f3 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -36,9 +36,10 @@ message ipcp_config_msg { optional bool has_ttl = 5; optional uint32 addr_auth_type = 6; optional uint32 routing_type = 7; + optional uint32 pff_type = 8; // Config for shim UDP - optional uint32 ip_addr = 8; - optional uint32 dns_addr = 9; + optional uint32 ip_addr = 9; + optional uint32 dns_addr = 10; // Config for the shim Ethernet LLC - optional string if_name = 10; + optional string if_name = 11; } diff --git a/src/lib/irm.c b/src/lib/irm.c index 7e593cc6..0b949e5a 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -123,6 +123,8 @@ int irm_bootstrap_ipcp(pid_t api, config.addr_auth_type = conf->addr_auth_type; config.has_routing_type = true; config.routing_type = conf->routing_type; + config.has_pff_type = true; + config.pff_type = conf->pff_type; dif_info.dir_hash_algo = conf->dif_info.dir_hash_algo; break; case IPCP_SHIM_UDP: |