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

Allow tincd to be locked into main memory.

Browse source
This commit is contained in:
Guus Sliepen 2002-07-16 13:12:49 +00:00
parent c4cd199357
commit 227ccd3a8a
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.60 2002/06/21 10:11:34 guus Exp $ $Id: tincd.c,v 1.10.4.61 2002/07/16 13:12:49 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -33,6 +33,7 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <sys/mman.h>
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h> # include <sys/ioctl.h>
@ -73,6 +74,9 @@ int generate_keys = 0;
/* If nonzero, use null ciphers and skip all key exchanges. */ /* If nonzero, use null ciphers and skip all key exchanges. */
int bypass_security = 0; int bypass_security = 0;
/* If nonzero, disable swapping for this process. */
int do_mlock = 0;
char *identname; /* program name for syslog */ char *identname; /* program name for syslog */
char *pidfilename; /* pid file location */ char *pidfilename; /* pid file location */
char **g_argv; /* a copy of the cmdline arguments */ char **g_argv; /* a copy of the cmdline arguments */
@ -90,6 +94,7 @@ static struct option const long_options[] =
{ "generate-keys", optional_argument, NULL, 'K'}, { "generate-keys", optional_argument, NULL, 'K'},
{ "debug", optional_argument, NULL, 'd'}, { "debug", optional_argument, NULL, 'd'},
{ "bypass-security", no_argument, &bypass_security, 1 }, { "bypass-security", no_argument, &bypass_security, 1 },
{ "mlock", no_argument, &do_mlock, 1},
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -105,8 +110,9 @@ usage(int status)
" -D, --no-detach Don't fork and detach.\n" " -D, --no-detach Don't fork and detach.\n"
" -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n"
" -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n" " -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n"
" -n, --net=NETNAME Connect to net NETNAME.\n")); " -n, --net=NETNAME Connect to net NETNAME.\n"
printf(_(" -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n" " -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
" -L, --mlock Lock tinc into main memory.\n"
" --help Display this help and exit.\n" " --help Display this help and exit.\n"
" --version Output version information and exit.\n\n")); " --version Output version information and exit.\n\n"));
printf(_("Report bugs to tinc@nl.linux.org.\n")); printf(_("Report bugs to tinc@nl.linux.org.\n"));
@ -120,7 +126,7 @@ parse_options(int argc, char **argv, char **envp)
int r; int r;
int option_index = 0; int option_index = 0;
while((r = getopt_long(argc, argv, "c:Dd::k::n:K::", long_options, &option_index)) != EOF) while((r = getopt_long(argc, argv, "c:DLd::k::n:K::", long_options, &option_index)) != EOF)
{ {
switch(r) switch(r)
{ {
@ -133,6 +139,9 @@ parse_options(int argc, char **argv, char **envp)
case 'D': /* no detach */ case 'D': /* no detach */
do_detach = 0; do_detach = 0;
break; break;
case 'L': /* no detach */
do_mlock = 1;
break;
case 'd': /* inc debug level */ case 'd': /* inc debug level */
if(optarg) if(optarg)
debug_lvl = atoi(optarg); debug_lvl = atoi(optarg);
@ -344,6 +353,14 @@ main(int argc, char **argv, char **envp)
openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
#endif #endif
/* Lock all pages into memory if requested */
if(do_mlock)
if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
syslog(LOG_ERR, _("System call `%s' failed: %s"), "mlockall", strerror(errno));
return -1;
}
g_argv = argv; g_argv = argv;
make_names(); make_names();