diff options
| author | Dimitri Staessens <[email protected]> | 2020-02-12 22:31:18 +0100 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2020-02-16 18:21:41 +0100 |
| commit | 0ae1f0dd600f6c21c34565cf4dc0c5ef0ae42709 (patch) | |
| tree | 023e611cb59e4e14f03adaffa15190c835f80814 /src/lib | |
| parent | 71eeedd1a05d5dd200c77527ea15086bf43e1a26 (diff) | |
| download | ouroboros-0ae1f0dd600f6c21c34565cf4dc0c5ef0ae42709.tar.gz ouroboros-0ae1f0dd600f6c21c34565cf4dc0c5ef0ae42709.zip | |
ipcpd: Configure PFF from routing policy
The Packet Forwarding Function (PFF) was user-configurable using the
irm tool. However, this isn't really wanted since the PFF is dictated
by the routing algorithm. This moves the responsability for selecting
the correct PFF from the network admin to the unicast IPCP
implementation. Each routing policy now has to specify which PFF it
will use.
Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ipcp_config.proto | 13 | ||||
| -rw-r--r-- | src/lib/irm.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index 17d1c47e..23c65e94 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -36,16 +36,15 @@ message ipcp_config_msg { optional uint32 max_ttl = 5; optional uint32 addr_auth_type = 6; optional uint32 routing_type = 7; - optional uint32 pff_type = 8; // Config for UDP - optional uint32 ip_addr = 9; - optional uint32 dns_addr = 10; - optional uint32 clt_port = 11; - optional uint32 srv_port = 12; + optional uint32 ip_addr = 8; + optional uint32 dns_addr = 9; + optional uint32 clt_port = 10; + optional uint32 srv_port = 11; // Config for the Ethernet - optional string dev = 13; + optional string dev = 12; // Config for DIX Ethernet - optional uint32 ethertype = 14; + optional uint32 ethertype = 13; } enum enroll_code { diff --git a/src/lib/irm.c b/src/lib/irm.c index 9b74c72d..e4b39f2c 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -132,8 +132,6 @@ int irm_bootstrap_ipcp(pid_t pid, 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; break; case IPCP_UDP: config.has_ip_addr = true; |