- Fixed a message in nl.po

- Woops, we forgot to send our connection list to our uplink when we
  connect to it... Fixed.

diff --git a/po/nl.po b/po/nl.po
index a32c47e..fdc53ae 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0pre3\n"
-"POT-Creation-Date: 2000-06-28 13:12+0200\n"
+"POT-Creation-Date: 2000-06-28 13:39+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"
@@ -44,7 +44,7 @@ msgid "Illegal passphrase in %s; size would be %d"
 msgstr "Ongeldig wachtwoord in %s; grootte zou %d zijn"
 
 #: src/encr.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Generating %d bits keys"
 msgstr "%d bits sleutel genereren."
 
@@ -95,7 +95,7 @@ msgid ": done.\n"
 msgstr ": klaar.\n"
 
 #: src/net.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Sending packet of %d bytes to "
 msgstr "%d bytes verzonden naar %lx"
 
@@ -116,17 +116,16 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #: src/net.c:112
-#, fuzzy
 msgid "Error sending packet to "
 msgstr "Fout bij verzenden van gegevens: %m"
 
 #: src/net.c:112
-#, fuzzy, c-format
+#, c-format
 msgid " (%s): %m"
 msgstr ":%d: %m"
 
 #: src/net.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "Receiving packet of %d bytes from "
 msgstr "Sleutel ontvangen van "
 
@@ -136,7 +135,6 @@ msgid "Can't write to tap device: %m"
 msgstr "Kan niet naar tap apparaat schrijven: %m"
 
 #: src/net.c:240
-#, fuzzy
 msgid "Queue flushed"
 msgstr "wachtrij leeggemaakt"
 
@@ -149,17 +147,14 @@ msgid "Flushing receive queue for "
 msgstr "Legen van de ontvangst-wachtrij voor "
 
 #: src/net.c:281
-#, fuzzy
 msgid "Trying to look up "
 msgstr "Proberen op te zoeken van "
 
 #: src/net.c:281 src/net.c:325
-#, fuzzy
 msgid " in connection list failed!"
 msgstr " in verbindingslijst mislukte!"
 
 #: src/net.c:293 src/net.c:306
-#, fuzzy
 msgid "There is no remote host I can send this packet to!"
 msgstr "Er is geen partner waar ik dit pakket naar kan sturen!"
 
@@ -172,7 +167,6 @@ msgid " via "
 msgstr " via "
 
 #: src/net.c:325
-#, fuzzy
 msgid "Indirect look up "
 msgstr "Indirect opzoeken van "
 
@@ -181,17 +175,16 @@ msgid "Double indirection for "
 msgstr "Dubbele indirectie voor "
 
 #: src/net.c:347
-#, fuzzy
 msgid "Could not open UDP connection to "
 msgstr "Kon geen UDP verbinding openen naar "
 
 #: src/net.c:354
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) has no valid key, queueing packet"
 msgstr " is niet gereed, pakket wordt in de wachtrij gezet."
 
 #: src/net.c:364
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) is not ready, queueing packet"
 msgstr " is niet gereed, pakket wordt in de wachtrij gezet."
 
@@ -231,7 +224,7 @@ msgid "Can't bind to port %hd/udp: %m"
 msgstr "Kan niet aan poort %hd/udp binden: %m"
 
 #: src/net.c:501
-#, fuzzy, c-format
+#, c-format
 msgid "Trying to connect to %s"
 msgstr "Beëindigen verbinding met %s."
 
@@ -241,17 +234,16 @@ msgid ":%d: %m"
 msgstr ":%d: %m"
 
 #: src/net.c:532
-#, fuzzy
 msgid "Connected to "
 msgstr "Verbinden naar "
 
 #: src/net.c:532
-#, fuzzy, c-format
+#, c-format
 msgid ":%hd"
 msgstr ",%hd) ontvangen"
 
 #: src/net.c:555
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan."
 
@@ -268,37 +260,35 @@ msgid "Unable to set up an incoming vpn data socket"
 msgstr "Kon geen socket maken voor inkomend vpn verkeer"
 
 #: src/net.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "Ready: listening on port %d"
 msgstr "Gereed: luister op poort %d."
 
 #: src/net.c:641
-#, fuzzy, c-format
+#, c-format
 msgid "Still failed to connect to other, will retry in %d seconds"
 msgstr "Wederom niet verbonden met de ander. Nieuwe poging over %d seconden."
 
 #: src/net.c:679
