From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 3 Sep 2017 23:16:33 +0000 (+0100)
Subject: server/keyexch.c: Rename kx_init => kx_setup.
X-Git-Tag: 1.5.0~51
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/0510f26241da5ac18afecf97fa46e0448ae705a4

server/keyexch.c: Rename kx_init => kx_setup.

I need the name for startup-time initialization of the key-exchange
code.
---

diff --git a/server/keyexch.c b/server/keyexch.c
index be5bc880..f1d0a56a 100644
--- a/server/keyexch.c
+++ b/server/keyexch.c
@@ -1472,7 +1472,7 @@ newkeys:
   }
 }
 
-/* --- @kx_init@ --- *
+/* --- @kx_setup@ --- *
  *
  * Arguments:	@keyexch *kx@ = pointer to key exchange context
  *		@peer *p@ = pointer to peer context
@@ -1486,7 +1486,7 @@ newkeys:
  *		exchange.
  */
 
-int kx_init(keyexch *kx, peer *p, keyset **ks, unsigned f)
+int kx_setup(keyexch *kx, peer *p, keyset **ks, unsigned f)
 {
   if ((kx->kpriv = km_findpriv(p_privtag(p))) == 0) goto fail_0;
   if ((kx->kpub = km_findpub(p_tag(p))) == 0) goto fail_1;
diff --git a/server/peer.c b/server/peer.c
index 0ad32913..e9b8f668 100644
--- a/server/peer.c
+++ b/server/peer.c
@@ -909,7 +909,7 @@ peer *p_create(peerspec *spec)
   T( trace(T_TUNNEL, "peer: attached interface %s to peer `%s'",
 	   p->ifname, p_name(p)); )
   p_setkatimer(p);
-  if (kx_init(&p->kx, p, &p->ks, p->spec.f & PSF_KXMASK))
+  if (kx_setup(&p->kx, p, &p->ks, p->spec.f & PSF_KXMASK))
     goto tidy_4;
   a_notify("ADD",
 	   "?PEER", p,
diff --git a/server/tripe.h b/server/tripe.h
index 6f611822..494aa182 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -925,7 +925,7 @@ extern void kx_free(keyexch */*kx*/);
 
 extern void kx_newkeys(keyexch */*kx*/);
 
-/* --- @kx_init@ --- *
+/* --- @kx_setup@ --- *
  *
  * Arguments:	@keyexch *kx@ = pointer to key exchange context
  *		@peer *p@ = pointer to peer context
@@ -939,8 +939,8 @@ extern void kx_newkeys(keyexch */*kx*/);
  *		exchange.
  */
 
-extern int kx_init(keyexch */*kx*/, peer */*p*/,
-		   keyset **/*ks*/, unsigned /*f*/);
+extern int kx_setup(keyexch */*kx*/, peer */*p*/,
+		    keyset **/*ks*/, unsigned /*f*/);
 
 /*----- Keysets and symmetric cryptography --------------------------------*/