summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-01 11:17:42 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-01 11:17:42 +0200
commit84293e0e57ee2a3d779a575717fbc54f8e94e178 (patch)
treee0825f5586c2870839f15e0c8f4b390463145cd0 /src/tools
parent434c782c99496b491684f4ab0058d9491c250774 (diff)
parentcf719963be2e42026012e152ae49f4c764dd9b4f (diff)
downloadouroboros-84293e0e57ee2a3d779a575717fbc54f8e94e178.tar.gz
ouroboros-84293e0e57ee2a3d779a575717fbc54f8e94e178.zip
Merged in sandervrijders/ouroboros/be-enrolment (pull request #182)
Be enrolment
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/irm/irm_ipcp_bootstrap.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c
index 94b7f81e..d5fa97da 100644
--- a/src/tools/irm/irm_ipcp_bootstrap.c
+++ b/src/tools/irm/irm_ipcp_bootstrap.c
@@ -41,7 +41,6 @@
#define DEFAULT_ADDR_SIZE 4
#define DEFAULT_CEP_ID_SIZE 2
#define DEFAULT_PDU_LEN_SIZE 2
-#define DEFAULT_QOS_ID_SIZE 1
#define DEFAULT_SEQ_NO_SIZE 4
#define DEFAULT_TTL_SIZE 1
#define DEFAULT_CHK_SIZE 2
@@ -62,7 +61,6 @@ static void usage()
" [addr <address size> (default: %d)]\n"
" [cep_id <CEP-id size> (default: %d)]\n"
" [pdu_len <PDU length size> (default: %d)]\n"
- " [qos_id <QoS-id size> (default: %d)]\n"
" [seqno <sequence number size> (default: %d)]\n"
" [ttl <time to live size> (default: %d)]\n"
" [chk <checksum size> (default: %d)]\n"
@@ -75,10 +73,9 @@ static void usage()
"if TYPE == " SHIM_ETH_LLC "\n"
" if_name <interface name>\n",
DEFAULT_ADDR_SIZE, DEFAULT_CEP_ID_SIZE,
- DEFAULT_PDU_LEN_SIZE, DEFAULT_QOS_ID_SIZE,
- DEFAULT_SEQ_NO_SIZE, DEFAULT_TTL_SIZE,
- DEFAULT_CHK_SIZE, DEFAULT_MIN_PDU_SIZE,
- DEFAULT_MAX_PDU_SIZE, DEFAULT_DDNS);
+ DEFAULT_PDU_LEN_SIZE, DEFAULT_SEQ_NO_SIZE,
+ DEFAULT_TTL_SIZE, DEFAULT_CHK_SIZE,
+ DEFAULT_MIN_PDU_SIZE, DEFAULT_MAX_PDU_SIZE, DEFAULT_DDNS);
}
int do_bootstrap_ipcp(int argc, char ** argv)
@@ -88,7 +85,6 @@ int do_bootstrap_ipcp(int argc, char ** argv)
uint8_t addr_size = DEFAULT_ADDR_SIZE;
uint8_t cep_id_size = DEFAULT_CEP_ID_SIZE;
uint8_t pdu_length_size = DEFAULT_PDU_LEN_SIZE;
- uint8_t qos_id_size = DEFAULT_QOS_ID_SIZE;
uint8_t seqno_size = DEFAULT_SEQ_NO_SIZE;
uint8_t ttl_size = DEFAULT_TTL_SIZE;
uint8_t chk_size = DEFAULT_CHK_SIZE;
@@ -128,8 +124,6 @@ int do_bootstrap_ipcp(int argc, char ** argv)
cep_id_size = atoi(*(argv + 1));
} else if (matches(*argv, "pdu_len") == 0) {
pdu_length_size = atoi(*(argv + 1));
- } else if (matches(*argv, "qos_id") == 0) {
- qos_id_size = atoi(*(argv + 1));
} else if (matches(*argv, "seqno") == 0) {
seqno_size = atoi(*(argv + 1));
} else if (matches(*argv, "ttl") == 0) {
@@ -162,7 +156,6 @@ int do_bootstrap_ipcp(int argc, char ** argv)
conf.addr_size = addr_size;
conf.cep_id_size = cep_id_size;
conf.pdu_length_size = pdu_length_size;
- conf.qos_id_size = qos_id_size;
conf.seqno_size = seqno_size;
conf.ttl_size = ttl_size;
conf.chk_size = chk_size;