diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-04-11 17:01:47 +0200 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-04-11 17:01:47 +0200 |
commit | 9906ac98c45530e530d7aa439937aedf526c3508 (patch) | |
tree | cab5c35acbe4c8a1778fb2809c928a8d488a1111 /src/tools | |
parent | 60e357b819c8f2cf4dd699e67c496b50410872ac (diff) | |
download | ouroboros-9906ac98c45530e530d7aa439937aedf526c3508.tar.gz ouroboros-9906ac98c45530e530d7aa439937aedf526c3508.zip |
lib: Change ipcp types
This changes the name of the IPCP types after discussions with
Dimitri.
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/irm/irm_bootstrap_ipcp.c | 6 | ||||
-rw-r--r-- | src/tools/irm/irm_create_ipcp.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/tools/irm/irm_bootstrap_ipcp.c b/src/tools/irm/irm_bootstrap_ipcp.c index 7e7b6e05..78a09362 100644 --- a/src/tools/irm/irm_bootstrap_ipcp.c +++ b/src/tools/irm/irm_bootstrap_ipcp.c @@ -139,7 +139,7 @@ int do_bootstrap_ipcp(int argc, char ** argv) conf.dif_name = dif_name; if (strcmp(ipcp_type, NORMAL) == 0) { - conf.type = NORMAL_IPCP; + conf.type = IPCP_NORMAL; conf.addr_size = addr_size; conf.cep_id_size = cep_id_size; conf.pdu_length_size = pdu_length_size; @@ -150,13 +150,11 @@ int do_bootstrap_ipcp(int argc, char ** argv) conf.min_pdu_size = min_pdu_size; conf.max_pdu_size = max_pdu_size; } else if (strcmp(ipcp_type, SHIM_UDP) == 0) { - conf.type = SHIM_UDP_IPCP; - + conf.type = IPCP_SHIM_UDP; if (ip_addr == 0) { usage(); return -1; } - conf.ip_addr = ip_addr; } else { usage(); diff --git a/src/tools/irm/irm_create_ipcp.c b/src/tools/irm/irm_create_ipcp.c index e4a0f22f..08b55259 100644 --- a/src/tools/irm/irm_create_ipcp.c +++ b/src/tools/irm/irm_create_ipcp.c @@ -73,9 +73,9 @@ int do_create_ipcp(int argc, char ** argv) } if (strcmp(ipcp_type, NORMAL) == 0) - type = NORMAL_IPCP; + type = IPCP_NORMAL; else if (strcmp(ipcp_type, SHIM_UDP) == 0) - type = SHIM_UDP_IPCP; + type = IPCP_SHIM_UDP; else { usage(); return -1; |