diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-11 18:59:11 +0100 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-12 13:40:38 +0100 |
commit | 15e9b779385c71d366776b83540e19e0735c4e66 (patch) | |
tree | 5f4fe39683c0676c243f287840f2775a867c9142 /src/lib | |
parent | a991831b5373eba38d6f756d254f151b22790238 (diff) | |
download | ouroboros-15e9b779385c71d366776b83540e19e0735c4e66.tar.gz ouroboros-15e9b779385c71d366776b83540e19e0735c4e66.zip |
ipcpd: normal: Create policies for GAM
This allows the selection of a policy for the graph adjacency
manager. Currently we only support constructing a complete graph.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/cacep.c | 6 | ||||
-rw-r--r-- | src/lib/dif_config.proto | 7 | ||||
-rw-r--r-- | src/lib/irm.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/cacep.c b/src/lib/cacep.c index 90994c04..22c6137f 100644 --- a/src/lib/cacep.c +++ b/src/lib/cacep.c @@ -39,9 +39,9 @@ struct cacep { uint64_t address; }; -struct cacep * cacep_create(int fd, - char * name, - uint64_t address) +struct cacep * cacep_create(int fd, + const char * name, + uint64_t address) { struct cacep * tmp; diff --git a/src/lib/dif_config.proto b/src/lib/dif_config.proto index 8a1d329e..f1f8747b 100644 --- a/src/lib/dif_config.proto +++ b/src/lib/dif_config.proto @@ -37,9 +37,10 @@ message dif_config_msg { optional uint32 min_pdu_size = 10; optional uint32 max_pdu_size = 11; optional uint32 addr_auth_type = 12; + optional uint32 dt_gam_type = 13; // Config for shim UDP - optional uint32 ip_addr = 13; - optional uint32 dns_addr = 14; + optional uint32 ip_addr = 14; + optional uint32 dns_addr = 15; // Config for the shim Ethernet LLC - optional string if_name = 15; + optional string if_name = 16; }
\ No newline at end of file diff --git a/src/lib/irm.c b/src/lib/irm.c index 635c8f9b..ade38b6f 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -120,6 +120,7 @@ int irm_bootstrap_ipcp(pid_t api, config.has_min_pdu_size = true; config.has_max_pdu_size = true; config.has_addr_auth_type = true; + config.has_dt_gam_type = true; config.addr_size = conf->addr_size; config.cep_id_size = conf->cep_id_size; @@ -131,6 +132,7 @@ int irm_bootstrap_ipcp(pid_t api, config.min_pdu_size = conf->min_pdu_size; config.max_pdu_size = conf->max_pdu_size; config.addr_auth_type = conf->addr_auth_type; + config.dt_gam_type = conf->dt_gam_type; break; case IPCP_SHIM_UDP: config.has_ip_addr = true; |