- Updated dutch translation.

- Shutdown properly.

diff --git a/po/es.po b/po/es.po
index 5940438..b54fbd9 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre2\n"
-"POT-Creation-Date: 2000-10-20 18:35+0200\n"
+"POT-Creation-Date: 2000-10-29 02:49+0100\n"
 "PO-Revision-Date: 2000-07-02 12:49+01:00\n"
 "Last-Translator: Enrique Zanardi <ezanardi@id-agora.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -33,658 +33,677 @@ msgstr ""
 msgid "Invalid value for variable on line %d while reading config file %s"
 msgstr ""
 
-#: src/meta.c:42
+#: src/conf.c:219
+#, c-format
+msgid "Failed to read `%s': %m\n"
+msgstr ""
+
+#: src/meta.c:45
 #, fuzzy, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/meta.c:57
+#: src/meta.c:61
 #, fuzzy, c-format
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Error enviando datos: %m"
 
-#: src/meta.c:85 src/net.c:847
+#: src/meta.c:89 src/net.c:940
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/meta.c:91
+#: src/meta.c:95
 #, fuzzy, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Error en el `socket' de metadatos: %s"
 
-#: src/meta.c:110
+#: src/meta.c:115
 #, fuzzy, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Conexión desde %s:%d"
 
-#: src/meta.c:114
+#: src/meta.c:119
 #, fuzzy, c-format
 msgid "Metadata socket read error for %s (%s): %m"
 msgstr "Error de lectura del `socket' de metadatos: %m"
 
-#: src/meta.c:144
+#: src/meta.c:149
 #, fuzzy, c-format
 msgid "Got request from %s (%s): %s"
 msgstr "Petición desconocida: %s"
 
-#: src/meta.c:162
+#: src/meta.c:167
 #, fuzzy, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Desbordamiento del búfer de lectura de metadatos"
 
-#: src/net.c:107
+#: src/net.c:119
 #, fuzzy, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Enviados %d bytes a %lx"
 
-#: src/net.c:116
+#: src/net.c:128
 #, fuzzy, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Error enviando datos: %m"
 
-#: src/net.c:130
+#: src/net.c:160
 #, fuzzy, c-format
-msgid "Receiving packet of %d bytes"
-msgstr "Recibiendo clave de "
+msgid "Can't write to tun/tap device: %m"
+msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:143
-#, c-format
-msgid "Can't write to tap device: %m"
+#: src/net.c:167
+#, fuzzy, c-format
+msgid "Can't write to ethertap device: %m"
 msgstr "No puedo escribir en el dispositivo tap: %m"
 
-#: src/net.c:243
+#: src/net.c:268
 #, fuzzy
 msgid "Queue flushed"
 msgstr "cola vaciada"
 
-#: src/net.c:258
+#: src/net.c:283
 #, fuzzy, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Vaciando la cola de envíos para "
 
-#: src/net.c:266
+#: src/net.c:291
 #, fuzzy, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Vaciando la cola de recepción para "
 
-#: src/net.c:284
+#: src/net.c:310
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr ""
 
-#: src/net.c:298
+#: src/net.c:326
 #, fuzzy, c-format
 msgid "Could not open UDP connection to %s (%s)"
 msgstr "No pude abrir %s: %s\n"
 
-#: src/net.c:306
-#, c-format
-msgid "No valid key known yet for %s (%s), queueing packet"
-msgstr ""
-
-#: src/net.c:317
-#, c-format
-msgid "%s (%s) is not ready, queueing packet"
-msgstr ""
-
-#: src/net.c:352
+#: src/net.c:383
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "No pude abrir %s: %m"
 
-#: src/net.c:370
+#: src/net.c:410
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr ""
 
-#: src/net.c:373
-msgid "tun/tap device will be left unconfigured"
-msgstr ""
-
-#: src/net.c:396
+#: src/net.c:439
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Fallo al crear el metasocket: %m"
 
-#: src/net.c:402 src/net.c:408 src/net.c:470
+#: src/net.c:445 src/net.c:451 src/net.c:513
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt(): %m"
 
-#: src/net.c:415 src/net.c:477
+#: src/net.c:458 src/net.c:520
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl(): %m"
 
-#: src/net.c:423
+#: src/net.c:466
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr ""
 
-#: src/net.c:439
+#: src/net.c:482
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Ha fallado la llamada a bind() con el puerto %hd/tcp: %m"
 
-#: src/net.c:445
+#: src/net.c:488
 #, c-format
 msgid "listen: %m"
 msgstr "listen(): %m"
 
-#: src/net.c:464
+#: src/net.c:507
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:488
+#: src/net.c:531
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Ha fallado la llamada a bind() con el puerto %hd/udp: %m"
 
-#: src/net.c:505
+#: src/net.c:548
 #, fuzzy, c-format
 msgid "Trying to connect to %s"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:515
+#: src/net.c:558
 #, fuzzy, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:526
+#: src/net.c:569
 #, c-format
 msgid "%s port %hd: %m"
 msgstr ""
 
-#: src/net.c:533
+#: src/net.c:576
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr ""
 
-#: src/net.c:539
+#: src/net.c:582
 #, fuzzy, c-format
 msgid "Connected to %s port %hd"
 msgstr "Conectado a %s:%hd"
 
-#: src/net.c:562
+#: src/net.c:605
 msgid "Invalid name for outgoing connection"
 msgstr ""
 
-#: src/net.c:571
+#: src/net.c:614
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr ""
 
-#: src/net.c:578
+#: src/net.c:621
 #, c-format
 msgid "No address specified for %s"
 msgstr ""
 
-#: src/net.c:585
+#: src/net.c:628
 #, fuzzy, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/net.c:595
+#: src/net.c:638
 #, fuzzy, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "No he podido configurar una meta conexión."
 
-#: src/net.c:629
+#: src/net.c:673
 msgid "Name for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:637
+#: src/net.c:681
 msgid "Invalid name for myself!"
 msgstr ""
 
-#: src/net.c:643
+#: src/net.c:687
 msgid "Private key for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:655
+#: src/net.c:699
 msgid "Cannot open host configuration file for myself!"
 msgstr ""
 
-#: src/net.c:661
+#: src/net.c:705
 msgid "Public key for tinc daemon required!"
 msgstr ""
 
-#: src/net.c:690
+#: src/net.c:745
+msgid "Network address and subnet mask do not match!"
+msgstr ""
+
+#: src/net.c:754
 #, fuzzy
 msgid "Unable to set up a listening socket!"
 msgstr "No puedo configurar un `socket' a la escucha"
 
-#: src/net.c:696
+#: src/net.c:760
 #, fuzzy
 msgid "Unable to set up an incoming vpn data socket!"
 msgstr "No puedo configurar un `socket' para recibir datos de la vpn"
 
-#: src/net.c:703
+#: src/net.c:767
 #, fuzzy, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Listo: escuchando en el puerto %d."
 
-#: src/net.c:734
+#: src/net.c:799
 #, fuzzy, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Siguo sin poder conectar con el otro. Lo reintentaré en %d segundos."
 
-#: src/net.c:772
+#: src/net.c:834 src/net.c:893
+#, fuzzy, c-format
+msgid "Error while executing %s: %m"
+msgstr "Error esperando entrada: %m"
+
+#: src/net.c:856
 #, fuzzy, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/net.c:810
+#: src/net.c:903
 #, fuzzy
 msgid "Terminating"
 msgstr "Terminando."
 
-#: src/net.c:824
+#: src/net.c:917
 #, fuzzy, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Abriendo `socket' UDP a "
 
-#: src/net.c:829
+#: src/net.c:922
 #, fuzzy, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Error al crear el `socket': %m"
 
-#: src/net.c:839
+#: src/net.c:932
 #, fuzzy, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Error al crear `socket' de datos: %m"
 
-#: src/net.c:872
+#: src/net.c:965
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Error: getpeername(): %m"
 
-#: src/net.c:887
+#: src/net.c:980
 #, fuzzy, c-format
 msgid "Connection from %s port %d"
 msgstr "Conexión desde %s:%d"
 
-#: src/net.c:931
+#: src/net.c:1025
 #, fuzzy, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Esto es un `bug': %s:%d: %d:%m"
 
-#: src/net.c:937
+#: src/net.c:1031
 #, fuzzy, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Error en el `socket' de recepción de datos: %s"
 
-#: src/net.c:943
+#: src/net.c:1037
 #, fuzzy, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Error recibiendo datos: %m"
 
-#: src/net.c:964
+#: src/net.c:1068
 #, fuzzy, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Cerrando conexión con %s."
 
-#: src/net.c:1007
+#: src/net.c:1108
 #, fuzzy
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
-#: src/net.c:1037
+#: src/net.c:1136
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr ""
 
-#: src/net.c:1068
+#: src/net.c:1167
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Error al aceptar una nueva conexión: %m"
 
-#: src/net.c:1076
+#: src/net.c:1175
 #, fuzzy
 msgid "Closed attempted connection"
 msgstr "Se ha cerrado la conexión que se intentaba realizar."
 
-#: src/net.c:1111
+#: src/net.c:1208
 #, fuzzy, c-format
 msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Error en el `socket' de datos salientes: %s"
 
-#: src/net.c:1150 src/net.c:1159
-#, c-format
-msgid "Error while reading from tapdevice: %m"
+#: src/net.c:1244
+#, fuzzy, c-format
+msgid "Error while reading from tun/tap device: %m"
 msgstr "Error leyendo del dispositivo tap: %m"
 
-#: src/net.c:1171
+#: src/net.c:1253
 #, fuzzy, c-format
-msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
-msgstr "Trama ethernet no-IP %04x de "
+msgid "Error while reading from ethertap device: %m"
+msgstr "Error leyendo del dispositivo tap: %m"
+
+#: src/net.c:1264
+msgid "Received short packet from tap device"
+msgstr ""
 
-#: src/net.c:1178
+#: src/net.c:1270
 #, c-format
-msgid "Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"
+msgid "Read packet of length %d from tap device"
 msgstr ""
 
-#: src/net.c:1213
+#: src/net.c:1301
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Error esperando entrada: %m"
 
+#: src/net.c:1308
+msgid "Rereading configuration file and restarting in 5 seconds"
+msgstr ""
+
+#: src/net.c:1315
+msgid "Unable to reread configuration file, exiting"
+msgstr ""
+
 #: src/netutl.c:115
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Error buscando `%s': %s\n"
 
-#: src/protocol.c:80
+#: src/protocol.c:82
 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr ""
 
-#: src/protocol.c:87
+#: src/protocol.c:89
 #, fuzzy, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Envio ACK a %s"
 
-#: src/protocol.c:101
+#: src/protocol.c:103
 #, fuzzy, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Petición desconocida: %s"
 
-#: src/protocol.c:108
+#: src/protocol.c:110
 #, fuzzy, c-format
 msgid "Got %s from %s (%s)"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:114
+#: src/protocol.c:116
+#, fuzzy, c-format
+msgid "Unauthorized request from %s (%s)"
+msgstr "Petición desconocida: %s"
+
+#: src/protocol.c:123
 #, fuzzy, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Error al procesar la petición de "
 
-#: src/protocol.c:121
+#: src/protocol.c:130
 #, fuzzy, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Se han recibido datos sin sentido."
 
-#: src/protocol.c:170
+#: src/protocol.c:181
 #, fuzzy, c-format
 msgid "Got bad ID from %s"
 msgstr "recibí una petición BASIC_INFO incorrecta: %s"
 
-#: src/protocol.c:178
+#: src/protocol.c:189
 #, fuzzy, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr ""
 "La máquina remota usa una versión incompatible del protocolo (versión %d)."
 
-#: src/protocol.c:187
+#: src/protocol.c:198
 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr ""
 
-#: src/protocol.c:195
+#: src/protocol.c:206
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr ""
 
-#: src/protocol.c:209
+#: src/protocol.c:220
 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr ""
 
-#: src/protocol.c:219
+#: src/protocol.c:236
 #, c-format
 msgid "No public key known for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:258 src/protocol.c:312
+#: src/protocol.c:273
+#, c-format
+msgid "Generated random challenge (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:280 src/protocol.c:334
 #, c-format
 msgid "Error during encryption of challenge for %s (%s)"
 msgstr ""
 
-#: src/protocol.c:284
+#: src/protocol.c:306
 #, fuzzy, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:294
+#: src/protocol.c:316
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:330
+#: src/protocol.c:343
+#, c-format
+msgid "Received random challenge (unencrypted): %s"
+msgstr ""
+
+#: src/protocol.c:359
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr ""
 
-#: src/protocol.c:361
+#: src/protocol.c:390
 #, fuzzy, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:370
+#: src/protocol.c:399
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:387
+#: src/protocol.c:416
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:425
+#: src/protocol.c:421
+#, c-format
+msgid "Expected challenge reply: %s"
+msgstr ""
+
+#: src/protocol.c:463
 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 
-#: src/protocol.c:437
+#: src/protocol.c:476
 #, fuzzy, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Activada la conexión con %s."
 
-#: src/protocol.c:477
+#: src/protocol.c:531
 #, fuzzy, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:486
+#: src/protocol.c:540
 #, fuzzy, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:495
+#: src/protocol.c:549
 #, fuzzy, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:506
+#: src/protocol.c:560
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:517
+#: src/protocol.c:571
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:545
+#: src/protocol.c:611
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:554
+#: src/protocol.c:620
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:563
+#: src/protocol.c:629
 #, fuzzy, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:574
+#: src/protocol.c:640
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:585
+#: src/protocol.c:651
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:616
+#: src/protocol.c:688
 #, fuzzy, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:624
+#: src/protocol.c:696
 #, fuzzy, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr "recibí una petición ADD_HOST incorrecta: %s"
 
-#: src/protocol.c:633
+#: src/protocol.c:705
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:643
-#, c-format
-msgid "Warning: got ADD_HOST from %s (%s) from ourself, restarting"
-msgstr ""
-
-#: src/protocol.c:653
-#, c-format
-msgid ""
-"Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-
-#: src/protocol.c:672
+#: src/protocol.c:722
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr ""
 
-#: src/protocol.c:679
+#: src/protocol.c:730
 #, c-format
-msgid "Removing old entry for %s (%s)"
+msgid "Removing old entry for %s (%s) in favour of new connection"
 msgstr ""
 
-#: src/protocol.c:722
+#: src/protocol.c:773
 #, fuzzy, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:731
+#: src/protocol.c:782
 #, fuzzy, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:740
+#: src/protocol.c:791
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr ""
 
-#: src/protocol.c:751
-#, c-format
-msgid "Warning: got DEL_HOST from %s (%s) from ourself, restarting"
-msgstr ""
-
-#: src/protocol.c:761
-#, c-format
-msgid ""
-"Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-
-#: src/protocol.c:773
+#: src/protocol.c:802
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 
-#: src/protocol.c:783
+#: src/protocol.c:812
 #, fuzzy, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:815
+#: src/protocol.c:848
 #, fuzzy, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:822
+#: src/protocol.c:855
 #, fuzzy, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:846
+#: src/protocol.c:879
 #, fuzzy, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "recibí una petición DEL_HOST incorrecta: %s"
 
-#: src/protocol.c:853
+#: src/protocol.c:886
 #, fuzzy, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "He recibido una petición: %s"
 
-#: src/protocol.c:931
+#: src/protocol.c:962
 #, fuzzy, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "recibí KEY_CHANGED de "
 
-#: src/protocol.c:938
+#: src/protocol.c:969
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:968
+#: src/protocol.c:999
 #, fuzzy, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "recibí REQ_KEY de "
 
-#: src/protocol.c:975
+#: src/protocol.c:1006
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:991
+#: src/protocol.c:1022
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/protocol.c:1019
+#: src/protocol.c:1050
 #, fuzzy, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "recibí una petición ANS_KEY incorrecta: %s"
 
-#: src/protocol.c:1026
+#: src/protocol.c:1057
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
 
-#: src/protocol.c:1042
-#, fuzzy, c-format
-msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
-msgstr "recibí una petición ANS_KEY incorrecta: %s"
-
-#: src/protocol.c:1055
+#: src/protocol.c:1091
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
 "connection list"
 msgstr ""
 
-#: src/tincd.c:99
+#. Do some intl stuff right now
+#: src/subnet.c:242 src/tincd.c:397
+msgid "unknown"
+msgstr ""
+
+#: src/subnet.c:298
+#, fuzzy
+msgid "Subnet list:"
+msgstr "Lista de conexiones:"
+
+#: src/subnet.c:307
+msgid "End of subnet list."
+msgstr ""
+
+#: src/tincd.c:101
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/tincd.c:102
+#: src/tincd.c:104
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -693,7 +712,7 @@ msgstr ""
 "Modo de empleo: %s [opción]...\n"
 "\n"
 
-#: src/tincd.c:103
+#: src/tincd.c:105
 #, fuzzy
 msgid ""
 "  -c, --config=DIR      Read configuration options from DIR.\n"
@@ -710,7 +729,7 @@ msgstr ""
 "  -t, --timeout=TIEMPO  Segundos a esperar antes de cancelar una "
 "trasmisión.\n"
 
-#: src/tincd.c:108
+#: src/tincd.c:110
 #, fuzzy
 msgid ""
 "  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
@@ -722,93 +741,88 @@ msgstr ""
 "      --version         Muestra información de la versión y termina.\n"
 "\n"
 
-#: src/tincd.c:111
+#: src/tincd.c:113
 msgid "Report bugs to tinc@nl.linux.org.\n"
 msgstr "Comunicar `bugs' a tinc@nl.linux.org.\n"
 
-#: src/tincd.c:152
+#: src/tincd.c:153
 msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
 msgstr ""
 
-#: src/tincd.c:207
+#: src/tincd.c:208
 msgid ""
 "Seeding the PRNG: please press some keys or move\n"
 "the mouse if this program seems to have halted...\n"
 msgstr ""
 
 #. OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :)
-#: src/tincd.c:210
+#: src/tincd.c:211
 #, fuzzy, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Generando claves de %d bits."
 
-#: src/tincd.c:214
+#: src/tincd.c:215
 msgid "Error during key generation!"
 msgstr ""
 
-#: src/tincd.c:218
+#: src/tincd.c:219
 #, fuzzy
 msgid "Done.\n"
 msgstr ": hecho.\n"
 
-#: src/tincd.c:220
+#: src/tincd.c:221
 msgid ""
 "Please copy the private key to tinc.conf and the\n"
 "public key to your host configuration file:\n"
 "\n"
 msgstr ""
 
-#: src/tincd.c:230
+#: src/tincd.c:231
 #, fuzzy, c-format
 msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
 msgstr ""
 "Memoria agotada (la última es %s:%d) (no pude asignar %d bytes); terminando."
 
-#: src/tincd.c:285
+#: src/tincd.c:286
 #, fuzzy, c-format
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) comenzando, nivel de depuración %d."
 
-#: src/tincd.c:288
+#: src/tincd.c:289
 #, fuzzy, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s comenzando, nivel de depuración %d."
 
-#: src/tincd.c:303
+#: src/tincd.c:304
 #, fuzzy, c-format
 msgid "Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"
 msgstr ""
 "Total de bytes escritos: tap %d, socket %d; bytes leidos: tap %d, socket %d."
 
-#: src/tincd.c:321
+#: src/tincd.c:322
 #, c-format
 msgid "A tincd is already running for net `%s' with pid %d.\n"
 msgstr ""
 "Un tincd está actualmente en ejecución para la red `%s' con el pid %d.\n"
 
-#: src/tincd.c:324
+#: src/tincd.c:325
 #, c-format
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Un tincd está actualmente en ejecución con el pid %d.\n"
 
-#: src/tincd.c:345
+#: src/tincd.c:346
 #, c-format
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "No hay ningún otro tincd en ejecución para la red `%s'.\n"
 
-#: src/tincd.c:347
+#: src/tincd.c:348
 msgid "No other tincd is running.\n"
 msgstr "No hay ningún otro tincd en ejecución.\n"
 
-#: src/tincd.c:354
+#: src/tincd.c:355
 msgid "Removing stale lock file.\n"
 msgstr "Borrando fichero de bloqueo en desuso.\n"
 
-#. Do some intl stuff right now
-#: src/tincd.c:397
-msgid "unknown"
-msgstr ""
-
 #: src/tincd.c:403
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
@@ -847,8 +861,9 @@ msgid "Restarting in %d seconds!"
 msgstr ""
 
 #: src/tincd.c:462 src/tincd.c:508
-msgid "Aieee! Not restarting."
-msgstr ""
+#, fuzzy
+msgid "Not restarting."
+msgstr "tincd %s comenzando, nivel de depuración %d."
 
 #: src/tincd.c:472
 msgid "Got TERM signal"
@@ -873,24 +888,35 @@ msgid "Trying to re-execute in 5 seconds..."
 msgstr "Intento re-establecer la conexión saliente en 5 segundos."
 
 #: src/tincd.c:517
-msgid "Got HUP signal, rereading configuration and restarting"
-msgstr ""
+msgid "Got HUP signal"
+msgstr "Recibí la señal HUP"
 
 #: src/tincd.c:525
 #, fuzzy
 msgid "Got INT signal, exiting"
 msgstr "Recibí la señal INT"
 
-#: src/tincd.c:539
-#, fuzzy
-msgid "Got USR2 signal, forcing new key generation"
-msgstr "Forzando generación de una nueva clave"
-
-#: src/tincd.c:548
+#: src/tincd.c:549
 #, fuzzy, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Recibí una señal inesperada (%d)."
 
+#, fuzzy
+#~ msgid "Receiving packet of %d bytes"
+#~ msgstr "Recibiendo clave de "
+
+#, fuzzy
+#~ msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
+#~ msgstr "Trama ethernet no-IP %04x de "
+
+#, fuzzy
+#~ msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
+#~ msgstr "recibí una petición ANS_KEY incorrecta: %s"
+
+#, fuzzy
+#~ msgid "Got USR2 signal, forcing new key generation"
+#~ msgstr "Forzando generación de una nueva clave"
+
 #~ msgid "Usage: %s bits\n"
 #~ msgstr "Uso: %s bits\n"
 
@@ -959,9 +985,6 @@ msgstr "Recib
 #~ msgid "Dropping short packet"
 #~ msgstr "Descartando paquete corto"
 
-#~ msgid "Connection list:"
-#~ msgstr "Lista de conexiones:"
-
 #, fuzzy
 #~ msgid "Send failed: %d:%d: %m"
 #~ msgstr "Error enviando: %d:%d: %m"
@@ -1179,6 +1202,3 @@ msgstr "Recib
 
 #~ msgid "%s version %s\n"
 #~ msgstr "%s versión %s\n"
-
-#~ msgid "Got HUP signal"
-#~ msgstr "Recibí la señal HUP"

diff --git a/po/nl.po b/po/nl.po
index 8282032..9dc5634 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"
-"POT-Creation-Date: 2000-10-20 18:35+0200\n"
+"POT-Creation-Date: 2000-10-29 02:49+0100\n"
 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Guus Sliepen <guus@sliepen.warande.net>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -39,623 +39,628 @@ msgstr ""
 "Ongeldige waarde voor variabele op regel %d  tijdens het lezen van "
 "configuratie bestand %s"
 
-#: src/meta.c:42
+#: src/conf.c:219
+#, c-format
+msgid "Failed to read `%s': %m\n"
+msgstr ""
+
+#: src/meta.c:45
 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s): %s"
 msgstr "Verzending %d bytes metadata naar %s (%s): %s"
 
-#: src/meta.c:57
+#: src/meta.c:61
 #, c-format
 msgid "Sending meta data to %s (%s) failed: %m"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %m"
 
-#: src/meta.c:85 src/net.c:847
+#: src/meta.c:89 src/net.c:940
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m %s (%s)"
 
-#: src/meta.c:91
+#: src/meta.c:95
 #, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 
-#: src/meta.c:110
+#: src/meta.c:115
 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 
-#: src/meta.c:114
+#: src/meta.c:119
 #, c-format
 msgid "Metadata socket read error for %s (%s): %m"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %m"
 
-#: src/meta.c:144
+#: src/meta.c:149
 #, c-format
 msgid "Got request from %s (%s): %s"
 msgstr "Kreeg verzoek van %s (%s): %s"
 
-#: src/meta.c:162
+#: src/meta.c:167
 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overvol voor %s (%s)"
 
-#: src/net.c:107
+#: src/net.c:119
 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Verzending pakket van %d bytes naar %s (%s)"
 
-#: src/net.c:116
+#: src/net.c:128
 #, c-format
 msgid "Error sending packet to %s (%s): %m"
 msgstr "Fout tijdens verzenden pakket naar %s (%s): %m"
 
-#: src/net.c:130
+#: src/net.c:160
 #, c-format
-msgid "Receiving packet of %d bytes"
-msgstr "Ontvangst pakket van %d bytes"
+msgid "Can't write to tun/tap device: %m"
+msgstr "Kan niet naar tun/tap apparaat schrijven: %m"
 
-#: src/net.c:143
+#: src/net.c:167
 #, c-format
-msgid "Can't write to tap device: %m"
-msgstr "Kan niet naar tap apparaat schrijven: %m"
+msgid "Can't write to ethertap device: %m"
+msgstr "Kan niet naar ethertap apparaat schrijven: %m"
 
-#: src/net.c:243
+#: src/net.c:268
 msgid "Queue flushed"
 msgstr "Wachtrij leeggemaakt"
 
-#: src/net.c:258
+#: src/net.c:283
 #, c-format
 msgid "Flushing send queue for %s (%s)"
 msgstr "Legen van verzend-wachtrij voor %s (%s)"
 
-#: src/net.c:266
+#: src/net.c:291
 #, c-format
 msgid "Flushing receive queue for %s (%s)"
 msgstr "Legen van de ontvangst-wachtrij voor %s (%s)"
 
-#: src/net.c:284
+#: src/net.c:310
 #, c-format
 msgid "Trying to look up %d.%d.%d.%d in connection list failed!"
 msgstr "Poging tot opzoeken %d.%d.%d.%d in verbindingslijst mislukte!"
 
-#: src/net.c:298
+#: src/net.c:326
 #, c-format
 msgid "Could not open UDP connection to %s (%s)"
 msgstr "Kon geen UDP verbinding openen naar %s (%s)"
 
-#: src/net.c:306
-#, c-format
-msgid "No valid key known yet for %s (%s), queueing packet"
-msgstr ""
-"Nog geen geldige sleutel bekend voor %s (%s), pakket wordt in de wachtrij "
-"gezet"
-
-#: src/net.c:317
-#, c-format
-msgid "%s (%s) is not ready, queueing packet"
-msgstr "%s (%s) is niet gereed, pakket wordt in de wachtrij gezet"
-
-#: src/net.c:352
+#: src/net.c:383
 #, c-format
 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
 
-#: src/net.c:370
+#: src/net.c:410
 #, c-format
 msgid "%s is a new style tun/tap device"
 msgstr "%s is een nieuwe stijl tun/tap apparaat"
 
-#: src/net.c:373
-msgid "tun/tap device will be left unconfigured"
-msgstr "tun/tap apparaat wordt ongeconfigureerd gelaten"
-
-#: src/net.c:396
+#: src/net.c:439
 #, c-format
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
-#: src/net.c:402 src/net.c:408 src/net.c:470
+#: src/net.c:445 src/net.c:451 src/net.c:513
 #, c-format
 msgid "setsockopt: %m"
 msgstr "setsockopt: %m"
 
-#: src/net.c:415 src/net.c:477
+#: src/net.c:458 src/net.c:520
 #, c-format
 msgid "fcntl: %m"
 msgstr "fcntl: %m"
 
-#: src/net.c:423
+#: src/net.c:466
 #, c-format
 msgid "Unable to bind listen socket to interface %s: %m"
 msgstr "Kon luistersocket niet binden aan interface %s: %m"
 
-#: src/net.c:439
+#: src/net.c:482
 #, c-format
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
-#: src/net.c:445
+#: src/net.c:488
 #, c-format
 msgid "listen: %m"
 msgstr "listen: %m"
 
-#: src/net.c:464
+#: src/net.c:507
 #, c-format
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
-#: src/net.c:488
+#: src/net.c:531
 #, c-format
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
-#: src/net.c:505
+#: src/net.c:548
 #, c-format
 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 
-#: src/net.c:515
+#: src/net.c:558
 #, c-format
 msgid "Creating socket for %s port %d failed: %m"
 msgstr "Aanmaken socket voor %s poort %d mislukt: %m"
 
-#: src/net.c:526
+#: src/net.c:569
 #, c-format
 msgid "%s port %hd: %m"
 msgstr "%s poort %hd: %m"
 
-#: src/net.c:533
+#: src/net.c:576
 #, c-format
 msgid "fcntl for %s port %d: %m"
 msgstr "fcntl voor %s poort %d: %m"
 
-#: src/net.c:539
+#: src/net.c:582
 #, c-format
 msgid "Connected to %s port %hd"
 msgstr "Verbonden met %s poort %hd"
 
-#: src/net.c:562
+#: src/net.c:605
 msgid "Invalid name for outgoing connection"
 msgstr "Ongelige naam voor uitgaande verbinding"
 
-#: src/net.c:571
+#: src/net.c:614
 #, c-format
 msgid "Error reading host configuration file for %s"
 msgstr "Fout tijdens lezen host configuratie bestand voor %s"
 
-#: src/net.c:578
+#: src/net.c:621
 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 
-#: src/net.c:585
+#: src/net.c:628
 #, c-format
 msgid "Error looking up `%s': %m"
 msgstr "Fout bij het opzoeken van `%s': %m"
 
-#: src/net.c:595
+#: src/net.c:638
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
-#: src/net.c:629
+#: src/net.c:673
 msgid "Name for tinc daemon required!"
 msgstr "Naam voor tinc daemon verplicht!"
 
-#: src/net.c:637
+#: src/net.c:681
 msgid "Invalid name for myself!"
 msgstr "Ongelige naam voor mijzelf!"
 
-#: src/net.c:643
+#: src/net.c:687
 msgid "Private key for tinc daemon required!"
 msgstr "Privé sleutel voor tinc daemon verplicht!"
 
-#: src/net.c:655
+#: src/net.c:699
 msgid "Cannot open host configuration file for myself!"
 msgstr "Kan host configuratie bestand voor mijzelf niet openen!"
 
-#: src/net.c:661
+#: src/net.c:705
 msgid "Public key for tinc daemon required!"
 msgstr "Publieke sleutel voor tinc daemon verplicht!"
 
-#: src/net.c:690
+#: src/net.c:745
+msgid "Network address and subnet mask do not match!"
+msgstr "Netwerk adres en subnet masker komen niet overeen!"
+
+#: src/net.c:754
 msgid "Unable to set up a listening socket!"
 msgstr "Kon geen luistersocket aanmaken!"
 
-#: src/net.c:696
+#: src/net.c:760
 msgid "Unable to set up an incoming vpn data socket!"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer!"
 
-#: src/net.c:703
+#: src/net.c:767
 #, c-format
 msgid "Ready: listening on port %hd"
 msgstr "Gereed: luisterend op poort %hd"
 
-#: src/net.c:734
+#: src/net.c:799
 #, 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:772
+#: src/net.c:834 src/net.c:893
+#, c-format
+msgid "Error while executing %s: %m"
+msgstr "Fout tijdens uitvoeren %s: %m"
+
+#: src/net.c:856
 #, 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:810
+#: src/net.c:903
 msgid "Terminating"
 msgstr "Beëindigen"
 
-#: src/net.c:824
+#: src/net.c:917
 #, c-format
 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 
-#: src/net.c:829
+#: src/net.c:922
 #, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 
-#: src/net.c:839
+#: src/net.c:932
 #, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 
-#: src/net.c:872
+#: src/net.c:965
 #, c-format
 msgid "Error: getpeername: %m"
 msgstr "Fout: getpeername: %m"
 
-#: src/net.c:887
+#: src/net.c:980
 #, c-format
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 
-#: src/net.c:931
+#: src/net.c:1025
 #, c-format
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 
-#: src/net.c:937
+#: src/net.c:1031
 #, c-format
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
-#: src/net.c:943
+#: src/net.c:1037
 #, c-format
 msgid "Receiving packet failed: %m"
 msgstr "Ontvangst pakket mislukt: %m"
 
-#: src/net.c:964
+#: src/net.c:1068
 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Beëindigen verbinding met %s (%s)"
 
-#: src/net.c:1007
+#: src/net.c:1108
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
-#: src/net.c:1037
+#: src/net.c:1136
 #, c-format
 msgid "%s (%s) didn't respond to PING"
 msgstr "%s (%s) antwoordde niet op ping"
 
-#: src/net.c:1068
+#: src/net.c:1167
 #, c-format
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
-#: src/net.c:1076
+#: src/net.c:1175
 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 
-#: src/net.c:1111
+#: src/net.c:1208
 #, c-format
 msgid "Outgoing data socket error for %s (%s): %s"
 msgstr "Fout op socket voor uitgaand verkeer voor %s (%s): %s"
 
-#: src/net.c:1150 src/net.c:1159
+#: src/net.c:1244
 #, c-format
-msgid "Error while reading from tapdevice: %m"
-msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
+msgid "Error while reading from tun/tap device: %m"
+msgstr "Fout tijdens lezen van tun/tap apparaat: %m"
 
-#: src/net.c:1171
+#: src/net.c:1253
 #, c-format
-msgid "Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"
-msgstr "Niet-IP ethernet pakket %04x van %02x:%02x:%02x:%02x:%02x:%02x"
+msgid "Error while reading from ethertap device: %m"
+msgstr "Fout tijdens lezen van ethertap apparaat: %m"
+
+#: src/net.c:1264
+msgid "Received short packet from tap device"
+msgstr "Kort pakket ontvangen van tap apparaat"
 
-#: src/net.c:1178
+#: src/net.c:1270
 #, c-format
-msgid "Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"
-msgstr "Te kort pakket van %02x:%02x:%02x:%02x:%02x:%02x genegeerd"
+msgid "Read packet of length %d from tap device"
+msgstr "Pakket gelezen van lengte %d van tap apparaat"
 
-#: src/net.c:1213
+#: src/net.c:1301
 #, c-format
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 
+#: src/net.c:1308
+msgid "Rereading configuration file and restarting in 5 seconds"
+msgstr "Herlezen configuratiebestand en herstart in 5 seconden"
+
+#: src/net.c:1315
+msgid "Unable to reread configuration file, exiting"
+msgstr "Kan configuratiebestand niet herlezen, beëindigen"
+
 #: src/netutl.c:115
 #, c-format
 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 
-#: src/protocol.c:80
+#: src/protocol.c:82
 #, c-format
 msgid "Output buffer overflow while sending %s to %s (%s)"
 msgstr "Uitvoer buffer overvol tijdens zenden %s naar %s (%s)"
 
-#: src/protocol.c:87
+#: src/protocol.c:89
 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Verzending %s naar %s (%s)"
 
-#: src/protocol.c:101
+#: src/protocol.c:103
 #, c-format
 msgid "Unknown request from %s (%s)"
 msgstr "Onbekend verzoek van %s (%s)"
 
-#: src/protocol.c:108
+#: src/protocol.c:110
 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "Kreeg %s van %s (%s)"
 
-#: src/protocol.c:114
+#: src/protocol.c:116
+#, c-format
+msgid "Unauthorized request from %s (%s)"
+msgstr "Niet toegestaan verzoek van %s (%s)"
+
+#: src/protocol.c:123
 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Fout tijdens afhandelen %s van %s (%s)"
 
-#: src/protocol.c:121
+#: src/protocol.c:130
 #, c-format
 msgid "Bogus data received from %s (%s)"
 msgstr "Onzinnige data ontvangen van %s (%s)"
 
-#: src/protocol.c:170
+#: src/protocol.c:181
 #, c-format
 msgid "Got bad ID from %s"
 msgstr "Kreeg ongeldige ID van %s"
 
-#: src/protocol.c:178
+#: src/protocol.c:189
 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "Ander %s (%s) gebruikt een niet-compatibel protocol versie %d"
 
-#: src/protocol.c:187
+#: src/protocol.c:198
 #, c-format
 msgid "Peer %s uses invalid identity name"
 msgstr "Ander %s gebruikt een ongeldige identiteitsnaam"
 
-#: src/protocol.c:195
+#: src/protocol.c:206
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft een onbekende identiteit (%s)"
 
-#: src/protocol.c:209
+#: src/protocol.c:220
 #, c-format
 msgid "Uplink %s (%s) is already in our connection list"
 msgstr "%s (%s) staat al in onze verbindingslijst"
 
-#: src/protocol.c:219
+#: src/protocol.c:236
 #, c-format
 msgid "No public key known for %s (%s)"
 msgstr "Geen publieke sleutel bekend voor %s (%s)"
 
-#: src/protocol.c:258 src/protocol.c:312
+#: src/protocol.c:273
+#, c-format
+msgid "Generated random challenge (unencrypted): %s"
+msgstr "Uitdaging gegenereerd (niet versleuteld): %s"
+
+#: src/protocol.c:280 src/protocol.c:334
 #, c-format
 msgid "Error during encryption of challenge for %s (%s)"
 msgstr "Fout tijdens versleuteling van uitdaging voor %s (%s)"
 
-#: src/protocol.c:284
+#: src/protocol.c:306
 #, c-format
 msgid "Got bad CHALLENGE from %s (%s)"
 msgstr "Kreeg ongeldige CHALLENGE van %s (%s)"
 
-#: src/protocol.c:294
+#: src/protocol.c:316
 #, c-format
 msgid "Intruder: wrong challenge length from %s (%s)"
 msgstr "Indringer: verkeerde lengte voor uitdaging van %s (%s)"
 
-#: src/protocol.c:330
+#: src/protocol.c:343
+#, c-format
+msgid "Received random challenge (unencrypted): %s"
+msgstr "Uitdaging ontvangen (niet versleuteld): %s"
+
+#: src/protocol.c:359
 #, c-format
 msgid "Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"
 msgstr "Poging tot zenden CHAL_REPLY naar %s (%s) zonder een geldige CHALLENGE"
 
-#: src/protocol.c:361
+#: src/protocol.c:390
 #, c-format
 msgid "Got bad CHAL_REPLY from %s (%s)"
 msgstr "Kreeg ongeldige CHAL_REPLY van %s (%s)"
 
-#: src/protocol.c:370
+#: src/protocol.c:399
 #, c-format
 msgid "Intruder: wrong challenge reply length from %s (%s)"
 msgstr "Indringer: verkeerde lengte van antwoord op uitdaging van %s (%s)"
 
-#: src/protocol.c:387
+#: src/protocol.c:416
 #, c-format
 msgid "Intruder: wrong challenge reply from %s (%s)"
 msgstr "Indringer: verkeerd antwoord op de uitdaging van %s (%s)"
 
-#: src/protocol.c:425
+#: src/protocol.c:421
+#, c-format
+msgid "Expected challenge reply: %s"
+msgstr "Verwacht antwoord op uitdaging: %s"
+
+#: src/protocol.c:463
 #, c-format
 msgid "Removing old entry for %s at %s in favour of new connection from %s"
 msgstr ""
 "Verwijdering oude verbinding voor %s op %s in voordeel van nieuwe verbinding "
 "van %s"
 
-#: src/protocol.c:437
+#: src/protocol.c:476
 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
 
-#: src/protocol.c:477
+#: src/protocol.c:531
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s)"
 
-#: src/protocol.c:486
+#: src/protocol.c:540
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
-#: src/protocol.c:495
+#: src/protocol.c:549
 #, c-format
 msgid "Got bad ADD_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige ADD_SUBNET van %s (%s): ongeldig subnet"
 
-#: src/protocol.c:506
+#: src/protocol.c:560
 #, c-format
 msgid "Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_SUBNET van %s (%s) voor onszelf, herstart"
 
-#: src/protocol.c:517
+#: src/protocol.c:571
 #, c-format
 msgid "Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
-"Kreeg DEL_SUBNET voor %d.%d.%d.%d van %s (%s) die niet voorkomt in onze "
+"Kreeg ADD_SUBNET voor %d.%d.%d.%d van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
-#: src/protocol.c:545
+#: src/protocol.c:611
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s)"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s)"
 
-#: src/protocol.c:554
+#: src/protocol.c:620
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
-#: src/protocol.c:563
+#: src/protocol.c:629
 #, c-format
 msgid "Got bad DEL_SUBNET from %s (%s): invalid subnet string"
 msgstr "Kreeg ongeldige DEL_SUBNET van %s (%s): ongeldige identiteitsnaam"
 
-#: src/protocol.c:574
+#: src/protocol.c:640
 #, c-format
 msgid "Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_SUBNET van %s (%s) voor onszelf, herstart"
 
-#: src/protocol.c:585
+#: src/protocol.c:651
 #, c-format
 msgid "Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"
 msgstr ""
 "Kreeg DEL_SUBNET voor %d.%d.%d.%d van %s (%s) die niet voorkomt in onze "
 "verbindingslijst"
 
-#: src/protocol.c:616
+#: src/protocol.c:688
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s)"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s)"
 
-#: src/protocol.c:624
+#: src/protocol.c:696
 #, c-format
 msgid "Got bad ADD_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige ADD_HOST van %s (%s): ongeldige identiteitsnaam"
 
-#: src/protocol.c:633
+#: src/protocol.c:705
 #, c-format
 msgid "Warning: got ADD_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg ADD_HOST van %s (%s) voor onszelf, herstart"
 
-#: src/protocol.c:643
-#, c-format
-msgid "Warning: got ADD_HOST from %s (%s) from ourself, restarting"
-msgstr "Waarschuwing: kreeg ADD_HOST van %s (%s) van onszelf, herstart"
-
-#: src/protocol.c:653
-#, c-format
-msgid ""
-"Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-"Kreeg ADD_HOST van %s (%s) met herkomst %s die niet in onze verbindingslijst "
-"voorkomt"
-
-#: src/protocol.c:672
+#: src/protocol.c:722
 #, c-format
 msgid "Got duplicate ADD_HOST for %s (%s) from %s (%s)"
 msgstr "Kreeg een tweede ADD_HOST voor %s (%s) van %s (%s)"
 
-#: src/protocol.c:679
+#: src/protocol.c:730
 #, c-format
-msgid "Removing old entry for %s (%s)"
-msgstr "Verwijdering oude verbinding voor %s (%s)"
+msgid "Removing old entry for %s (%s) in favour of new connection"
+msgstr ""
+"Verwijdering oude verbinding voor %s (%s) in voordeel van nieuwe verbinding"
 
-#: src/protocol.c:722
+#: src/protocol.c:773
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s)"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s)"
 
-#: src/protocol.c:731
+#: src/protocol.c:782
 #, c-format
 msgid "Got bad DEL_HOST from %s (%s): invalid identity name"
 msgstr "Kreeg ongeldige DEL_HOST van %s (%s): ongeldige identiteitsnaam"
 
-#: src/protocol.c:740
+#: src/protocol.c:791
 #, c-format
 msgid "Warning: got DEL_HOST from %s (%s) for ourself, restarting"
 msgstr "Waarschuwing: kreeg DEL_HOST van %s (%s) voor onszelf, herstart"
 
-#: src/protocol.c:751
-#, c-format
-msgid "Warning: got DEL_HOST from %s (%s) from ourself, restarting"
-msgstr "Waarschuwing: kreeg DEL_HOST van %s (%s) van onszelf, herstart"
-
-#: src/protocol.c:761
-#, c-format
-msgid ""
-"Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"
-msgstr ""
-"Kreeg DEL_HOST voor %s (%s) met herkomst %s die niet in onze "
-"verbindingslijst voorkomt"
-
-#: src/protocol.c:773
+#: src/protocol.c:802
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which is not in our connection list"
 msgstr ""
 "Kreeg DEL_HOST van %s (%s) voor %s die niet in onze verbindingslijst voorkomt"
 
-#: src/protocol.c:783
+#: src/protocol.c:812
 #, c-format
 msgid "Got DEL_HOST from %s (%s) for %s which doesn't match"
 msgstr "Kreeg DEL_HOST van %s (%s) voor %s wat niet overeenkomt"
 
-#: src/protocol.c:815
+#: src/protocol.c:848
 #, c-format
 msgid "Got bad STATUS from %s (%s)"
 msgstr "Kreeg ongeldige STATUS van %s (%s)"
 
-#: src/protocol.c:822
+#: src/protocol.c:855
 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Ontving statusbericht van %s (%s): %s: %s"
 
-#: src/protocol.c:846
+#: src/protocol.c:879
 #, c-format
 msgid "Got bad ERROR from %s (%s)"
 msgstr "Kreeg ongeldige ERROR van %s (%s)"
 
-#: src/protocol.c:853
+#: src/protocol.c:886
 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Ontving foutmelding van %s (%s): %s: %s"
 
-#: src/protocol.c:931
+#: src/protocol.c:962
 #, c-format
 msgid "Got bad KEY_CHANGED from %s (%s)"
 msgstr "Kreeg ongeldige KEY_CHANGED van %s (%s)"
 
-#: src/protocol.c:938
+#: src/protocol.c:969
 #, c-format
 msgid ""
 "Got KEY_CHANGED from %s (%s) origin %s which does not exist in our "
 "connection list"
 msgstr ""
-"Kreeg KEY_CHANGED van %s (%s) met herkomst %s die niet in onze "
-"verbindingslijst voorkomt"
+"Kreeg KEY_CHANGED van %s (%s) herkomst %s die niet in onze verbindingslijst "
+"voorkomt"
 
-#: src/protocol.c:968
+#: src/protocol.c:999
 #, c-format
 msgid "Got bad REQ_KEY from %s (%s)"
 msgstr "Kreeg ongeldige REQ_KEY van %s (%s)"
 
-#: src/protocol.c:975
+#: src/protocol.c:1006
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) origin %s which does not exist in our connection "
@@ -664,7 +669,7 @@ msgstr ""
 "Kreeg REQ_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 
-#: src/protocol.c:991
+#: src/protocol.c:1022
 #, c-format
 msgid ""
 "Got REQ_KEY from %s (%s) destination %s which does not exist in our "
@@ -672,26 +677,21 @@ msgid ""
 msgstr ""
 "Kreeg REQ_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 
-#: src/protocol.c:1019
+#: src/protocol.c:1050
 #, c-format
 msgid "Got bad ANS_KEY from %s (%s)"
 msgstr "Kreeg ongeldige ANS_KEY van %s (%s)"
 
-#: src/protocol.c:1026
+#: src/protocol.c:1057
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) origin %s which does not exist in our connection "
 "list"
 msgstr ""
-"Kreeg ANS_KEY van %s (%s) met herkomst %s die niet in onze verbindingslijst "
+"Kreeg ANS_KEY van %s (%s) herkomst %s die niet in onze verbindingslijst "
 "voorkomt"
 
-#: src/protocol.c:1042
-#, c-format
-msgid "Got bad ANS_KEY from %s (%s) origin %s: invalid key"
-msgstr "Kreeg ongeldige ANS_KEY van %s (%s) herkomst %s: ongeldige sleutel"
-
-#: src/protocol.c:1055
+#: src/protocol.c:1091
 #, c-format
 msgid ""
 "Got ANS_KEY from %s (%s) destination %s which does not exist in our "
@@ -699,12 +699,25 @@ msgid ""
 msgstr ""
 "Kreeg ANS_KEY van %s (%s) doel %s die niet in onze verbindingslijst voorkomt"
 
-#: src/tincd.c:99
+#. Do some intl stuff right now
+#: src/subnet.c:242 src/tincd.c:397
+msgid "unknown"
+msgstr "onbekend"
+
+#: src/subnet.c:298
+msgid "Subnet list:"
+msgstr "Subnet lijst:"
+
+#: src/subnet.c:307
+msgid "End of subnet list."
+msgstr "Einde van subnet lijst."
+
+#: src/tincd.c:101
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: src/tincd.c:102
+#: src/tincd.c:104
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -713,7 +726,7 @@ msgstr ""
 "Gebruik: %s [optie]...\n"
 "\n"
 
-#: src/tincd.c:103
+#: src/tincd.c:105
 msgid ""
 "  -c, --config=DIR      Read configuration options from DIR.\n"
 "  -D, --no-detach       Don't fork and detach.\n"
@@ -727,7 +740,7 @@ msgstr ""
 "  -k, --kill            Poging tot doden van lopende tincd en beëindig.\n"
 "  -n, --net=NETNAAM     Verbind met net NETNAAM.\n"
 
-#: src/tincd.c:108
+#: src/tincd.c:110
 msgid ""
 "  -K, --keygen[=BITS]   Generate public/private RSA keypair.\n"
 "      --help            Display this help and exit.\n"
@@ -739,18 +752,18 @@ msgstr ""
 "      --version         Geef versie informatie en beëindig.\n"
 "\n"
 
-#: src/tincd.c:111
+#: src/tincd.c:113
 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"
 
-#: src/tincd.c:152
+#: src/tincd.c:153
 msgid "Invalid argument! BITS must be a number equal to or greater than 512.\n"
 msgstr ""
 "Ongeldig argument! BITS moet een nummer zijn gelijk aan of groter dan 512.\n"
 
-#: src/tincd.c:207
+#: src/tincd.c:208
 msgid ""
 "Seeding the PRNG: please press some keys or move\n"
 "the mouse if this program seems to have halted...\n"
@@ -759,20 +772,20 @@ msgstr ""
 "de muis als het programma gestopt lijkt te zijn...\n"
 
 #. OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :)
-#: src/tincd.c:210
+#: src/tincd.c:211
 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 
-#: src/tincd.c:214
+#: src/tincd.c:215
 msgid "Error during key generation!"
 msgstr "Fout tijdens genereren sleutel!"
 
-#: src/tincd.c:218
+#: src/tincd.c:219
 msgid "Done.\n"
 msgstr "Klaar.\n"
 
-#: src/tincd.c:220
+#: src/tincd.c:221
 msgid ""
 "Please copy the private key to tinc.conf and the\n"
 "public key to your host configuration file:\n"
@@ -782,57 +795,52 @@ msgstr ""
 "publieke sleutel naar het host configuratie bestand:\n"
 "\n"
 
-#: src/tincd.c:230
+#: src/tincd.c:231
 #, c-format
 msgid "Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."
 msgstr ""
 "Geheugen is vol (laatste %s:%d) (kon geen %d bytes vrijmaken), beëindigen."
 
-#: src/tincd.c:285
+#: src/tincd.c:286
 #, c-format
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) gestart, debugniveau %d"
 
-#: src/tincd.c:288
+#: src/tincd.c:289
 #, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s gestart"
 
-#: src/tincd.c:303
+#: src/tincd.c:304
 #, 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."
 
-#: src/tincd.c:321
+#: src/tincd.c:322
 #, 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"
 
-#: src/tincd.c:324
+#: src/tincd.c:325
 #, c-format
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Een tincd draait al met procesnummer %d.\n"
 
-#: src/tincd.c:345
+#: src/tincd.c:346
 #, c-format
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "Geen andere tincd gevonden voor net `%s'.\n"
 
-#: src/tincd.c:347
+#: src/tincd.c:348
 msgid "No other tincd is running.\n"
 msgstr "Geen andere tincd gevonden.\n"
 
-#: src/tincd.c:354
+#: src/tincd.c:355
 msgid "Removing stale lock file.\n"
 msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
 
-#. Do some intl stuff right now
-#: src/tincd.c:397
-msgid "unknown"
-msgstr "onbekend"
-
 #: src/tincd.c:403
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
@@ -870,8 +878,8 @@ msgid "Restarting in %d seconds!"
 msgstr "Herstart in %d seconden!"
 
 #: src/tincd.c:462 src/tincd.c:508
-msgid "Aieee! Not restarting."
-msgstr "Waaah! Geen herstart."
+msgid "Not restarting."
+msgstr "Geen herstart."
 
 #: src/tincd.c:472
 msgid "Got TERM signal"
@@ -894,39 +902,14 @@ msgid "Trying to re-execute in 5 seconds..."
 msgstr "Poging tot herstaren over 5 seconden..."
 
 #: src/tincd.c:517
-msgid "Got HUP signal, rereading configuration and restarting"
-msgstr "Kreeg HUP signaal, herlezen configuratie en herstarten"
+msgid "Got HUP signal"
+msgstr "Kreeg HUP signaal"
 
 #: src/tincd.c:525
 msgid "Got INT signal, exiting"
 msgstr "Kreeg INT signaal, beëindigen"
 
-#: src/tincd.c:539
-msgid "Got USR2 signal, forcing new key generation"
-msgstr "Kreeg USR2 signaal, nieuwe sleutels geforceerd"
-
-#: src/tincd.c:548
+#: src/tincd.c:549
 #, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Kreeg onverwacht signaal %d (%s)"
-
-#~ msgid "Usage: %s bits\n"
-#~ msgstr "Gebruik: %s bits\n"
-
-#~ msgid "Illegal number: %s\n"
-#~ msgstr "Ongeldig nummer: %s\n"
-
-#~ msgid "Invalid timeout value `%s'.\n"
-#~ msgstr "Ongeldige timeout waarde `%s'.\n"
-
-#~ msgid "Illegal passphrase in %s; size would be %d"
-#~ msgstr "Ongeldig wachtwoord in %s; grootte zou %d zijn"
-
-#~ msgid "Generating %d bits keys"
-#~ msgstr "%d bits sleutel genereren"
-
-#~ msgid "Opening /dev/urandom failed: %m"
-#~ msgstr "Openen van /dev/urandom mislukt: %m"
-
-#~ msgid "Encryption key set to %s"
-#~ msgstr "Sleutel ingesteld op %s"

diff --git a/src/connlist.c b/src/connlist.c
index 2965ced..ac6970b 100644 (file)
--- a/src/connlist.c
+++ b/src/connlist.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connlist.c,v 1.1.2.10 2000/10/29 00:02:17 guus Exp $
+    $Id: connlist.c,v 1.1.2.11 2000/10/29 02:07:39 guus Exp $
 */
 
 #include <syslog.h>
@@ -64,6 +64,8 @@ cp
     free(p->cipher_pktkey);
   if(p->buffer)
     free(p->buffer);
+  if(p->config)
+    clear_config(&p->config);
   free(p);
 cp
 }

diff --git a/src/net.c b/src/net.c
index 32c66e8..480a126 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     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.51 2000/10/29 00:46:43 guus Exp $
+    $Id: net.c,v 1.35.4.52 2000/10/29 02:07:40 guus Exp $
 */
 
 #include "config.h"
@@ -869,16 +869,8 @@ void close_network_connections(void)
 cp
   for(p = conn_list; p != NULL; p = p->next)
     {
-      if(p->status.dataopen)
-       {
-         shutdown(p->socket, 0); /* No more receptions */
-         close(p->socket);
-       }
-      if(p->status.meta)
-       {
-         shutdown(p->meta_socket, 0); /* No more receptions */
-          close(p->meta_socket);
-        }
+      p->status.active = 0;
+      terminate_connection(p);
     }
 
   if(myself)
@@ -886,6 +878,8 @@ cp
       {
        close(myself->meta_socket);
        close(myself->socket);
+        free_conn_list(myself);
+        myself = NULL;
       }
 
   /* Execute tinc-down script right before shutting down the interface */
@@ -1065,9 +1059,7 @@ void terminate_connection(conn_list_t *cl)
   subnet_t *s;
 cp
   if(cl->status.remove)
-    {
-      return;
-    }
+    return;
 
   cl->status.remove = 1;
 
@@ -1101,19 +1093,19 @@ cp
   for(s = cl->subnets; s; s = s->next)
     subnet_del(s);
 
-  /* Inactivate */
-
-  cl->status.active = 0;
-
   /* Check if this was our outgoing connection */
     
-  if(cl->status.outgoing)
+  if(cl->status.outgoing && cl->status.active)
     {
       signal(SIGALRM, sigalrm_handler);
       seconds_till_retry = 5;
       alarm(seconds_till_retry);
       syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
     }
+
+  /* Inactivate */
+
+  cl->status.active = 0;
 cp
 }
 
@@ -1312,20 +1304,22 @@ cp
 
       if(sighup)
         {
+          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
           sighup = 0;
-/* FIXME: reprogram this.
-         if(debug_lvl > 1)
-           syslog(LOG_INFO, _("Rereading configuration file"));
           close_network_connections();
-          clear_config();
-          if(read_config_file(&config, configfilename))
+          clear_config(&config);
+
+          if(read_server_config())
             {
               syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
               exit(0);
             }
+
           sleep(5);
-          setup_network_connections();
-*/
+          
+          if(setup_network_connections())
+            return;
+            
           continue;
         }
 

diff --git a/src/tincd.c b/src/tincd.c
index ca873ef..a220154 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     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.17 2000/10/29 00:02:20 guus Exp $
+    $Id: tincd.c,v 1.10.4.18 2000/10/29 02:07:41 guus Exp $
 */
 
 #include "config.h"
@@ -459,7 +459,7 @@ main(int argc, char **argv, char **envp)
         }
       else
         {
-          syslog(LOG_ERR, _("Aieee! Not restarting."));
+          syslog(LOG_ERR, _("Not restarting."));
           exit(0);
         }
     }
@@ -505,7 +505,7 @@ sigsegv_handler(int a)
     }
   else
     {
-      syslog(LOG_NOTICE, _("Aieee! Not restarting."));
+      syslog(LOG_NOTICE, _("Not restarting."));
       exit(0);
     }
 }
@@ -514,7 +514,7 @@ RETSIGTYPE
 sighup_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
-    syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+    syslog(LOG_NOTICE, _("Got HUP signal"));
   sighup = 1;
 }
 
@@ -536,9 +536,9 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   dump_subnet_list();
-//  if(debug_lvl > DEBUG_NOTHING)
-//   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
 /* FIXME: reprogram this.
+  if(debug_lvl > DEBUG_NOTHING)
+   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
   regenerate_keys();
 */
 }