summaryrefslogtreecommitdiff
path: root/src/tools/irm
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/irm')
-rw-r--r--src/tools/irm/irm_ipcp_bootstrap.c9
-rw-r--r--src/tools/irm/irm_ipcp_connect.c22
-rw-r--r--src/tools/irm/irm_name_create.c24
3 files changed, 31 insertions, 24 deletions
diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c
index de73b076..cc8bf8fa 100644
--- a/src/tools/irm/irm_ipcp_bootstrap.c
+++ b/src/tools/irm/irm_ipcp_bootstrap.c
@@ -105,7 +105,8 @@ static char * usage_str = \
" [Data Transfer Constants]\n"
" [addr <address size> (default: %d)]\n"
" [eid <eid size> (default: %d)]\n"
- " [ttl <max time-to-live>, default: %d)]\n\n"
+ " [ttl <max time-to-live>, default: %d)]\n"
+ " [rtt <max layer RTT in ms> (default: %d)]\n\n"
"if DIRECTORY_POLICY == " DHT_DIR "\n"
" [dht_alpha <search factor> (default: %u)]\n"
" [dht_k <replication factor> (default: %u)]\n"
@@ -152,7 +153,7 @@ static void usage(void)
/* unicast */
FLAT_RANDOM, DHT_DIR, SHA3_256, LINK_STATE, MB_ECN_CA,
/* dt */
- DT(addr_size), DT(eid_size), DT(max_ttl),
+ DT(addr_size), DT(eid_size), DT(max_ttl), DT(max_rtt),
/* dht */
DHT(alpha), DHT(k), DHT(t_expire),
DHT(t_refresh), DHT(t_replicate),
@@ -184,6 +185,7 @@ int do_bootstrap_ipcp(int argc,
uint8_t addr_size = DT(addr_size);
uint8_t eid_size = DT(eid_size);
uint8_t max_ttl = DT(max_ttl);
+ uint16_t max_rtt = DT(max_rtt);
struct routing_config routing = default_routing_config;
enum pol_addr_auth addr_auth_type = UNI(addr_auth_type);
enum pol_cong_avoid cong_avoid = UNI(cong_avoid);
@@ -250,6 +252,8 @@ int do_bootstrap_ipcp(int argc,
eid_size = atoi(*(argv + 1));
} else if (matches(*argv, "ttl") == 0) {
max_ttl = atoi(*(argv + 1));
+ } else if (matches(*argv, "rtt") == 0) {
+ max_rtt = atoi(*(argv + 1));
} else if (matches(*argv, "port") == 0) {
port4 = atoi(*(argv + 1));
port6 = port4;
@@ -422,6 +426,7 @@ int do_bootstrap_ipcp(int argc,
conf.unicast.dt.addr_size = addr_size;
conf.unicast.dt.eid_size = eid_size;
conf.unicast.dt.max_ttl = max_ttl;
+ conf.unicast.dt.max_rtt = max_rtt;
conf.unicast.dt.routing = routing;
conf.unicast.addr_auth_type = addr_auth_type;
conf.unicast.cong_avoid = cong_avoid;
diff --git a/src/tools/irm/irm_ipcp_connect.c b/src/tools/irm/irm_ipcp_connect.c
index f88c36dc..fb21faec 100644
--- a/src/tools/irm/irm_ipcp_connect.c
+++ b/src/tools/irm/irm_ipcp_connect.c
@@ -100,16 +100,18 @@ int do_connect_ipcp(int argc,
}
if (qos != NULL) {
- if (strcmp(qos, "best") == 0)
- qs = qos_best_effort;
- else if (strcmp(qos, "raw") == 0)
+ if (strcmp(qos, "raw") == 0)
qs = qos_raw;
- else if (strcmp(qos, "video") == 0)
- qs = qos_video;
- else if (strcmp(qos, "voice") == 0)
- qs = qos_voice;
- else if (strcmp(qos, "data") == 0)
- qs = qos_data;
+ else if (strcmp(qos, "safe") == 0)
+ qs = qos_raw_safe;
+ else if (strcmp(qos, "rt") == 0)
+ qs = qos_rt;
+ else if (strcmp(qos, "rt-safe") == 0)
+ qs = qos_rt_safe;
+ else if (strcmp(qos, "msg") == 0)
+ qs = qos_msg;
+ else if (strcmp(qos, "stream") == 0)
+ qs = qos_stream;
else
printf("Unknown QoS cube, defaulting to raw.\n");
}
@@ -126,7 +128,7 @@ int do_connect_ipcp(int argc,
if (wildcard_match(comp, MGMT) == 0) {
component = MGMT_COMP;
- /* FIXME: move to qos_data when stable */
+ /* FIXME: move to qos_msg when stable */
if (irm_connect_ipcp(pid, dst, component, qos_raw))
return -1;
}
diff --git a/src/tools/irm/irm_name_create.c b/src/tools/irm/irm_name_create.c
index 1055700c..40a51193 100644
--- a/src/tools/irm/irm_name_create.c
+++ b/src/tools/irm/irm_name_create.c
@@ -51,10 +51,10 @@
#define RR "round-robin"
#define SPILL "spillover"
-#define SENC "<security_dir>/server/<name>/enc.conf"
+#define SSEC "<security_dir>/server/<name>/sec.conf"
#define SCRT "<security_dir>/server/<name>/crt.pem"
#define SKEY "<security_dir>/server/<name>/key.pem"
-#define CENC "<security_dir>/client/<name>/enc.conf"
+#define CSEC "<security_dir>/client/<name>/sec.conf"
#define CCRT "<security_dir>/client/<name>/crt.pem"
#define CKEY "<security_dir>/client/<name>/key.pem"
@@ -63,10 +63,10 @@ static void usage(void)
printf("Usage: irm name create\n"
" <name>. max %d chars.\n"
" [lb LB_POLICY], default: %s\n"
- " [sencpath <path>, default: " SENC "]\n"
+ " [ssecpath <path>, default: " SSEC "]\n"
" [scrtpath <path>, default: " SCRT "]\n"
" [skeypath <path>, default: " SKEY "]\n"
- " [cencpath <path>, default: " CENC "]\n"
+ " [csecpath <path>, default: " CSEC "]\n"
" [ccrtpath <path>, default: " CCRT "]\n"
" [ckeypath <path>, default: " CKEY "]\n"
"\n"
@@ -105,10 +105,10 @@ int do_create_name(int argc,
{
struct name_info info = {};
char * name = NULL;
- char * sencpath = NULL;
+ char * ssecpath = NULL;
char * scrtpath = NULL;
char * skeypath = NULL;
- char * cencpath = NULL;
+ char * csecpath = NULL;
char * ccrtpath = NULL;
char * ckeypath = NULL;
char * lb_pol = RR;
@@ -119,14 +119,14 @@ int do_create_name(int argc,
while (argc > 0) {
if (matches(*argv, "lb") == 0) {
lb_pol = *(argv + 1);
- } else if (matches(*argv, "sencpath") == 0) {
- sencpath = *(argv + 1);
+ } else if (matches(*argv, "ssecpath") == 0) {
+ ssecpath = *(argv + 1);
} else if (matches(*argv, "scrtpath") == 0) {
scrtpath = *(argv + 1);
} else if (matches(*argv, "skeypath") == 0) {
skeypath = *(argv + 1);
- } else if (matches(*argv, "cencpath") == 0) {
- cencpath = *(argv + 1);
+ } else if (matches(*argv, "csecpath") == 0) {
+ csecpath = *(argv + 1);
} else if (matches(*argv, "ccrtpath") == 0) {
ccrtpath = *(argv + 1);
} else if (matches(*argv, "ckeypath") == 0) {
@@ -151,7 +151,7 @@ int do_create_name(int argc,
strcpy(info.name, name);
- if (sencpath != NULL && cp_chk_path(info.s.enc, sencpath) < 0)
+ if (ssecpath != NULL && cp_chk_path(info.s.sec, ssecpath) < 0)
goto fail;
if (scrtpath != NULL && cp_chk_path(info.s.crt, scrtpath) < 0)
@@ -160,7 +160,7 @@ int do_create_name(int argc,
if (skeypath != NULL && cp_chk_path(info.s.key, skeypath) < 0)
goto fail;
- if (cencpath != NULL && cp_chk_path(info.c.enc, cencpath) < 0)
+ if (csecpath != NULL && cp_chk_path(info.c.sec, csecpath) < 0)
goto fail;
if (ccrtpath != NULL && cp_chk_path(info.c.crt, ccrtpath) < 0)
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-05 09:15:51 +0000