Move epoch and cid generation into the rx core

[openafs.git] / src / rxkad / rxkad_common.c

diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index 75a8b26..463573c 100644 (file)
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -36,10 +36,10 @@
 #endif /* !UKERNEL */
 #else /* KERNEL */
 #include <roken.h>
+#include <afs/opr.h>
 #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV)
 #define RXKAD_STATS_DECLSPEC __declspec(dllexport)
 #endif
-#include <afs/afsutil.h>
 #endif /* KERNEL */
 
 #include <rx/rx.h>
@@ -60,17 +60,16 @@
 /* variable initialization for the benefit of darwin compiler; if it causes
    problems elsewhere, conditionalize for darwin or fc_test compile breaks */
 #ifdef AFS_PTHREAD_ENV
-struct rxkad_global_stats rxkad_global_stats = { 0 };
+struct rxkad_global_stats rxkad_global_stats;
 pthread_mutex_t rxkad_global_stats_lock;
 pthread_key_t rxkad_stats_key;
 #else /* AFS_PTHREAD_ENV */
-struct rxkad_stats rxkad_stats = { { 0 } };
+struct rxkad_stats rxkad_stats;
 #endif /* AFS_PTHREAD_ENV */
 
 #ifdef AFS_PTHREAD_ENV
 /* Pthread initialisation */
 static pthread_once_t rxkad_once_init = PTHREAD_ONCE_INIT;
-extern pthread_mutex_t rxkad_client_uid_mutex;
 extern pthread_mutex_t rxkad_random_mutex;
 
 static void
@@ -83,7 +82,6 @@ rxkad_global_stats_init(void)
 
 static void
 rxkad_InitPthread(void) {
-    MUTEX_INIT(&rxkad_client_uid_mutex, "uid", MUTEX_DEFAULT, 0);
     MUTEX_INIT(&rxkad_random_mutex, "rxkad random", MUTEX_DEFAULT, 0);
 
     rxkad_global_stats_init();
@@ -356,7 +354,6 @@ rxkad_NewConnection(struct rx_securityClass *aobj,
        if (!(tcp->type & rxkad_client))
            return RXKADINCONSISTENCY;
        rxkad_SetLevel(aconn, tcp->level);      /* set header and trailer sizes */
-       rxkad_AllocCID(aobj, aconn);    /* CHANGES cid AND epoch!!!! */
        rxkad_DeriveXORInfo(aconn, (fc_KeySchedule *)tcp->keysched, (char *)tcp->ivec, (char *)data->preSeq);
        INC_RXKAD_STATS(connections[rxkad_LevelIndex(tcp->level)]);
     }
@@ -430,7 +427,6 @@ rxkad_CheckPacket(struct rx_securityClass *aobj, struct rx_call *acall,
 
     tconn = rx_ConnectionOf(acall);
     len = rx_GetDataSize(apacket);
-    checkCksum = 0;            /* init */
     if (rx_IsServerConn(tconn)) {
        struct rxkad_sconn *sconn;
        sconn = rx_GetSecurityData(tconn);