From 8c42a17adc7ce1b8e8de3d9cfcc52c2f20ad65f0 Mon Sep 17 00:00:00 2001
From: David Byers <byers@lysator.liu.se>
Date: Sat, 26 Jun 1999 08:53:26 +0000
Subject: [PATCH] Protocol:     Don't send new-membership when a membership is
 changed.

Documentation:
    Document protocol change.

Test suite:
    Do not expect new-membership when membership is changed.
---
 ChangeLog                             | 13 +++++++++++++
 doc/Protocol-A.texi                   |  7 +++----
 src/server/membership.c               |  6 +++---
 src/server/testsuite/lyskomd.0/06.exp |  3 +--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69ff7fb9..d14d53b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-06-26  David Byers  <davby@ida.liu.se>
+
+	Send new-membership only for new memberships.
+	* doc/Protocol-A.texi (async-new-membership): Remove
+	documentation that says this message is sent when a membership is
+	reprioritized.
+
+	* src/server/testsuite/lyskomd.0/06.exp (shutdown_06): Don't
+	expect new-membership when membership is changed.
+
+	* src/server/membership.c (add_member_common): Only send
+	new-membership for new memberships, not changed memberships.
+
 1999-06-25  Per Cederqvist  <ceder@lysator.liu.se>
 
 	* Release 2.0.0.
diff --git a/doc/Protocol-A.texi b/doc/Protocol-A.texi
index 72d52dfa..d237b3a6 100644
--- a/doc/Protocol-A.texi
+++ b/doc/Protocol-A.texi
@@ -2,7 +2,7 @@
 @c
 @c FIXME: Explain how the garb works with nice and keep-commented
 @c
-@c $Id: Protocol-A.texi,v 1.79 1999/06/25 21:40:55 ceder Exp $
+@c $Id: Protocol-A.texi,v 1.80 1999/06/26 08:52:32 byers Exp $
 @c %**start of header
 @setfilename protocol-a.info
 @settitle LysKOM Protocol A
@@ -7964,9 +7964,8 @@ the recipient.
 @end example
 
 This message indicates that the membership for @code{pers-no} in
-conference @code{conf-no} has been added or reprioritized. This message
-is currently sent only to @code{pers-no}, but that may change in the
-future.
+conference @code{conf-no} has been added. This message is currently sent
+only to @code{pers-no}, but that may change in the future.
 
 See also @pxref{async-leave-conf}.
 
diff --git a/src/server/membership.c b/src/server/membership.c
index d5d8b975..23f2f2b7 100644
--- a/src/server/membership.c
+++ b/src/server/membership.c
@@ -1,5 +1,5 @@
 /*
- * $Id: membership.c,v 0.49 1999/06/24 12:58:01 ceder Exp $
+ * $Id: membership.c,v 0.50 1999/06/26 08:53:13 byers Exp $
  * Copyright (C) 1991-1999  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -38,7 +38,7 @@
 #define DEBUG_MARK_AS_READ
 
 static const char *
-rcsid = "$Id: membership.c,v 0.49 1999/06/24 12:58:01 ceder Exp $";
+rcsid = "$Id: membership.c,v 0.50 1999/06/26 08:53:13 byers Exp $";
 #include "rcs.h"
 USE(rcsid);
 
@@ -1032,9 +1032,9 @@ add_member_common(Conf_no              conf_no,
 	do_add_member(conf_no, conf_c, pers_no, pers_p, ACTPERS,
                       priority, where, type, fake_passive);
 
+        send_async_new_membership(pers_no, conf_no);
     }
 
-    send_async_new_membership(pers_no, conf_no);
     return OK;
 }
 
diff --git a/src/server/testsuite/lyskomd.0/06.exp b/src/server/testsuite/lyskomd.0/06.exp
index 8b83d979..1671700c 100644
--- a/src/server/testsuite/lyskomd.0/06.exp
+++ b/src/server/testsuite/lyskomd.0/06.exp
@@ -472,9 +472,8 @@ simple_expect "=1051"
 talk_to client 1
 kom_ping_server
 
-# Check that async message is sent to person
+# Check that async message is not sent to person
 talk_to client 0
-simple_expect ":2 18 8 9"
 kom_ping_server
 
 # Check that accept-async can block the message
-- 
GitLab