[PATCH 05/18] Keepalives: Document that they're unimplemented; remove vestigial code

Ian Jackson ijackson at chiark.greenend.org.uk
Wed Aug 17 23:54:23 BST 2011

Keepalives are not actually implemented; the keepalive option does
nothing.  Mention this in the README.  Remove the option's parsing
and recording from site.c.

Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
 README |    3 ++-
 site.c |    3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README b/README
index b094e66..73679c2 100644
--- a/README
+++ b/README
@@ -290,7 +290,8 @@ site: dict argument
     allowing another attempt [20000]
   renegotiate-time (integer): if we see traffic on the link after this time
     then renegotiate another session key immediately [depends on key-lifetime]
-  keepalive (bool): if True then attempt always to keep a valid session key
+  keepalive (bool): if True then attempt always to keep a valid session key.
+    Not actually currently implemented. [false]
   log-events (string list): types of events to log for this site
     unexpected: unexpected key setup packets (may be late retransmissions)
     setup-init: start of attempt to setup a session key
diff --git a/site.c b/site.c
index 006d9b4..a7775bd 100644
--- a/site.c
+++ b/site.c
@@ -154,8 +154,6 @@ struct site {
     int32_t key_renegotiate_time; /* If we see traffic (or a keepalive)
 				      after this time, initiate a new
 				      key exchange */
-    bool_t keepalive; /* Send keepalives to detect peer failure (not yet
-			 implemented) */
     uint8_t *setupsig; /* Expected signature of incoming MSG1 packets */
     int32_t setupsiglen; /* Allows us to discard packets quickly if
@@ -1259,7 +1257,6 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 		 "renegotiate-time must be less than key-lifetime\n");
-    st->keepalive=dict_read_bool(dict,"keepalive",False,"site",loc,False);

More information about the sgo-software-discuss mailing list