-#, fuzzy
 msgid "Trying to re-establish outgoing connection in 5 minutes"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 minuten."
 
 #: src/net.c:716
-#, fuzzy
 msgid "Terminating"
 msgstr "Beëindigen."
 
 #: src/net.c:730
-#, fuzzy, c-format
+#, c-format
 msgid "Opening UDP socket to %s"
-msgstr "Tijdens openen van UDP socket naar "
+msgstr "Bezig met openen UDP socket naar %s"
 
 #: src/net.c:735
-#, fuzzy, c-format
+#, c-format
 msgid "Creating UDP socket failed: %m"
 msgstr "Aanmaak socket mislukte: %m"
 
 #: src/net.c:745
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s port %d failed: %m"
 msgstr "Aanmaak datasocket mislukt: %m"
 
@@ -313,7 +303,7 @@ msgid "Error: getpeername: %m"
 msgstr "Fout: getpeername: %m"
 
 #: src/net.c:790
-#, fuzzy, c-format
+#, c-format
 msgid "Connection from %s port %d"
 msgstr "Verbinding van %s:%d"
 
@@ -323,12 +313,11 @@ msgid "Incoming data socket error: %s"
 msgstr "Fout op socket voor inkomend verkeer: %s"
 
 #: src/net.c:852
-#, fuzzy, c-format
+#, c-format
 msgid "Receiving packet from %s failed: %m"
 msgstr "Ontvangen van data mislukt: %m"
 
 #: src/net.c:866
-#, fuzzy
 msgid "Got packet from "
 msgstr "Kreeg pakket van "
 
@@ -342,17 +331,15 @@ msgid "?"
 msgstr "?"
 
 #: src/net.c:900
-#, fuzzy
 msgid "Closing connection with "
 msgstr "Beëindigen verbinding met "
 
 #: src/net.c:917
-#, fuzzy
 msgid "Trying to re-establish outgoing connection in 5 seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over 5 seconden"
 
 #: src/net.c:976
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) didn't respond to ping"
 msgstr " (%s) antwoordde niet op ping"
 
@@ -362,7 +349,6 @@ msgid "Accepting a new connection failed: %m"
 msgstr "Aanname van nieuwe verbinding is mislukt: %m"
 
 #: src/net.c:1015
-#, fuzzy
 msgid "Closed attempted connection"
 msgstr "Aangenomen verbinding verbroken"
 
@@ -372,7 +358,6 @@ msgid "Metadata socket error: %s"
 msgstr "Fout op socket voor metaverkeer: %s"
 
 #: src/net.c:1048
-#, fuzzy
 msgid "Metadata read buffer overflow!"
 msgstr "Metadata ontvangstbuffer overloop!"
 
@@ -382,7 +367,6 @@ msgid "Metadata socket read error: %m"
 msgstr "Fout op socket voor metaverkeer tijdens lezen: %m"
 
 #: src/net.c:1082
-#, fuzzy
 msgid "Got request from "
 msgstr "Ontving verzoek van "
 
@@ -392,7 +376,6 @@ msgid " (%s): %s"
 msgstr " (%s): %s"
 
 #: src/net.c:1088
-#, fuzzy
 msgid "Unknown request from "
 msgstr "Onbekend verzoek van "
 
@@ -401,7 +384,6 @@ msgid "Error while processing request from "
 msgstr "Fout tijdens afhandelen van verzoek van "
 
 #: src/net.c:1102
-#, fuzzy
 msgid "Bogus data received from "
 msgstr "Onzinnige data ontvangen van "
 
@@ -452,17 +434,15 @@ msgid " at %s flags %d sockets %d, %d status %04x"
 msgstr " op %s vlaggen %d sockets %d, %d status %04x"
 
 #: src/protocol.c:54
-#, fuzzy
 msgid "Sending ACK to "
 msgstr "Verzending ACK naar "
 
 #: src/protocol.c:61
-#, fuzzy, c-format
+#, c-format
 msgid "Send failed: %d:%d: %m"
 msgstr "Verzenden mislukte: %d:%d: %m"
 
 #: src/protocol.c:66 src/protocol.c:510
-#, fuzzy
 msgid "Connection with "
 msgstr "Verbinding met "
 
@@ -472,50 +452,43 @@ msgid " (%s) activated"
 msgstr " (%s) geactiveerd"
 
 #: src/protocol.c:76
-#, fuzzy
 msgid "Sending TERMREQ to "
 msgstr "Verzending TERMREQ naar "
 
 #: src/protocol.c:84 src/protocol.c:102 src/protocol.c:120 src/protocol.c:138
 #: src/protocol.c:156 src/protocol.c:195 src/protocol.c:213 src/protocol.c:241
-#: src/protocol.c:262 src/protocol.c:280 src/protocol.c:323 src/protocol.c:738
-#: src/protocol.c:841
-#, fuzzy, c-format
+#: src/protocol.c:262 src/protocol.c:280 src/protocol.c:323 src/protocol.c:353
+#: src/protocol.c:738 src/protocol.c:841
+#, c-format
 msgid "Send failed: %s:%d: %m"
 msgstr "Verzenden mislukte: %s:%d: %m"
 
 #: src/protocol.c:95
-#, fuzzy
 msgid "Sending TIMEOUT to "
 msgstr "Verzending TIMEOUT naar "
 
 #: src/protocol.c:113
-#, fuzzy
 msgid "Sending DEL_HOST for "
 msgstr "Verzending DEL_HOST voor "
 
 #: src/protocol.c:113 src/protocol.c:188
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) to "
 msgstr " (%s) naar "
 
 #: src/protocol.c:131
-#, fuzzy
 msgid "Sending PING to "
 msgstr "Verzending PING naar "
 
 #: src/protocol.c:149
-#, fuzzy
 msgid "Sending PONG to "
 msgstr "Verzending PONG naar "
 
 #: src/protocol.c:188
-#, fuzzy
 msgid "Sending ADD_HOST for "
 msgstr "Verzending ADD_HOST voor "
 
 #: src/protocol.c:206
-#, fuzzy
 msgid "Sending KEY_CHANGED origin "
 msgstr "Verzending KEY_CHANGED herkomst "
 
@@ -524,22 +497,19 @@ msgid " to "
 msgstr " naar "
 
 #: src/protocol.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Sending BASIC_INFO to %s"
 msgstr "Verzending BASIC_INFO naar %s"
 
 #: src/protocol.c:255
-#, fuzzy
 msgid "Sending PASSPHRASE to "
 msgstr "Verzending PASSPHRASE naar "
 
 #: src/protocol.c:273
-#, fuzzy
 msgid "Sending PUBLIC_KEY to "
 msgstr "Verzending PUBLIC_KEY naar "
 
 #: src/protocol.c:310
-#, fuzzy
 msgid "Attempting to send REQ_KEY to "
 msgstr "Poging tot verzenden REQ_KEY naar "
 
@@ -549,68 +519,54 @@ msgid ", which does not exist?"
 msgstr ", die niet bestaat?"
 
 #: src/protocol.c:316
-#, fuzzy
 msgid "Sending REQ_KEY to "
 msgstr "Verzending REQ_KEY naar "
 
 #: src/protocol.c:340
-#, fuzzy
 msgid "Attempting to send ANS_KEY to "
 msgstr "Poging tot verzenden ANS_KEY naar "
 
 #: src/protocol.c:346
-#, fuzzy
 msgid "Sending ANS_KEY to "
 msgstr "Verzending ANS_KEY naar "
 
-#: src/protocol.c:353
-#, c-format
-msgid "Send failed: %s:%d: %m"
-msgstr "Verzenden mislukte: %s:%d: %m"
-
 #: src/protocol.c:400
-#, fuzzy, c-format
+#, c-format
 msgid "Got BASIC_INFO from %s"
 msgstr "Kreeg BASIC_INFO van %s"
 
 #: src/protocol.c:404
-#, fuzzy, c-format
+#, c-format
 msgid "Got bad BASIC_INFO from %s"
 msgstr "Kreeg ongeldige BASIC_INFO van %s"
 
 #: src/protocol.c:411
-#, fuzzy, c-format
+#, c-format
 msgid "Peer uses incompatible protocol version %d"
 msgstr "De ander gebruikt een niet-compatibel protocol versie %d"
 
 #: src/protocol.c:439
-#, fuzzy
 msgid "Got bad PASSPHRASE from "
 msgstr "Ongeldig PASSPHRASE verzoek ontvangen: %s"
 
 #: src/protocol.c:446
-#, fuzzy
 msgid "Got PASSPHRASE from "
 msgstr "PASSPHRASE ontvangen"
 
 #: src/protocol.c:464
-#, fuzzy
 msgid "Got bad PUBLIC_KEY from "
 msgstr "Kreeg ongeldige PUBLIC_KEY van "
 
 #: src/protocol.c:470
-#, fuzzy
 msgid "Got PUBLIC_KEY from "
 msgstr "Kreeg PUBLIC_KEY van "
 
 #. intruder!
 #: src/protocol.c:476
-#, fuzzy
 msgid "Intruder: passphrase does not match!"
 msgstr "Indringer: wachwoord komt niet overeen!"
 
 #: src/protocol.c:506
-#, fuzzy
 msgid "Got ACK from "
 msgstr "Kreeg ACK van "
 
@@ -619,7 +575,6 @@ msgid "Got unauthorized TERMREQ from "
 msgstr "Kreeg niet-geautoriseerde TERMREQ van "
 
 #: src/protocol.c:528
-#, fuzzy
 msgid "Got TERMREQ from "
 msgstr "Kreeg TERMREQ van "
 
@@ -628,22 +583,18 @@ msgid "Got unauthorized TIMEOUT from "
 msgstr "Kreeg niet-geautoriseerde TIMEOUT van "
 
 #: src/protocol.c:554
-#, fuzzy
 msgid "Got TIMEOUT from "
 msgstr "Kreeg TIMEOUT van "
 
 #: src/protocol.c:570
-#, fuzzy
 msgid "Got unauthorized DEL_HOST from "
 msgstr "Kreeg niet-geautoriseerde DEL_HOST van "
 
 #: src/protocol.c:577
-#, fuzzy
 msgid "Got bad DEL_HOST from "
 msgstr "Kreeg ongeldige DEL_HOST van "
 
 #: src/protocol.c:584 src/protocol.c:590
-#, fuzzy
 msgid "Got DEL_HOST for "
 msgstr "Kreeg DEL_HOST voor "
 
@@ -652,12 +603,12 @@ msgid " from "
 msgstr " van "
 
 #: src/protocol.c:584
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) which does not exist?"
 msgstr " (%s), die niet bestaat?"
 
 #: src/protocol.c:590 src/protocol.c:683
-#, fuzzy, c-format
+#, c-format
 msgid " (%s) from "
 msgstr " (%s) van "
 
@@ -666,7 +617,6 @@ msgid "Got unauthorized PING from "
 msgstr "Kreeg niet-geautoriseerde PING van "
 
 #: src/protocol.c:614
-#, fuzzy
 msgid "Got PING from "
 msgstr "Kreeg PING van "
 
@@ -675,7 +625,6 @@ msgid "Got unauthorized PONG from "
 msgstr "Kreeg niet-geautoriseerde PONG van "
 
 #: src/protocol.c:636
-#, fuzzy
 msgid "Got PONG from "
 msgstr "Kreeg PONG van "
 
@@ -684,27 +633,22 @@ msgid "Got unauthorized ADD_HOST from "
 msgstr "Kreeg niet-geautoriseerde ADD_HOST van "
 
 #: src/protocol.c:662
-#, fuzzy
 msgid "Got bad ADD_HOST from "
 msgstr "Kreeg ongeldige ADD_HOST van "
 
 #: src/protocol.c:683
-#, fuzzy
 msgid "Got ADD_HOST for "
 msgstr "Kreeg ADD_HOST voor "
 
 #: src/protocol.c:699
-#, fuzzy
 msgid "Got unauthorized REQ_KEY from "
 msgstr "Kreeg niet-geautoriseerde REQ_KEY van "
 
 #: src/protocol.c:706
-#, fuzzy
 msgid "Got bad REQ_KEY from "
 msgstr "Kreeg ongeldige REQ_KEY van "
 
 #: src/protocol.c:712
-#, fuzzy
 msgid "Got REQ_KEY origin "
 msgstr "Kreeg REQ_KEY van "
 
@@ -713,62 +657,50 @@ msgid " destination "
 msgstr " bestemming "
 
 #: src/protocol.c:725
-#, fuzzy
 msgid "Attempting to forward REQ_KEY to "
 msgstr "Poging tot doorsturenREQ_KEY naar "
 
 #: src/protocol.c:731
-#, fuzzy
 msgid "Forwarding REQ_KEY to "
 msgstr "Doorsturen REQ_KEY naar "
 
 #: src/protocol.c:790
