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

Comparing gvpe/src/gvpe.C (file contents):
Revision 1.13 by pcg, Thu Aug 7 17:54:27 2008 UTC vs.
Revision 1.17 by pcg, Mon Mar 23 15:22:00 2009 UTC

97 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ()); 97 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ());
98 printf (_ 98 printf (_
99 (" -c, --config=DIR Read configuration options from DIR.\n" 99 (" -c, --config=DIR Read configuration options from DIR.\n"
100 " -D, --no-detach Don't fork and detach.\n" 100 " -D, --no-detach Don't fork and detach.\n"
101 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n" 101 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n"
102 " -L, --mlock Lock tinc into main memory.\n" 102 " -L, --mlock Lock gvpe into main memory.\n"
103 " --help Display this help and exit.\n" 103 " --help Display this help and exit.\n"
104 " --version Output version information and exit.\n\n")); 104 " --version Output version information and exit.\n\n"));
105 printf (_("Report bugs to <gvpe@schmorp.de>.\n")); 105 printf (_("Report bugs to <gvpe@schmorp.de>.\n"));
106 } 106 }
107 107
203 act.sa_flags = 0; 203 act.sa_flags = 0;
204 204
205 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL); 205 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL);
206 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL); 206 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL);
207 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL); 207 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL);
208 act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL);
209 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL); 208 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL);
210 act.sa_flags = SA_RESETHAND; 209 act.sa_flags = SA_RESETHAND;
211 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL); 210 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL);
212 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL); 211 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL);
213} 212}
234 { 233 {
235 printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (), 234 printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (),
236 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 235 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
237 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); 236 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
238 printf (_ 237 printf (_
239 ("Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de> and others.\n" 238 ("Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> and others.\n"
240 "See the AUTHORS file for a complete list.\n\n" 239 "See the AUTHORS file for a complete list.\n\n"
241 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 240 "GVPE comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
242 "and you are welcome to redistribute it under certain conditions;\n" 241 "and you are welcome to redistribute it under certain conditions;\n"
243 "see the file COPYING for details.\n")); 242 "see the file COPYING for details.\n"));
244 243
245 return 0; 244 return 0;
246 } 245 }
294 { 293 {
295 ev_loop (EV_DEFAULT_ 0); 294 ev_loop (EV_DEFAULT_ 0);
296 cleanup_and_exit (EXIT_FAILURE); 295 cleanup_and_exit (EXIT_FAILURE);
297 } 296 }
298 297
299 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 298 slog (L_ERR, _("unrecoverable error while setting up network, exiting."));
300 cleanup_and_exit (EXIT_FAILURE); 299 cleanup_and_exit (EXIT_FAILURE);
301} 300}
302 301

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines