- Removed all IP_ADDR_S macros, because gettext doesn't like them. Each

  connection now has two hostnames: real_hostname (replacing the old),
  and vpn_hostname. In those places where hostnames really aren't usefull
  IP_ADDR_S has been replaced by %d.%d.%d.%d.

diff --git a/po/nl.po b/po/nl.po
index d75f348..bcdcf0b 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"

-"POT-Creation-Date: 2000-06-28 16:29+0200\n"
+"POT-Creation-Date: 2000-06-29 14:53+0200\n"

 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "PO-Revision-Date: 2000-05-31 20:14+02:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"


@@ -15,50 +15,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/conf.c:167
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/conf.c:167

+#, c-format

 msgid "%s: %d: Invalid variable name `%s'.\n"
 msgstr "%s: %d: Ongeldige variabelenaam `%s'.\n"
 
 #: src/conf.c:174
 msgid "%s: %d: Invalid variable name `%s'.\n"
 msgstr "%s: %d: Ongeldige variabelenaam `%s'.\n"
 
 #: src/conf.c:174

+#, c-format

 msgid "%s: %d: No value given for `%s'.\n"
 msgstr "%s: %d: Geen waarde gegeven voor `%s'.\n"
 
 #: src/conf.c:182
 msgid "%s: %d: No value given for `%s'.\n"
 msgstr "%s: %d: Geen waarde gegeven voor `%s'.\n"
 
 #: src/conf.c:182

+#, c-format

 msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
 msgstr "%s: %d: Ongeldige waarde `%s' voor variabele `%s'.\n"
 
 #: src/conf.c:203
 msgid "%s: %d: Invalid value `%s' for variable `%s'.\n"
 msgstr "%s: %d: Ongeldige waarde `%s' voor variabele `%s'.\n"
 
 #: src/conf.c:203

+#, c-format

 msgid "Could not open %s: %s\n"
 msgstr "Kon %s niet openen: %s\n"
 
 #: src/encr.c:112 src/net.c:390
 msgid "Could not open %s: %s\n"
 msgstr "Kon %s niet openen: %s\n"
 
 #: src/encr.c:112 src/net.c:390

+#, c-format

 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
 
 #: src/encr.c:119
 msgid "Could not open %s: %m"
 msgstr "Kon %s niet openen: %m"
 
 #: src/encr.c:119

+#, c-format

 msgid "Illegal passphrase in %s; size would be %d"
 msgstr "Ongeldig wachtwoord in %s; grootte zou %d zijn"
 
 #: src/encr.c:153
 msgid "Illegal passphrase in %s; size would be %d"
 msgstr "Ongeldig wachtwoord in %s; grootte zou %d zijn"
 
 #: src/encr.c:153

+#, c-format

 msgid "Generating %d bits keys"
 msgstr "%d bits sleutel genereren"
 
 #: src/encr.c:157
 msgid "Generating %d bits keys"
 msgstr "%d bits sleutel genereren"
 
 #: src/encr.c:157

+#, c-format

 msgid "Opening /dev/urandom failed: %m"
 msgstr "Openen van /dev/urandom mislukt: %m"
 
 #: src/encr.c:222
 msgid "Opening /dev/urandom failed: %m"
 msgstr "Openen van /dev/urandom mislukt: %m"
 
 #: src/encr.c:222

+#, c-format

 msgid "Encryption key set to %s"
 msgstr "Sleutel ingesteld op %s"
 
 #: src/genauth.c:48
 msgid "Encryption key set to %s"
 msgstr "Sleutel ingesteld op %s"
 
 #: src/genauth.c:48

+#, c-format

 msgid "Usage: %s bits\n"
 msgstr "Gebruik: %s bits\n"
 
 #: src/genauth.c:57
 msgid "Usage: %s bits\n"
 msgstr "Gebruik: %s bits\n"
 
 #: src/genauth.c:57

+#, c-format

 msgid "Illegal number: %s\n"
 msgstr "Ongeldig nummer: %s\n"
 
 #: src/genauth.c:62
 msgid "Illegal number: %s\n"
 msgstr "Ongeldig nummer: %s\n"
 
 #: src/genauth.c:62

+#, c-format

 msgid "Generating %d bits number"
 msgstr "Genereren van %d bits nummer"
 
 msgid "Generating %d bits number"
 msgstr "Genereren van %d bits nummer"
 


@@ -84,37 +96,22 @@ msgid ": done.\n"
 msgstr ": klaar.\n"
 
 #: src/net.c:107
 msgstr ": klaar.\n"
 
 #: src/net.c:107

-msgid "Sending packet of %d bytes to "
-msgstr "Verzending pakket van %d bytes naar "
-
-#: src/net.c:107 src/net.c:133 src/net.c:347 src/net.c:900 src/net.c:1088
-#: src/net.c:1095 src/net.c:1102 src/protocol.c:54 src/protocol.c:72
-#: src/protocol.c:91 src/protocol.c:109 src/protocol.c:127 src/protocol.c:145
-#: src/protocol.c:184 src/protocol.c:202 src/protocol.c:251 src/protocol.c:269
-#: src/protocol.c:312 src/protocol.c:342 src/protocol.c:435 src/protocol.c:442
-#: src/protocol.c:460 src/protocol.c:466 src/protocol.c:507 src/protocol.c:528
-#: src/protocol.c:534 src/protocol.c:554 src/protocol.c:560 src/protocol.c:576
-#: src/protocol.c:583 src/protocol.c:596 src/protocol.c:614 src/protocol.c:620
-#: src/protocol.c:636 src/protocol.c:642 src/protocol.c:661 src/protocol.c:668
-#: src/protocol.c:689 src/protocol.c:705 src/protocol.c:712 src/protocol.c:718
-#: src/protocol.c:737 src/protocol.c:796 src/protocol.c:803 src/protocol.c:809
-#: src/protocol.c:840 src/protocol.c:861 src/protocol.c:868 src/protocol.c:874
-msgid " (%s)"
-msgstr " (%s)"
+#, c-format
+msgid "Sending packet of %d bytes to %s (%s)"
+msgstr "Verzending pakket van %d bytes naar %s (%s)"

 
 #: src/net.c:112
 
 #: src/net.c:112

-msgid "Error sending packet to "
-msgstr "Fout tijdens verzenden pakket naar "
-
-#: src/net.c:112
-msgid " (%s): %m"
-msgstr " (%s): %m"
+#, c-format
+msgid "Error sending packet to %s (%s): %m"
+msgstr "Fout tijdens verzenden pakket naar %s (%s): %m"

 
 #: src/net.c:133
 
 #: src/net.c:133

-msgid "Receiving packet of %d bytes from "
-msgstr "Ontvangst pakket van %d bytes van "
+#, c-format
+msgid "Receiving packet of %d bytes from %s (%s)"
+msgstr "Ontvangst pakket van %d bytes van %s (%s)"

 
 #: src/net.c:137
 
 #: src/net.c:137

+#, c-format

 msgid "Can't write to tap device: %m"
 msgstr "Kan niet naar tap apparaat schrijven: %m"
 
 msgid "Can't write to tap device: %m"
 msgstr "Kan niet naar tap apparaat schrijven: %m"
 


@@ -123,98 +120,106 @@ msgid "Queue flushed"
 msgstr "Wachtrij leeggemaakt"
 
 #: src/net.c:255
 msgstr "Wachtrij leeggemaakt"
 
 #: src/net.c:255

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

 
 #: src/net.c:263
 
 #: src/net.c:263

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

 
 #: src/net.c:281
 
 #: src/net.c:281

-msgid "Trying to look up "
-msgstr "Proberen op te zoeken van "
-
-#: src/net.c:281 src/net.c:325
-msgid " in connection list failed!"
-msgstr " in verbindingslijst mislukte!"
+#, 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:293 src/net.c:306
 msgid "There is no remote host I can send this packet to!"
 msgstr "Er is geen partner waar ik dit pakket naar kan sturen!"
 
 #: src/net.c:320
 
 #: src/net.c:293 src/net.c:306
 msgid "There is no remote host I can send this packet to!"
 msgstr "Er is geen partner waar ik dit pakket naar kan sturen!"
 
 #: src/net.c:320

-msgid "Indirect packet to "
-msgstr "Indirect pakket naar "
-
-#: src/net.c:320
-msgid " via "
-msgstr " via "
+#, c-format
+msgid "Indirect packet to %s via %s"
+msgstr "Indirect pakket naar %s via %s"

 
 #: src/net.c:325
 
 #: src/net.c:325

-msgid "Indirect look up "
-msgstr "Indirect opzoeken van "
+#, c-format
+msgid "Indirect look up %d.%d.%d.%d in connection list failed!"
+msgstr "Indirect opzoeken %d.%d.%d.%d in verbindingslijst mislukte!"

 
 #: src/net.c:335
 
 #: src/net.c:335

