From 11c0039eede8cf4c3012c1f2e391c7a476538edd Mon Sep 17 00:00:00 2001 Message-Id: <11c0039eede8cf4c3012c1f2e391c7a476538edd.1714922949.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 30 Apr 2005 19:06:32 +0000 Subject: [PATCH] Issue ADD and KXSTART notifications in the right order! Organization: Straylight/Edgeware From: mdw --- keyexch.c | 2 +- peer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/keyexch.c b/keyexch.c index 7c0217c5..f010a38b 100644 --- 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); - a_notify("KXSTART %s", p_name(kx->p)); + /* Don't notify here: the ADD message hasn't gone out yet. */ return (0); } diff --git a/peer.c b/peer.c index 1469a3a8..5fdfc1bc 100644 --- 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("KXSTART %s", name); /* Couldn't tell anyone before */ return (p); tidy_1: -- [mdw]