From 000c665881f8941d62d236550727f886298e54e2 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 14 Feb 2010 00:45:19 +0000
Subject: [PATCH] Unix CM: Add xdrmem and xdrlen to kernel builds

Add the new xdrmem and xdrlen XDR sources to kernel space. Make some
changes to the xdrmem header file to permit it to build in kernel space.

Change-Id: I2ab32f67287df28d4ffded651d3d49d1211dd40e
Reviewed-on: http://gerrit.openafs.org/1328
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/libafs/Makefile.common.in  |  8 ++++++++
 src/libuafs/Makefile.common.in | 30 ++++++++++++++++++++++++------
 src/rx/xdr_len.c               |  7 ++++++-
 src/rx/xdr_mem.c               | 16 ++++++++--------
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index a9f44e346..907fb81d6 100644
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -151,6 +151,8 @@ AFSAOBJS = \
 	rx_packet.o	\
 	rx_multi.o	\
 	xdr_rx.o	\
+	xdr_mem.o	\
+	xdr_len.o	\
 	Kvldbint.cs.o	\
 	Kvldbint.xdr.o	\
 	Kcallback.ss.o	\
@@ -217,6 +219,8 @@ AFSPAGOBJS = \
 	rx_packet.o	\
 	rx_multi.o	\
 	xdr_rx.o	\
+	xdr_mem.o	\
+	xdr_len.o	\
 	Kpagcb.ss.o	\
 	Kpagcb.xdr.o	\
 	Krxstat.ss.o	\
@@ -332,6 +336,10 @@ afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
 	$(CRULE_OPT)
 xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
 	$(CRULE_OPT)
+xdr_mem.o: $(TOP_SRCDIR)/rx/xdr_mem.c
+	$(CRULE_OPT)
+xdr_len.o: $(TOP_SRCDIR)/rx/xdr_len.c
+	$(CRULE_OPT)
 
 # these files are not to be optimized - subject to change.
 afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index 8f33816a4..b86bce4b5 100644
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -208,7 +208,9 @@ UAFSOBJ = \
 	$(UOBJ)/Krxstat.xdr.o \
 	$(UOBJ)/rxstat.o \
 	$(UOBJ)/xdr_int32.o \
-	$(UOBJ)/xdr_int64.o
+	$(UOBJ)/xdr_int64.o \
+	$(UOBJ)/xdr_mem.o \
+	$(UOBJ)/xdr_len.o
 
 AFSWEBOBJ = \
 	$(WEBOBJ)/afs_atomlist.o \
@@ -338,8 +340,9 @@ AFSWEBOBJ = \
 	$(WEBOBJ)/nsafs.o \
 	$(WEBOBJ)/Krxstat.ss.o \
 	$(WEBOBJ)/Krxstat.xdr.o \
-	$(WEBOBJ)/rxstat.o
-
+	$(WEBOBJ)/rxstat.o \
+	$(WEBOBJ)/xdr_mem.o \
+	$(WEBOBJ)/xdr_len.o
 
 AFSWEBOBJKRB = \
 	$(WEBOBJ)/afs_atomlist.o \
@@ -464,7 +467,9 @@ AFSWEBOBJKRB = \
 	$(WEBOBJ)/nsafs.o \
 	$(WEBOBJ)/Krxstat.ss.o \
 	$(WEBOBJ)/Krxstat.xdr.o \
-	$(WEBOBJ)/rxstat.o
+	$(WEBOBJ)/rxstat.o \
+	$(WEBOBJ)/xdr_mem.o \
+	$(WEBOBJ)/xdr_len.o
 
 JUAFSOBJ = \
 	$(JUAFS)/afs_atomlist.o \
@@ -592,7 +597,9 @@ JUAFSOBJ = \
 	$(JUAFS)/Krxstat.ss.o \
 	$(JUAFS)/Krxstat.xdr.o \
 	$(JUAFS)/rxstat.o \
-	$(JUAFS)/xdr_int64.o
+	$(JUAFS)/xdr_int64.o \
+	$(JUAFS)/xdr_mem.o \
+	$(JUAFS)/xdr_len.o
 
 # Compilation rules
 
@@ -862,6 +869,10 @@ $(UOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
 	$(CRULE1)
 $(UOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
 	$(CRULE1)
+$(UOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+	$(CRULE1)
+$(UOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+	$(CRULE1)
 
 # These files are for the netscape plugin
 
@@ -1132,6 +1143,10 @@ $(WEBOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
 	$(CRULE2)
 $(WEBOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
 	$(CRULE2)
+$(WEBOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+	$(CRULE2)
+$(WEBOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+	$(CRULE2)
 
 # These are for libjuafs.a 
 # Used for linking with libafsauthent and libafsrpc
@@ -1396,7 +1411,10 @@ $(JUAFS)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
 	$(CRULE1)
 $(JUAFS)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
 	$(CRULE1)
-
+$(JUAFS)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+	$(CRULE1)
+$(JUAFS)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+	$(CRULE1)
 
 clean:
 	-$(RM) -rf UAFS* JUAFS* AFSWEB* nsapi des afs afsint config rx
diff --git a/src/rx/xdr_len.c b/src/rx/xdr_len.c
index f226f5433..b92150a6b 100644
--- a/src/rx/xdr_len.c
+++ b/src/rx/xdr_len.c
@@ -25,7 +25,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <stdlib.h>
+#ifdef KERNEL
+# include "afs/sysincludes.h"
+#else
+# include <stdlib.h>
+#endif
+
 #include "xdr.h"
 
 static void
diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c
index 483de0c5a..27995da4c 100644
--- a/src/rx/xdr_mem.c
+++ b/src/rx/xdr_mem.c
@@ -29,9 +29,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#ifndef	NeXT
-
 /*
  * xdr_mem.h, XDR implementation using memory buffers.
  *
@@ -43,10 +40,14 @@
  *
  */
 
-#include <string.h>
-#include <limits.h>
-#ifndef AFS_NT40_ENV
-# include <netinet/in.h>
+#ifdef KERNEL
+# include "afs/sysincludes.h"
+#else
+# include <string.h>
+# include <limits.h>
+# ifndef AFS_NT40_ENV
+#  include <netinet/in.h>
+# endif
 #endif
 
 #include "xdr.h"
@@ -194,4 +195,3 @@ xdrmem_inline(AFS_XDRS_T axdrs, u_int len)
     }
     return (buf);
 }
-#endif /* NeXT */
-- 
2.39.5