miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unlock glorytun path

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-07-17 14:27:46 +00:00
parent a72075036a
commit cce55fac21
2 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mud

Submodule mud updated: 06e165e664...14893f9ea9

91
src/path.c
View File

@@ -8,49 +8,30 @@
#include "../argz/argz.h" #include "../argz/argz.h"
static int static void
gt_path_status(int fd) gt_path_print_status(struct mud_path *path, int term)
{ {
struct ctl_msg req = {
.type = CTL_PATH_STATUS,
}, res = {0};
if (send(fd, &req, sizeof(struct ctl_msg), 0) == -1)
return -1;
int term = isatty(1);
do {
if (recv(fd, &res, sizeof(struct ctl_msg), 0) == -1)
return -1;
if (res.type != req.type)
return -2;
if (!res.ret)
return 0;
char bindstr[INET6_ADDRSTRLEN]; char bindstr[INET6_ADDRSTRLEN];
char publstr[INET6_ADDRSTRLEN]; char publstr[INET6_ADDRSTRLEN];
char peerstr[INET6_ADDRSTRLEN]; char peerstr[INET6_ADDRSTRLEN];
gt_toaddr(bindstr, sizeof(bindstr), gt_toaddr(bindstr, sizeof(bindstr),
(struct sockaddr *)&res.path_status.local_addr); (struct sockaddr *)&path->local_addr);
gt_toaddr(publstr, sizeof(publstr), gt_toaddr(publstr, sizeof(publstr),
(struct sockaddr *)&res.path_status.r_addr); (struct sockaddr *)&path->r_addr);
gt_toaddr(peerstr, sizeof(peerstr), gt_toaddr(peerstr, sizeof(peerstr),
(struct sockaddr *)&res.path_status.addr); (struct sockaddr *)&path->addr);
const char *statestr = NULL; const char *statestr = NULL;
switch (res.path_status.state) { switch (path->state) {
case MUD_UP: statestr = "UP"; break; case MUD_UP: statestr = "UP"; break;
case MUD_BACKUP: statestr = "BACKUP"; break; case MUD_BACKUP: statestr = "BACKUP"; break;
case MUD_DOWN: statestr = "DOWN"; break; case MUD_DOWN: statestr = "DOWN"; break;
default: return -2; default: return;
} }
const char *statusstr = res.path_status.ok ? "OK" : "DEGRADED"; const char *statusstr = path->ok ? "OK" : "DEGRADED";
printf(term ? "path %s\n" printf(term ? "path %s\n"
" status: %s\n" " status: %s\n"
@@ -78,19 +59,53 @@ gt_path_status(int fd)
statestr, statestr,
statusstr, statusstr,
bindstr[0] ? bindstr : "-", bindstr[0] ? bindstr : "-",
gt_get_port((struct sockaddr *)&res.path_status.local_addr), gt_get_port((struct sockaddr *)&path->local_addr),
publstr[0] ? publstr : "-", publstr[0] ? publstr : "-",
gt_get_port((struct sockaddr *)&res.path_status.r_addr), gt_get_port((struct sockaddr *)&path->r_addr),
peerstr[0] ? peerstr : "-", peerstr[0] ? peerstr : "-",
gt_get_port((struct sockaddr *)&res.path_status.addr), gt_get_port((struct sockaddr *)&path->addr),
res.path_status.mtu.ok, path->mtu.ok,
(double)res.path_status.rtt.val / 1e3, (double)path->rtt.val / 1e3,
(double)res.path_status.rtt.var / 1e3, (double)path->rtt.var / 1e3,
res.path_status.rate_tx, path->rate_tx,
res.path_status.rate_rx, path->rate_rx,
res.path_status.send.total, path->send.total,
res.path_status.recv.total); path->recv.total);
} while (res.ret == EAGAIN); }
static int
gt_path_status(int fd)
{
struct ctl_msg req = {
.type = CTL_PATH_STATUS,
}, res = {0};
if (send(fd, &req, sizeof(struct ctl_msg), 0) == -1)
return -1;
struct mud_path path[MUD_PATH_MAX];
int count = 0;
while (1) {
if (recv(fd, &res, sizeof(struct ctl_msg), 0) == -1)
return -1;
if (res.type != req.type)
return -2;
if (res.ret == EAGAIN) {
memcpy(&path[count], &res.path_status, sizeof(struct mud_path));
count++;
} else if (res.ret) {
errno = res.ret;
return -1;
} else break;
}
int term = isatty(1);
for (int i = 0; i < count; i++)
gt_path_print_status(&path[i], term);
return 0; return 0;
} }