Issue ADD and KXSTART notifications in the right order!

diff --git a/keyexch.c b/keyexch.c
index 7c0217c5ccdae50b69af40e7fb20af3ae1768ccc..f010a38b00616208b1aa5e43926815acbb7a10ef 100644 (file)
--- a/keyexch.c
+++ b/keyexch.c
@@ -1217,7 +1217,7 @@ int kx_init(keyexch *kx, peer *p, keyset **ks)
   kx->f = KXF_DEAD | KXF_PUBKEY;
   start(kx, time(0));
   resend(kx);
   kx->f = KXF_DEAD | KXF_PUBKEY;
   start(kx, time(0));
   resend(kx);

-  a_notify("KXSTART %s", p_name(kx->p));
+  /* Don't notify here: the ADD message hasn't gone out yet. */

   return (0);
 }
 
   return (0);
 }
 

diff --git a/peer.c b/peer.c
index 1469a3a86340995a4baa6340d46821e1d6977e0f..5fdfc1bca4ec14354039b72a461d34e95985ccf4 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -346,6 +346,7 @@ peer *p_create(const char *name, struct sockaddr *sa, size_t sz)
       a_notify("ADD %s UNKNOWN", name);
       break;
   }
       a_notify("ADD %s UNKNOWN", name);
       break;
   }

+  a_notify("KXSTART %s", name);                /* Couldn't tell anyone before */

   return (p);
 
 tidy_1:
   return (p);
 
 tidy_1: