projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use functions from logger.c
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
6d1f4e2
..
da5eed6
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-1,7
+1,7
@@
/*
tincd.c -- the main file for tincd
/*
tincd.c -- the main file for tincd
- Copyright (C) 1998-200
2
Ivo Timmermans <ivo@o2w.nl>
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-200
3
Ivo Timmermans <ivo@o2w.nl>
+ 2000-200
3
Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,31
+17,18
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: tincd.c,v 1.10.4.7
0 2003/07/06 22:11:33
guus Exp $
+ $Id: tincd.c,v 1.10.4.7
4 2003/07/21 13:18:44
guus Exp $
*/
*/
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
+#include "system.h"
/* Darwin (MacOS/X) needs the following definition... */
#ifndef _P1003_1B_VISIBLE
#define _P1003_1B_VISIBLE
#endif
/* Darwin (MacOS/X) needs the following definition... */
#ifndef _P1003_1B_VISIBLE
#define _P1003_1B_VISIBLE
#endif
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#include <sys/mman.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
#endif
#include <openssl/rand.h>
#endif
#include <openssl/rand.h>
@@
-51,18
+38,14
@@
#include <lzo1x.h>
#include <lzo1x.h>
-#include <utils.h>
-#include <xalloc.h>
-
#include "conf.h"
#include "conf.h"
+#include "logger.h"
#include "net.h"
#include "netutl.h"
#include "process.h"
#include "protocol.h"
#include "net.h"
#include "netutl.h"
#include "process.h"
#include "protocol.h"
-#include "subnet.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
/* The name this program was run with. */
char *program_name = NULL;
/* The name this program was run with. */
char *program_name = NULL;
@@
-133,7
+116,7
@@
static void usage(int status)
exit(status);
}
exit(status);
}
-void parse_options(int argc, char **argv, char **envp)
+
static
void parse_options(int argc, char **argv, char **envp)
{
int r;
int option_index = 0;
{
int r;
int option_index = 0;
@@
-230,7
+213,7
@@
void parse_options(int argc, char **argv, char **envp)
/* This function prettyprints the key generation process */
/* This function prettyprints the key generation process */
-void indicator(int a, int b, void *p)
+
static
void indicator(int a, int b, void *p)
{
switch (a) {
case 0:
{
switch (a) {
case 0:
@@
-269,7
+252,7
@@
void indicator(int a, int b, void *p)
Generate a public/private RSA keypair, and ask for a file to store
them in.
*/
Generate a public/private RSA keypair, and ask for a file to store
them in.
*/
-int keygen(int bits)
+
static
int keygen(int bits)
{
RSA *rsa_key;
FILE *f;
{
RSA *rsa_key;
FILE *f;
@@
-323,7
+306,7
@@
int keygen(int bits)
/*
Set all files and paths according to netname
*/
/*
Set all files and paths according to netname
*/
-void make_names(void)
+
static
void make_names(void)
{
if(netname) {
if(!pidfilename)
{
if(netname) {
if(!pidfilename)
@@
-334,7
+317,7
@@
void make_names(void)
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
- logger(
DEBUG_ALWAYS,
LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
+ logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
if(!identname)
asprintf(&identname, "tinc.%s", netname);
if(!identname)
asprintf(&identname, "tinc.%s", netname);
@@
-367,7
+350,7
@@
int main(int argc, char **argv, char **envp)
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
- printf(_("Copyright (C) 1998-200
2
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998-200
3
Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n"
"See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n"
@@
-389,11
+372,11
@@
int main(int argc, char **argv, char **envp)
if(do_mlock)
#ifdef HAVE_MLOCKALL
if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
if(do_mlock)
#ifdef HAVE_MLOCKALL
if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
strerror(errno));
#else
{
strerror(errno));
#else
{
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("mlockall() not supported on this platform!"));
+ logger(LOG_ERR, _("mlockall() not supported on this platform!"));
#endif
return -1;
}
#endif
return -1;
}
@@
-417,7
+400,7
@@
int main(int argc, char **argv, char **envp)
exit(1);
if(lzo_init() != LZO_E_OK) {
exit(1);
if(lzo_init() != LZO_E_OK) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Error initializing LZO compressor!"));
+ logger(LOG_ERR, _("Error initializing LZO compressor!"));
exit(1);
}
exit(1);
}
@@
-430,14
+413,14
@@
int main(int argc, char **argv, char **envp)
cleanup_and_exit(1);
}
cleanup_and_exit(1);
}
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Unrecoverable error"));
+ logger(LOG_ERR, _("Unrecoverable error"));
cp_trace();
if(do_detach) {
cp_trace();
if(do_detach) {
- logger(
DEBUG_ALWAYS,
LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
+ logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
sleep(maxtimeout);
} else {
sleep(maxtimeout);
} else {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Not restarting."));
+ logger(LOG_ERR, _("Not restarting."));
exit(1);
}
}
exit(1);
}
}