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

Create socket directly from ctl_connect()

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-02-28 08:18:18 +00:00
parent ff5b966866
commit f95aaef092
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/show.c
View File

@@ -41,9 +41,6 @@ gt_ss_addr(char *str, size_t size, struct sockaddr_storage *ss)
static int
gt_show_dev_status(int fd, const char *dev)
{
if (ctl_connect(fd, "/run/" PACKAGE_NAME, dev) == -1)
return -1;
struct ctl_msg res, req = {.type = CTL_STATUS};
if (ctl_reply(fd, &res, &req))
@@ -89,9 +86,9 @@ gt_show_dev_status(int fd, const char *dev)
static int
gt_show_dev(const char *dev)
{
int fd = ctl_create("/run/" PACKAGE_NAME, NULL);
int fd = ctl_connect("/run/" PACKAGE_NAME, dev);
if (fd < 0) {
if (fd == -1) {
perror(dev);
return -1;
}