ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vped.C
(Generate patch)

Comparing gvpe/src/vped.C (file contents):
Revision 1.6 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.11 by pcg, Thu Oct 16 02:41:21 2003 UTC

1/* 1/*
2 vped.C -- the main file for vped 2 vped.C -- the main file for vped
3 Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl> 3 Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
4 2000-2002 Guus Sliepen <guus@sliepen.eu.org> 4 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
5 2003 Marc Lehmannn <pcg@goof.com> 5 2003 Marc Lehmann <pcg@goof.com>
6 6
7 This program is free software; you can redistribute it and/or modify 7 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 10 (at your option) any later version.
… …
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h> 32#include <unistd.h>
33#include <signal.h> 33#include <signal.h>
34#include <termios.h> 34#include <termios.h>
35 35
36#if HAVE_SYS_MMAN_H
36#include <sys/mman.h> 37# include <sys/mman.h>
38#endif
37 39
40#include <openssl/err.h>
38#include <openssl/rand.h> 41#include <openssl/rand.h>
39 42
40#include "gettext.h" 43#include "gettext.h"
41#include "pidfile.h" 44#include "pidfile.h"
42 45
… …
54static int show_help; 57static int show_help;
55 58
56/* If nonzero, print the version on standard output and exit. */ 59/* If nonzero, print the version on standard output and exit. */
57static int show_version; 60static int show_version;
58 61
59#if HAVE_MLOCKALL
60/* If nonzero, disable swapping for this process. */ 62/* If nonzero, disable swapping for this process. */
61static int do_mlock = 0; 63static int do_mlock = 0;
62#endif
63 64
64/* If zero, don't detach from the terminal. */ 65/* If zero, don't detach from the terminal. */
65static int do_detach = 1; 66static int do_detach = 1;
66 67
67static struct option const long_options[] = 68static struct option const long_options[] =
… …
69 {"config", required_argument, NULL, 'c'}, 70 {"config", required_argument, NULL, 'c'},
70 {"help", no_argument, &show_help, 1}, 71 {"help", no_argument, &show_help, 1},
71 {"version", no_argument, &show_version, 1}, 72 {"version", no_argument, &show_version, 1},
72 {"no-detach", no_argument, &do_detach, 0}, 73 {"no-detach", no_argument, &do_detach, 0},
73 {"log-level", required_argument, NULL, 'l'}, 74 {"log-level", required_argument, NULL, 'l'},
74#if HAVE_MLOCKALL
75 {"mlock", no_argument, &do_mlock, 1}, 75 {"mlock", no_argument, &do_mlock, 1},
76#endif
77 {NULL, 0, NULL, 0} 76 {NULL, 0, NULL, 0}
78 }; 77 };
79 78
80static void 79static void
81usage (int status) 80usage (int status)
… …
121 120
122 case 'D': /* no detach */ 121 case 'D': /* no detach */
123 do_detach = 0; 122 do_detach = 0;
124 break; 123 break;
125 124
126#if HAVE_MLOCKALL
127 case 'L': /* lock into memory */ 125 case 'L': /* lock into memory */
128 do_mlock = 1; 126 do_mlock = 1;
129 break; 127 break;
130#endif
131 128
132 case 'l': /* inc debug level */ 129 case 'l': /* inc debug level */
133 { 130 {
134 llevel = string_to_loglevel (optarg); 131 llevel = string_to_loglevel (optarg);
135 132
… …
209} 206}
210 207
211int 208int
212main (int argc, char **argv, char **envp) 209main (int argc, char **argv, char **envp)
213{ 210{
211 ERR_load_crypto_strings (); // we have the RAM
212
214 set_loglevel (L_INFO); 213 set_loglevel (L_INFO);
215 set_identity (argv[0]); 214 set_identity (argv[0]);
216 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 215 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
217 216
218 setlocale (LC_ALL, ""); 217 setlocale (LC_ALL, "");
… …
221 220
222 parse_options (argc, argv, envp); 221 parse_options (argc, argv, envp);
223 222
224 if (show_version) 223 if (show_version)
225 { 224 {
226 printf (_("%s version %s (built %s %s, protocol %d:%d)\n"), get_identity (), 225 printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (),
227 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 226 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
228 printf (_ 227 printf (_
229 ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n" 228 ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n"
230 "See the AUTHORS file for a complete list.\n\n" 229 "See the AUTHORS file for a complete list.\n\n"
231 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 230 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
… …
240 239
241 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 240 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
242 241
243 /* Lock all pages into memory if requested */ 242 /* Lock all pages into memory if requested */
244 243
245#if HAVE_MLOCKALL 244#if HAVE_MLOCKALL && HAVE_SYS_MMAN_H && _POSIX_MEMLOCK
246 if (do_mlock) 245 if (do_mlock)
247 if (mlockall (MCL_CURRENT | MCL_FUTURE)) 246 if (mlockall (MCL_CURRENT | MCL_FUTURE))
248 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno)); 247 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
249#endif 248#endif
250 249

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines