More missing IPv6 definitions and autoconf checks to make sure it compiles

under Solaris 2.6.

diff --git a/configure.in b/configure.in
index 41c1aaf..a51bd29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Process this file with autoconf to produce a configure script.
 

-dnl $Id: configure.in,v 1.13.2.65 2003/07/07 11:11:33 guus Exp $
+dnl $Id: configure.in,v 1.13.2.66 2003/07/11 16:12:58 guus Exp $

 
 AC_PREREQ(2.53)
 AC_INIT(src/tincd.c)
 
 AC_PREREQ(2.53)
 AC_INIT(src/tincd.c)


@@ -127,7 +127,7 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 

-AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
+AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])

 
 AC_CACHE_SAVE
 
 
 AC_CACHE_SAVE
 

diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index d831732..5e95a2a 100644 (file)
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -13,8 +13,9 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
 
 #include <stdlib.h>
 #include <sys/types.h>

-#include <netinet/in.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

+#include <netinet/in.h>
+#include <arpa/inet.h>

 #include <netdb.h>
 #include <string.h>
 
 #include <netdb.h>
 #include <string.h>
 


@@ -97,12 +98,14 @@ int getaddrinfo(const char *hostname, const char *servname,
                        return EAI_MEMORY;
        }
        
                        return EAI_MEMORY;
        }
        

+#ifdef HAVE_INET_ATON

        if (inet_aton(hostname, &in)) {
                if (NULL != (*res = malloc_ai(port, in.s_addr)))
                        return 0;
                else
                        return EAI_MEMORY;
        }
        if (inet_aton(hostname, &in)) {
                if (NULL != (*res = malloc_ai(port, in.s_addr)))
                        return 0;
                else
                        return EAI_MEMORY;
        }

+#endif

        
        hp = gethostbyname(hostname);
        if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
        
        hp = gethostbyname(hostname);
        if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {

diff --git a/lib/ipv6.h b/lib/ipv6.h
index 8851d6d..c04ada2 100644 (file)
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -17,7 +17,7 @@
     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: ipv6.h,v 1.1.2.2 2003/07/07 11:50:52 guus Exp $
+    $Id: ipv6.h,v 1.1.2.3 2003/07/11 16:12:59 guus Exp $

 */
 
 #ifndef __TINC_IPV6_H__
 */
 
 #ifndef __TINC_IPV6_H__


@@ -60,6 +60,13 @@ struct sockaddr_in6 {
 };
 #endif
 
 };
 #endif
 

+#ifndef IN6_IS_ADDR_V4MAPPED
+#define IN6_IS_ADDR_V4MAPPED(a) \
+        ((((__const uint32_t *) (a))[0] == 0) \
+        && (((__const uint32_t *) (a))[1] == 0) \
+        && (((__const uint32_t *) (a))[2] == htonl (0xffff)))
+#endif
+

 #ifndef HAVE_NETINET_IP6_H
 struct ip6_hdr {
        union {
 #ifndef HAVE_NETINET_IP6_H
 struct ip6_hdr {
        union {

diff --git a/po/nl.po b/po/nl.po
index da4bf6f..cecd310 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0-cvs\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: tinc 1.0-cvs\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2003-06-11 22:14+0200\n"
+"POT-Creation-Date: 2003-07-07 13:41+0200\n"

 "PO-Revision-Date: 2003-05-06 23:10+0200\n"
 "Last-Translator: Guus Sliepen <guus@sliepen.eu.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "PO-Revision-Date: 2003-05-06 23:10+0200\n"
 "Last-Translator: Guus Sliepen <guus@sliepen.eu.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"


@@ -14,30 +14,30 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/conf.c:175
+#: src/conf.c:173

 #, c-format
 msgid "\"yes\" or \"no\" expected for configuration variable %s in %s line %d"
 msgstr ""
 "\"ja\" of \"nee\" verwacht voor configuratievariabele %s in %s regel %d"
 
 #, c-format
 msgid "\"yes\" or \"no\" expected for configuration variable %s in %s line %d"
 msgstr ""
 "\"ja\" of \"nee\" verwacht voor configuratievariabele %s in %s regel %d"
 

-#: src/conf.c:191
+#: src/conf.c:189

 #, c-format
 msgid "Integer expected for configuration variable %s in %s line %d"
 msgstr "Geheel getal verwacht voor configuratievariabele %s in %s regel %d"
 
 #, c-format
 msgid "Integer expected for configuration variable %s in %s line %d"
 msgstr "Geheel getal verwacht voor configuratievariabele %s in %s regel %d"
 

-#: src/conf.c:225
+#: src/conf.c:223

 #, c-format
 msgid ""
 "Hostname or IP address expected for configuration variable %s in %s line %d"
 msgstr ""
 "Hostnaam of IP adres verwacht voor configuratievariabele %s in %s regel %d"
 
 #, c-format
 msgid ""
 "Hostname or IP address expected for configuration variable %s in %s line %d"
 msgstr ""
 "Hostnaam of IP adres verwacht voor configuratievariabele %s in %s regel %d"
 

-#: src/conf.c:243
+#: src/conf.c:241

 #, c-format
 msgid "Subnet expected for configuration variable %s in %s line %d"
 msgstr "Subnet verwacht voor configuratievariabele %s in %s regel %d"
 
 #, c-format
 msgid "Subnet expected for configuration variable %s in %s line %d"
 msgstr "Subnet verwacht voor configuratievariabele %s in %s regel %d"
 

-#: src/conf.c:254
+#: src/conf.c:252

 #, c-format
 msgid ""
 "Network address and prefix length do not match for configuration variable %s "
 #, c-format
 msgid ""
 "Network address and prefix length do not match for configuration variable %s "


@@ -46,69 +46,69 @@ msgstr ""
 "Netwerk adres en prefix lengte komen niet overeen bij configuratievariabele %"
 "s in %s regel %d"
 
 "Netwerk adres en prefix lengte komen niet overeen bij configuratievariabele %"
 "s in %s regel %d"
 

-#: src/conf.c:353
+#: src/conf.c:351

 #, c-format
 msgid "Cannot open config file %s: %s"
 msgstr "Kan configuratie bestand %s niet openen: %s"
 
 #, c-format
 msgid "Cannot open config file %s: %s"
 msgstr "Kan configuratie bestand %s niet openen: %s"
 

-#: src/conf.c:391
+#: src/conf.c:389

 #, c-format
 msgid "No value for variable `%s' on line %d while reading config file %s"
 msgstr ""
 "Geen waarde voor variabele `%s' op regel %d tijdens het lezen van "
 "configuratie bestand %s"
 
 #, c-format
 msgid "No value for variable `%s' on line %d while reading config file %s"
 msgstr ""
 "Geen waarde voor variabele `%s' op regel %d tijdens het lezen van "
 "configuratie bestand %s"
 

-#: src/conf.c:426
+#: src/conf.c:424

 #, c-format
 msgid "Failed to read `%s': %s"
 msgstr "Lezen van `%s' mislukte: %s"
 
 #, c-format
 msgid "Failed to read `%s': %s"
 msgstr "Lezen van `%s' mislukte: %s"
 

-#: src/conf.c:453
+#: src/conf.c:451

 #, c-format
 msgid "`%s' is not an absolute path"
 msgstr "`%s' is geen absoluut pad"
 
 #, c-format
 msgid "`%s' is not an absolute path"
 msgstr "`%s' is geen absoluut pad"
 

-#: src/conf.c:469 src/conf.c:497
+#: src/conf.c:467 src/conf.c:495

 #, c-format
 msgid "Couldn't stat `%s': %s"
 msgstr "Kon `%s' niet statten: %s"
 
 #, c-format
 msgid "Couldn't stat `%s': %s"
 msgstr "Kon `%s' niet statten: %s"
 

-#: src/conf.c:474 src/conf.c:505
+#: src/conf.c:472 src/conf.c:503

 #, c-format
 msgid "`%s' is owned by UID %d instead of %d"
 msgstr "`%s' is eigendom van UID %d in plaats van %d"
 
 #, c-format
 msgid "`%s' is owned by UID %d instead of %d"
 msgstr "`%s' is eigendom van UID %d in plaats van %d"
 

-#: src/conf.c:480 src/conf.c:511
+#: src/conf.c:478 src/conf.c:509

 #, c-format
 msgid "Warning: `%s' is a symlink"
 msgstr "Waarschuwing: `%s' is een symbolische link"
 
 #, c-format
 msgid "Warning: `%s' is a symlink"
 msgstr "Waarschuwing: `%s' is een symbolische link"
 

-#: src/conf.c:483 src/conf.c:514
+#: src/conf.c:481 src/conf.c:512

 #, c-format
 msgid "Unable to read symbolic link `%s': %s"
 msgstr "Kan symbolische link `%s' niet lezen: %s"
 
 #, c-format
 msgid "Unable to read symbolic link `%s': %s"
 msgstr "Kan symbolische link `%s' niet lezen: %s"
 

-#: src/conf.c:525
+#: src/conf.c:523

 #, c-format
 msgid "`%s' has unsecure permissions"
 msgstr "`%s' heeft onveilige permissies"
 
 #, c-format
 msgid "`%s' has unsecure permissions"
 msgstr "`%s' heeft onveilige permissies"
 

-#: src/conf.c:547
+#: src/conf.c:545

 #, c-format
 msgid "Please enter a file to save %s to [%s]: "
 msgstr "Geef een bestand om de %s naar de schrijven [%s]: "
 
 #, c-format
 msgid "Please enter a file to save %s to [%s]: "
 msgstr "Geef een bestand om de %s naar de schrijven [%s]: "
 

-#: src/conf.c:554
+#: src/conf.c:552

 #, c-format
 msgid "Error while reading stdin: %s\n"
 msgstr "Fout tijdens lezen van standaardinvoer: %s\n"
 
 #, c-format
 msgid "Error while reading stdin: %s\n"
 msgstr "Fout tijdens lezen van standaardinvoer: %s\n"
 

-#: src/conf.c:582
+#: src/conf.c:580

 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fout bij het openen van het bestand `%s': %s\n"
 
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fout bij het openen van het bestand `%s': %s\n"
 

-#: src/conf.c:590
+#: src/conf.c:588

 #, c-format
 msgid ""
 "The file `%s' (or any of the leading directories) has unsafe permissions.\n"
 #, c-format
 msgid ""
 "The file `%s' (or any of the leading directories) has unsafe permissions.\n"


@@ -139,193 +139,193 @@ msgstr " %s op %s opties %lx socket %d status %04x"
 msgid "End of connections."
 msgstr "Einde van verbindingen."
 
 msgid "End of connections."
 msgstr "Einde van verbindingen."
 

-#: src/meta.c:52
+#: src/meta.c:51

 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s)"
 msgstr "Verzenden van %d bytes metadata naar %s (%s)"
 
 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s)"
 msgstr "Verzenden van %d bytes metadata naar %s (%s)"
 

-#: src/meta.c:67
+#: src/meta.c:66

 #, c-format
 msgid "Sending meta data to %s (%s) failed: %s"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %s"
 
 #, c-format
 msgid "Sending meta data to %s (%s) failed: %s"
 msgstr "Fout tijdens verzenden metadata naar %s (%s): %s"
 

-#: src/meta.c:105
+#: src/meta.c:104

 #, c-format
 msgid "This is a bug: %s:%d: %d:%s %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%s %s (%s)"
 
 #, c-format
 msgid "This is a bug: %s:%d: %d:%s %s (%s)"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%s %s (%s)"
 

-#: src/meta.c:111
+#: src/meta.c:110

 #, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 
 #, c-format
 msgid "Metadata socket error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s): %s"
 

-#: src/meta.c:130
+#: src/meta.c:128

 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 
 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 

-#: src/meta.c:135
+#: src/meta.c:133

 #, c-format
 msgid "Metadata socket read error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %s"
 
 #, c-format
 msgid "Metadata socket read error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %s"
 

-#: src/meta.c:198
+#: src/meta.c:196

 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 
 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
 

-#: src/net.c:98
+#: src/net.c:94

 msgid "Purging unreachable nodes"
 msgstr "Verwijderen onbereikbare nodes"
 
 msgid "Purging unreachable nodes"
 msgstr "Verwijderen onbereikbare nodes"
 

-#: src/net.c:106
+#: src/net.c:101

 #, c-format
 msgid "Purging node %s (%s)"
 msgstr "Verwijdering node %s (%s)"
 
 #, c-format
 msgid "Purging node %s (%s)"
 msgstr "Verwijdering node %s (%s)"
 

-#: src/net.c:188
+#: src/net.c:182

 #, 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)"
 

-#: src/net.c:242
+#: src/net.c:235

 #, 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"
 

-#: src/net.c:251
+#: src/net.c:244

 #, c-format
 msgid "Old connection_t for %s (%s) status %04x still lingering, deleting..."
 msgstr ""
 "Oude connection_t voor %s (%s) status %04x nog steeds aanwezig, wordt "
 "verwijderd..."
 
 #, c-format
 msgid "Old connection_t for %s (%s) status %04x still lingering, deleting..."
 msgstr ""
 "Oude connection_t voor %s (%s) status %04x nog steeds aanwezig, wordt "
 "verwijderd..."
 

-#: src/net.c:257
+#: src/net.c:249

 #, c-format
 msgid "Timeout from %s (%s) during authentication"
 msgstr "Timeout van %s (%s) tijdens authenticatie"
 
 #, c-format
 msgid "Timeout from %s (%s) during authentication"
 msgstr "Timeout van %s (%s) tijdens authenticatie"
 

-#: src/net.c:300
+#: src/net.c:291

 #, c-format
 msgid "Error while connecting to %s (%s): %s"
 msgstr "Fout tijdens schrijven naar %s (%s): %s"
 
 #, c-format
 msgid "Error while connecting to %s (%s): %s"
 msgstr "Fout tijdens schrijven naar %s (%s): %s"
 

-#: src/net.c:353
+#: src/net.c:344

 #, c-format
 msgid "Error while waiting for input: %s"
 msgstr "Fout tijdens wachten op invoer: %s"
 
 #, c-format
 msgid "Error while waiting for input: %s"
 msgstr "Fout tijdens wachten op invoer: %s"
 

-#: src/net.c:385
+#: src/net.c:375

 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 
 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 

-#: src/net.c:401
+#: src/net.c:391

 msgid "Flushing event queue"
 msgstr "Legen taakrij"
 
 msgid "Flushing event queue"
 msgstr "Legen taakrij"
 

-#: src/net.c:425
+#: src/net.c:415

 msgid "Unable to reread configuration file, exitting."
 msgstr "Kan configuratiebestand niet herlezen, beëindigen."
 
 msgid "Unable to reread configuration file, exitting."
 msgstr "Kan configuratiebestand niet herlezen, beëindigen."
 

-#: src/net_packet.c:153
+#: src/net_packet.c:136
+#, c-format
+msgid "Received packet of %d bytes from %s (%s)"
+msgstr "Ontvangst pakket van %d bytes van %s (%s)"
+
+#: src/net_packet.c:162

 #, c-format
 msgid "Got unauthenticated packet from %s (%s)"
 msgstr "Kreeg niet-geauthenticeerd pakket van %s (%s)"
 
 #, c-format
 msgid "Got unauthenticated packet from %s (%s)"
 msgstr "Kreeg niet-geauthenticeerd pakket van %s (%s)"
 

-#: src/net_packet.c:183
+#: src/net_packet.c:191

 #, c-format
 msgid "Lost %d packets from %s (%s)"
 msgstr "%d pakketten van %s (%s) verloren"
 
 #, c-format
 msgid "Lost %d packets from %s (%s)"
 msgstr "%d pakketten van %s (%s) verloren"
 

-#: src/net_packet.c:189
+#: src/net_packet.c:197

 #, c-format
 msgid "Got late or replayed packet from %s (%s), seqno %d, last received %d"
 msgstr ""
 "Kreeg laat of gedupliceerd pakket van %s (%s), seqno %d, laatste ontvangen %d"
 
 #, c-format
 msgid "Got late or replayed packet from %s (%s), seqno %d, last received %d"
 msgstr ""
 "Kreeg laat of gedupliceerd pakket van %s (%s), seqno %d, laatste ontvangen %d"
 

-#: src/net_packet.c:209
+#: src/net_packet.c:217

 #, c-format
 msgid "Error while uncompressing packet from %s (%s)"
 msgstr "Fout tijdens decomprimeren pakket van %s (%s)"
 
 #, c-format
 msgid "Error while uncompressing packet from %s (%s)"
 msgstr "Fout tijdens decomprimeren pakket van %s (%s)"
 

-#: src/net_packet.c:237
-#, c-format
-msgid "Received packet of %d bytes from %s (%s)"
-msgstr "Ontvangst pakket van %d bytes van %s (%s)"
-
-#: src/net_packet.c:263
+#: src/net_packet.c:259

 #, 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 wachtrij gezet"
 
 #, 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 wachtrij gezet"
 

-#: src/net_packet.c:293
+#: src/net_packet.c:289

 #, c-format
 msgid "Error while compressing packet to %s (%s)"
 msgstr "Fout tijdens comprimeren pakket naar %s (%s)"
 
 #, c-format
 msgid "Error while compressing packet to %s (%s)"
 msgstr "Fout tijdens comprimeren pakket naar %s (%s)"
 

-#: src/net_packet.c:345
+#: src/net_packet.c:340

 #, c-format
 msgid "Setting outgoing packet priority to %d"
 msgstr "Instellen prioriteit uitgaand pakket op %d"
 
 #, c-format
 msgid "Setting outgoing packet priority to %d"
 msgstr "Instellen prioriteit uitgaand pakket op %d"
 

-#: src/net_packet.c:348 src/net_setup.c:485 src/net_socket.c:110
-#: src/net_socket.c:157 src/net_socket.c:187 src/tincd.c:381 src/process.c:265
-#: src/process.c:295
+#: src/net_packet.c:342 src/net_setup.c:484 src/net_socket.c:110
+#: src/net_socket.c:157 src/net_socket.c:187 src/tincd.c:392 src/process.c:263
+#: src/process.c:291

 #, c-format
 msgid "System call `%s' failed: %s"
 msgstr "Systeemaanroep `%s' mislukte: %s"
 
 #, c-format
 msgid "System call `%s' failed: %s"
 msgstr "Systeemaanroep `%s' mislukte: %s"
 

-#: src/net_packet.c:354
+#: src/net_packet.c:348

 #, c-format
 msgid "Error sending packet to %s (%s): %s"
 msgstr "Fout tijdens verzenden pakket naar %s (%s): %s"
 
 #, c-format
 msgid "Error sending packet to %s (%s): %s"
 msgstr "Fout tijdens verzenden pakket naar %s (%s): %s"
 

-#: src/net_packet.c:372
+#: src/net_packet.c:365

 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Verzending pakket van %d bytes naar %s (%s)"
 
 #, c-format
 msgid "Sending packet of %d bytes to %s (%s)"
 msgstr "Verzending pakket van %d bytes naar %s (%s)"
 

-#: src/net_packet.c:377
+#: src/net_packet.c:369

 msgid "Packet is looping back to us!"
 msgstr "Pakket komt terug naar ons!"
 
 msgid "Packet is looping back to us!"
 msgstr "Pakket komt terug naar ons!"
 

-#: src/net_packet.c:384
+#: src/net_packet.c:374

 #, c-format
 msgid "Node %s (%s) is not reachable"
 msgstr "Node %s (%s) is niet bereikbaar"
 
 #, c-format
 msgid "Node %s (%s) is not reachable"
 msgstr "Node %s (%s) is niet bereikbaar"
 

-#: src/net_packet.c:393
+#: src/net_packet.c:382

 #, c-format
 msgid "Sending packet to %s via %s (%s)"
 msgstr "Verzending pakket naar %s via %s (%s)"
 
 #, c-format
 msgid "Sending packet to %s via %s (%s)"
 msgstr "Verzending pakket naar %s via %s (%s)"
 

-#: src/net_packet.c:413
+#: src/net_packet.c:401

 #, c-format
 msgid "Broadcasting packet of %d bytes from %s (%s)"
 msgstr "Verspreiding pakket van %d bytes van %s (%s)"
 
 #, c-format
 msgid "Broadcasting packet of %d bytes from %s (%s)"
 msgstr "Verspreiding pakket van %d bytes van %s (%s)"
 

-#: src/net_packet.c:431
+#: src/net_packet.c:418

 #, c-format
 msgid "Flushing queue for %s (%s)"
 msgstr "Legen van wachtrij voor %s (%s)"
 
 #, c-format
 msgid "Flushing queue for %s (%s)"
 msgstr "Legen van wachtrij voor %s (%s)"
 

-#: src/net_packet.c:452
+#: src/net_packet.c:439

 #, c-format
 msgid "This is a bug: %s:%d: %d:%s"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%s"
 
 #, c-format
 msgid "This is a bug: %s:%d: %d:%s"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%s"
 

-#: src/net_packet.c:459
+#: src/net_packet.c:446

 #, 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"
 

-#: src/net_packet.c:466
+#: src/net_packet.c:453

 #, c-format
 msgid "Receiving packet failed: %s"
 msgstr "Ontvangst pakket mislukt: %s"
 
 #, c-format
 msgid "Receiving packet failed: %s"
 msgstr "Ontvangst pakket mislukt: %s"
 

-#: src/net_packet.c:476
+#: src/net_packet.c:463

 #, c-format
 msgid "Received UDP packet from unknown source %s"
 msgstr "Ontvangst UDP pakket van onbekende oorsprong %s"
 #, c-format
 msgid "Received UDP packet from unknown source %s"
 msgstr "Ontvangst UDP pakket van onbekende oorsprong %s"


@@ -387,36 +387,36 @@ msgstr "Onzinnige maximum timeout!"
 msgid "Invalid address family!"
 msgstr "Ongeldige adresfamilie!"
 
 msgid "Invalid address family!"
 msgstr "Ongeldige adresfamilie!"
 

-#: src/net_setup.c:386
+#: src/net_setup.c:385

 msgid "Unrecognized cipher type!"
 msgstr "Onbekend cipher type!"
 
 msgid "Unrecognized cipher type!"
 msgstr "Onbekend cipher type!"
 

-#: src/net_setup.c:421
+#: src/net_setup.c:420

 msgid "Unrecognized digest type!"
 msgstr "Onbekend digest type!"
 
 msgid "Unrecognized digest type!"
 msgstr "Onbekend digest type!"
 

-#: src/net_setup.c:435
+#: src/net_setup.c:434

 msgid "MAC length exceeds size of digest!"
 msgstr "MAC lengte is groter dan dat van digest!"
 
 msgid "MAC length exceeds size of digest!"
 msgstr "MAC lengte is groter dan dat van digest!"
 

-#: src/net_setup.c:438
+#: src/net_setup.c:437

 msgid "Bogus MAC length!"
 msgstr "Onzinnige MAC lengte!"
 
 msgid "Bogus MAC length!"
 msgstr "Onzinnige MAC lengte!"
 

-#: src/net_setup.c:453
+#: src/net_setup.c:452

 msgid "Bogus compression level!"
 msgstr "Onzinnig compressieniveau!"
 
 msgid "Bogus compression level!"
 msgstr "Onzinnig compressieniveau!"
 

-#: src/net_setup.c:507
+#: src/net_setup.c:506

 #, c-format
 msgid "Listening on %s"
 msgstr "Luisterend op %s"
 
 #, c-format
 msgid "Listening on %s"
 msgstr "Luisterend op %s"
 

-#: src/net_setup.c:518
+#: src/net_setup.c:517

 msgid "Ready"
 msgstr "Gereed"
 
 msgid "Ready"
 msgstr "Gereed"
 

-#: src/net_setup.c:520
+#: src/net_setup.c:519

 msgid "Unable to create any listening socket!"
 msgstr "Kon geen enkele luistersocket aanmaken!"
 
 msgid "Unable to create any listening socket!"
 msgstr "Kon geen enkele luistersocket aanmaken!"
 


@@ -449,279 +449,279 @@ msgstr "Aanmaak UDP socket mislukte: %s"
 msgid "Can't bind to %s/udp: %s"
 msgstr "Kan niet aan %s/udp binden: %s"
 
 msgid "Can't bind to %s/udp: %s"
 msgstr "Kan niet aan %s/udp binden: %s"
 

-#: src/net_socket.c:241
+#: src/net_socket.c:240

 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
 
 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
 

-#: src/net_socket.c:250
+#: src/net_socket.c:248

 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Verbonden met %s (%s)"
 
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Verbonden met %s (%s)"
 

-#: src/net_socket.c:268
+#: src/net_socket.c:265

 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 

-#: src/net_socket.c:304
+#: src/net_socket.c:300

 #, c-format
 msgid "Trying to connect to %s (%s)"
 msgstr "Poging tot verbinden met %s (%s)"
 
 #, c-format
 msgid "Trying to connect to %s (%s)"
 msgstr "Poging tot verbinden met %s (%s)"
 

-#: src/net_socket.c:311
+#: src/net_socket.c:306

 #, c-format
 msgid "Creating socket for %s failed: %s"
 msgstr "Aanmaken socket voor %s mislukt: %s"
 
 #, c-format
 msgid "Creating socket for %s failed: %s"
 msgstr "Aanmaken socket voor %s mislukt: %s"
 

-#: src/net_socket.c:334
+#: src/net_socket.c:329

 #, c-format
 msgid "fcntl for %s: %s"
 msgstr "fcntl voor %s: %s"
 
 #, c-format
 msgid "fcntl for %s: %s"
 msgstr "fcntl voor %s: %s"
 

-#: src/net_socket.c:350
+#: src/net_socket.c:344

 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 

-#: src/net_socket.c:372
+#: src/net_socket.c:365

 #, c-format
 msgid "Already connected to %s"
 msgstr "Reeds verbonden met %s"
 
 #, c-format
 msgid "Already connected to %s"
 msgstr "Reeds verbonden met %s"
 

-#: src/net_socket.c:391
+#: src/net_socket.c:384

 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 
 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 

-#: src/net_socket.c:421
+#: src/net_socket.c:414

 #, c-format
 msgid "Accepting a new connection failed: %s"
 msgstr "Aanname van nieuwe verbinding is mislukt: %s"
 
 #, c-format
 msgid "Accepting a new connection failed: %s"
 msgstr "Aanname van nieuwe verbinding is mislukt: %s"
 

-#: src/net_socket.c:440
+#: src/net_socket.c:432

 #, c-format
 msgid "Connection from %s"
 msgstr "Verbinding van %s"
 
 #, c-format
 msgid "Connection from %s"
 msgstr "Verbinding van %s"
 

-#: src/net_socket.c:464
+#: src/net_socket.c:456

 #, c-format
 msgid "Invalid name for outgoing connection in %s line %d"
 msgstr "Ongeldige naam voor uitgaande verbinding in %s regel %d"
 
 #, c-format
 msgid "Invalid name for outgoing connection in %s line %d"
 msgstr "Ongeldige naam voor uitgaande verbinding in %s regel %d"
 

-#: src/netutl.c:71 src/netutl.c:97
+#: src/netutl.c:70 src/netutl.c:95

 #, c-format
 msgid "Error looking up %s port %s: %s\n"
 msgstr "Fout bij het opzoeken van %s poort %s: %s\n"
 
 #, c-format
 msgid "Error looking up %s port %s: %s\n"
 msgstr "Fout bij het opzoeken van %s poort %s: %s\n"
 

-#: src/netutl.c:122
+#: src/netutl.c:120

 #, c-format
 msgid "Error while translating addresses: %s"
 msgstr "Fout tijdens vertalen adressen: %s"
 
 #, c-format
 msgid "Error while translating addresses: %s"
 msgstr "Fout tijdens vertalen adressen: %s"
 

-#: src/netutl.c:150
+#: src/netutl.c:148

 #, c-format
 msgid "Error while looking up hostname: %s"
 msgstr "Fout bij het opzoeken van hostnaam: %s"
 
 #, c-format
 msgid "Error while looking up hostname: %s"
 msgstr "Fout bij het opzoeken van hostnaam: %s"
 

-#: src/netutl.c:154
+#: src/netutl.c:152

 #, c-format
 msgid "%s port %s"
 msgstr "%s poort %s"
 
 #, c-format
 msgid "%s port %s"
 msgstr "%s poort %s"
 

-#: src/netutl.c:191
+#: src/netutl.c:189

 #, c-format
 msgid "sockaddrcmp() was called with unknown address family %d, exitting!"
 msgstr ""
 "sockaddrcmp() werd aangeroepen met onbekende adresfamilie %d, beëindigen!"
 
 #, c-format
 msgid "sockaddrcmp() was called with unknown address family %d, exitting!"
 msgstr ""
 "sockaddrcmp() werd aangeroepen met onbekende adresfamilie %d, beëindigen!"
 

-#: src/protocol.c:77
+#: src/protocol.c:98

 #, c-format
 msgid "Output buffer overflow while sending request to %s (%s)"
 msgstr "Uitvoer buffer overvol tijdens zenden verzoek naar %s (%s)"
 
 #, c-format
 msgid "Output buffer overflow while sending request to %s (%s)"
 msgstr "Uitvoer buffer overvol tijdens zenden verzoek naar %s (%s)"
 

-#: src/protocol.c:85
+#: src/protocol.c:106

 #, c-format
 msgid "Sending %s to %s (%s): %s"
 msgstr "Verzending %s naar %s (%s): %s"
 
 #, c-format
 msgid "Sending %s to %s (%s): %s"
 msgstr "Verzending %s naar %s (%s): %s"
 

-#: src/protocol.c:88
+#: src/protocol.c:109

 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Verzending %s naar %s (%s)"
 
 #, c-format
 msgid "Sending %s to %s (%s)"
 msgstr "Verzending %s naar %s (%s)"
 

-#: src/protocol.c:110
+#: src/protocol.c:131

 #, c-format
 msgid "Forwarding %s from %s (%s): %s"
 msgstr "Doorsturen %s van %s (%s): %s"
 
 #, c-format
 msgid "Forwarding %s from %s (%s): %s"
 msgstr "Doorsturen %s van %s (%s): %s"
 

-#: src/protocol.c:114
+#: src/protocol.c:135

 #, c-format
 msgid "Forwarding %s from %s (%s)"
 msgstr "Doorsturen %s van %s (%s)"
 
 #, c-format
 msgid "Forwarding %s from %s (%s)"
 msgstr "Doorsturen %s van %s (%s)"
 

-#: src/protocol.c:132
+#: src/protocol.c:153

 #, c-format
 msgid "Unknown request from %s (%s): %s"
 msgstr "Onbekend verzoek van %s (%s): %s"
 
 #, c-format
 msgid "Unknown request from %s (%s): %s"
 msgstr "Onbekend verzoek van %s (%s): %s"
 

-#: src/protocol.c:135
+#: src/protocol.c:156

 #, 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)"
 

-#: src/protocol.c:142
+#: src/protocol.c:163

 #, c-format
 msgid "Got %s from %s (%s): %s"
 msgstr "Kreeg %s van %s (%s): %s"
 
 #, c-format
 msgid "Got %s from %s (%s): %s"
 msgstr "Kreeg %s van %s (%s): %s"
 

-#: src/protocol.c:146
+#: src/protocol.c:167

 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "Kreeg %s van %s (%s)"
 
 #, c-format
 msgid "Got %s from %s (%s)"
 msgstr "Kreeg %s van %s (%s)"
 

-#: src/protocol.c:152
+#: src/protocol.c:173

 #, c-format
 msgid "Unauthorized request from %s (%s)"
 msgstr "Niet toegestaan verzoek van %s (%s)"
 
 #, c-format
 msgid "Unauthorized request from %s (%s)"
 msgstr "Niet toegestaan verzoek van %s (%s)"
 

-#: src/protocol.c:160
+#: src/protocol.c:181

 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Fout tijdens afhandelen %s van %s (%s)"
 
 #, c-format
 msgid "Error while processing %s from %s (%s)"
 msgstr "Fout tijdens afhandelen %s van %s (%s)"
 

-#: src/protocol.c:165
+#: src/protocol.c:186

 #, 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)"
 

-#: src/protocol.c:212
+#: src/protocol.c:232

 msgid "Already seen request"
 msgstr "Verzoek reeds gezien"
 
 msgid "Already seen request"
 msgstr "Verzoek reeds gezien"
 

-#: src/protocol.c:242
+#: src/protocol.c:262

 #, c-format
 msgid "Aging past requests: deleted %d, left %d\n"
 msgstr "Veroudering vorige verzoeken: %d gewist, %d overgebleven\n"
 
 #, c-format
 msgid "Aging past requests: deleted %d, left %d\n"
 msgstr "Veroudering vorige verzoeken: %d gewist, %d overgebleven\n"
 

-#: src/protocol_auth.c:72 src/protocol_auth.c:228 src/protocol_auth.c:355
-#: src/protocol_auth.c:419 src/protocol_auth.c:524 src/protocol_edge.c:82
-#: src/protocol_edge.c:196 src/protocol_key.c:70 src/protocol_key.c:112
-#: src/protocol_key.c:176 src/protocol_misc.c:63 src/protocol_misc.c:94
-#: src/protocol_misc.c:188 src/protocol_subnet.c:71 src/protocol_subnet.c:162
+#: src/protocol_auth.c:68 src/protocol_auth.c:224 src/protocol_auth.c:351
+#: src/protocol_auth.c:415 src/protocol_auth.c:519 src/protocol_edge.c:82
+#: src/protocol_edge.c:193 src/protocol_key.c:70 src/protocol_key.c:112
+#: src/protocol_key.c:176 src/protocol_misc.c:75 src/protocol_misc.c:104
+#: src/protocol_misc.c:196 src/protocol_subnet.c:71 src/protocol_subnet.c:161

 #, c-format
 msgid "Got bad %s from %s (%s)"
 msgstr "Kreeg verkeerde %s van %s (%s)"
 
 #, c-format
 msgid "Got bad %s from %s (%s)"
 msgstr "Kreeg verkeerde %s van %s (%s)"
 

-#: src/protocol_auth.c:80 src/protocol_edge.c:90 src/protocol_edge.c:96
-#: src/protocol_edge.c:204 src/protocol_edge.c:210 src/protocol_subnet.c:79
-#: src/protocol_subnet.c:89 src/protocol_subnet.c:170
-#: src/protocol_subnet.c:191
+#: src/protocol_auth.c:76 src/protocol_edge.c:90 src/protocol_edge.c:96
+#: src/protocol_edge.c:201 src/protocol_edge.c:207 src/protocol_subnet.c:79
+#: src/protocol_subnet.c:89 src/protocol_subnet.c:169
+#: src/protocol_subnet.c:189

 #, c-format
 msgid "Got bad %s from %s (%s): %s"
 msgstr "Kreeg verkeerde %s van %s (%s): %s"
 
 #, c-format
 msgid "Got bad %s from %s (%s): %s"
 msgstr "Kreeg verkeerde %s van %s (%s): %s"
 

-#: src/protocol_auth.c:89
+#: src/protocol_auth.c:85

 #, c-format
 msgid "Peer %s is %s instead of %s"
 msgstr "Ander %s is %s in plaats van %s"
 
 #, c-format
 msgid "Peer %s is %s instead of %s"
 msgstr "Ander %s is %s in plaats van %s"
 

-#: src/protocol_auth.c:99
+#: src/protocol_auth.c:95

 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "Ander %s (%s) gebruikt incompatibele versie %d"
 
 #, c-format
 msgid "Peer %s (%s) uses incompatible version %d"
 msgstr "Ander %s (%s) gebruikt incompatibele versie %d"
 

-#: src/protocol_auth.c:117
+#: src/protocol_auth.c:113

 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft onbekende identiteit (%s)"
 
 #, c-format
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft onbekende identiteit (%s)"
 

-#: src/protocol_auth.c:176
+#: src/protocol_auth.c:172

 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr "Willekeurige meta sleutel aangemaakt (niet versleuteld): %s"
 
 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr "Willekeurige meta sleutel aangemaakt (niet versleuteld): %s"
 

-#: src/protocol_auth.c:188 src/protocol_auth.c:257
+#: src/protocol_auth.c:184 src/protocol_auth.c:253

 #, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Fout tijdens versleutelen van meta key voor %s (%s)"
 
 #, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Fout tijdens versleutelen van meta key voor %s (%s)"
 

-#: src/protocol_auth.c:238 src/protocol_auth.c:365 src/protocol_auth.c:427
-#: src/protocol_auth.c:445
+#: src/protocol_auth.c:234 src/protocol_auth.c:361 src/protocol_auth.c:423
+#: src/protocol_auth.c:441

 #, c-format
 msgid "Possible intruder %s (%s): %s"
 msgstr "Mogelijke indringer %s (%s): %s"
 
 #, c-format
 msgid "Possible intruder %s (%s): %s"
 msgstr "Mogelijke indringer %s (%s): %s"
 

-#: src/protocol_auth.c:265
+#: src/protocol_auth.c:261

 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr "Ontving willekeurige meta key (niet versleuteld): %s"
 
 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr "Ontving willekeurige meta key (niet versleuteld): %s"
 

-#: src/protocol_auth.c:276
+#: src/protocol_auth.c:272

 #, c-format
 msgid "%s (%s) uses unknown cipher!"
 msgstr "%s (%s) gebruikt onbekende cipher!"
 
 #, c-format
 msgid "%s (%s) uses unknown cipher!"
 msgstr "%s (%s) gebruikt onbekende cipher!"
 

-#: src/protocol_auth.c:296 src/protocol_key.c:243
+#: src/protocol_auth.c:292 src/protocol_key.c:243

 #, c-format
 msgid "Node %s (%s) uses unknown digest!"
 msgstr "Node %s (%s) gebruikt onbekende digest!"
 
 #, c-format
 msgid "Node %s (%s) uses unknown digest!"
 msgstr "Node %s (%s) gebruikt onbekende digest!"
 

-#: src/protocol_auth.c:301
+#: src/protocol_auth.c:297

 #, c-format
 msgid "%s (%s) uses bogus MAC length!"
 msgstr "%s (%s) gebruikt onzinnige MAC lengte!"
 
 #, c-format
 msgid "%s (%s) uses bogus MAC length!"
 msgstr "%s (%s) gebruikt onzinnige MAC lengte!"
 

-#: src/protocol_auth.c:428
+#: src/protocol_auth.c:424

 msgid "wrong challenge reply length"
 msgstr "verkeerde lengte antwoord op uitdaging"
 
 msgid "wrong challenge reply length"
 msgstr "verkeerde lengte antwoord op uitdaging"
 

-#: src/protocol_auth.c:446
+#: src/protocol_auth.c:442

 msgid "wrong challenge reply"
 msgstr "verkeerd antwoord op uitdaging"
 
 msgid "wrong challenge reply"
 msgstr "verkeerd antwoord op uitdaging"
 

-#: src/protocol_auth.c:451
+#: src/protocol_auth.c:447

 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr "Verwachtte antwoord op uitdaging: %s"
 
 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr "Verwachtte antwoord op uitdaging: %s"
 

-#: src/protocol_auth.c:541
+#: src/protocol_auth.c:535

 #, c-format
 msgid "Established a second connection with %s (%s), closing old connection"
 msgstr "Tweede verbinding met %s (%s) gemaakt, oude verbinding wordt gesloten"
 
 #, c-format
 msgid "Established a second connection with %s (%s), closing old connection"
 msgstr "Tweede verbinding met %s (%s) gemaakt, oude verbinding wordt gesloten"
 

-#: src/protocol_auth.c:559
+#: src/protocol_auth.c:552

 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
 
 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
 

-#: src/protocol_edge.c:91 src/protocol_edge.c:97 src/protocol_edge.c:205
-#: src/protocol_edge.c:211 src/protocol_subnet.c:80 src/protocol_subnet.c:171
+#: src/protocol_edge.c:91 src/protocol_edge.c:97 src/protocol_edge.c:202
+#: src/protocol_edge.c:208 src/protocol_subnet.c:80 src/protocol_subnet.c:170

 msgid "invalid name"
 msgstr "ongeldige naam"
 
 msgid "invalid name"
 msgstr "ongeldige naam"
 

-#: src/protocol_edge.c:134
+#: src/protocol_edge.c:133

 #, c-format
 msgid "Got %s from %s (%s) for ourself which does not match existing entry"
 msgstr ""
 "Kreeg %s van %s (%s) voor onszelf welke niet overeenkomt met reeds bekende"
 
 #, c-format
 msgid "Got %s from %s (%s) for ourself which does not match existing entry"
 msgstr ""
 "Kreeg %s van %s (%s) voor onszelf welke niet overeenkomt met reeds bekende"
 

-#: src/protocol_edge.c:140
+#: src/protocol_edge.c:138

 #, c-format
 msgid "Got %s from %s (%s) which does not match existing entry"
 msgstr "Kreeg %s van %s (%s) welke niet overeenkomt met reeds bekende"
 
 #, c-format
 msgid "Got %s from %s (%s) which does not match existing entry"
 msgstr "Kreeg %s van %s (%s) welke niet overeenkomt met reeds bekende"
 

-#: src/protocol_edge.c:149
+#: src/protocol_edge.c:146

 #, c-format
 msgid "Got %s from %s (%s) for ourself which does not exist"
 msgstr "Kreeg %s van %s (%s) voor onszelf welke niet bestaat"
 
 #, c-format
 msgid "Got %s from %s (%s) for ourself which does not exist"
 msgstr "Kreeg %s van %s (%s) voor onszelf welke niet bestaat"
 

-#: src/protocol_edge.c:224 src/protocol_edge.c:233 src/protocol_edge.c:244
+#: src/protocol_edge.c:220 src/protocol_edge.c:228 src/protocol_edge.c:238

 #, c-format
 msgid "Got %s from %s (%s) which does not appear in the edge tree"
 msgstr "Kreeg %s van %s (%s) welke niet voorkomt in de edge tree"
 
 #, c-format
 msgid "Got %s from %s (%s) which does not appear in the edge tree"
 msgstr "Kreeg %s van %s (%s) welke niet voorkomt in de edge tree"
 

-#: src/protocol_edge.c:251 src/protocol_subnet.c:118 src/protocol_subnet.c:218
+#: src/protocol_edge.c:244 src/protocol_subnet.c:117 src/protocol_subnet.c:214

 #, c-format
 msgid "Got %s from %s (%s) for ourself"
 msgstr "Kreeg %s van %s (%s) voor onszelf"
 #, c-format
 msgid "Got %s from %s (%s) for ourself"
 msgstr "Kreeg %s van %s (%s) voor onszelf"


@@ -766,26 +766,26 @@ msgstr "Node %s (%s) gebruikt onzinnige MAC lengte!"
 msgid "Node %s (%s) uses bogus compression level!"
 msgstr "Node %s (%s) gebruikt onzinnig compressieniveau!"
 
 msgid "Node %s (%s) uses bogus compression level!"
 msgstr "Node %s (%s) gebruikt onzinnig compressieniveau!"
 

-#: src/protocol_misc.c:69
+#: src/protocol_misc.c:80

 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Statusmelding van %s (%s): %s: %s"
 
 #, c-format
 msgid "Status message from %s (%s): %s: %s"
 msgstr "Statusmelding van %s (%s): %s: %s"
 

-#: src/protocol_misc.c:100
+#: src/protocol_misc.c:109

 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Foutmelding van %s (%s): %s: %s"
 
 #, c-format
 msgid "Error message from %s (%s): %s: %s"
 msgstr "Foutmelding van %s (%s): %s: %s"
 

-#: src/protocol_subnet.c:90 src/protocol_subnet.c:192
+#: src/protocol_subnet.c:90 src/protocol_subnet.c:190

 msgid "invalid subnet string"
 msgstr "ongeldige subnet string"
 
 msgid "invalid subnet string"
 msgstr "ongeldige subnet string"
 

-#: src/protocol_subnet.c:181
+#: src/protocol_subnet.c:179

 #, c-format
 msgid "Got %s from %s (%s) for %s which is not in our node tree"
 msgstr "Kreeg %s van %s (%s) voor %s welke niet voorkomt in de node boom"
 
 #, c-format
 msgid "Got %s from %s (%s) for %s which is not in our node tree"
 msgstr "Kreeg %s van %s (%s) voor %s welke niet voorkomt in de node boom"
 

-#: src/protocol_subnet.c:209
+#: src/protocol_subnet.c:206

 #, c-format
 msgid "Got %s from %s (%s) for %s which does not appear in his subnet tree"
 msgstr "Kreeg %s van %s (%s) voor %s welke niet voorkomt in zijn subnet boom"
 #, c-format
 msgid "Got %s from %s (%s) for %s which does not appear in his subnet tree"
 msgstr "Kreeg %s van %s (%s) voor %s welke niet voorkomt in zijn subnet boom"


@@ -814,12 +814,12 @@ msgstr " %s eigenaar %s"
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 

-#: src/tincd.c:111
+#: src/tincd.c:116

 #, 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"
 

-#: src/tincd.c:114
+#: src/tincd.c:119

 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"


@@ -828,7 +828,8 @@ msgstr ""
 "Gebruik: %s [optie]...\n"
 "\n"
 
 "Gebruik: %s [optie]...\n"
 "\n"
 

-#: src/tincd.c:115
+#: src/tincd.c:120
+#, fuzzy

 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
 "  -D, --no-detach            Don't fork and detach.\n"
 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
 "  -D, --no-detach            Don't fork and detach.\n"


@@ -837,6 +838,7 @@ msgid ""
 "  -n, --net=NETNAME          Connect to net NETNAME.\n"
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
 "  -L, --mlock                Lock tinc into main memory.\n"
 "  -n, --net=NETNAME          Connect to net NETNAME.\n"
 "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
 "  -L, --mlock                Lock tinc into main memory.\n"

+"  -F, --logfile[=FILENAME]   Write log entries to a logfile.\n"

 "      --help                 Display this help and exit.\n"
 "      --version              Output version information and exit.\n"
 "\n"
 "      --help                 Display this help and exit.\n"
 "      --version              Output version information and exit.\n"
 "\n"


@@ -853,13 +855,13 @@ msgstr ""
 "      --version              Geef versie informatie en beëindig.\n"
 "\n"
 
 "      --version              Geef versie informatie en beëindig.\n"
 "\n"
 

-#: src/tincd.c:124
+#: src/tincd.c:130

 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"
 

-#: src/tincd.c:182
+#: src/tincd.c:188

 #, c-format
 msgid ""
 "Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, "
 #, c-format
 msgid ""
 "Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, "


@@ -868,7 +870,7 @@ msgstr ""
 "Ongeldig argument `%s'; SIGNAAL moet een getal zijn of één van HUP, TERM, "
 "KILL, USR1, USR2, WINCH, INT of ALRM.\n"
 
 "Ongeldig argument `%s'; SIGNAAL moet een getal zijn of één van HUP, TERM, "
 "KILL, USR1, USR2, WINCH, INT of ALRM.\n"
 

-#: src/tincd.c:201
+#: src/tincd.c:206

 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"
 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"


@@ -876,24 +878,24 @@ msgstr ""
 "Ongeldig argument `%s'; BITS moet een nummer zijn gelijk aan of groter dan "
 "512.\n"
 
 "Ongeldig argument `%s'; BITS moet een nummer zijn gelijk aan of groter dan "
 "512.\n"
 

-#: src/tincd.c:268
+#: src/tincd.c:279

 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 
 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 

-#: src/tincd.c:272
+#: src/tincd.c:283

 msgid "Error during key generation!\n"
 msgstr "Fout tijdens genereren sleutel!\n"
 
 msgid "Error during key generation!\n"
 msgstr "Fout tijdens genereren sleutel!\n"
 

-#: src/tincd.c:275
+#: src/tincd.c:286

 msgid "Done.\n"
 msgstr "Klaar.\n"
 
 msgid "Done.\n"
 msgstr "Klaar.\n"
 

-#: src/tincd.c:284
+#: src/tincd.c:295

 msgid "public RSA key"
 msgstr "openbare RSA sleutel"
 
 msgid "public RSA key"
 msgstr "openbare RSA sleutel"
 

-#: src/tincd.c:290 src/tincd.c:303
+#: src/tincd.c:301 src/tincd.c:314

 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"
 msgid ""
 "Appending key to existing contents.\n"
 "Make sure only one key is stored in the file.\n"


@@ -901,21 +903,21 @@ msgstr ""
 "Sleutel wordt toegevoegd aan bestaande inhoud.\n"
 "Let er op dat er slechts één sleutel in het bestand is.\n"
 
 "Sleutel wordt toegevoegd aan bestaande inhoud.\n"
 "Let er op dat er slechts één sleutel in het bestand is.\n"
 

-#: src/tincd.c:297
+#: src/tincd.c:308

 msgid "private RSA key"
 msgstr "geheime RSA sleutel"
 
 msgid "private RSA key"
 msgstr "geheime RSA sleutel"
 

-#: src/tincd.c:324
+#: src/tincd.c:337

 msgid "Both netname and configuration directory given, using the latter..."
 msgstr ""
 "Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt..."
 
 msgid "Both netname and configuration directory given, using the latter..."
 msgstr ""
 "Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt..."
 

-#: src/tincd.c:353
+#: src/tincd.c:368

 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
 
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
 

-#: src/tincd.c:355
+#: src/tincd.c:370

 msgid ""
 "Copyright (C) 1998-2002 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"
 msgid ""
 "Copyright (C) 1998-2002 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"


@@ -932,69 +934,69 @@ msgstr ""
 "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n"
 "zie het bestand COPYING voor details.\n"
 
 "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n"
 "zie het bestand COPYING voor details.\n"
 

-#: src/tincd.c:385
+#: src/tincd.c:396

 msgid "mlockall() not supported on this platform!"
 msgstr "mlockall() wordt niet ondersteund op dit platform!"
 
 msgid "mlockall() not supported on this platform!"
 msgstr "mlockall() wordt niet ondersteund op dit platform!"
 

-#: src/tincd.c:421
+#: src/tincd.c:420

 msgid "Error initializing LZO compressor!"
 msgstr "Fout tijdens initialiseren LZO compressor!"
 
 msgid "Error initializing LZO compressor!"
 msgstr "Fout tijdens initialiseren LZO compressor!"
 

-#: src/tincd.c:434
+#: src/tincd.c:433

 msgid "Unrecoverable error"
 msgstr "Onherstelbare fout"
 
 msgid "Unrecoverable error"
 msgstr "Onherstelbare fout"
 

-#: src/tincd.c:438
+#: src/tincd.c:437

 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "Herstart in %d seconden!"
 
 #, c-format
 msgid "Restarting in %d seconds!"
 msgstr "Herstart in %d seconden!"
 

-#: src/tincd.c:441 src/process.c:353
+#: src/tincd.c:440 src/process.c:347

 msgid "Not restarting."
 msgstr "Geen herstart."
 
 msgid "Not restarting."
 msgstr "Geen herstart."
 

-#: src/process.c:69
+#: src/process.c:70

 #, c-format
 msgid "Memory exhausted (couldn't allocate %d bytes), exitting."
 msgstr "Geheugen uitgeput (kon geen %d bytes reserveren), beëindigen."
 
 #, c-format
 msgid "Memory exhausted (couldn't allocate %d bytes), exitting."
 msgstr "Geheugen uitgeput (kon geen %d bytes reserveren), beëindigen."
 

-#: src/process.c:101
+#: src/process.c:102

 msgid "Terminating"
 msgstr "Beëindigen"
 
 msgid "Terminating"
 msgstr "Beëindigen"
 

-#: src/process.c:120
+#: src/process.c:121

 #, c-format
 msgid "A tincd is already running for net `%s' with pid %d.\n"
 msgstr "Een tincd draait al voor net `%s' met pid %d.\n"
 
 #, c-format
 msgid "A tincd is already running for net `%s' with pid %d.\n"
 msgstr "Een tincd draait al voor net `%s' met pid %d.\n"
 

-#: src/process.c:123
+#: src/process.c:124

 #, c-format
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Een tincd draait al met pid %d.\n"
 
 #, c-format
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Een tincd draait al met pid %d.\n"
 

-#: src/process.c:147
+#: src/process.c:148

 #, c-format
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "Geen andere tincd draait voor net `%s'.\n"
 
 #, c-format
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "Geen andere tincd draait voor net `%s'.\n"
 

-#: src/process.c:150
+#: src/process.c:151

 msgid "No other tincd is running.\n"
 msgstr "Geen andere tincd draait.\n"
 
 msgid "No other tincd is running.\n"
 msgstr "Geen andere tincd draait.\n"
 

-#: src/process.c:159
+#: src/process.c:160

 #, c-format
 msgid "The tincd for net `%s' is no longer running. "
 msgstr "De tincd voor net `%s' draait niet meer. "
 
 #, c-format
 msgid "The tincd for net `%s' is no longer running. "
 msgstr "De tincd voor net `%s' draait niet meer. "
 

-#: src/process.c:162
+#: src/process.c:163

 msgid "The tincd is no longer running. "
 msgstr "De tincd draait niet meer. "
 
 msgid "The tincd is no longer running. "
 msgstr "De tincd draait niet meer. "
 

-#: src/process.c:164
+#: src/process.c:165

 msgid "Removing stale lock file.\n"
 msgstr "Verwijdering oud vergrendelingsbestand.\n"
 
 msgid "Removing stale lock file.\n"
 msgstr "Verwijdering oud vergrendelingsbestand.\n"
 

-#: src/process.c:191
+#: src/process.c:192

 #, c-format
 msgid "Couldn't detach from terminal: %s"
 msgstr "Kon niet ontkoppelen van terminal: %s"
 #, c-format
 msgid "Couldn't detach from terminal: %s"
 msgstr "Kon niet ontkoppelen van terminal: %s"


@@ -1004,68 +1006,63 @@ msgstr "Kon niet ontkoppelen van terminal: %s"
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) start, debug niveau %d"
 
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) start, debug niveau %d"
 

-#: src/process.c:208
-#, c-format
-msgid "tincd %s starting"
-msgstr "tincd %s wordt gestart"
-
-#: src/process.c:238
+#: src/process.c:236

 #, c-format
 msgid "Could not execute `%s': %s"
 msgstr "Kon `%s' niet uitvoeren: %s"
 
 #, c-format
 msgid "Could not execute `%s': %s"
 msgstr "Kon `%s' niet uitvoeren: %s"
 

-#: src/process.c:272
+#: src/process.c:269

 #, c-format
 msgid "Executing script %s"
 msgstr "Uitvoeren script %s"
 
 #, c-format
 msgid "Executing script %s"
 msgstr "Uitvoeren script %s"
 

-#: src/process.c:279
+#: src/process.c:276

 #, c-format
 msgid "Process %d (%s) exited with non-zero status %d"
 msgstr "Proces %d (%s) beëindigde met status %d"
 
 #, c-format
 msgid "Process %d (%s) exited with non-zero status %d"
 msgstr "Proces %d (%s) beëindigde met status %d"
 

-#: src/process.c:285
+#: src/process.c:282

 #, c-format
 msgid "Process %d (%s) was killed by signal %d (%s)"
 msgstr "Proces %d (%s) was gestopt door signaal %d (%s)"
 
 #, c-format
 msgid "Process %d (%s) was killed by signal %d (%s)"
 msgstr "Proces %d (%s) was gestopt door signaal %d (%s)"
 

-#: src/process.c:290
+#: src/process.c:286

 #, c-format
 msgid "Process %d (%s) terminated abnormally"
 msgstr "Proces %d (%s) abnormaal beëindigd"
 
 #, c-format
 msgid "Process %d (%s) terminated abnormally"
 msgstr "Proces %d (%s) abnormaal beëindigd"
 

-#: src/process.c:314
+#: src/process.c:309

 msgid "Got TERM signal"
 msgstr "Kreeg TERM signaal"
 
 msgid "Got TERM signal"
 msgstr "Kreeg TERM signaal"
 

-#: src/process.c:322
+#: src/process.c:316

 msgid "Got QUIT signal"
 msgstr "Kreeg QUIT signaal"
 
 msgid "Got QUIT signal"
 msgstr "Kreeg QUIT signaal"
 

-#: src/process.c:328
+#: src/process.c:322

 #, c-format
 msgid "Got another fatal signal %d (%s): not restarting."
 msgstr "Kreeg nog een fataal signaal %d (%s): geen herstart."
 
 #, c-format
 msgid "Got another fatal signal %d (%s): not restarting."
 msgstr "Kreeg nog een fataal signaal %d (%s): geen herstart."
 

-#: src/process.c:337
+#: src/process.c:331

 #, c-format
 msgid "Got fatal signal %d (%s)"
 msgstr "Kreeg fataal signaal %d (%s)"
 
 #, c-format
 msgid "Got fatal signal %d (%s)"
 msgstr "Kreeg fataal signaal %d (%s)"
 

-#: src/process.c:341
+#: src/process.c:335

 msgid "Trying to re-execute in 5 seconds..."
 msgstr "Poging tot herstarten over 5 seconden..."
 
 msgid "Trying to re-execute in 5 seconds..."
 msgstr "Poging tot herstarten over 5 seconden..."
 

-#: src/process.c:361
+#: src/process.c:354

 msgid "Got HUP signal"
 msgstr "Kreeg HUP signaal"
 
 msgid "Got HUP signal"
 msgstr "Kreeg HUP signaal"
 

-#: src/process.c:368
+#: src/process.c:361

 #, c-format
 msgid "Reverting to old debug level (%d)"
 msgstr "Herstellen van oud debug niveau (%d)"
 
 #, c-format
 msgid "Reverting to old debug level (%d)"
 msgstr "Herstellen van oud debug niveau (%d)"
 

-#: src/process.c:373
+#: src/process.c:367

 #, c-format
 msgid ""
 "Temporarily setting debug level to 5.  Kill me with SIGINT again to go back "
 #, c-format
 msgid ""
 "Temporarily setting debug level to 5.  Kill me with SIGINT again to go back "


@@ -1074,41 +1071,41 @@ msgstr ""
 "Tijdelijk instellen debug niveau op 5. Zend nog een SIGINT signaal om niveau "
 "%d te herstellen."
 
 "Tijdelijk instellen debug niveau op 5. Zend nog een SIGINT signaal om niveau "
 "%d te herstellen."
 

-#: src/process.c:383
+#: src/process.c:376

 msgid "Got ALRM signal"
 msgstr "Kreeg ALRM signaal"
 
 msgid "Got ALRM signal"
 msgstr "Kreeg ALRM signaal"
 

-#: src/process.c:408
+#: src/process.c:401

 #, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Kreeg onverwacht signaal %d (%s)"
 
 #, c-format
 msgid "Got unexpected signal %d (%s)"
 msgstr "Kreeg onverwacht signaal %d (%s)"
 

-#: src/process.c:415
+#: src/process.c:407

 #, c-format
 msgid "Ignored signal %d (%s)"
 msgstr "Signaal %d (%s) genegeerd"
 
 #, c-format
 msgid "Ignored signal %d (%s)"
 msgstr "Signaal %d (%s) genegeerd"
 

-#: src/process.c:470
+#: src/process.c:460

 #, c-format
 msgid "Installing signal handler for signal %d (%s) failed: %s\n"
 msgstr "Installeren van signaal afhandelaar voor signaal %d (%s) faalde: %s\n"
 
 #, c-format
 msgid "Installing signal handler for signal %d (%s) failed: %s\n"
 msgstr "Installeren van signaal afhandelaar voor signaal %d (%s) faalde: %s\n"
 

-#: src/route.c:118
+#: src/route.c:133

 #, c-format
 msgid "Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"
 msgstr "Nieuw MAC adres %hx:%hx:%hx:%hx:%hx:%hx geleerd"
 
 #, c-format
 msgid "Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"
 msgstr "Nieuw MAC adres %hx:%hx:%hx:%hx:%hx:%hx geleerd"
 

-#: src/route.c:152
+#: src/route.c:166

 #, c-format
 msgid "MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"
 msgstr "MAC adres %hx:%hx:%hx:%hx:%hx:%hx verlopen"
 
 #, c-format
 msgid "MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"
 msgstr "MAC adres %hx:%hx:%hx:%hx:%hx:%hx verlopen"
 

-#: src/route.c:262
+#: src/route.c:275

 #, c-format
 msgid "Cannot route packet: unknown IPv4 destination address %d.%d.%d.%d"
 msgstr "Kan pakket niet routeren: onbekend IPv4 doeladres %d.%d.%d.%d"
 
 #, c-format
 msgid "Cannot route packet: unknown IPv4 destination address %d.%d.%d.%d"
 msgstr "Kan pakket niet routeren: onbekend IPv4 doeladres %d.%d.%d.%d"
 

-#: src/route.c:355
+#: src/route.c:366

 #, c-format
 msgid ""
 "Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%"
 #, c-format
 msgid ""
 "Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%"


@@ -1117,19 +1114,19 @@ msgstr ""
 "Kan pakket niet routeren: onbekend IPv6 doeladres %hx:%hx:%hx:%hx:%hx:%hx:%"
 "hx:%hx"
 
 "Kan pakket niet routeren: onbekend IPv6 doeladres %hx:%hx:%hx:%hx:%hx:%hx:%"
 "hx:%hx"
 

-#: src/route.c:409
+#: src/route.c:418

 msgid ""
 "Cannot route packet: received unknown type neighbor solicitation request"
 msgstr ""
 "Kan pakket niet routeren: ontvangst van onbekend type neighbor solicitation "
 "verzoek"
 
 msgid ""
 "Cannot route packet: received unknown type neighbor solicitation request"
 msgstr ""
 "Kan pakket niet routeren: ontvangst van onbekend type neighbor solicitation "
 "verzoek"
 

-#: src/route.c:428
+#: src/route.c:435

 msgid "Cannot route packet: checksum error for neighbor solicitation request"
 msgstr ""
 "Kan pakket niet routeren: checksum fout voor neighbor solicitation verzoek"
 
 msgid "Cannot route packet: checksum error for neighbor solicitation request"
 msgstr ""
 "Kan pakket niet routeren: checksum fout voor neighbor solicitation verzoek"
 

-#: src/route.c:438
+#: src/route.c:444

 #, c-format
 msgid ""
 "Cannot route packet: neighbor solicitation request for unknown address %hx:%"
 #, c-format
 msgid ""
 "Cannot route packet: neighbor solicitation request for unknown address %hx:%"


@@ -1138,25 +1135,25 @@ msgstr ""
 "Kan pakket niet routeren: neighbor solicitation verzoek voor onbekend adres %"
 "hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"
 
 "Kan pakket niet routeren: neighbor solicitation verzoek voor onbekend adres %"
 "hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"
 

-#: src/route.c:519
+#: src/route.c:523

 msgid "Cannot route packet: received unknown type ARP request"
 msgstr "Kan pakket niet routeren: ontvangst van onbekend type ARP verzoek"
 
 msgid "Cannot route packet: received unknown type ARP request"
 msgstr "Kan pakket niet routeren: ontvangst van onbekend type ARP verzoek"
 

-#: src/route.c:530
+#: src/route.c:532

 #, c-format
 msgid "Cannot route packet: ARP request for unknown address %d.%d.%d.%d"
 msgstr "Kan pakket niet routeren: ARP verzoek voor onbekend adres %d.%d.%d.%d"
 
 #, c-format
 msgid "Cannot route packet: ARP request for unknown address %d.%d.%d.%d"
 msgstr "Kan pakket niet routeren: ARP verzoek voor onbekend adres %d.%d.%d.%d"
 

-#: src/route.c:588
+#: src/route.c:587

 #, c-format
 msgid "Cannot route packet: unknown type %hx"
 msgstr "Kan pakket niet routeren: onbekend type %hx"
 
 #, c-format
 msgid "Cannot route packet: unknown type %hx"
 msgstr "Kan pakket niet routeren: onbekend type %hx"
 

-#: src/node.c:175
+#: src/node.c:176

 msgid "Nodes:"
 msgstr "Nodes:"
 
 msgid "Nodes:"
 msgstr "Nodes:"
 

-#: src/node.c:179
+#: src/node.c:180

 #, c-format
 msgid ""
 " %s at %s cipher %d digest %d maclength %d compression %d options %lx status "
 #, c-format
 msgid ""
 " %s at %s cipher %d digest %d maclength %d compression %d options %lx status "


@@ -1165,7 +1162,7 @@ msgstr ""
 " %s op %s cipher %d digest %d maclengte %d compressie %d opties %lx status %"
 "04x nexthop %s via %s"
 
 " %s op %s cipher %d digest %d maclengte %d compressie %d opties %lx status %"
 "04x nexthop %s via %s"
 

-#: src/node.c:186
+#: src/node.c:187

 msgid "End of nodes."
 msgstr "Einde van nodes."
 
 msgid "End of nodes."
 msgstr "Einde van nodes."
 


@@ -1182,145 +1179,148 @@ msgstr " %s naar %s op %s opties %lx gewicht %d"
 msgid "End of edges."
 msgstr "Einde van edges."
 
 msgid "End of edges."
 msgstr "Einde van edges."
 

-#: src/graph.c:267
+#: src/graph.c:263

 #, c-format
 msgid "Node %s (%s) became reachable"
 msgstr "Node %s (%s) werd bereikbaar"
 
 #, c-format
 msgid "Node %s (%s) became reachable"
 msgstr "Node %s (%s) werd bereikbaar"
 

-#: src/graph.c:270
+#: src/graph.c:266

 #, c-format
 msgid "Node %s (%s) became unreachable"
 msgstr "Node %s (%s) is niet meer bereikbaar"
 
 #, c-format
 msgid "Node %s (%s) became unreachable"
 msgstr "Node %s (%s) is niet meer bereikbaar"
 

-#: src/linux/device.c:92 src/freebsd/device.c:68 src/solaris/device.c:72
-#: src/netbsd/device.c:72 src/openbsd/device.c:72
+#: src/linux/device.c:91 src/freebsd/device.c:67 src/solaris/device.c:71
+#: src/netbsd/device.c:71 src/openbsd/device.c:71

 #, c-format
 msgid "Could not open %s: %s"
 msgstr "Kon `%s' niet openen: %s"
 
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "Kon `%s' niet openen: %s"
 

-#: src/linux/device.c:103
+#: src/linux/device.c:102

 msgid "Linux tun/tap device (tun mode)"
 msgstr "Linux tun/tap apparaat (tun modus)"
 
 msgid "Linux tun/tap device (tun mode)"
 msgstr "Linux tun/tap apparaat (tun modus)"
 

-#: src/linux/device.c:107
+#: src/linux/device.c:106

 msgid "Linux tun/tap device (tap mode)"
 msgstr "Linux tun/tap apparaat (tap modus)"
 
 msgid "Linux tun/tap device (tap mode)"
 msgstr "Linux tun/tap apparaat (tap modus)"
 

-#: src/linux/device.c:117
+#: src/linux/device.c:116

 #, c-format
 msgid "Old ioctl() request was needed for %s"
 msgstr "Oud ioctl() verzoek was nodig voor %s"
 
 #, c-format
 msgid "Old ioctl() request was needed for %s"
 msgstr "Oud ioctl() verzoek was nodig voor %s"
 

-#: src/linux/device.c:125
+#: src/linux/device.c:124

 msgid "Linux ethertap device"
 msgstr "Linux ethertap apparaat"
 
 msgid "Linux ethertap device"
 msgstr "Linux ethertap apparaat"
 

-#: src/linux/device.c:130 src/freebsd/device.c:74 src/solaris/device.c:121
-#: src/netbsd/device.c:78 src/openbsd/device.c:78
+#: src/linux/device.c:129 src/freebsd/device.c:73 src/solaris/device.c:120
+#: src/netbsd/device.c:77 src/openbsd/device.c:77

 #, c-format
 msgid "%s is a %s"
 msgstr "%s is een %s"
 
 #, c-format
 msgid "%s is a %s"
 msgstr "%s is een %s"
 

-#: src/linux/device.c:157 src/linux/device.c:168 src/linux/device.c:179
-#: src/freebsd/device.c:97 src/solaris/device.c:140 src/netbsd/device.c:97
-#: src/openbsd/device.c:99
+#: src/linux/device.c:156 src/linux/device.c:167 src/linux/device.c:178
+#: src/freebsd/device.c:96 src/solaris/device.c:139 src/netbsd/device.c:96
+#: src/openbsd/device.c:98

 #, c-format
 msgid "Error while reading from %s %s: %s"
 msgstr "Fout tijdens lezen van %s %s: %s"
 
 #, c-format
 msgid "Error while reading from %s %s: %s"
 msgstr "Fout tijdens lezen van %s %s: %s"
 

