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

Write state after the close()

Browse Source
This commit is contained in:
angt
2015-12-28 07:18:00 +01:00
parent e5eb30598d
commit 46842dd200
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@@ -43,9 +43,6 @@
#define GT_TUNR_SIZE (0x7FFF-16) #define GT_TUNR_SIZE (0x7FFF-16)
#define GT_TUNW_SIZE (0x7FFF) #define GT_TUNW_SIZE (0x7FFF)
#define GT_STARTED "STARTED\n"
#define GT_STOPPED "STOPPED\n"
struct fdbuf { struct fdbuf {
int fd; int fd;
buffer_t read; buffer_t read;
@@ -387,6 +384,11 @@ static ssize_t fd_write (int fd, const void *data, size_t size)
return ret; return ret;
} }
static ssize_t fd_write_str (int fd, const char *str)
{
return fd_write(fd, str, str_len(str));
}
static size_t fd_read_all (int fd, void *data, size_t size) static size_t fd_read_all (int fd, void *data, size_t size)
{ {
size_t done = 0; size_t done = 0;
@@ -955,7 +957,7 @@ int main (int argc, char **argv)
retry = 0; retry = 0;
fd_write(state_fd, GT_STARTED, sizeof(GT_STARTED)-1); fd_write_str(state_fd, "STARTED");
fd_set rfds; fd_set rfds;
FD_ZERO(&rfds); FD_ZERO(&rfds);
@@ -1128,8 +1130,6 @@ int main (int argc, char **argv)
} }
restart: restart:
fd_write(state_fd, GT_STOPPED, sizeof(GT_STOPPED)-1);
if (sockname) { if (sockname) {
free(sockname); free(sockname);
sockname = NULL; sockname = NULL;
@@ -1139,6 +1139,8 @@ int main (int argc, char **argv)
close(sock.fd); close(sock.fd);
sock.fd = -1; sock.fd = -1;
} }
fd_write_str(state_fd, "STOPPED");
} }
freeaddrinfo(ai); freeaddrinfo(ai);