diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-11-01 11:17:40 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-11-01 11:17:40 +0000 |
| commit | 0a9f1f2936381dfe350c1846b3bafc306590a88f (patch) | |
| tree | e077cc1012baa343a73e84816ede6e5dd1e94c38 /src/lib | |
| parent | 409cf34d132c71910d7b9d452f54ae49154946f9 (diff) | |
| parent | 2d88fdaaa018d607eca5ce057dfbdf41beb6125b (diff) | |
| download | ouroboros-0a9f1f2936381dfe350c1846b3bafc306590a88f.tar.gz ouroboros-0a9f1f2936381dfe350c1846b3bafc306590a88f.zip | |
Merged in sandervrijders/ouroboros/be-addr-auth (pull request #296)
ipcpd: normal: Add policy for obtaining a flat address
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dif_config.proto | 7 | ||||
| -rw-r--r-- | src/lib/irm.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/dif_config.proto b/src/lib/dif_config.proto index 338634d1..7eff28ba 100644 --- a/src/lib/dif_config.proto +++ b/src/lib/dif_config.proto @@ -11,9 +11,10 @@ message dif_config_msg { optional bool has_chk = 9; optional uint32 min_pdu_size = 10; optional uint32 max_pdu_size = 11; + optional uint32 addr_auth_type = 12; // Config for shim UDP - optional uint32 ip_addr = 12; - optional uint32 dns_addr = 13; + optional uint32 ip_addr = 13; + optional uint32 dns_addr = 14; // Config for the shim Ethernet LLC - optional string if_name = 14; + optional string if_name = 15; }
\ No newline at end of file diff --git a/src/lib/irm.c b/src/lib/irm.c index c68aa0f6..b1998145 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -119,6 +119,7 @@ int irm_bootstrap_ipcp(pid_t api, config.has_has_chk = true; config.has_min_pdu_size = true; config.has_max_pdu_size = true; + config.has_addr_auth_type = true; config.addr_size = conf->addr_size; config.cep_id_size = conf->cep_id_size; @@ -129,6 +130,7 @@ int irm_bootstrap_ipcp(pid_t api, config.has_chk = conf->has_chk; config.min_pdu_size = conf->min_pdu_size; config.max_pdu_size = conf->max_pdu_size; + config.addr_auth_type = conf->addr_auth_type; break; case IPCP_SHIM_UDP: config.has_ip_addr = true; |