- Made main_loop() signal proof
- #defined MAXTIMEOUT (15 minutes)
- If something really really bad happens, close all connections, wait
for MAXTIMEOUT seconds, and then restart tinc
msgid ""
msgstr ""
"Project-Id-Version: tinc 1.0pre3\n"
msgid ""
msgstr ""
"Project-Id-Version: tinc 1.0pre3\n"
-"POT-Creation-Date: 2000-06-29 21:32+0200\n"
+"POT-Creation-Date: 2000-06-30 13:23+0200\n"
"PO-Revision-Date: 2000-05-31 20:14+02:00\n"
"Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"PO-Revision-Date: 2000-05-31 20:14+02:00\n"
"Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#, c-format
msgid "%s: %d: Invalid variable name `%s'.\n"
msgstr "%s: %d: Ongeldige variabelenaam `%s'.\n"
#, c-format
msgid "%s: %d: Invalid variable name `%s'.\n"
msgstr "%s: %d: Ongeldige variabelenaam `%s'.\n"
#, c-format
msgid "%s: %d: No value given for `%s'.\n"
msgstr "%s: %d: Geen waarde gegeven voor `%s'.\n"
#, c-format
msgid "%s: %d: No value given for `%s'.\n"
msgstr "%s: %d: Geen waarde gegeven voor `%s'.\n"
#, c-format
msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
msgstr "%s: %d: Ongeldige waarde `%s' voor variabele `%s'.\n"
#, c-format
msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
msgstr "%s: %d: Ongeldige waarde `%s' voor variabele `%s'.\n"
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kon %s niet openen: %s\n"
#, c-format
msgid "Could not open %s: %s\n"
msgstr "Kon %s niet openen: %s\n"
msgid "Ready: listening on port %hd"
msgstr "Gereed: luisterend op poort %hd"
msgid "Ready: listening on port %hd"
msgstr "Gereed: luisterend op poort %hd"
#, c-format
msgid "Still failed to connect to other, will retry in %d seconds"
msgstr "Wederom niet verbonden met de ander, nieuwe poging over %d seconden"
#, c-format
msgid "Still failed to connect to other, will retry in %d seconds"
msgstr "Wederom niet verbonden met de ander, nieuwe poging over %d seconden"
-#: src/net.c:680
-msgid "Trying to re-establish outgoing connection in 5 minutes"
-msgstr "Poging tot herstellen van uitgaande verbinding over 5 minuten"
+#: src/net.c:679
+#, c-format
+msgid "Trying to re-establish outgoing connection in %d seconds"
+msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
#: src/net.c:717
msgid "Terminating"
#: src/net.c:717
msgid "Terminating"
msgid "Connecting to %s port %d failed: %m"
msgstr "Verbinding naar %s poort %d mislukt: %m"
msgid "Connecting to %s port %d failed: %m"
msgstr "Verbinding naar %s poort %d mislukt: %m"
-#: src/net.c:754 src/net.c:841 src/net.c:1037
+#: src/net.c:754 src/net.c:840 src/net.c:1036
#, c-format
msgid "This is a bug: %s:%d: %d:%m"
msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
#, c-format
msgid "This is a bug: %s:%d: %d:%m"
msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
msgid "Error: getpeername: %m"
msgstr "Fout: getpeername: %m"
msgid "Error: getpeername: %m"
msgstr "Fout: getpeername: %m"
-#: src/net.c:782
-msgid "unknown"
-msgstr "onbekend"
-
-#: src/net.c:792
#, c-format
msgid "Connection from %s port %d"
msgstr "Verbinding van %s poort %d"
#, c-format
msgid "Connection from %s port %d"
msgstr "Verbinding van %s poort %d"
#, c-format
msgid "Incoming data socket error: %s"
msgstr "Fout op socket voor inkomend verkeer: %s"
#, c-format
msgid "Incoming data socket error: %s"
msgstr "Fout op socket voor inkomend verkeer: %s"
#, c-format
msgid "Receiving packet from %s failed: %m"
msgstr "Ontvangst pakket van %s mislukt: %m"
#, c-format
msgid "Receiving packet from %s failed: %m"
msgstr "Ontvangst pakket van %s mislukt: %m"
#, c-format
msgid "Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"
msgstr "Kreeg pakket van %s (%s) met onbekende herkomst %d.%d.%d.%d?"
#, c-format
msgid "Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"
msgstr "Kreeg pakket van %s (%s) met onbekende herkomst %d.%d.%d.%d?"
#, c-format
msgid "Closing connection with %s (%s)"
msgstr "Beëindigen verbinding met %s (%s)"
#, c-format
msgid "Closing connection with %s (%s)"
msgstr "Beëindigen verbinding met %s (%s)"
msgid "Trying to re-establish outgoing connection in 5 seconds"
msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
msgid "Trying to re-establish outgoing connection in 5 seconds"
msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
#, c-format
msgid "%s (%s) didn't respond to PING"
msgstr "%s (%s) antwoordde niet op ping"
#, c-format
msgid "%s (%s) didn't respond to PING"
msgstr "%s (%s) antwoordde niet op ping"
#, c-format
msgid "Accepting a new connection failed: %m"
msgstr "Aanname van nieuwe verbinding is mislukt: %m"
#, c-format
msgid "Accepting a new connection failed: %m"
msgstr "Aanname van nieuwe verbinding is mislukt: %m"
msgid "Closed attempted connection"
msgstr "Aangenomen verbinding verbroken"
msgid "Closed attempted connection"
msgstr "Aangenomen verbinding verbroken"
#, c-format
msgid "Metadata socket error: %s"
msgstr "Fout op socket voor metaverkeer: %s"
#, c-format
msgid "Metadata socket error: %s"
msgstr "Fout op socket voor metaverkeer: %s"
msgid "Metadata read buffer overflow!"
msgstr "Metadata ontvangstbuffer overloop!"
msgid "Metadata read buffer overflow!"
msgstr "Metadata ontvangstbuffer overloop!"
#, c-format
msgid "Metadata socket read error: %m"
msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
#, c-format
msgid "Metadata socket read error: %m"
msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
#, c-format
msgid "Got request from %s (%s): %s"
msgstr "Ontving verzoek van %s (%s): %s"
#, c-format
msgid "Got request from %s (%s): %s"
msgstr "Ontving verzoek van %s (%s): %s"
#, c-format
msgid "Unknown request from %s (%s)"
msgstr "Onbekend verzoek van %s (%s)"
#, c-format
msgid "Unknown request from %s (%s)"
msgstr "Onbekend verzoek van %s (%s)"
#, c-format
msgid "Error while processing request from %s (%s)"
msgstr "Fout tijdens afhandelen van verzoek van %s (%s)"
#, c-format
msgid "Error while processing request from %s (%s)"
msgstr "Fout tijdens afhandelen van verzoek van %s (%s)"
#, c-format
msgid "Bogus data received from %s (%s)"
msgstr "Onzinnige data ontvangen van %s (%s)"
#, c-format
msgid "Bogus data received from %s (%s)"
msgstr "Onzinnige data ontvangen van %s (%s)"
#, c-format
msgid "Outgoing data socket error for %s (%s): %s"
msgstr "Fout op socket voor uitgaand verkeer voor %s (%s): %s"
#, c-format
msgid "Outgoing data socket error for %s (%s): %s"
msgstr "Fout op socket voor uitgaand verkeer voor %s (%s): %s"
#, c-format
msgid "Error while reading from tapdevice: %m"
msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
#, c-format
msgid "Error while reading from tapdevice: %m"
msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
#, c-format
msgid "Non-IP ethernet frame %04x from "
msgstr "Niet-IP ethernet pakket %04x van "
#, c-format
msgid "Non-IP ethernet frame %04x from "
msgstr "Niet-IP ethernet pakket %04x van "
msgid "Dropping short packet"
msgstr "Te kort pakket genegeerd"
msgid "Dropping short packet"
msgstr "Te kort pakket genegeerd"
#, c-format
msgid "Error while waiting for input: %m"
msgstr "Fout tijdens wachten op invoer: %m"
#: src/net.c:1251
#, c-format
msgid "Error while waiting for input: %m"
msgstr "Fout tijdens wachten op invoer: %m"
#: src/net.c:1251
-msgid "Unable to reread configuration file, exitting"
+msgid "Unable to reread configuration file, exiting"
msgstr "Fout tijdens herlezen configuratie bestand, beëindigen"
msgstr "Fout tijdens herlezen configuratie bestand, beëindigen"
-#: src/net.c:1256
-msgid "Unable to restart, exitting"
-msgstr "Kon niet herstarten, beëindigen"
-
#: src/netutl.c:222
#, c-format
msgid "Error looking up `%s': %s\n"
#: src/netutl.c:222
#, c-format
msgid "Error looking up `%s': %s\n"
#: src/protocol.c:425
#, c-format
msgid "Uplink %s (%s) is already in our connection list"
#: src/protocol.c:425
#, c-format
msgid "Uplink %s (%s) is already in our connection list"
+msgstr "%s (%s) staat al in onze verbindingslijst"
#: src/protocol.c:455
#, c-format
#: src/protocol.c:455
#, c-format
msgid "Got KEY_CHANGED origin %s from %s (%s)"
msgstr "Kreeg KEY_CHANGED herkomst %s van %s (%s)"
msgid "Got KEY_CHANGED origin %s from %s (%s)"
msgstr "Kreeg KEY_CHANGED herkomst %s van %s (%s)"
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
#, c-format
msgid ""
"Usage: %s [option]...\n"
#, c-format
msgid ""
"Usage: %s [option]...\n"
"Gebruik: %s [optie]...\n"
"\n"
"Gebruik: %s [optie]...\n"
"\n"
msgid ""
" -c, --config=FILE Read configuration options from FILE.\n"
" -D, --no-detach Don't fork and detach.\n"
msgid ""
" -c, --config=FILE Read configuration options from FILE.\n"
" -D, --no-detach Don't fork and detach.\n"
" -n, --net=NETNAAM Verbind met net NETNAAM.\n"
" -t, --timeout=TIMEOUT Seconden wachten op timeout.\n"
" -n, --net=NETNAAM Verbind met net NETNAAM.\n"
" -t, --timeout=TIMEOUT Seconden wachten op timeout.\n"
msgid ""
" --help Display this help and exit.\n"
" --version Output version information and exit.\n"
msgid ""
" --help Display this help and exit.\n"
" --version Output version information and exit.\n"
" --version Geef versie informatie en beëindig.\n"
"\n"
" --version Geef versie informatie en beëindig.\n"
"\n"
msgid "Report bugs to tinc@nl.linux.org.\n"
msgstr ""
"Meld fouten in het programma aan tinc@nl.linux.org;\n"
"meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
msgid "Report bugs to tinc@nl.linux.org.\n"
msgstr ""
"Meld fouten in het programma aan tinc@nl.linux.org;\n"
"meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
#, c-format
msgid "Invalid timeout value `%s'.\n"
msgstr "Ongeldige timeout waarde `%s'.\n"
#, c-format
msgid "Invalid timeout value `%s'.\n"
msgstr "Ongeldige timeout waarde `%s'.\n"
-msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting"
+msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
-"Geheugen is vol (laatste %s:%d) (kon geen %d bytes vrijmaken), beëindigen"
+"Geheugen is vol (laatste %s:%d) (kon geen %d bytes vrijmaken), beëindigen."
#, c-format
msgid "tincd %s (%s %s) starting, debug level %d"
#, c-format
msgid "tincd %s (%s %s) starting, debug level %d"
-msgstr "tincd %s (%s %s) gestart, debugniveau %d."
+msgstr "tincd %s (%s %s) gestart, debugniveau %d"
#, c-format
msgid "tincd %s starting"
msgstr "tincd %s gestart"
#, c-format
msgid "tincd %s starting"
msgstr "tincd %s gestart"
#, c-format
msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
msgstr ""
"Totaal aantal bytes geschreven: tap %d, socket %d; bytes gelezen: top %d, "
"socket %d."
#, c-format
msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
msgstr ""
"Totaal aantal bytes geschreven: tap %d, socket %d; bytes gelezen: top %d, "
"socket %d."
#, c-format
msgid "A tincd is already running for net `%s' with pid %d.\n"
msgstr "Een tincd voor net `%s' draait al met procesnummer %d.\n"
#, c-format
msgid "A tincd is already running for net `%s' with pid %d.\n"
msgstr "Een tincd voor net `%s' draait al met procesnummer %d.\n"
#, c-format
msgid "A tincd is already running with pid %d.\n"
msgstr "Een tincd draait al met procesnummer %d.\n"
#, c-format
msgid "A tincd is already running with pid %d.\n"
msgstr "Een tincd draait al met procesnummer %d.\n"
#, c-format
msgid "No other tincd is running for net `%s'.\n"
msgstr "Geen andere tincd gevonden voor net `%s'.\n"
#, c-format
msgid "No other tincd is running for net `%s'.\n"
msgstr "Geen andere tincd gevonden voor net `%s'.\n"
msgid "No other tincd is running.\n"
msgstr "Geen andere tincd gevonden.\n"
msgid "No other tincd is running.\n"
msgstr "Geen andere tincd gevonden.\n"
msgid "Removing stale lock file.\n"
msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
msgid "Removing stale lock file.\n"
msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
#, c-format
msgid "%s version %s\n"
msgstr "%s versie %s\n"
#, c-format
msgid "%s version %s\n"
msgstr "%s versie %s\n"
msgid ""
"Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n"
"see the AUTHORS file for a complete list.\n"
msgid ""
"Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n"
"see the AUTHORS file for a complete list.\n"
"zie het bestand COPYING voor details.\n"
"\n"
"zie het bestand COPYING voor details.\n"
"\n"
msgid ""
"This product includes software developed by Eric Young (eay@mincom.oz.au)\n"
msgstr ""
"Dit produkt bevat programmatuur ontwikkeld door Eric Young "
"(eay@mincom.oz.au)\n"
msgid ""
"This product includes software developed by Eric Young (eay@mincom.oz.au)\n"
msgstr ""
"Dit produkt bevat programmatuur ontwikkeld door Eric Young "
"(eay@mincom.oz.au)\n"
msgid "You must be root to run this program. Sorry.\n"
msgstr ""
"Je moet systeembeheerder zijn om dit programma te kunnen draaien. Sorry.\n"
msgid "You must be root to run this program. Sorry.\n"
msgstr ""
"Je moet systeembeheerder zijn om dit programma te kunnen draaien. Sorry.\n"
+#: src/tincd.c:385
+#, c-format
+msgid "Unrecoverable error, restarting in %d seconds!"
+msgstr "Onherstelbare fout, herstart in %d seconden!"
+
+#: src/tincd.c:394
msgid "Got TERM signal"
msgstr "Kreeg TERM signaal"
msgid "Got TERM signal"
msgstr "Kreeg TERM signaal"
msgid "Got QUIT signal"
msgstr "Kreeg QUIT signaal"
msgid "Got QUIT signal"
msgstr "Kreeg QUIT signaal"
msgid "Got another SEGV signal: not restarting"
msgstr "Kreeg nog een SEGV signaal: niet herstarten"
msgid "Got another SEGV signal: not restarting"
msgstr "Kreeg nog een SEGV signaal: niet herstarten"
#, c-format
msgid "Got SEGV signal after %s line %d, trying to re-execute"
msgstr "Kreeg SEGV signaal na %s regel %d, probeer opnieuw opstarten"
#, c-format
msgid "Got SEGV signal after %s line %d, trying to re-execute"
msgstr "Kreeg SEGV signaal na %s regel %d, probeer opnieuw opstarten"
msgid "Got SEGV signal, trying to re-execute"
msgstr "Kreeg SEGV signaal, probeer opnieuw opstarten"
msgid "Got SEGV signal, trying to re-execute"
msgstr "Kreeg SEGV signaal, probeer opnieuw opstarten"
msgid "Got HUP signal, rereading configuration and restarting"
msgstr "Kreeg HUP signaal, herlezen configuratie en herstarten"
msgid "Got HUP signal, rereading configuration and restarting"
msgstr "Kreeg HUP signaal, herlezen configuratie en herstarten"
-#: src/tincd.c:439
-msgid "Got INT signal, exitting"
+#: src/tincd.c:440
+msgid "Got INT signal, exiting"
msgstr "Kreeg INT signaal, beëindigen"
msgstr "Kreeg INT signaal, beëindigen"
msgid "Got USR2 signal, forcing new key generation"
msgstr "Kreeg USR2 signaal, nieuwe sleutels geforceerd"
msgid "Got USR2 signal, forcing new key generation"
msgstr "Kreeg USR2 signaal, nieuwe sleutels geforceerd"
#, c-format
msgid "Got unexpected signal %d after %s line %d"
msgstr "Kreeg onverwacht signaal %d na %s regel %d"
#, c-format
msgid "Got unexpected signal %d after %s line %d"
msgstr "Kreeg onverwacht signaal %d na %s regel %d"
#, c-format
msgid "Got unexpected signal %d"
msgstr "Kreeg onverwacht signaal %d"
#, c-format
msgid "Got unexpected signal %d"
msgstr "Kreeg onverwacht signaal %d"
-
-#~ msgid "Got HUP signal"
-#~ msgstr "Kreeg HUP signaal"
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: conf.c,v 1.9.4.4 2000/06/29 19:47:02 guus Exp $
+ $Id: conf.c,v 1.9.4.5 2000/06/30 11:45:14 guus Exp $
+ p->argtype = argtype;
+
if(p->data.val)
{
if(*cfg)
if(p->data.val)
{
if(*cfg)
int
read_config_file(const char *fname)
{
int
read_config_file(const char *fname)
{
FILE *fp;
cp
if((fp = fopen (fname, "r")) == NULL)
FILE *fp;
cp
if((fp = fopen (fname, "r")) == NULL)
- if(readconfig(fname, fp))
- return -1;
-
+ err = readconfig(fname, fp);
- for(p = config; p; p = next)
+ for(p = config; p != NULL; p = next)
- if(p->data.ptr)
- free(p->data.ptr);
+ if(p->data.ptr && (p->argtype == TYPE_NAME))
+ {
+ free(p->data.ptr);
+ }
free(p);
}
config = NULL;
free(p);
}
config = NULL;
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: conf.h,v 1.6.4.4 2000/06/29 19:47:03 guus Exp $
+ $Id: conf.h,v 1.6.4.5 2000/06/30 11:45:14 guus Exp $
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
+#define MAXTIMEOUT 900 /* Maximum timeout value for retries. Should this be a configuration option? */
+
typedef struct ip_mask_t {
unsigned long ip;
unsigned long mask;
typedef struct ip_mask_t {
unsigned long ip;
unsigned long mask;
keyexpire,
vpnmask,
resolve_dns,
keyexpire,
vpnmask,
resolve_dns,
} which_t;
typedef struct config_t {
struct config_t *next;
which_t which;
} which_t;
typedef struct config_t {
struct config_t *next;
which_t which;
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: net.c,v 1.35.4.15 2000/06/29 19:47:03 guus Exp $
+ $Id: net.c,v 1.35.4.16 2000/06/30 11:45:14 guus Exp $
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
seconds_till_retry += 5;
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
seconds_till_retry += 5;
- if(seconds_till_retry>300) /* Don't wait more than 5 minutes. */
- seconds_till_retry = 300;
- alarm(seconds_till_retry);
+ if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
+ seconds_till_retry = MAXTIMEOUT;
syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
seconds_till_retry);
syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
seconds_till_retry);
+ alarm(seconds_till_retry);
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
- seconds_till_retry = 300;
+ seconds_till_retry = MAXTIMEOUT;
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
alarm(seconds_till_retry);
alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
- p->vpn_hostname = _("unknown");
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
close_network_connections();
clear_config();
if(read_config_file(configfilename))
{
close_network_connections();
clear_config();
if(read_config_file(configfilename))
{
- syslog(LOG_ERR, _("Unable to reread configuration file, exitting"));
+ syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
- if(setup_network_connections())
- {
- syslog(LOG_ERR, _("Unable to restart, exitting"));
- exit(0);
- }
- sighup = 0;
+ setup_network_connections();
{
check_dead_connections();
last_ping_check = time(NULL);
{
check_dead_connections();
last_ping_check = time(NULL);
- check_network_activity(&fset);
+ if(r > 0)
+ {
+ check_network_activity(&fset);
- /* local tap data */
- if(FD_ISSET(tap_fd, &fset))
- handle_tap_input();
+ /* local tap data */
+ if(FD_ISSET(tap_fd, &fset))
+ handle_tap_input();
+ }
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.5 2000/06/29 19:47:04 guus Exp $
+ $Id: tincd.c,v 1.10.4.6 2000/06/30 11:45:16 guus Exp $
if(security_init())
return 1;
if(security_init())
return 1;
- if(setup_network_connections())
- cleanup_and_exit(1);
+ for(;;)
+ {
+ setup_network_connections();
+
+ main_loop();
- cleanup_and_exit(1);
- return 1;
+ syslog(LOG_ERR, _("Unrecoverable error, restarting in %d seconds!"), MAXTIMEOUT);
+ sleep(MAXTIMEOUT);
+ }
sigint_handler(int a)
{
if(debug_lvl > 0)
sigint_handler(int a)
{
if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Got INT signal, exitting"));
+ syslog(LOG_NOTICE, _("Got INT signal, exiting"));