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

Don't show all tunnels

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-07-19 22:40:31 +00:00
parent ed82531fc0
commit 67ea65b1a8
3 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bind.c
View File

@@ -299,6 +299,7 @@ gt_bind(int argc, char **argv)
res.ret = errno;
break;
case CTL_STATUS:
memcpy(res.status.tun_name, tun_name, sizeof(tun_name)); // XXX
res.status.pid = pid;
res.status.mtu = mtu;
res.status.chacha = chacha;

1
src/ctl.h
View File

@@ -27,6 +27,7 @@ struct ctl_msg {
} path;
struct mud_path path_status;
struct {
char tun_name[64];
long pid;
size_t mtu;
int chacha;

71
src/show.c
View File

@@ -12,7 +12,7 @@
#include <unistd.h>
static int
gt_show_dev_status(int fd, const char *dev)
gt_show_print_status(int fd)
{
struct ctl_msg res, req = {.type = CTL_STATUS};
@@ -42,7 +42,7 @@ gt_show_dev_status(int fd, const char *dev)
" %zu"
" %s"
"\n",
dev,
res.status.tun_name,
res.status.pid,
bindstr[0] ? bindstr : "-",
gt_get_port((struct sockaddr *)&res.status.bind),
@@ -62,7 +62,7 @@ gt_show_dev_status(int fd, const char *dev)
" %zu"
" %s"
"\n",
dev,
res.status.tun_name,
res.status.pid,
bindstr[0] ? bindstr : "-",
gt_get_port((struct sockaddr *)&res.status.bind),
@@ -75,30 +75,6 @@ gt_show_dev_status(int fd, const char *dev)
return 0;
}
static int
gt_show_dev(const char *dev)
{
int fd = ctl_connect(GT_RUNDIR, dev);
if (fd < 0) {
if (fd == -1)
perror("show");
return -1;
}
int ret = gt_show_dev_status(fd, dev);
if (ret == -1)
perror(dev);
if (ret == -2)
gt_log("%s: bad reply from server\n", dev);
ctl_delete(fd);
return ret;
}
int
gt_show(int argc, char **argv)
{
@@ -111,27 +87,34 @@ gt_show(int argc, char **argv)
if (argz(showz, argc, argv))
return 1;
if (dev)
return !!gt_show_dev(dev);
int fd = ctl_connect(GT_RUNDIR, dev);
DIR *dp = opendir(GT_RUNDIR);
if (!dp) {
if (errno == ENOENT)
return 0;
if (fd < 0) {
switch (fd) {
case -1:
perror("show");
break;
case -2:
gt_log("no device\n");
break;
case -3:
gt_log("please choose a device\n");
break;
default:
gt_log("couldn't connect\n");
}
return 1;
}
int ret = 0;
struct dirent *d = NULL;
int ret = gt_show_print_status(fd);
while (d = readdir(dp), d) {
if (d->d_name[0] != '.')
ret |= !!gt_show_dev(d->d_name);
}
closedir(dp);
return ret;
if (ret == -2)
gt_log("bad reply from server\n");
if (ret == -1)
perror("show");
ctl_delete(fd);
return !!ret;
}