projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
control.c
diff --git
a/src/control.c
b/src/control.c
index
1f56213
..
bf8a12b
100644
(file)
--- a/
src/control.c
+++ b/
src/control.c
@@
-106,7
+106,7
@@
bool control_h(connection_t *c, const char *request) {
for list_each(connection_t, other, connection_list) {
if(strcmp(other->name, name))
continue;
for list_each(connection_t, other, connection_list) {
if(strcmp(other->name, name))
continue;
- terminate_connection(other, other->
status.activ
e);
+ terminate_connection(other, other->
edg
e);
found = true;
}
found = true;
}
@@
-134,8
+134,8
@@
bool control_h(connection_t *c, const char *request) {
}
bool init_control(void) {
}
bool init_control(void) {
- randomize(controlcookie, sizeof
controlcookie
/ 2);
- bin2hex(controlcookie, controlcookie, sizeof
controlcookie
/ 2);
+ randomize(controlcookie, sizeof
(controlcookie)
/ 2);
+ bin2hex(controlcookie, controlcookie, sizeof
(controlcookie)
/ 2);
mode_t mask = umask(0);
umask(mask | 077);
mode_t mask = umask(0);
umask(mask | 077);
@@
-151,7
+151,7
@@
bool init_control(void) {
char *localhost = NULL;
sockaddr_t sa;
char *localhost = NULL;
sockaddr_t sa;
- socklen_t len = sizeof
sa
;
+ socklen_t len = sizeof
(sa)
;
// Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
// Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
@@
-163,7
+163,7
@@
bool init_control(void) {
sa.in.sin_addr.s_addr = htonl(0x7f000001);
} else if(sa.sa.sa_family == AF_INET6) {
static const uint8_t zero[16] = {0};
sa.in.sin_addr.s_addr = htonl(0x7f000001);
} else if(sa.sa.sa_family == AF_INET6) {
static const uint8_t zero[16] = {0};
- if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof
zero
))
+ if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof
(zero)
))
sa.in6.sin6_addr.s6_addr[15] = 1;
}
sa.in6.sin6_addr.s6_addr[15] = 1;
}
@@
-178,15
+178,15
@@
bool init_control(void) {
#ifndef HAVE_MINGW
int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(unix_fd < 0) {
#ifndef HAVE_MINGW
int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(unix_fd < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(
sock
errno));
return false;
}
return false;
}
- struct sockaddr_un sun;
- sun.sun_family = AF_UNIX;
- strncpy(s
un.sun_path, unixsocketname, sizeof sun.sun_path
);
+ struct sockaddr_un s
a_
un;
+ s
a_
un.sun_family = AF_UNIX;
+ strncpy(s
a_un.sun_path, unixsocketname, sizeof(sa_un.sun_path)
);
- if(connect(unix_fd, (struct sockaddr *)&s
un, sizeof sun
) >= 0) {
+ if(connect(unix_fd, (struct sockaddr *)&s
a_un, sizeof(sa_un)
) >= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
return false;
}
@@
-194,16
+194,16
@@
bool init_control(void) {
unlink(unixsocketname);
umask(mask | 077);
unlink(unixsocketname);
umask(mask | 077);
- int result = bind(unix_fd, (struct sockaddr *)&s
un, sizeof sun
);
+ int result = bind(unix_fd, (struct sockaddr *)&s
a_un, sizeof(sa_un)
);
umask(mask);
if(result < 0) {
umask(mask);
if(result < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(
sock
errno));
return false;
}
if(listen(unix_fd, 3) < 0) {
return false;
}
if(listen(unix_fd, 3) < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(
sock
errno));
return false;
}
return false;
}
@@
-215,6
+215,7
@@
bool init_control(void) {
void exit_control(void) {
#ifndef HAVE_MINGW
void exit_control(void) {
#ifndef HAVE_MINGW
+ unlink(unixsocketname);
io_del(&unix_socket);
close(unix_socket.fd);
#endif
io_del(&unix_socket);
close(unix_socket.fd);
#endif