-#, fuzzy
 msgid "Got unauthorized ANS_KEY from "
 msgstr "Kreeg niet-geautoriseerde ANS_KEY van "
 
 #: src/protocol.c:797
-#, fuzzy
 msgid "Got bad ANS_KEY from "
 msgstr "Kreeg ongeldige ANS_KEY van "
 
 #: src/protocol.c:803
-#, fuzzy
 msgid "Got ANS_KEY origin "
 msgstr "Kreeg ANS_KEY van "
 
 #: src/protocol.c:812
-#, fuzzy
 msgid "Receiving ANS_KEY from "
 msgstr "Ontvangst ANS_KEY van "
 
 #: src/protocol.c:828
-#, fuzzy
 msgid "Attempting to forward ANS_KEY to "
 msgstr "Poging tot doorsturen ANS_KEY naar "
 
 #: src/protocol.c:834
-#, fuzzy
 msgid "Forwarding ANS_KEY to "
 msgstr "Doorsturen ANS_KEY naar "
 
 #: src/protocol.c:855
-#, fuzzy
 msgid "Got unauthorized KEY_CHANGED from "
 msgstr "Kreeg niet-geautoriseerde KEY_CHANGED van "
 
 #: src/protocol.c:862
-#, fuzzy
 msgid "Got bad KEY_CHANGED from "
 msgstr "Kreeg ongeldige KEY_CHANGED van "
 
 #: src/protocol.c:868
-#, fuzzy
 msgid "Got KEY_CHANGED origin "
 msgstr "Kreeg KEY_CHANGED herkomst "
 
 #: src/protocol.c:875
-#, fuzzy
 msgid "Got KEY_CHANGED from "
 msgstr "Kreeg KEY_CHANGED van "
 
@@ -824,23 +756,23 @@ msgid "Invalid timeout value `%s'.\n"
 msgstr "Ongeldige timeout waarde `%s'.\n"
 
 #: src/tincd.c:159
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, c-format
 msgid "tincd %s (%s %s) starting, debug level %d"
 msgstr "tincd %s (%s %s) gestart, debugniveau %d."
 
 #: src/tincd.c:217
-#, fuzzy, c-format
+#, c-format
 msgid "tincd %s starting"
 msgstr "tincd %s gestart"
 
 #: src/tincd.c:232
-#, fuzzy, c-format
+#, 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, "
@@ -918,12 +850,11 @@ msgid "Got another SEGV signal: not restarting"
 msgstr "Kreeg nog een SEGV signaal: niet herstarten"
 
 #: src/tincd.c:413
-#, fuzzy, c-format
+#, 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."
 
 #: src/tincd.c:416
-#, fuzzy
 msgid "Got SEGV signal, trying to re-execute"
 msgstr "Kreeg SEGV signaal, probeer opnieuw opstarten"
 
@@ -940,11 +871,11 @@ msgid "Forcing new key generation"
 msgstr "Nieuwe sleutels geforceerd"
 
 #: src/tincd.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "Got unexpected signal %d after %s line %d"
 msgstr "Ontving onverwacht signaal %d na %s regel %d"
 
 #: src/tincd.c:464
-#, fuzzy, c-format
+#, c-format
 msgid "Got unexpected signal %d"
 msgstr "Ontving onverwacht signaal %d"

diff --git a/src/protocol.c b/src/protocol.c
index 2cc49ad..d079dfb 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.
 
-    $Id: protocol.c,v 1.28.4.13 2000/06/28 11:38:00 guus Exp $
+    $Id: protocol.c,v 1.28.4.14 2000/06/28 13:41:02 guus Exp $
 */
 
 #include "config.h"
@@ -61,10 +61,6 @@ cp
       syslog(LOG_ERR, _("Send failed: %d:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
-  if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
-                       IP_ADDR_V(cl->vpn_ip), cl->hostname);
 cp
   return 0;
 }
@@ -492,6 +488,11 @@ cp
         terminate_connection(old);
 
       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);
+
       notify_others(cl, NULL, send_add_host);
       notify_one(cl);
     }
@@ -507,8 +508,13 @@ cp
               IP_ADDR_V(cl->vpn_ip), cl->hostname);
   
   cl->status.active = 1;
+
   syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
               IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
+  notify_others(cl, NULL, send_add_host);
+  notify_one(cl);
+
   upstreamindex = 0;
 cp
   return 0;