Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42faaf816f |
2
mud
2
mud
Submodule mud updated: 2f966bb365...bda2c6eaa7
@@ -305,7 +305,8 @@ gt_bind(int argc, char **argv)
|
|||||||
req.path.rate_tx,
|
req.path.rate_tx,
|
||||||
req.path.rate_rx,
|
req.path.rate_rx,
|
||||||
req.path.beat,
|
req.path.beat,
|
||||||
req.path.fixed_rate))
|
req.path.fixed_rate,
|
||||||
|
req.path.loss_limit))
|
||||||
res.ret = errno;
|
res.ret = errno;
|
||||||
break;
|
break;
|
||||||
case CTL_CONF:
|
case CTL_CONF:
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ struct ctl_msg {
|
|||||||
unsigned long rate_rx;
|
unsigned long rate_rx;
|
||||||
unsigned long beat;
|
unsigned long beat;
|
||||||
unsigned char fixed_rate;
|
unsigned char fixed_rate;
|
||||||
|
unsigned char loss_limit;
|
||||||
} path;
|
} path;
|
||||||
struct {
|
struct {
|
||||||
char tun_name[64];
|
char tun_name[64];
|
||||||
|
|||||||
12
src/path.c
12
src/path.c
@@ -40,6 +40,7 @@ gt_path_print_status(struct mud_path *path, int term)
|
|||||||
" rtt: %.3f ms\n"
|
" rtt: %.3f ms\n"
|
||||||
" rttvar: %.3f ms\n"
|
" rttvar: %.3f ms\n"
|
||||||
" rate: %s\n"
|
" rate: %s\n"
|
||||||
|
" losslim: %u\n"
|
||||||
" beat: %"PRIu64" ms\n"
|
" beat: %"PRIu64" ms\n"
|
||||||
" tx:\n"
|
" tx:\n"
|
||||||
" rate: %"PRIu64" bytes/sec\n"
|
" rate: %"PRIu64" bytes/sec\n"
|
||||||
@@ -52,7 +53,7 @@ gt_path_print_status(struct mud_path *path, int term)
|
|||||||
: "path %s %s"
|
: "path %s %s"
|
||||||
" %s %"PRIu16" %s %"PRIu16" %s %"PRIu16
|
" %s %"PRIu16" %s %"PRIu16" %s %"PRIu16
|
||||||
" %zu %.3f %.3f"
|
" %zu %.3f %.3f"
|
||||||
" %s"
|
" %s %u"
|
||||||
" %"PRIu64
|
" %"PRIu64
|
||||||
" %"PRIu64" %"PRIu64" %"PRIu64
|
" %"PRIu64" %"PRIu64" %"PRIu64
|
||||||
" %"PRIu64" %"PRIu64" %"PRIu64
|
" %"PRIu64" %"PRIu64" %"PRIu64
|
||||||
@@ -69,6 +70,7 @@ gt_path_print_status(struct mud_path *path, int term)
|
|||||||
(double)path->rtt.val / 1e3,
|
(double)path->rtt.val / 1e3,
|
||||||
(double)path->rtt.var / 1e3,
|
(double)path->rtt.var / 1e3,
|
||||||
path->conf.fixed_rate ? "fixed" : "auto",
|
path->conf.fixed_rate ? "fixed" : "auto",
|
||||||
|
path->conf.loss_limit * 100 / 255,
|
||||||
path->conf.beat / 1000,
|
path->conf.beat / 1000,
|
||||||
path->tx.rate,
|
path->tx.rate,
|
||||||
path->tx.loss * 100 / 255,
|
path->tx.loss * 100 / 255,
|
||||||
@@ -145,6 +147,7 @@ int
|
|||||||
gt_path(int argc, char **argv)
|
gt_path(int argc, char **argv)
|
||||||
{
|
{
|
||||||
const char *dev = NULL;
|
const char *dev = NULL;
|
||||||
|
unsigned int loss_limit = 0;
|
||||||
|
|
||||||
struct ctl_msg req = {
|
struct ctl_msg req = {
|
||||||
.type = CTL_STATE,
|
.type = CTL_STATE,
|
||||||
@@ -165,6 +168,7 @@ gt_path(int argc, char **argv)
|
|||||||
{"up|backup|down", NULL, NULL, argz_option},
|
{"up|backup|down", NULL, NULL, argz_option},
|
||||||
{"rate", NULL, &ratez, argz_option},
|
{"rate", NULL, &ratez, argz_option},
|
||||||
{"beat", "SECONDS", &req.path.beat, argz_time},
|
{"beat", "SECONDS", &req.path.beat, argz_time},
|
||||||
|
{"losslimit", "PERCENT", &loss_limit, argz_percent},
|
||||||
{NULL}};
|
{NULL}};
|
||||||
|
|
||||||
if (argz(pathz, argc, argv))
|
if (argz(pathz, argc, argv))
|
||||||
@@ -190,7 +194,8 @@ gt_path(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int set = argz_is_set(pathz, "rate")
|
int set = argz_is_set(pathz, "rate")
|
||||||
|| argz_is_set(pathz, "beat");
|
|| argz_is_set(pathz, "beat")
|
||||||
|
|| argz_is_set(pathz, "losslimit");
|
||||||
|
|
||||||
if (set && !req.path.addr.ss_family) {
|
if (set && !req.path.addr.ss_family) {
|
||||||
gt_log("please specify a path\n");
|
gt_log("please specify a path\n");
|
||||||
@@ -205,6 +210,9 @@ gt_path(int argc, char **argv)
|
|||||||
req.path.state = MUD_DOWN;
|
req.path.state = MUD_DOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (loss_limit)
|
||||||
|
req.path.loss_limit = loss_limit * 255 / 100;
|
||||||
|
|
||||||
if (argz_is_set(ratez, "fixed")) {
|
if (argz_is_set(ratez, "fixed")) {
|
||||||
req.path.fixed_rate = 3;
|
req.path.fixed_rate = 3;
|
||||||
} else if (argz_is_set(ratez, "auto")) {
|
} else if (argz_is_set(ratez, "auto")) {
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ gt_set(int argc, char **argv)
|
|||||||
{"tc", "CS|AF|EF", &req.conf.tc, gt_argz_tc},
|
{"tc", "CS|AF|EF", &req.conf.tc, gt_argz_tc},
|
||||||
{"kxtimeout", "SECONDS", &req.conf.kxtimeout, argz_time},
|
{"kxtimeout", "SECONDS", &req.conf.kxtimeout, argz_time},
|
||||||
{"timetolerance", "SECONDS", &req.conf.timetolerance, argz_time},
|
{"timetolerance", "SECONDS", &req.conf.timetolerance, argz_time},
|
||||||
{"losslimit", "PERCENT", &req.conf.losslimit, argz_percent},
|
|
||||||
{"keepalive", "SECONDS", &req.conf.keepalive, argz_time},
|
{"keepalive", "SECONDS", &req.conf.keepalive, argz_time},
|
||||||
{NULL}};
|
{NULL}};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user