Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-05-10 19:51:18 +00:00
parent 36be8008d8
commit ca71508e5c
3 changed files with 9 additions and 1 deletions

View File

@@ -202,7 +202,9 @@ gt_bind(int argc, char **argv)
fd_set_nonblock(mud_fd);
fd_set_nonblock(ctl_fd);
gt_log("running...\n");
const long pid = (long)getpid();
gt_log("running on device %s as pid %li\n", tun_name, pid);
fd_set rfds;
FD_ZERO(&rfds);
@@ -286,6 +288,7 @@ gt_bind(int argc, char **argv)
res.ret = errno;
break;
case CTL_STATUS:
res.status.pid = pid;
res.status.mtu = mtu;
res.status.chacha = chacha;
res.status.bind = bind_addr;

View File

@@ -26,6 +26,7 @@ struct ctl_msg {
} path;
struct mud_path path_status;
struct {
long pid;
size_t mtu;
int chacha;
struct sockaddr_storage bind;

View File

@@ -29,21 +29,25 @@ gt_show_dev_status(int fd, const char *dev)
if (server) {
printf("server %s:\n"
" pid: %li\n"
" bind: %s port %"PRIu16"\n"
" mtu: %zu\n"
" cipher: %s\n",
dev,
res.status.pid,
bindstr[0] ? bindstr : "-",
gt_get_port((struct sockaddr *)&res.status.bind),
res.status.mtu,
res.status.chacha ? "chacha20poly1305" : "aes256gcm");
} else {
printf("client %s:\n"
" pid: %li\n"
" bind: %s port %"PRIu16"\n"
" peer: %s port %"PRIu16"\n"
" mtu: %zu\n"
" cipher: %s\n",
dev,
res.status.pid,
bindstr[0] ? bindstr : "-",
gt_get_port((struct sockaddr *)&res.status.bind),
peerstr[0] ? peerstr : "-",