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 be5bc88085bfbc3f11ceb252f7d3b11366806d81..f1d0a56af5cb3690a40a647a8f129926cbad1fff 100644 (file)
--- 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
  *
  * Arguments:  @keyexch *kx@ = pointer to key exchange context
  *             @peer *p@ = pointer to peer context


@@ -1486,7 +1486,7 @@ newkeys:
  *             exchange.
  */
 
  *             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;
 {
   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 0ad329138ce5a36d1f1258bb0ae21b30e7dd04d5..e9b8f6681807a6f3c078e7bb3fdef660234ab146 100644 (file)
--- 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);
   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,
     goto tidy_4;
   a_notify("ADD",
           "?PEER", p,

diff --git a/server/tripe.h b/server/tripe.h
index 6f6118222b51e2e70ab6174a48131c26621a3191..494aa182584dbba6ea6dc4f631c49beda907cc08 100644 (file)
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -925,7 +925,7 @@ extern void kx_free(keyexch */*kx*/);
 
 extern void kx_newkeys(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
  *
  * 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.
  */
 
  *             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 --------------------------------*/
 
 
 /*----- Keysets and symmetric cryptography --------------------------------*/