/*
tincd.c -- the main file for tincd
- Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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
/*
* $Log: tincd.c,v $
+ * Revision 1.8 2000/05/14 12:22:42 guus
+ * Cleanups.
+ *
+ * Revision 1.7 2000/04/27 13:47:51 zarq
+ * Default config file name is tinc.conf, and pidfile is tinc.pid.
+ *
+ * Revision 1.6 2000/04/18 16:04:10 zarq
+ * Address for bugreports changed to tinc@nl.linux.org.
+ *
+ * Revision 1.5 2000/04/17 16:23:29 zarq
+ * Pass the requested size from xmalloc() and xrealloc() on to xalloc_fail_func()
+ *
* Revision 1.4 2000/04/06 18:28:29 zarq
* New option -D, don't detach.
*
" -t, --timeout=TIMEOUT Seconds to wait before giving a timeout.\n");
printf(" --help Display this help and exit.\n"
" --version Output version information and exit.\n\n");
- printf("Report bugs to zarq@iname.com.\n");
+ printf("Report bugs to tinc@nl.linux.org.\n");
}
exit(status);
}
}
}
-void memory_full(void)
+void memory_full(int size)
{
- syslog(LOG_ERR, "Memory exhausted; exiting.");
+ syslog(LOG_ERR, "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting.", cp_file, cp_line, size);
exit(1);
}
if(netname)
{
configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/%s/tincd.conf", CONFDIR, netname);
+ sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
}
else
{
configfilename = xmalloc(17+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/tincd.conf", CONFDIR);
+ sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
}
}
if(netname)
{
pidfilename = xmalloc(strlen(netname)+20);
- sprintf(pidfilename, "/var/run/tincd.%s.pid", netname);
+ sprintf(pidfilename, "/var/run/tinc.%s.pid", netname);
confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
identname = xmalloc(strlen(netname)+7);
- sprintf(identname, "tincd.%s", netname);
+ sprintf(identname, "tinc.%s", netname);
}
else
{
- pidfilename = "/var/run/tincd.pid";
+ pidfilename = "/var/run/tinc.pid";
confbase = xmalloc(7+strlen(CONFDIR));
sprintf(confbase, "%s/tinc/", CONFDIR);
- identname = "tincd";
+ identname = "tinc";
}
}
if(show_version)
{
- printf("%s version %s\nCopyright (C) 1998,99 Ivo Timmermans and others,\n"
+ printf("%s version %s\nCopyright (C) 1998,1999,2000 Ivo Timmermans 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"
{
exit(0);
}
-