projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename controlcookie file to pidfile.
[tinc]
/
src
/
control.c
diff --git
a/src/control.c
b/src/control.c
index
277f7cb
..
01f25aa
100644
(file)
--- a/
src/control.c
+++ b/
src/control.c
@@
-33,7
+33,7
@@
#include "xalloc.h"
char controlcookie[65];
#include "xalloc.h"
char controlcookie[65];
-extern char *
controlcooki
ename;
+extern char *
pidfil
ename;
static bool control_return(connection_t *c, int type, int error) {
return send_request(c, "%d %d %d", CONTROL, type, error);
static bool control_return(connection_t *c, int type, int error) {
return send_request(c, "%d %d %d", CONTROL, type, error);
@@
-135,16
+135,16
@@
bool init_control(void) {
bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
controlcookie[sizeof controlcookie - 1] = 0;
bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
controlcookie[sizeof controlcookie - 1] = 0;
- FILE *f = fopen(
controlcooki
ename, "w");
+ FILE *f = fopen(
pidfil
ename, "w");
if(!f) {
if(!f) {
- logger(LOG_ERR, "Cannot write control socket cookie file %s: %s",
controlcooki
ename, strerror(errno));
+ logger(LOG_ERR, "Cannot write control socket cookie file %s: %s",
pidfil
ename, strerror(errno));
return false;
}
#ifdef HAVE_FCHMOD
fchmod(fileno(f), 0600);
#else
return false;
}
#ifdef HAVE_FCHMOD
fchmod(fileno(f), 0600);
#else
- chmod(
controlcooki
ename, 0600);
+ chmod(
pidfil
ename, 0600);
#endif
fprintf(f, "%s %s %d\n", controlcookie, myport, getpid());
#endif
fprintf(f, "%s %s %d\n", controlcookie, myport, getpid());
@@
-154,5
+154,5
@@
bool init_control(void) {
}
void exit_control(void) {
}
void exit_control(void) {
- unlink(
controlcooki
ename);
+ unlink(
pidfil
ename);
}
}