-msgid "Double indirection for "
-msgstr "Dubbele indirectie voor "
+#, c-format
+msgid "Double indirection for %d.%d.%d.%d"
+msgstr "Dubbele indirectie voor %d.%d.%d.%d"

 
 #: src/net.c:347
 
 #: src/net.c:347

-msgid "Could not open UDP connection to "
-msgstr "Kon geen UDP verbinding openen naar "
+#, c-format
+msgid "Could not open UDP connection to %s (%s)"
+msgstr "Kon geen UDP verbinding openen naar %s (%s)"

 
 #: src/net.c:354
 
 #: src/net.c:354

-msgid " (%s) has no valid key, queueing packet"
-msgstr " (%s) heeft geen geldige sleutel, pakket wordt in de wachtrij gezet."
+#, c-format
+msgid "%s (%s) has no valid key, queueing packet"
+msgstr "%s (%s) heeft geen geldige sleutel, pakket wordt in de wachtrij gezet"

 
 #: src/net.c:364
 
 #: src/net.c:364

-msgid " (%s) is not ready, queueing packet"
-msgstr " (%s) is niet gereed, pakket wordt in de wachtrij gezet."
+#, 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:411
 
 #: src/net.c:411

+#, c-format

 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
 #: src/net.c:417 src/net.c:466
 msgid "Creating metasocket failed: %m"
 msgstr "Aanmaak van metasocket mislukt: %m"
 
 #: src/net.c:417 src/net.c:466

+#, c-format

 msgid "setsockopt: %m"
 msgstr "setsockopt: %m"
 
 #: src/net.c:424 src/net.c:473 src/net.c:528
 msgid "setsockopt: %m"
 msgstr "setsockopt: %m"
 
 #: src/net.c:424 src/net.c:473 src/net.c:528

+#, c-format

 msgid "fcntl: %m"
 msgstr "fcntl: %m"
 
 #: src/net.c:435
 msgid "fcntl: %m"
 msgstr "fcntl: %m"
 
 #: src/net.c:435

+#, c-format

 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
 #: src/net.c:441
 msgid "Can't bind to port %hd/tcp: %m"
 msgstr "Kan niet aan poort %hd/tcp binden: %m"
 
 #: src/net.c:441

+#, c-format

 msgid "listen: %m"
 msgstr "listen: %m"
 
 #: src/net.c:460 src/net.c:511
 msgid "listen: %m"
 msgstr "listen: %m"
 
 #: src/net.c:460 src/net.c:511

+#, c-format

 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
 #: src/net.c:484
 msgid "Creating socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
 #: src/net.c:484

+#, c-format

 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
 #: src/net.c:501
 msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
 #: src/net.c:501

+#, c-format

 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 
 #: src/net.c:521
 msgid "Trying to connect to %s"
 msgstr "Poging tot verbinding met %s"
 
 #: src/net.c:521

-msgid ":%d: %m"
-msgstr ":%d: %m"
-
-#: src/net.c:532
-msgid "Connected to "
-msgstr "Verbonden met "
+#, c-format
+msgid "%s port %hd: %m"
+msgstr "%s poort %hd: %m"

 
 #: src/net.c:532
 
 #: src/net.c:532

-msgid ":%hd"
-msgstr ":%hd"
+#, c-format
+msgid "Connected to %s port %hd"
+msgstr "Verbonden met %s poort %hd"

 
 #: src/net.c:555
 
 #: src/net.c:555

+#, c-format

 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 


@@ -222,432 +227,473 @@ msgstr "Kon geen metaverbinding aangaan met %s"
 msgid "No value for my VPN IP given"
 msgstr "Geen waarde gegeven voor mijn VPN IP adres"
 
 msgid "No value for my VPN IP given"
 msgstr "Geen waarde gegeven voor mijn VPN IP adres"
 

-#: src/net.c:600
+#: src/net.c:601

 msgid "Unable to set up a listening socket"
 msgstr "Kon geen luistersocket aanmaken"
 
 msgid "Unable to set up a listening socket"
 msgstr "Kon geen luistersocket aanmaken"
 

-#: src/net.c:606
+#: src/net.c:607

 msgid "Unable to set up an incoming vpn data socket"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer"
 
 msgid "Unable to set up an incoming vpn data socket"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer"
 

-#: src/net.c:613
-msgid "Ready: listening on port %d"
-msgstr "Gereed: luisterend op poort %d"
+#: src/net.c:614
+#, c-format
+msgid "Ready: listening on port %hd"
+msgstr "Gereed: luisterend op poort %hd"

 
 

-#: src/net.c:641
+#: src/net.c:642
+#, 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"
 
 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:679
+#: src/net.c:680

 msgid "Trying to re-establish outgoing connection in 5 minutes"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 minuten"
 
 msgid "Trying to re-establish outgoing connection in 5 minutes"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 minuten"
 

-#: src/net.c:716
+#: src/net.c:717

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

-#: src/net.c:730
+#: src/net.c:731
+#, c-format

 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 
 msgid "Opening UDP socket to %s"
 msgstr "Bezig met openen UDP socket naar %s"
 

-#: src/net.c:735
+#: src/net.c:736
+#, c-format

 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak UDP socket mislukte: %m"
 

-#: src/net.c:745
+#: src/net.c:746
+#, c-format

 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Verbinding naar %s poort %d mislukt: %m"
 

-#: src/net.c:753 src/net.c:839 src/net.c:1037
+#: src/net.c:754 src/net.c:841 src/net.c:1039
+#, c-format

 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 
 msgid "This is a bug: %s:%d: %d:%m"
 msgstr "Dit is een programmeerfout: %s:%d: %d:%m"
 

-#: src/net.c:777
+#: src/net.c:778
+#, c-format

 msgid "Error: getpeername: %m"
 msgstr "Fout: getpeername: %m"
 
 msgid "Error: getpeername: %m"
 msgstr "Fout: getpeername: %m"
 

-#: src/net.c:790
+#: src/net.c:782
+msgid "unknown"
+msgstr "onbekend"
+
+#: src/net.c:792
+#, c-format

 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s poort %d"
 

-#: src/net.c:844
+#: src/net.c:846
+#, c-format

 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
 msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 

-#: src/net.c:852
+#: src/net.c:854
+#, c-format

 msgid "Receiving packet from %s failed: %m"
 msgstr "Ontvangst pakket van %s mislukt: %m"
 
 msgid "Receiving packet from %s failed: %m"
 msgstr "Ontvangst pakket van %s mislukt: %m"
 

-#: src/net.c:866
-msgid "Got packet from "
-msgstr "Kreeg pakket van "
+#: src/net.c:868
+#, c-format
+msgid "Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"
+msgstr "Kreeg pakket van %s (%s) met onbekende herkomst %d.%d.%d.%d?"

 
 

-#: src/net.c:866
-msgid " (%s) with unknown origin "
-msgstr " (%s) met onbekende herkomst "
+#: src/net.c:902
+#, c-format
+msgid "Closing connection with %s (%s)"
+msgstr "Beëindigen verbinding met %s (%s)"

 
 

-#: src/net.c:866
-msgid "?"
-msgstr "?"
-
-#: src/net.c:900
-msgid "Closing connection with "
-msgstr "Beëindigen verbinding met "
-
-#: src/net.c:917
+#: src/net.c:919

 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 

-#: src/net.c:976
-msgid " (%s) didn't respond to ping"
-msgstr " (%s) antwoordde niet op ping"
+#: src/net.c:978
+#, c-format
+msgid "%s (%s) didn't respond to PING"
+msgstr "%s (%s) antwoordde niet op ping"

 
 

-#: src/net.c:1007
+#: src/net.c:1009
+#, c-format

 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
 msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 

-#: src/net.c:1015
+#: src/net.c:1017

 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 
 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 

-#: src/net.c:1042
+#: src/net.c:1044
+#, c-format

 msgid "Metadata socket error: %s"
 msgstr "Fout op socket voor metaverkeer: %s"
 
 msgid "Metadata socket error: %s"
 msgstr "Fout op socket voor metaverkeer: %s"
 

-#: src/net.c:1048
+#: src/net.c:1050

 msgid "Metadata read buffer overflow!"
 msgstr "Metadata ontvangstbuffer overloop!"
 
 msgid "Metadata read buffer overflow!"
 msgstr "Metadata ontvangstbuffer overloop!"
 

-#: src/net.c:1058
+#: src/net.c:1060
+#, c-format

 msgid "Metadata socket read error: %m"
 msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
 
 msgid "Metadata socket read error: %m"
 msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
 

-#: src/net.c:1082
-msgid "Got request from "
-msgstr "Ontving verzoek van "
+#: src/net.c:1084
+#, c-format
+msgid "Got request from %s (%s): %s"
+msgstr "Ontving verzoek van %s (%s): %s"

 
 

-#: src/net.c:1082
-msgid " (%s): %s"
-msgstr " (%s): %s"
+#: src/net.c:1090
+#, c-format
+msgid "Unknown request from %s (%s)"
+msgstr "Onbekend verzoek van %s (%s)"

 
 

-#: src/net.c:1088
-msgid "Unknown request from "
-msgstr "Onbekend verzoek van "
+#: src/net.c:1097
+#, c-format
+msgid "Error while processing request from %s (%s)"
+msgstr "Fout tijdens afhandelen van verzoek van %s (%s)"

 
 

-#: src/net.c:1095
-msgid "Error while processing request from "
-msgstr "Fout tijdens afhandelen van verzoek van "
+#: src/net.c:1104
+#, c-format
+msgid "Bogus data received from %s (%s)"
+msgstr "Onzinnige data ontvangen van %s (%s)"

 
 

-#: src/net.c:1102
-msgid "Bogus data received from "
-msgstr "Onzinnige data ontvangen van "
-
-#: src/net.c:1147
+#: src/net.c:1149
+#, c-format

 msgid "Outgoing data socket error: %s"
 msgstr "Fout op socket voor uitgaand verkeer: %s"
 
 msgid "Outgoing data socket error: %s"
 msgstr "Fout op socket voor uitgaand verkeer: %s"
 

-#: src/net.c:1182
+#: src/net.c:1184
+#, c-format

 msgid "Error while reading from tapdevice: %m"
 msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
 
 msgid "Error while reading from tapdevice: %m"
 msgstr "Fout tijdens lezen van tap-apparaatbestand tijdens lezen: %m"
 

-#: src/net.c:1192
+#: src/net.c:1194
+#, c-format

 msgid "Non-IP ethernet frame %04x from "
 msgstr "Niet-IP ethernet pakket %04x van "
 
 msgid "Non-IP ethernet frame %04x from "
 msgstr "Niet-IP ethernet pakket %04x van "
 

-#: src/net.c:1200
+#: src/net.c:1202

 msgid "Dropping short packet"
 msgstr "Te kort pakket genegeerd"
 
 msgid "Dropping short packet"
 msgstr "Te kort pakket genegeerd"
 

-#: src/net.c:1239
+#: src/net.c:1241
+#, c-format

 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 
 msgid "Error while waiting for input: %m"
 msgstr "Fout tijdens wachten op invoer: %m"
 

-#: src/netutl.c:218
+#: src/netutl.c:222
+#, c-format

 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 
 msgid "Error looking up `%s': %s\n"
 msgstr "Fout bij het opzoeken van `%s': %s\n"
 

-#: src/netutl.c:242
+#: src/netutl.c:246

 msgid "Connection list:"
 msgstr "Verbindingslijst:"
 
 msgid "Connection list:"
 msgstr "Verbindingslijst:"
 

-#: src/netutl.c:246
-msgid " "
-msgstr " "
-
-#: src/netutl.c:246
-msgid "/"
-msgstr "/"
-
-#: src/netutl.c:246
-msgid " at %s flags %d sockets %d, %d status %04x"
-msgstr " op %s vlaggen %d sockets %d, %d status %04x"
+#: src/netutl.c:250
+#, c-format
+msgid ""
+"%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"
+msgstr "%s netmask %d.%d.%d.%d op %s vlaggen %hd sockets %d, %d status %04x"

 
 #: src/protocol.c:54
 
 #: src/protocol.c:54

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

 
 #: src/protocol.c:61
 
 #: src/protocol.c:61

+#, c-format

 msgid "Send failed: %d:%d: %m"
 msgstr "Verzenden mislukte: %d:%d: %m"
 
 #: src/protocol.c:72
 msgid "Send failed: %d:%d: %m"
 msgstr "Verzenden mislukte: %d:%d: %m"
 
 #: src/protocol.c:72

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

 
 #: src/protocol.c:80 src/protocol.c:98 src/protocol.c:116 src/protocol.c:134
 #: src/protocol.c:152 src/protocol.c:191 src/protocol.c:209 src/protocol.c:237
 #: src/protocol.c:258 src/protocol.c:276 src/protocol.c:319 src/protocol.c:349
 
 #: src/protocol.c:80 src/protocol.c:98 src/protocol.c:116 src/protocol.c:134
 #: src/protocol.c:152 src/protocol.c:191 src/protocol.c:209 src/protocol.c:237
 #: src/protocol.c:258 src/protocol.c:276 src/protocol.c:319 src/protocol.c:349

-#: src/protocol.c:744 src/protocol.c:847
+#: src/protocol.c:747 src/protocol.c:850
+#, c-format

 msgid "Send failed: %s:%d: %m"
 msgstr "Verzenden mislukte: %s:%d: %m"
 
 #: src/protocol.c:91
 msgid "Send failed: %s:%d: %m"
 msgstr "Verzenden mislukte: %s:%d: %m"
 
 #: src/protocol.c:91

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

 
 #: src/protocol.c:109
 
 #: src/protocol.c:109

-msgid "Sending DEL_HOST for "
-msgstr "Verzending DEL_HOST voor "
-
-#: src/protocol.c:109 src/protocol.c:184
-msgid " (%s) to "
-msgstr " (%s) naar "
+#, c-format
+msgid "Sending DEL_HOST for %s (%s) to %s (%s)"
+msgstr "Verzending DEL_HOST voor %s (%s) naar %s (%s)"

 
 #: src/protocol.c:127
 
 #: src/protocol.c:127

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

 
 #: src/protocol.c:145
 
 #: src/protocol.c:145

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

 
 #: src/protocol.c:184
 
 #: src/protocol.c:184

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

 
 #: src/protocol.c:202
 
 #: src/protocol.c:202

-msgid "Sending KEY_CHANGED origin "
-msgstr "Verzending KEY_CHANGED herkomst "
-
-#: src/protocol.c:202
-msgid " to "
-msgstr " naar "
+#, c-format
+msgid "Sending KEY_CHANGED origin %s to %s (%s)"
+msgstr "Verzending KEY_CHANGED herkomst %s naar %s (%s)"

 
 #: src/protocol.c:230
 
 #: src/protocol.c:230

+#, c-format

 msgid "Sending BASIC_INFO to %s"
 msgstr "Verzending BASIC_INFO naar %s"
 
 #: src/protocol.c:251
 msgid "Sending BASIC_INFO to %s"
 msgstr "Verzending BASIC_INFO naar %s"
 
 #: src/protocol.c:251

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

 
 #: src/protocol.c:269
 
 #: src/protocol.c:269

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

 
 #: src/protocol.c:306
 
 #: src/protocol.c:306

-msgid "Attempting to send REQ_KEY to "
-msgstr "Poging tot verzenden REQ_KEY naar "
-
-#: src/protocol.c:306 src/protocol.c:336 src/protocol.c:731 src/protocol.c:818
-#: src/protocol.c:834 src/protocol.c:881
-msgid ", which does not exist?"
-msgstr ", die niet bestaat?"
+#, c-format
+msgid "Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr "Poging tot verzenden REQ_KEY naar %d.%d.%d.%d, die niet bestaat?"

 
 #: src/protocol.c:312
 
 #: src/protocol.c:312

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

 
 #: src/protocol.c:336
 
 #: src/protocol.c:336

-msgid "Attempting to send ANS_KEY to "
-msgstr "Poging tot verzenden ANS_KEY naar "
+#, c-format
+msgid "Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr "Poging tot verzenden ANS_KEY naar %d.%d.%d.%d, die niet bestaat?"

 
 #: src/protocol.c:342
 
 #: src/protocol.c:342

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

 
 #: src/protocol.c:396
 
 #: src/protocol.c:396

+#, c-format

 msgid "Got BASIC_INFO from %s"
 msgstr "Kreeg BASIC_INFO van %s"
 
 #: src/protocol.c:400
 msgid "Got BASIC_INFO from %s"
 msgstr "Kreeg BASIC_INFO van %s"
 
 #: src/protocol.c:400

+#, c-format

 msgid "Got bad BASIC_INFO from %s"
 msgstr "Kreeg ongeldige BASIC_INFO van %s"
 
 msgid "Got bad BASIC_INFO from %s"
 msgstr "Kreeg ongeldige BASIC_INFO van %s"
 

-#: src/protocol.c:407
+#: src/protocol.c:409
+#, c-format

 msgid "Peer uses incompatible protocol version %d"
 msgstr "De ander gebruikt een niet-compatibel protocol versie %d"
 
 msgid "Peer uses incompatible protocol version %d"
 msgstr "De ander gebruikt een niet-compatibel protocol versie %d"
 

-#: src/protocol.c:435
-msgid "Got bad PASSPHRASE from "
-msgstr "Ongeldig PASSPHRASE verzoek ontvangen: %s"
+#: src/protocol.c:437
+#, c-format
+msgid "Got bad PASSPHRASE from %s (%s)"
+msgstr "Kreeg ongeldige PASSPHRASE van %s (%s)"

 
 

-#: src/protocol.c:442
-msgid "Got PASSPHRASE from "
-msgstr "PASSPHRASE ontvangen"
+#: src/protocol.c:444
+#, c-format
+msgid "Got PASSPHRASE from %s (%s)"
+msgstr "Kreeg PASSPHRASE van %s (%s)"

 
 

-#: src/protocol.c:460
-msgid "Got bad PUBLIC_KEY from "
-msgstr "Kreeg ongeldige PUBLIC_KEY van "
+#: src/protocol.c:462
+#, c-format
+msgid "Got bad PUBLIC_KEY from %s (%s)"
+msgstr "Kreeg ongeldige PUBLIC_KEY van %s (%s)"

 
 

-#: src/protocol.c:466
-msgid "Got PUBLIC_KEY from "
-msgstr "Kreeg PUBLIC_KEY van "
+#: src/protocol.c:468
+#, c-format
+msgid "Got PUBLIC_KEY from %s (%s)"
+msgstr "Kreeg PUBLIC_KEY van %s (%s)"

 
 #. intruder!
 
 #. intruder!

-#: src/protocol.c:472
+#: src/protocol.c:474

 msgid "Intruder: passphrase does not match!"
 msgstr "Indringer: wachwoord komt niet overeen!"
 
 msgid "Intruder: passphrase does not match!"
 msgstr "Indringer: wachwoord komt niet overeen!"
 

-#: src/protocol.c:493 src/protocol.c:512
-msgid "Connection with "
-msgstr "Verbinding met "
-
-#: src/protocol.c:493 src/protocol.c:512
-msgid " (%s) activated"
-msgstr " (%s) geactiveerd"
-
-#: src/protocol.c:507
-msgid "Got ACK from "
-msgstr "Kreeg ACK van "
-
-#: src/protocol.c:528
-msgid "Got unauthorized TERMREQ from "
-msgstr "Kreeg niet-geautoriseerde TERMREQ van "
-
-#: src/protocol.c:534
-msgid "Got TERMREQ from "
-msgstr "Kreeg TERMREQ van "
-
-#: src/protocol.c:554
-msgid "Got unauthorized TIMEOUT from "
-msgstr "Kreeg niet-geautoriseerde TIMEOUT van "
-
-#: src/protocol.c:560
-msgid "Got TIMEOUT from "
-msgstr "Kreeg TIMEOUT van "
-
-#: src/protocol.c:576
-msgid "Got unauthorized DEL_HOST from "
-msgstr "Kreeg niet-geautoriseerde DEL_HOST van "
-
-#: src/protocol.c:583
-msgid "Got bad DEL_HOST from "
-msgstr "Kreeg ongeldige DEL_HOST van "
-
-#: src/protocol.c:590 src/protocol.c:596
-msgid "Got DEL_HOST for "
-msgstr "Kreeg DEL_HOST voor "
-
-#: src/protocol.c:590 src/protocol.c:718 src/protocol.c:809 src/protocol.c:874
-msgid " from "
-msgstr " van "
-
-#: src/protocol.c:590
-msgid " (%s) which does not exist?"
-msgstr " (%s), die niet bestaat?"
-
-#: src/protocol.c:596 src/protocol.c:689
-msgid " (%s) from "
-msgstr " (%s) van "
-
-#: src/protocol.c:614
-msgid "Got unauthorized PING from "
-msgstr "Kreeg niet-geautoriseerde PING van "
-
-#: src/protocol.c:620
-msgid "Got PING from "
-msgstr "Kreeg PING van "
-
-#: src/protocol.c:636
-msgid "Got unauthorized PONG from "
-msgstr "Kreeg niet-geautoriseerde PONG van "
-
-#: src/protocol.c:642
-msgid "Got PONG from "
-msgstr "Kreeg PONG van "
-
-#: src/protocol.c:661
-msgid "Got unauthorized ADD_HOST from "
-msgstr "Kreeg niet-geautoriseerde ADD_HOST van "
-
-#: src/protocol.c:668
-msgid "Got bad ADD_HOST from "
-msgstr "Kreeg ongeldige ADD_HOST van "
-
-#: src/protocol.c:689
-msgid "Got ADD_HOST for "
-msgstr "Kreeg ADD_HOST voor "
-
-#: src/protocol.c:705
-msgid "Got unauthorized REQ_KEY from "
-msgstr "Kreeg niet-geautoriseerde REQ_KEY van "
-
-#: src/protocol.c:712
-msgid "Got bad REQ_KEY from "
-msgstr "Kreeg ongeldige REQ_KEY van "
-
-#: src/protocol.c:718
-msgid "Got REQ_KEY origin "
-msgstr "Kreeg REQ_KEY van "
-
-#: src/protocol.c:718 src/protocol.c:809
-msgid " destination "
-msgstr " bestemming "
-
-#: src/protocol.c:731
-msgid "Attempting to forward REQ_KEY to "
-msgstr "Poging tot doorsturenREQ_KEY naar "
-
-#: src/protocol.c:737
-msgid "Forwarding REQ_KEY to "
-msgstr "Doorsturen REQ_KEY naar "
-
-#: src/protocol.c:796
-msgid "Got unauthorized ANS_KEY from "
-msgstr "Kreeg niet-geautoriseerde ANS_KEY van "
-
-#: src/protocol.c:803
-msgid "Got bad ANS_KEY from "
-msgstr "Kreeg ongeldige ANS_KEY van "
-
-#: src/protocol.c:809
-msgid "Got ANS_KEY origin "
-msgstr "Kreeg ANS_KEY van "
-
-#: src/protocol.c:818
-msgid "Receiving ANS_KEY from "
-msgstr "Ontvangst ANS_KEY van "
-
-#: src/protocol.c:834
-msgid "Attempting to forward ANS_KEY to "
-msgstr "Poging tot doorsturen ANS_KEY naar "
-
-#: src/protocol.c:840
-msgid "Forwarding ANS_KEY to "
-msgstr "Doorsturen ANS_KEY naar "
-
-#: src/protocol.c:861
-msgid "Got unauthorized KEY_CHANGED from "
-msgstr "Kreeg niet-geautoriseerde KEY_CHANGED van "
-
-#: src/protocol.c:868
-msgid "Got bad KEY_CHANGED from "
-msgstr "Kreeg ongeldige KEY_CHANGED van "
-
-#: src/protocol.c:874
-msgid "Got KEY_CHANGED origin "
-msgstr "Kreeg KEY_CHANGED herkomst "
-
-#: src/protocol.c:881
-msgid "Got KEY_CHANGED from "
-msgstr "Kreeg KEY_CHANGED van "
+#: src/protocol.c:495 src/protocol.c:514
+#, c-format
+msgid "Connection with %s (%s) activated"
+msgstr "Verbinding met %s (%s) geactiveerd"
+
+#: src/protocol.c:509
+#, c-format
+msgid "Got ACK from %s (%s)"
+msgstr "Kreeg ACK van  %s (%s)"
+
+#: src/protocol.c:530
+#, c-format
+msgid "Got unauthorized TERMREQ from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde TERMREQ van %s (%s)"
+
+#: src/protocol.c:536
+#, c-format
+msgid "Got TERMREQ from %s (%s)"
+msgstr "Kreeg TERMREQ van %s (%s)"
+
+#: src/protocol.c:556
+#, c-format
+msgid "Got unauthorized TIMEOUT from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde TIMEOUT van %s (%s)"
+
+#: src/protocol.c:562
+#, c-format
+msgid "Got TIMEOUT from %s (%s)"
+msgstr "Kreeg TIMEOUT van %s (%s)"
+
+#: src/protocol.c:578
+#, c-format
+msgid "Got unauthorized DEL_HOST from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde DEL_HOST van %s (%s)"
+
+#: src/protocol.c:585
+#, c-format
+msgid "Got bad DEL_HOST from %s (%s)"
+msgstr "Kreeg ongeldige DEL_HOST van %s (%s)"
+
+#: src/protocol.c:592
+#, c-format
+msgid "Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"
+msgstr "Kreeg DEL_HOST voor %d.%d.%d.%d van %s (%s), die niet bestaat?"
+
+#: src/protocol.c:598
+#, c-format
+msgid "Got DEL_HOST for %s (%s) from %s (%s)"
+msgstr "Kreeg DEL_HOST voor %s (%s) van %s (%s)"
+
+#: src/protocol.c:616
+#, c-format
+msgid "Got unauthorized PING from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde PING van %s (%s)"
+
+#: src/protocol.c:622
+#, c-format
+msgid "Got PING from %s (%s)"
+msgstr "Kreeg PING van %s (%s)"
+
+#: src/protocol.c:638
+#, c-format
+msgid "Got unauthorized PONG from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde PONG van %s (%s)"
+
+#: src/protocol.c:644
+#, c-format
+msgid "Got PONG from %s (%s)"
+msgstr "Kreeg PONG van %s (%s)"
+
+#: src/protocol.c:663
+#, c-format
+msgid "Got unauthorized ADD_HOST from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde ADD_HOST van %s (%s)"
+
+#: src/protocol.c:670
+#, c-format
+msgid "Got bad ADD_HOST from %s (%s)"
+msgstr "Kreeg ongeldige ADD_HOST van %s (%s)"
+
+#: src/protocol.c:692
+#, c-format
+msgid "Got ADD_HOST for %s (%s) from %s (%s)"
+msgstr "Kreeg ADD_HOST voor %s (%s) van %s (%s)"
+
+#: src/protocol.c:708
+#, c-format
+msgid "Got unauthorized REQ_KEY from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde REQ_KEY van %s (%s)"
+
+#: src/protocol.c:715
+#, c-format
+msgid "Got bad REQ_KEY from %s (%s)"
+msgstr "Kreeg ongeldige REQ_KEY van %s (%s)"
+
+#: src/protocol.c:721
+#, c-format
+msgid "Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"
+msgstr "Kreeg REQ_KEY herkmonst %d.%d.%d.%d bestemming %d.%d.%d.%d van %s (%s)"
+
+#: src/protocol.c:734
+#, c-format
+msgid "Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr "Poging tot doorsturen REQ_KEY naar %d.%d.%d.%d, die niet bestaat?"
+
+#: src/protocol.c:740
+#, c-format
+msgid "Forwarding REQ_KEY to %s (%s)"
+msgstr "Doorsturen REQ_KEY naar %s (%s)"
+
+#: src/protocol.c:799
+#, c-format
+msgid "Got unauthorized ANS_KEY from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde ANS_KEY van %s (%s)"
+
+#: src/protocol.c:806
+#, c-format
+msgid "Got bad ANS_KEY from %s (%s)"
+msgstr "Kreeg ongeldige ANS_KEY van %s (%s)"
+
+#: src/protocol.c:812
+#, c-format
+msgid "Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"
+msgstr "Kreeg ANS_KEY herkomst %d.%d.%d.%d bestemming %d.%d.%d.%d van %s (%s)"
+
+#: src/protocol.c:821
+#, c-format
+msgid ""
+"Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"
+msgstr "Kreeg ANS_KEY herkomst %d.%d.%d.%d van %s (%s), die niet bestaat?"
+
+#: src/protocol.c:837
+#, c-format
+msgid "Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"
+msgstr "Poging tot doorsturen ANS_KEY naar %d.%d.%d.%d, die niet besttaat?"
+
+#: src/protocol.c:843
+#, c-format
+msgid "Forwarding ANS_KEY to %s (%s)"
+msgstr "Doorsturen ANS_KEY naar %s (%s)"
+
+#: src/protocol.c:864
+#, c-format
+msgid "Got unauthorized KEY_CHANGED from %s (%s)"
+msgstr "Kreeg niet-geautoriseerde KEY_CHANGED van %s (%s)"
+
+#: src/protocol.c:871
+#, c-format
+msgid "Got bad KEY_CHANGED from %s (%s)"
+msgstr "Kreeg ongeldige KEY_CHANGED van %s (%s)"
+
+#: src/protocol.c:880
+#, c-format
+msgid "Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"
+msgstr "Kreeg KEY_CHANGED herkomst %d.%d.%d.%d van %s (%s), die niet bestaat?"
+
+#: src/protocol.c:886
+#, c-format
+msgid "Got KEY_CHANGED origin %s from %s (%s)"
+msgstr "Kreeg KEY_CHANGED herkomst %s van %s (%s)"

 
 #: src/tincd.c:95
 
 #: src/tincd.c:95

+#, c-format

 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
 #: src/tincd.c:98
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
 #: src/tincd.c:98

+#, c-format

 msgid ""
 "Usage: %s [option]...\n"
 "\n"
 msgid ""
 "Usage: %s [option]...\n"
 "\n"


@@ -688,37 +734,45 @@ msgstr ""
 "meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 
 #: src/tincd.c:145
 "meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 
 #: src/tincd.c:145

+#, c-format

 msgid "Invalid timeout value `%s'.\n"
 msgstr "Ongeldige timeout waarde `%s'.\n"
 
 #: src/tincd.c:159
 msgid "Invalid timeout value `%s'.\n"
 msgstr "Ongeldige timeout waarde `%s'.\n"
 
 #: src/tincd.c:159

+#, 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:214
 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:214

+#, c-format

 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) gestart, debugniveau %d."
 
 #: src/tincd.c:217
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) gestart, debugniveau %d."
 
 #: src/tincd.c:217

+#, c-format

 msgid "tincd %s starting"
 msgstr "tincd %s gestart"
 
 #: src/tincd.c:232
 msgid "tincd %s starting"
 msgstr "tincd %s gestart"
 
 #: src/tincd.c:232

+#, 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:250
 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:250

+#, 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:253
 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:253

+#, c-format

 msgid "A tincd is already running with pid %d.\n"
 msgstr "Een tincd draait al met procesnummer %d.\n"
 
 #: src/tincd.c:274
 msgid "A tincd is already running with pid %d.\n"
 msgstr "Een tincd draait al met procesnummer %d.\n"
 
 #: src/tincd.c:274

+#, c-format

 msgid "No other tincd is running for net `%s'.\n"
 msgstr "Geen andere tincd gevonden voor net `%s'.\n"
 
 msgid "No other tincd is running for net `%s'.\n"
 msgstr "Geen andere tincd gevonden voor net `%s'.\n"
 


@@ -731,6 +785,7 @@ msgid "Removing stale lock file.\n"
 msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
 
 #: src/tincd.c:339
 msgstr "Ongebruikt vergrendelingsbestand verwijderd.\n"
 
 #: src/tincd.c:339

+#, c-format

 msgid "%s version %s\n"
 msgstr "%s versie %s\n"
 
 msgid "%s version %s\n"
 msgstr "%s versie %s\n"
 


@@ -778,6 +833,7 @@ msgid "Got another SEGV signal: not restarting"
 msgstr "Kreeg nog een SEGV signaal: niet herstarten"
 
 #: src/tincd.c:413
 msgstr "Kreeg nog een SEGV signaal: niet herstarten"
 
 #: src/tincd.c:413

+#, c-format

 msgid "Got SEGV signal after %s line %d, trying to re-execute"
 msgstr "Kreeg SEGV signaal na %s regel %d. Probeer opnieuw opstarten."
 
 msgid "Got SEGV signal after %s line %d, trying to re-execute"
 msgstr "Kreeg SEGV signaal na %s regel %d. Probeer opnieuw opstarten."
 


@@ -798,10 +854,12 @@ msgid "Forcing new key generation"
 msgstr "Nieuwe sleutels geforceerd"
 
 #: src/tincd.c:461
 msgstr "Nieuwe sleutels geforceerd"
 
 #: src/tincd.c:461

+#, c-format

 msgid "Got unexpected signal %d after %s line %d"
 msgstr "Kreeg onverwacht signaal %d na %s regel %d"
 
 #: src/tincd.c:464
 msgid "Got unexpected signal %d after %s line %d"
 msgstr "Kreeg onverwacht signaal %d na %s regel %d"
 
 #: src/tincd.c:464

+#, c-format

 msgid "Got unexpected signal %d"
 msgstr "Kreeg onverwacht signaal %d"
 
 msgid "Got unexpected signal %d"
 msgstr "Kreeg onverwacht signaal %d"
 

diff --git a/src/net.c b/src/net.c
index fd38c02..af9077c 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.
 
     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.12 2000/06/28 10:11:10 guus Exp $
+    $Id: net.c,v 1.35.4.13 2000/06/29 13:04:14 guus Exp $

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


@@ -104,13 +104,13 @@ cp
   rp.len = htons(rp.len);
 
   if(debug_lvl > 3)
   rp.len = htons(rp.len);
 
   if(debug_lvl > 3)

-    syslog(LOG_ERR, _("Sending packet of %d bytes to " IP_ADDR_S " (%s)"),
-           ntohs(rp.len), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+           ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);

 
   if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {
 
   if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {

-      syslog(LOG_ERR, _("Error sending packet to " IP_ADDR_S " (%s): %m"),
-             IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+             cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
       return -1;
     }
 


@@ -130,8 +130,8 @@ cp
   add_mac_addresses(&vp);
 
   if(debug_lvl > 3)
   add_mac_addresses(&vp);
 
   if(debug_lvl > 3)

-    syslog(LOG_ERR, _("Receiving packet of %d bytes from " IP_ADDR_S " (%s)"),
-           ((real_packet_t*)packet)->len, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+           ((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname);

 
   if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
     syslog(LOG_ERR, _("Can't write to tap device: %m"));
 
   if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
     syslog(LOG_ERR, _("Can't write to tap device: %m"));


@@ -252,16 +252,16 @@ cp
   if(cl->sq)
     {
       if(debug_lvl > 3)
   if(cl->sq)
     {
       if(debug_lvl > 3)

-       syslog(LOG_DEBUG, _("Flushing send queue for " IP_ADDR_S),
-              IP_ADDR_V(cl->vpn_ip));
+       syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       flush_queue(cl, &(cl->sq), xsend);
     }
 
   if(cl->rq)
     {
       if(debug_lvl > 3)
       flush_queue(cl, &(cl->sq), xsend);
     }
 
   if(cl->rq)
     {
       if(debug_lvl > 3)

-       syslog(LOG_DEBUG, _("Flushing receive queue for " IP_ADDR_S),
-              IP_ADDR_V(cl->vpn_ip));
+       syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       flush_queue(cl, &(cl->rq), xrecv);
     }
 cp
       flush_queue(cl, &(cl->rq), xrecv);
     }
 cp


@@ -278,7 +278,7 @@ cp
     {
       if(debug_lvl > 3)
         {
     {
       if(debug_lvl > 3)
         {

-          syslog(LOG_NOTICE, _("Trying to look up " IP_ADDR_S " in connection list failed!"),
+          syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),

                 IP_ADDR_V(to));
         }
         
                 IP_ADDR_V(to));
         }
         


@@ -317,12 +317,12 @@ cp
   if(cl->flags & INDIRECTDATA)
     {
       if(debug_lvl > 3)
   if(cl->flags & INDIRECTDATA)
     {
       if(debug_lvl > 3)

-        syslog(LOG_NOTICE, _("Indirect packet to " IP_ADDR_S " via " IP_ADDR_S),
-               IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+        syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
+               cl->vpn_hostname, cl->real_hostname);

       if((cl = lookup_conn(cl->real_ip)) == NULL)
         {
           if(debug_lvl > 3)
       if((cl = lookup_conn(cl->real_ip)) == NULL)
         {
           if(debug_lvl > 3)

-              syslog(LOG_NOTICE, _("Indirect look up " IP_ADDR_S " in connection list failed!"),
+              syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"),

                     IP_ADDR_V(to));
             
           /* Gateway tincd dead? Should we kill it? (GS) */
                     IP_ADDR_V(to));
             
           /* Gateway tincd dead? Should we kill it? (GS) */


@@ -332,7 +332,7 @@ cp
       if(cl->flags & INDIRECTDATA)  /* This should not happen */
         {
           if(debug_lvl > 3)
       if(cl->flags & INDIRECTDATA)  /* This should not happen */
         {
           if(debug_lvl > 3)

-              syslog(LOG_NOTICE, _("Double indirection for " IP_ADDR_S),
+              syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"),

                     IP_ADDR_V(to));
           return -1;        
         }
                     IP_ADDR_V(to));
           return -1;        
         }


@@ -344,14 +344,14 @@ cp
   if(!cl->status.dataopen)
     if(setup_vpn_connection(cl) < 0)
       {
   if(!cl->status.dataopen)
     if(setup_vpn_connection(cl) < 0)
       {

-        syslog(LOG_ERR, _("Could not open UDP connection to " IP_ADDR_S " (%s)"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+        syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), cl->vpn_hostname, cl->real_hostname);

         return -1;
       }
       
   if(!cl->status.validkey)
     {
       if(debug_lvl > 3)
         return -1;
       }
       
   if(!cl->status.validkey)
     {
       if(debug_lvl > 3)

-       syslog(LOG_INFO, _(IP_ADDR_S " (%s) has no valid key, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"), cl->vpn_hostname, cl->real_hostname);

       add_queue(&(cl->sq), packet, packet->len + 2);
       if(!cl->status.waitingforkey)
        send_key_request(cl->vpn_ip);                   /* Keys should be sent to the host running the tincd */
       add_queue(&(cl->sq), packet, packet->len + 2);
       if(!cl->status.waitingforkey)
        send_key_request(cl->vpn_ip);                   /* Keys should be sent to the host running the tincd */


@@ -361,7 +361,7 @@ cp
   if(!cl->status.active)
     {
       if(debug_lvl > 3)
   if(!cl->status.active)
     {
       if(debug_lvl > 3)

-       syslog(LOG_INFO, _(IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_hostname);

       add_queue(&(cl->sq), packet, packet->len + 2);
       return 0; /* We don't want to mess up, do we? */
     }
       add_queue(&(cl->sq), packet, packet->len + 2);
       return 0; /* We don't want to mess up, do we? */
     }


@@ -498,7 +498,7 @@ int setup_outgoing_meta_socket(conn_list_t *cl)
   config_t const *cfg;
 cp
   if(debug_lvl > 0)
   config_t const *cfg;
 cp
   if(debug_lvl > 0)

-    syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
+    syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname);

 
   if((cfg = get_config_val(upstreamport)) == NULL)
     cl->port = 655;
 
   if((cfg = get_config_val(upstreamport)) == NULL)
     cl->port = 655;


@@ -518,7 +518,7 @@ cp
 
   if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
 
   if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
     {

-      syslog(LOG_ERR, _(IP_ADDR_S ":%d: %m"), IP_ADDR_V(cl->real_ip), cl->port);
+      syslog(LOG_ERR, _("%s port %hd: %m"), cl->real_hostname, cl->port);

       return -1;
     }
 
       return -1;
     }
 


@@ -529,8 +529,8 @@ cp
       return -1;
     }
 
       return -1;
     }
 

-  syslog(LOG_INFO, _("Connected to " IP_ADDR_S ":%hd"),
-         IP_ADDR_V(cl->real_ip), cl->port);
+  syslog(LOG_INFO, _("Connected to %s port %hd"),
+         cl->real_hostname, cl->port);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -548,12 +548,12 @@ int setup_outgoing_connection(ip_t ip)
 cp
   ncn = new_conn_list();
   ncn->real_ip = ip;
 cp
   ncn = new_conn_list();
   ncn->real_ip = ip;

-  ncn->hostname = hostlookup(htonl(ip));
+  ncn->real_hostname = hostlookup(htonl(ip));

   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),

-             ncn->hostname);
+             ncn->real_hostname);

       free_conn_element(ncn);
       return -1;
     }
       free_conn_element(ncn);
       return -1;
     }


@@ -582,7 +582,8 @@ cp
     }
 
   myself->vpn_ip = cfg->data.ip->ip;
     }
 
   myself->vpn_ip = cfg->data.ip->ip;

-  myself->hostname = hostlookup(htonl(myself->vpn_ip));
+  myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip));
+  myself->real_hostname = hostlookup(htonl(myself->vpn_ip));

   myself->vpn_mask = cfg->data.ip->mask;
   myself->flags = 0;
 
   myself->vpn_mask = cfg->data.ip->mask;
   myself->flags = 0;
 


@@ -610,7 +611,7 @@ cp
 
   myself->status.active = 1;
 
 
   myself->status.active = 1;
 

-  syslog(LOG_NOTICE, _("Ready: listening on port %d"), myself->port);
+  syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -727,7 +728,7 @@ int setup_vpn_connection(conn_list_t *cl)
   struct sockaddr_in a;
 cp
   if(debug_lvl > 0)
   struct sockaddr_in a;
 cp
   if(debug_lvl > 0)

-    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
+    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname);

 
   nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if(nfd == -1)
 
   nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if(nfd == -1)


@@ -743,7 +744,7 @@ cp
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
       syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
       syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),

-            cl->hostname, cl->port);
+            cl->real_hostname, cl->port);

       return -1;
     }
 
       return -1;
     }
 


@@ -778,8 +779,9 @@ cp
       return NULL;
     }
 
       return NULL;
     }
 

+  p->vpn_hostname = _("unknown");

   p->real_ip = ntohl(ci.sin_addr.s_addr);
   p->real_ip = ntohl(ci.sin_addr.s_addr);

-  p->hostname = hostlookup(ci.sin_addr.s_addr);
+  p->real_hostname = hostlookup(ci.sin_addr.s_addr);

   p->meta_socket = sfd;
   p->status.meta = 1;
   p->buflen = 0;
   p->meta_socket = sfd;
   p->status.meta = 1;
   p->buflen = 0;


@@ -788,7 +790,7 @@ cp
   
   if(debug_lvl > 0)
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
   
   if(debug_lvl > 0)
     syslog(LOG_NOTICE, _("Connection from %s port %d"),

-         p->hostname, htons(ci.sin_port));
+         p->real_hostname, htons(ci.sin_port));

 
   if(send_basic_info(p) < 0)
     {
 
   if(send_basic_info(p) < 0)
     {


@@ -849,7 +851,7 @@ cp
   lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
   if(lenin <= 0)
     {
   lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
   if(lenin <= 0)
     {

-      syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->hostname);
+      syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->real_hostname);

       return -1;
     }
   total_socket_in += lenin;
       return -1;
     }
   total_socket_in += lenin;


@@ -863,8 +865,8 @@ cp
       f = lookup_conn(rp.from);
       if(!f)
        {
       f = lookup_conn(rp.from);
       if(!f)
        {

-         syslog(LOG_ERR, _("Got packet from " IP_ADDR_S " (%s) with unknown origin " IP_ADDR_S "?"),
-                IP_ADDR_V(cl->vpn_ip), cl->hostname, IP_ADDR_V(rp.from));
+         syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+                cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));

          return -1;
        }
 
          return -1;
        }
 


@@ -897,8 +899,8 @@ cp
     return;
 
   if(debug_lvl > 0)
     return;
 
   if(debug_lvl > 0)

-    syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+           cl->vpn_hostname, cl->real_hostname);

 
   if(cl->status.timeout)
     send_timeout(cl);
 
   if(cl->status.timeout)
     send_timeout(cl);


@@ -973,8 +975,8 @@ cp
               if(p->status.pinged && !p->status.got_pong)
                 {
                   if(debug_lvl > 1)
               if(p->status.pinged && !p->status.got_pong)
                 {
                   if(debug_lvl > 1)

-                   syslog(LOG_INFO, _(IP_ADDR_S " (%s) didn't respond to ping"),
-                          IP_ADDR_V(p->vpn_ip), p->hostname);
+                   syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+                          p->vpn_hostname, p->real_hostname);

                  p->status.timeout = 1;
                  terminate_connection(p);
                 }
                  p->status.timeout = 1;
                  terminate_connection(p);
                 }


@@ -1079,28 +1081,28 @@ cp
       if(cl->reqlen)
         {
           if(debug_lvl > 2)
       if(cl->reqlen)
         {
           if(debug_lvl > 2)

-            syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (%s): %s"),
-                         IP_ADDR_V(cl->vpn_ip), cl->hostname, cl->buffer);
+            syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
+                         cl->vpn_hostname, cl->real_hostname, cl->buffer);

           if(sscanf(cl->buffer, "%d", &request) == 1)
             {
               if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
                 {
           if(sscanf(cl->buffer, "%d", &request) == 1)
             {
               if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
                 {

-                  syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (%s)"),
-                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
+                  syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+                         cl->vpn_hostname, cl->real_hostname);

                   return -1;
                 }
 
               if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
                 {
                   return -1;
                 }
 
               if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
                 {

-                  syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (%s)"),
-                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
+                  syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
+                         cl->vpn_hostname, cl->real_hostname);

                   return -1;
                 }
             }
           else
             {
                   return -1;
                 }
             }
           else
             {

-              syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (%s)"),
-                         IP_ADDR_V(cl->vpn_ip), cl->hostname);
+              syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+                         cl->vpn_hostname, cl->real_hostname);

               return -1;
             }
 
               return -1;
             }
 

diff --git a/src/net.h b/src/net.h
index 3d0dbff..98367a3 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -16,7 +16,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.4 2000/06/25 16:01:12 guus Exp $
+    $Id: net.h,v 1.9.4.5 2000/06/29 13:04:15 guus Exp $

 */
 
 #ifndef __TINC_NET_H__
 */
 
 #ifndef __TINC_NET_H__


@@ -106,7 +106,8 @@ typedef struct conn_list_t {
   ip_t vpn_ip;                     /* his vpn ip */
   ip_t vpn_mask;                   /* his vpn network address */
   ip_t real_ip;                    /* his real (internet) ip */
   ip_t vpn_ip;                     /* his vpn ip */
   ip_t vpn_mask;                   /* his vpn network address */
   ip_t real_ip;                    /* his real (internet) ip */

-  char *hostname;                  /* the hostname of its real ip */
+  char *real_hostname;             /* the hostname of its real ip */
+  char *vpn_hostname;              /* the hostname of the vpn ip */

   short unsigned int port;         /* his portnumber */
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
   short unsigned int port;         /* his portnumber */
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */

diff --git a/src/netutl.c b/src/netutl.c
index 5beb4a1..fda9abd 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -16,7 +16,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: netutl.c,v 1.12.4.4 2000/06/26 19:39:34 guus Exp $
+    $Id: netutl.c,v 1.12.4.5 2000/06/29 13:04:15 guus Exp $

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


@@ -89,6 +89,10 @@ cp
     destroy_queue(p->sq);
   if(p->rq)
     destroy_queue(p->rq);
     destroy_queue(p->sq);
   if(p->rq)
     destroy_queue(p->rq);

+  if(p->vpn_hostname)
+    free(p->vpn_hostname);
+  if(p->real_hostname)
+    free(p->real_hostname);

   free_key(p->public_key);
   free_key(p->key);
   free(p);
   free_key(p->public_key);
   free_key(p->key);
   free(p);


@@ -188,8 +192,8 @@ cp
     }
   else
     {
     }
   else
     {

-      name = xmalloc(strlen(host->h_name)+20);
-      sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
+      name = xmalloc(strlen(host->h_name));
+      sprintf(name, "%s", host->h_name);

     }
 cp
   return name;
     }
 cp
   return name;


@@ -243,8 +247,8 @@ cp
 
   for(p = conn_list; p != NULL; p = p->next)
     {
 
   for(p = conn_list; p != NULL; p = p->next)
     {

-      syslog(LOG_DEBUG, _(" " IP_ADDR_S "/" IP_ADDR_S " at %s flags %d sockets %d, %d status %04x"),
-            IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->hostname, p->flags,
+      syslog(LOG_DEBUG, _("%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"),
+            p->vpn_hostname, IP_ADDR_V(p->vpn_mask), p->real_hostname, p->port, p->flags,

             p->socket, p->meta_socket, p->status);
     }
 cp
             p->socket, p->meta_socket, p->status);
     }
 cp

diff --git a/src/protocol.c b/src/protocol.c
index d079dfb..6740cb0 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.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: protocol.c,v 1.28.4.14 2000/06/28 13:41:02 guus Exp $
+    $Id: protocol.c,v 1.28.4.15 2000/06/29 13:04:15 guus Exp $

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


@@ -51,8 +51,8 @@ int send_ack(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending ACK to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
 


@@ -69,8 +69,8 @@ int send_termreq(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
 


@@ -88,8 +88,8 @@ int send_timeout(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
 


@@ -106,8 +106,8 @@ int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(new_host->vpn_ip), new_host->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending DEL_HOST for %s (%s) to %s (%s)"),
+          new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
 


@@ -124,8 +124,8 @@ int send_ping(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
 


@@ -142,8 +142,8 @@ int send_pong(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
 


@@ -163,7 +163,7 @@ int send_add_host(conn_list_t *cl, conn_list_t *new_host)
   char *hostname;
 cp
   real_ip = new_host->real_ip;
   char *hostname;
 cp
   real_ip = new_host->real_ip;

-  hostname = new_host->hostname;
+  hostname = new_host->real_hostname;

   flags = new_host->flags;
   
   /* If we need to propagate information about a new host that wants us to export
   flags = new_host->flags;
   
   /* If we need to propagate information about a new host that wants us to export


@@ -177,12 +177,12 @@ cp
       flags &= ~EXPORTINDIRECTDATA;
       flags |= INDIRECTDATA;
       real_ip = myself->vpn_ip;
       flags &= ~EXPORTINDIRECTDATA;
       flags |= INDIRECTDATA;
       real_ip = myself->vpn_ip;

-      hostname = myself->hostname;
+      hostname = myself->real_hostname;

     }
 
   if(debug_lvl > 1)
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(new_host->vpn_ip), hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
+          new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
 


@@ -199,8 +199,8 @@ int send_key_changed(conn_list_t *cl, conn_list_t *src)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
+          src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
 


@@ -228,7 +228,7 @@ int send_basic_info(conn_list_t *cl)
 cp
   if(debug_lvl > 1)
     syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
 cp
   if(debug_lvl > 1)
     syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),

-          cl->hostname);
+          cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
 


@@ -248,8 +248,8 @@ cp
   encrypt_passphrase(&tmp);
 
   if(debug_lvl > 1)
   encrypt_passphrase(&tmp);
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PASSPHRASE to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
 


@@ -266,8 +266,8 @@ int send_public_key(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to %s (%s)"),
+          cl->vpn_hostname, cl->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
 


@@ -303,14 +303,14 @@ cp
   fw = lookup_conn(to);
   if(!fw)
     {
   fw = lookup_conn(to);
   if(!fw)
     {

-      syslog(LOG_ERR, _("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),

             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
+          fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
 


@@ -333,14 +333,14 @@ cp
   
   if(!fw)
     {
   
   if(!fw)
     {

-      syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),

             IP_ADDR_V(to));
       return -1;
     }
 
  if(debug_lvl > 1)
             IP_ADDR_V(to));
       return -1;
     }
 
  if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
+          fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);

 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
 
 
   buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
 


@@ -393,14 +393,16 @@ int basic_info_h(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->hostname);
+    syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->real_hostname);

 
   if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
     {
        syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
 
   if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
     {
        syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),

-              cl->hostname);
+              cl->real_hostname);

        return -1;
        return -1;

-    }  
+    }
+    
+  cl->vpn_hostname = hostlookup(htonl(cl->vpn_ip));

 
   if(cl->protocol_version != PROT_CURRENT)
     {
 
   if(cl->protocol_version != PROT_CURRENT)
     {


@@ -432,15 +434,15 @@ cp
 
   if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
     {
 
   if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
     {

-      syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got bad PASSPHRASE from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
   cl->pp->len = strlen(cl->pp->phrase);
     
   if(debug_lvl > 1)
       return -1;
     }
   cl->pp->len = strlen(cl->pp->phrase);
     
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PASSPHRASE from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

 
   if(cl->status.outgoing)
     send_passphrase(cl);
 
   if(cl->status.outgoing)
     send_passphrase(cl);


@@ -457,14 +459,14 @@ int public_key_h(conn_list_t *cl)
 cp
   if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
     {
 cp
   if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
     {

-       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad PUBLIC_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
   if(debug_lvl > 1)
        return -1;
     }  
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PUBLIC_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

 
   if(verify_passphrase(cl, g_n))
     {
 
   if(verify_passphrase(cl, g_n))
     {


@@ -490,8 +492,8 @@ cp
       cl->status.active = 1;
 
       if(debug_lvl > 0)
       cl->status.active = 1;
 
       if(debug_lvl > 0)

-        syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
-                           IP_ADDR_V(cl->vpn_ip), cl->hostname);
+        syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+                           cl->vpn_hostname, cl->real_hostname);

 
       notify_others(cl, NULL, send_add_host);
       notify_one(cl);
 
       notify_others(cl, NULL, send_add_host);
       notify_one(cl);


@@ -504,13 +506,13 @@ int ack_h(conn_list_t *cl)
 {
 cp
   if(debug_lvl > 1)
 {
 cp
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ACK from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

   
   cl->status.active = 1;
 
   
   cl->status.active = 1;
 

-  syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+  syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+              cl->vpn_hostname, cl->real_hostname);

 
   notify_others(cl, NULL, send_add_host);
   notify_one(cl);
 
   notify_others(cl, NULL, send_add_host);
   notify_one(cl);


@@ -525,14 +527,14 @@ int termreq_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized TERMREQ from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
     
   if(debug_lvl > 1)
       return -1;
     }
     
   if(debug_lvl > 1)

-   syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (%s)"),
-             IP_ADDR_V(cl->vpn_ip), cl->hostname);
+   syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
+             cl->vpn_hostname, cl->real_hostname);

   
   cl->status.termreq = 1;
 
   
   cl->status.termreq = 1;
 


@@ -551,14 +553,14 @@ int timeout_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(debug_lvl > 1)
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

 
   cl->status.termreq = 1;
   terminate_connection(cl);
 
   cl->status.termreq = 1;
   terminate_connection(cl);


@@ -573,28 +575,28 @@ int del_host_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized DEL_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
     {
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
     {

-       syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
   if(!(fw = lookup_conn(vpn_ip)))
     {
        return -1;
     }  
 
   if(!(fw = lookup_conn(vpn_ip)))
     {

-      syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s) which does not exist?"),
-            IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
+            IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);

       return 0;
     }
 
   if(debug_lvl > 1)
       return 0;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(fw->vpn_ip), fw->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
+           fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);

 
   notify_others(fw, cl, send_del_host);
 
 
   notify_others(fw, cl, send_del_host);
 


@@ -611,14 +613,14 @@ int ping_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized PING from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(debug_lvl > 1)
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

 
   cl->status.pinged = 0;
   cl->status.got_pong = 1;
 
   cl->status.pinged = 0;
   cl->status.got_pong = 1;


@@ -633,14 +635,14 @@ int pong_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized PONG from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(debug_lvl > 1)
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

 
   cl->status.got_pong = 1;
 cp
 
   cl->status.got_pong = 1;
 cp


@@ -658,15 +660,15 @@ int add_host_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized ADD_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
     
   if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
     {
       return -1;
     }
     
   if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
     {

-       syslog(LOG_ERR, _("Got bad ADD_HOST from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
        return -1;
     }  
 


@@ -675,9 +677,10 @@ cp
     
   ncn = new_conn_list();
   ncn->real_ip = real_ip;
     
   ncn = new_conn_list();
   ncn->real_ip = real_ip;

-  ncn->hostname = hostlookup(htonl(real_ip));
+  ncn->real_hostname = hostlookup(htonl(real_ip));

   ncn->vpn_ip = vpn_ip;
   ncn->vpn_mask = vpn_mask;
   ncn->vpn_ip = vpn_ip;
   ncn->vpn_mask = vpn_mask;

+  ncn->vpn_hostname = hostlookup(htonl(vpn_ip));

   ncn->port = port;
   ncn->flags = flags;
   ncn->nexthop = cl;
   ncn->port = port;
   ncn->flags = flags;
   ncn->nexthop = cl;


@@ -686,8 +689,8 @@ cp
   ncn->status.active = 1;
 
   if(debug_lvl > 1)
   ncn->status.active = 1;
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got ADD_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(ncn->vpn_ip), ncn->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
+           ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);

 
   notify_others(ncn, cl, send_add_host);
 cp
 
   notify_others(ncn, cl, send_add_host);
 cp


@@ -702,21 +705,21 @@ int req_key_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
     {
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
     {

-       syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
   if(debug_lvl > 1)
        return -1;
     }  
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got REQ_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-           IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
+           IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);

 
   if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
     {  /* hey! they want something from ME! :) */
 
   if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
     {  /* hey! they want something from ME! :) */


@@ -728,14 +731,14 @@ cp
   
   if(!fw)
     {
   
   if(!fw)
     {

-      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),

             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
+          fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);

   
   cl->buffer[cl->reqlen-1] = '\n';
   
   
   cl->buffer[cl->reqlen-1] = '\n';
   


@@ -793,21 +796,21 @@ int ans_key_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
     {
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
     {

-       syslog(LOG_ERR, _("Got bad ANS_KEY from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
   if(debug_lvl > 1)
        return -1;
     }  
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Got ANS_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-            IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+    syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
+            IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);

 
   if(to == myself->vpn_ip)
     {  /* hey! that key's for ME! :) */
 
   if(to == myself->vpn_ip)
     {  /* hey! that key's for ME! :) */


@@ -815,8 +818,8 @@ cp
 
       if(!gk)
         {
 
       if(!gk)
         {

-          syslog(LOG_ERR, _("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?"),
-                IP_ADDR_V(from));
+          syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
+                IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);

           return -1;
         }
 
           return -1;
         }
 


@@ -831,14 +834,14 @@ cp
   
   if(!fw)
     {
   
   if(!fw)
     {

-      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+      syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),

             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)
             IP_ADDR_V(to));
       return -1;
     }
 
   if(debug_lvl > 1)

-    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (%s)"),
-          IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+    syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
+          fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);

 
   cl->buffer[cl->reqlen-1] = '\n';
 
 
   cl->buffer[cl->reqlen-1] = '\n';
 


@@ -858,31 +861,31 @@ int key_changed_h(conn_list_t *cl)
 cp
   if(!cl->status.active)
     {
 cp
   if(!cl->status.active)
     {

-      syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+      syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
     {
       return -1;
     }
 
   if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
     {

-       syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (%s)"),
-              IP_ADDR_V(cl->vpn_ip), cl->hostname);
+       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+              cl->vpn_hostname, cl->real_hostname);

        return -1;
     }  
 
        return -1;
     }  
 

-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
-            IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), cl->hostname);
-

   ik = lookup_conn(from);
 
   if(!ik)
     {
   ik = lookup_conn(from);
 
   if(!ik)
     {

-      syslog(LOG_ERR, _("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?"),
-            IP_ADDR_V(from));
+      syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
+            IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);

       return -1;
     }
 
       return -1;
     }
 

+  if(debug_lvl > 1)
+    syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
+            ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+

   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;
 
   ik->status.validkey = 0;
   ik->status.waitingforkey = 0;