j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use the TCP socket infrastructure for control sockets.

Browse source 
The control socket code was completely different from how meta connections are
handled, resulting in lots of extra code to handle requests.  Also, not every
operating system has UNIX sockets, so we have to resort to another type of
sockets or pipes for those anyway.  To reduce code duplication and make control
sockets work the same on all platforms, we now just connect to the TCP port
where tincd is already listening on.

To authenticate, the program that wants to control a running tinc daemon must
send the contents of a cookie file. The cookie is a random 256 bits number that
is regenerated every time tincd starts. The cookie file should only be readable
by the same user that can start a tincd.

Instead of the binary-ish protocol previously used, we now use an ASCII
protocol similar to that of the meta connections, but this can still change.
This commit is contained in:
Guus Sliepen 2009-11-07 23:43:25 +01:00
parent c388527e34
commit edebf579f2
18 changed files with 294 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tincd.c
View file

@ -78,8 +78,8 @@ static const char *switchuser = NULL;
bool use_logfile = false;
char *identname = NULL; /* program name for syslog */
char *controlsocketname = NULL; /* control socket location */
char *logfilename = NULL; /* log file location */
char *controlcookiename = NULL;
char **g_argv; /* a copy of the cmdline arguments */
static int status;
@ -96,7 +96,7 @@ static struct option const long_options[] = {
{"chroot", no_argument, NULL, 'R'},
{"user", required_argument, NULL, 'U'},
{"logfile", optional_argument, NULL, 4},
{"controlsocket", required_argument, NULL, 5},
{"controlcookie", required_argument, NULL, 5},
{NULL, 0, NULL, 0}
};
@ -117,7 +117,7 @@ static void usage(bool status) {
" -n, --net=NETNAME Connect to net NETNAME.\n"
" -L, --mlock Lock tinc into main memory.\n"
" --logfile[=FILENAME] Write log entries to a logfile.\n"
" --controlsocket=FILENAME Open control socket at FILENAME.\n"
" --controlcookie=FILENAME Write control socket cookie to FILENAME.\n"
" --bypass-security Disables meta protocol security, for debugging.\n"
" -R, --chroot chroot to NET dir at startup.\n"
" -U, --user=USER setuid to given USER at startup.\n" " --help Display this help and exit.\n"
@ -190,7 +190,7 @@ static bool parse_options(int argc, char **argv) {
break;
case 5: /* open control socket here */
controlsocketname = xstrdup(optarg);
controlcookiename = xstrdup(optarg);
break;
case '?':
@ -231,6 +231,8 @@ static void make_names(void) {
else
xasprintf(&confbase, "%s", installdir);
}
if(!controlcookiename)
xasprintf(&controlcookiename, "%s/cookie", confbase);
}
RegCloseKey(key);
if(*installdir)
@ -238,9 +240,6 @@ static void make_names(void) {
}
#endif
if(!controlsocketname)
xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
if(!logfilename)
xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
@ -258,7 +257,7 @@ static void make_names(void) {
static void free_names() {
if (identname) free(identname);
if (netname) free(netname);
if (controlsocketname) free(controlsocketname);
if (controlcookiename) free(controlcookiename);
if (logfilename) free(logfilename);
if (confbase) free(confbase);
}
@ -359,9 +358,6 @@ int main(int argc, char **argv) {
return 1;
}
if(!init_control())
return 1;
g_argv = argv;
init_configuration(&config_tree);
@ -410,6 +406,9 @@ int main2(int argc, char **argv) {
if(!setup_network())
goto end;
if(!init_control())
return 1;
/* Initiate all outgoing connections. */
try_outgoing_connections();
@ -449,9 +448,7 @@ int main2(int argc, char **argv) {
end:
logger(LOG_NOTICE, "Terminating");
#ifndef HAVE_MINGW
exit_control();
#endif
crypto_exit();