-#: src/linux/device.c:191 src/freebsd/device.c:107 src/solaris/device.c:153
-#: src/netbsd/device.c:110 src/openbsd/device.c:129
+#: src/linux/device.c:189 src/freebsd/device.c:105 src/solaris/device.c:151
+#: src/netbsd/device.c:108 src/openbsd/device.c:125

 #, c-format
 msgid "Read packet of %d bytes from %s"
 msgstr "Pakket van %d bytes gelezen van %s"
 
 #, c-format
 msgid "Read packet of %d bytes from %s"
 msgstr "Pakket van %d bytes gelezen van %s"
 

-#: src/linux/device.c:203 src/freebsd/device.c:118 src/solaris/device.c:165
-#: src/netbsd/device.c:122 src/openbsd/device.c:145
+#: src/linux/device.c:199 src/freebsd/device.c:115 src/solaris/device.c:161
+#: src/netbsd/device.c:119 src/openbsd/device.c:140

 #, c-format
 msgid "Writing packet of %d bytes to %s"
 msgstr "Pakket van %d bytes geschreven naar %s"
 
 #, c-format
 msgid "Writing packet of %d bytes to %s"
 msgstr "Pakket van %d bytes geschreven naar %s"
 

-#: src/linux/device.c:210 src/linux/device.c:217 src/linux/device.c:226
-#: src/solaris/device.c:169 src/netbsd/device.c:126 src/openbsd/device.c:171
+#: src/linux/device.c:206 src/linux/device.c:213 src/linux/device.c:222
+#: src/solaris/device.c:165 src/netbsd/device.c:123 src/openbsd/device.c:165

 #, c-format
 msgid "Can't write to %s %s: %s"
 msgstr "Kan niet schrijven naar %s %s: %s"
 
 #, c-format
 msgid "Can't write to %s %s: %s"
 msgstr "Kan niet schrijven naar %s %s: %s"
 

-#: src/linux/device.c:242 src/freebsd/device.c:134 src/solaris/device.c:183
-#: src/netbsd/device.c:138 src/openbsd/device.c:183
+#: src/linux/device.c:238 src/freebsd/device.c:131 src/solaris/device.c:179
+#: src/netbsd/device.c:135 src/openbsd/device.c:177

 #, c-format
 msgid "Statistics for %s %s:"
 msgstr "Statistieken voor %s %s:"
 
 #, c-format
 msgid "Statistics for %s %s:"
 msgstr "Statistieken voor %s %s:"
 

-#: src/linux/device.c:243 src/freebsd/device.c:135 src/solaris/device.c:184
-#: src/netbsd/device.c:139 src/openbsd/device.c:184
+#: src/linux/device.c:239 src/freebsd/device.c:132 src/solaris/device.c:180
+#: src/netbsd/device.c:136 src/openbsd/device.c:178

 #, c-format
 msgid " total bytes in:  %10d"
 msgstr " totaal aantal bytes in:  %10d"
 
 #, c-format
 msgid " total bytes in:  %10d"
 msgstr " totaal aantal bytes in:  %10d"
 

-#: src/linux/device.c:244 src/freebsd/device.c:136 src/solaris/device.c:185
-#: src/netbsd/device.c:140 src/openbsd/device.c:185
+#: src/linux/device.c:240 src/freebsd/device.c:133 src/solaris/device.c:181
+#: src/netbsd/device.c:137 src/openbsd/device.c:179

 #, c-format
 msgid " total bytes out: %10d"
 msgstr " totaal aantal bytes uit: %10d"
 
 #, c-format
 msgid " total bytes out: %10d"
 msgstr " totaal aantal bytes uit: %10d"
 

-#: src/freebsd/device.c:72
+#: src/freebsd/device.c:71

 msgid "FreeBSD tap device"
 msgstr "FreeBSD tap apparaat"
 
 msgid "FreeBSD tap device"
 msgstr "FreeBSD tap apparaat"
 

-#: src/freebsd/device.c:122
+#: src/freebsd/device.c:119

 #, c-format
 msgid "Error while writing to %s %s: %s"
 msgstr "Fout tijdens schrijven naar %s %s: %s"
 
 #, c-format
 msgid "Error while writing to %s %s: %s"
 msgstr "Fout tijdens schrijven naar %s %s: %s"
 

-#: src/solaris/device.c:84
+#: src/solaris/device.c:83

 #, c-format
 msgid "Could not open /dev/ip: %s"
 msgstr "Kon /dev/ip niet openen: %s"
 
 #, c-format
 msgid "Could not open /dev/ip: %s"
 msgstr "Kon /dev/ip niet openen: %s"
 

-#: src/solaris/device.c:90
+#: src/solaris/device.c:89

 #, c-format
 msgid "Can't assign new interface: %s"
 msgstr "Kan geen nieuwe interface toekennen: %s"
 
 #, c-format
 msgid "Can't assign new interface: %s"
 msgstr "Kan geen nieuwe interface toekennen: %s"
 

-#: src/solaris/device.c:95
+#: src/solaris/device.c:94

 #, c-format
 msgid "Could not open %s twice: %s"
 msgstr "Kon `%s' niet twee keer openen: %s"
 
 #, c-format
 msgid "Could not open %s twice: %s"
 msgstr "Kon `%s' niet twee keer openen: %s"
 

-#: src/solaris/device.c:101
+#: src/solaris/device.c:100

 #, c-format
 msgid "Can't push IP module: %s"
 msgstr "Kan IP module niet invoegen: %s"
 
 #, c-format
 msgid "Can't push IP module: %s"
 msgstr "Kan IP module niet invoegen: %s"
 

-#: src/solaris/device.c:107
+#: src/solaris/device.c:106

 #, c-format
 msgid "Can't set PPA %d: %s"
 msgstr "Kon PPA %d niet instellen: %s"
 
 #, c-format
 msgid "Can't set PPA %d: %s"
 msgstr "Kon PPA %d niet instellen: %s"
 

-#: src/solaris/device.c:112
+#: src/solaris/device.c:111

 #, c-format
 msgid "Can't link TUN device to IP: %s"
 msgstr "Kan TUN apparaat niet koppelen aan IP: %s"
 
 #, c-format
 msgid "Can't link TUN device to IP: %s"
 msgstr "Kan TUN apparaat niet koppelen aan IP: %s"
 

-#: src/solaris/device.c:119
+#: src/solaris/device.c:118

 msgid "Solaris tun device"
 msgstr "Solaris tun apparaat"
 
 msgid "Solaris tun device"
 msgstr "Solaris tun apparaat"
 

-#: src/netbsd/device.c:76
+#: src/netbsd/device.c:75

 msgid "NetBSD tun device"
 msgstr "NetBSD tun apparaat"
 
 msgid "NetBSD tun device"
 msgstr "NetBSD tun apparaat"
 

-#: src/openbsd/device.c:76
+#: src/openbsd/device.c:75

 msgid "OpenBSD tun device"
 msgstr "OpenBSD tun apparaat"
 
 msgid "OpenBSD tun device"
 msgstr "OpenBSD tun apparaat"
 

-#: src/openbsd/device.c:119
+#: src/openbsd/device.c:116

 #, c-format
 msgid "Unknown address family %d while reading packet from %s %s"
 msgstr "Onbekende adresfamilie %d tijdens lezen pakket van %s %s"
 
 #, c-format
 msgid "Unknown address family %d while reading packet from %s %s"
 msgstr "Onbekende adresfamilie %d tijdens lezen pakket van %s %s"
 

-#: src/openbsd/device.c:160
+#: src/openbsd/device.c:154

 #, c-format
 msgid "Unknown address family %d while writing packet to %s %s"
 msgstr "Onbekende adresfamilie %d tijdens schrijven pakket naar %s %s"
 #, c-format
 msgid "Unknown address family %d while writing packet to %s %s"
 msgstr "Onbekende adresfamilie %d tijdens schrijven pakket naar %s %s"

+
+#~ msgid "tincd %s starting"
+#~ msgstr "tincd %s wordt gestart"

diff --git a/src/conf.c b/src/conf.c
index 09e72a5..75d7ebe 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     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.63 2003/07/06 23:16:28 guus Exp $
+    $Id: conf.c,v 1.9.4.64 2003/07/11 16:12:59 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -429,16 +429,6 @@ int read_server_config()
        return x;
 }
 
        return x;
 }
 

-static int isadir(const char *f)
-{
-       struct stat s;
-
-       if(stat(f, &s) < 0)
-               return 0;
-       else
-               return S_ISDIR(s.st_mode);
-}
-

 int is_safe_path(const char *file)
 {
        char *p;
 int is_safe_path(const char *file)
 {
        char *p;

diff --git a/src/net.h b/src/net.h
index 2a1e79e..142d867 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,7 +17,7 @@
     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.h,v 1.9.4.61 2003/07/07 11:11:33 guus Exp $
+    $Id: net.h,v 1.9.4.62 2003/07/11 16:13:00 guus Exp $

 */
 
 #ifndef __TINC_NET_H__
 */
 
 #ifndef __TINC_NET_H__


@@ -35,6 +35,8 @@
 #include <inttypes.h>
 #endif
 
 #include <inttypes.h>
 #endif
 

+#include "utils.h"
+

 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014                               /* 9000 bytes payload + 14 bytes ethernet header */
 #else
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014                               /* 9000 bytes payload + 14 bytes ethernet header */
 #else

diff --git a/src/process.c b/src/process.c
index 45acc5c..46d6067 100644 (file)
--- a/src/process.c
+++ b/src/process.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: process.c,v 1.1.2.52 2003/07/06 23:16:28 guus Exp $
+    $Id: process.c,v 1.1.2.53 2003/07/11 16:13:00 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -287,11 +287,14 @@ int execute_script(const char *name, char **envp)
                                           name);
                                return -1;
                        }
                                           name);
                                return -1;
                        }

-               } else {
+               } else if (errno != EINTR) {

                        logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
                                   strerror(errno));
                        return -1;
                }
                        logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
                                   strerror(errno));
                        return -1;
                }

+
+               /* Why do we get EINTR? */
+               return 0;

        }
 
        /* Child here */
        }
 
        /* Child here */