readd missing statistics

make cm and ukernel compile with new stuff

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

add missing include path

====================

un-nocopy bg-fcrypt

====================

and readd rx/rx.h so private_data's struct clock ref is resolved

(cherry picked from commit da3dad673043bdf35b58dc303f3ab324b0d0d828)

diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common
index 73a84c64dd320a035b8ce1b5d6f8d9815b75ee0c..d0c86a0fd9a679f970c03b32acbe520130d6312b 100644 (file)
--- a/src/libafs/Makefile.common
+++ b/src/libafs/Makefile.common
@@ -95,7 +95,7 @@ AFSAOBJS = \
        xdr_arrayn.o    \
        xdr_int64.o     \
        Kvice.cs.o      \
-       fcrypt.o                \
+       bg-fcrypt.o             \
        rx.o            \
        rx_rdwr.o       \
        rx_clock.o      \
@@ -114,7 +114,6 @@ AFSAOBJS = \
        Krxstat.ss.o    \
        Krxstat.xdr.o   \
        rxstat.o        \
-       crypt_conn.o    \
        AFS_component_version_number.o\
        afs_exporter.o  \
        rxkad_client.o  \
@@ -247,9 +246,7 @@ afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE1);
 afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE1);
-fcrypt.o:      $(AFS)/fcrypt.c
-       $(CRULE1);
-crypt_conn.o: $(AFS)/crypt_conn.c
+bg-fcrypt.o:   $(AFS)/bg-fcrypt.c
        $(CRULE1);
 rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE1);

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 0a51284510c2ad622deba285ddef484e9148f967..0f4ec27be68cfe22646e93793b19cfccfe1f287c 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -31,7 +31,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-INCLUDES=-I${TOP_INCDIR} -I.. -I../rx
+INCLUDES=-I${TOP_INCDIR} -I.. -I../rx -I../rxkad
 CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
 SFLAGS=-P -I${TOP_INCDIR}
 RX = ../rx
@@ -102,8 +102,7 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       fcrypt.o \
-       crypt_conn.o
+       bg-fcrypt.o
 
 DESOBJS =\
        des.o \
@@ -207,10 +206,7 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-fcrypt.o: ${RXKAD}/fcrypt.c
-       ${CCRULE}
-
-crypt_conn.o: ${RXKAD}/crypt_conn.c
+bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c

diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common
index 00a930380c55718465f327e614ecdec6f6b23448..97688490dff8b1768eeefca6b12172309994ce8f 100644 (file)
--- a/src/libuafs/Makefile.common
+++ b/src/libuafs/Makefile.common
@@ -107,7 +107,7 @@ UAFSOBJ = \
        $(UOBJ)/Kvice.xdr.o \
        $(UOBJ)/xdr_arrayn.o \
        $(UOBJ)/Kvice.cs.o \
-       $(UOBJ)/fcrypt.o \
+       $(UOBJ)/bg-fcrypt.o \
        $(UOBJ)/rx.o \
        $(UOBJ)/rx_rdwr.o \
        $(UOBJ)/rx_clock.o \
@@ -124,7 +124,6 @@ UAFSOBJ = \
        $(UOBJ)/Kvldbint.cs.o \
        $(UOBJ)/Kvldbint.xdr.o \
        $(UOBJ)/Kcallback.ss.o \
-       $(UOBJ)/crypt_conn.o \
        $(UOBJ)/AFS_component_version_number.o \
        $(UOBJ)/afs_exporter.o \
        $(UOBJ)/rxkad_client.o \
@@ -224,7 +223,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
+       $(WEBOBJ)/bg-fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -241,7 +240,6 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -341,7 +339,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
+       $(WEBOBJ)/bg-fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -358,7 +356,6 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -498,9 +495,7 @@ $(UOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE1);
 $(UOBJ)/afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE1);
-$(UOBJ)/fcrypt.o:      $(AFS)/fcrypt.c
-       $(CRULE1);
-$(UOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+$(UOBJ)/bg-fcrypt.o:   $(AFS)/bg-fcrypt.c
        $(CRULE1);
 $(UOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE1);
@@ -743,9 +738,7 @@ $(WEBOBJ)/afs_memcache.o: $(AFS)/afs_memcache.c
        $(CRULE2);
 $(WEBOBJ)/afs_stat.o: $(AFS)/afs_stat.c
        $(CRULE2);
-$(WEBOBJ)/fcrypt.o:    $(AFS)/fcrypt.c
-       $(CRULE2);
-$(WEBOBJ)/crypt_conn.o: $(AFS)/crypt_conn.c
+$(WEBOBJ)/bg-fcrypt.o:         $(AFS)/bg-fcrypt.c
        $(CRULE2);
 $(WEBOBJ)/rxkad_client.o: $(AFS)/rxkad_client.c
        $(CRULE2);

diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c
index c968b0db014d4f45f00e2a293190ab1b9908361b..83d2cf9f0e05793f10a061c2088c221755ad9e46 100644 (file)
--- a/src/rxkad/bg-fcrypt.c
+++ b/src/rxkad/bg-fcrypt.c
@@ -32,7 +32,7 @@
  */
 #include <afsconfig.h>
 #ifdef KERNEL
-#include "afs/param.h"
+#include "../afs/param.h"
 #else
 #include <afs/param.h>
 #endif
@@ -42,21 +42,21 @@ RCSID("$Header$");
 #define DEBUG 0
 #ifdef KERNEL
 #ifndef UKERNEL
-#include "afs/stds.h"
-#include "h/types.h"
+#include "../afs/stds.h"
+#include "../h/types.h"
 #if !defined(AFS_LINUX20_ENV) && !defined(AFS_OBSD_ENV)
-#include "netinet/in.h"
+#include "../netinet/in.h"
 #endif
 #else /* UKERNEL */
-#include "afs/sysincludes.h"
-#include "afs/stds.h"
+#include "../afs/sysincludes.h"
+#include "../afs/stds.h"
 #endif /* UKERNEL */
 #ifdef AFS_LINUX22_ENV
 #include <asm/byteorder.h>
 #endif
 
-#include "afs/longc_procs.h"
-
+#include "../afs/longc_procs.h"
+#include "../rx/rx.h"
 #else /* KERNEL */
 
 #include <afs/stds.h>
@@ -72,6 +72,7 @@ RCSID("$Header$");
 #include "fcrypt.h"
 #include "rxkad.h"
 #include "fcrypt.h"
+#include "private_data.h"
 
 #undef WORDS_BIGENDIAN
 #ifdef AFSBIG_ENDIAN
@@ -258,9 +259,9 @@ static const afs_uint32 sbox3[256] = {
  */
 
 #define F_ENCRYPT(R, L, sched) { \
- union lc4 { afs_uint32 l; unsigned char c[4]; } u; \
- u.l = sched ^ R; \
- L ^= sbox0[u.c[0]] ^ sbox1[u.c[1]] ^ sbox2[u.c[2]] ^ sbox3[u.c[3]]; }
+ union lc4 { afs_uint32 l; unsigned char c[4]; } un; \
+ un.l = sched ^ R; \
+ L ^= sbox0[un.c[0]] ^ sbox1[un.c[1]] ^ sbox2[un.c[2]] ^ sbox3[un.c[3]]; }
 
 #ifndef WORDS_BIGENDIAN
 /* BEWARE: this code is endian dependent.
@@ -269,9 +270,9 @@ static const afs_uint32 sbox3[256] = {
 #undef F_ENCRYPT
 #define FF(y, shiftN) (((y) >> shiftN) & 0xFF)
 #define F_ENCRYPT(R, L, sched) { \
- afs_uint32 u; \
- u = sched ^ R; \
- L ^= sbox0[FF(u, 0)] ^ sbox1[FF(u, 8)] ^ sbox2[FF(u, 16)] ^ sbox3[FF(u, 24)];}
+ afs_uint32 un; \
+ un = sched ^ R; \
+ L ^= sbox0[FF(un, 0)] ^ sbox1[FF(un, 8)] ^ sbox2[FF(un, 16)] ^ sbox3[FF(un, 24)];}
 #endif
 
 static inline
@@ -428,7 +429,10 @@ fc_ecb_encrypt(afs_uint32 *in, afs_uint32 *out,
               fc_KeySchedule sched,
               int encrypt)
 {
-  if (encrypt)
+  LOCK_RXKAD_STATS
+  rxkad_stats.fc_encrypts[encrypt]++;
+  UNLOCK_RXKAD_STATS
+  if (encrypt) 
     fc_ecb_enc(in[0], in[1], out, sched);
   else
     fc_ecb_dec(in[0], in[1], out, sched);
@@ -533,7 +537,6 @@ fc_keysched(void *key_,
   *sched++ = EFF_NTOHL((afs_uint32)k);
   ROT56R64(k, 11);
   *sched++ = EFF_NTOHL((afs_uint32)k);
-  return 0;
 #else
   afs_uint32 hi, lo; /* hi is upper 24 bits and lo lower 32, total 56 */
 
@@ -591,8 +594,11 @@ fc_keysched(void *key_,
   *sched++ = EFF_NTOHL(lo);
   ROT56R(hi, lo, 11);
   *sched++ = EFF_NTOHL(lo);
-  return 0;
 #endif
+  LOCK_RXKAD_STATS
+  rxkad_stats.fc_key_scheds++;
+  UNLOCK_RXKAD_STATS
+  return 0;
 }
 
 /*
@@ -609,6 +615,14 @@ rxkad_EncryptPacket(const struct rx_connection *rx_connection_not_used,
 {
   afs_uint32 ivec[2];
   struct iovec *frag;
+  struct rx_securityClass *obj;
+  struct rxkad_cprivate *tp;          /* s & c have type at same offset */
+
+  obj = rx_SecurityObjectOf(rx_connection_not_used);
+  tp = (struct rxkad_cprivate *)obj->privateData;
+  LOCK_RXKAD_STATS
+  rxkad_stats.bytesEncrypted[rxkad_TypeIndex(tp->type)] += len;
+  UNLOCK_RXKAD_STATS
 
   {
     /* What is this good for?
@@ -643,6 +657,14 @@ rxkad_DecryptPacket(const struct rx_connection *rx_connection_not_used,
 {
   afs_uint32 ivec[2];
   struct iovec *frag;
+  struct rx_securityClass *obj;
+  struct rxkad_cprivate *tp;          /* s & c have type at same offset */
+
+  obj = rx_SecurityObjectOf(rx_connection_not_used);
+  tp = (struct rxkad_cprivate *)obj->privateData;
+  LOCK_RXKAD_STATS
+  rxkad_stats.bytesDecrypted[rxkad_TypeIndex(tp->type)] += len;
+  UNLOCK_RXKAD_STATS
 
   memcpy(ivec, iv, sizeof(ivec)); /* Must use copy of iv */
   for (frag = &packet->wirevec[1]; len > 0; frag++)

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 021028954a2e2b8072593d390050a81d7b436862..6346c2a6e4661df0b0bbad74af25071106e41584 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -104,8 +104,7 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       fcrypt.o \
-       crypt_conn.o
+       bg-fcrypt.o 
 
 DESOBJS =\
        des.o \
@@ -215,10 +214,7 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-fcrypt.o: ${RXKAD}/fcrypt.c
-       ${CCRULE}
-
-crypt_conn.o: ${RXKAD}/crypt_conn.c
+bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c