add xdr_alloc

applications can allocate memory that must be deallocated by
the XDR package.  Add xdr_alloc to permit that.

Export from libafsrpc.

LICENSE BSD

Reviewed-on: http://gerrit.openafs.org/269
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index 9da08b8..a488c86 100644 (file)
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -1149,7 +1149,7 @@ GetCellCommon(afs_int32 a_cellnum, char **a_name, serverList *a_hosts)
           sn++, serverRefp = serverRefp->next);
 
     a_hosts->serverList_len = sn;
-    a_hosts->serverList_val = (afs_int32 *)osi_Alloc(sn * sizeof(afs_int32));
+    a_hosts->serverList_val = (afs_int32 *)xdr_alloc(sn * sizeof(afs_int32));
 
     for ( sn = 0, serverRefp = cellp->vlServersp; 
           sn < AFSMAXCELLHOSTS && serverRefp;
@@ -1246,7 +1246,7 @@ SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
     lock_ReleaseRead(&cm_syscfgLock);
 
     dataBytes = 1 * sizeof(afs_uint32);
-    dataBuffP = (afs_uint32 *) osi_Alloc(dataBytes);
+    dataBuffP = (afs_uint32 *) xdr_alloc(dataBytes);
     dataBuffP[0] = CLIENT_CAPABILITY_ERRORTRANS;
     capabilities->Capabilities_len = dataBytes / sizeof(afs_uint32);
     capabilities->Capabilities_val = dataBuffP;

diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def
index 0fe1c64..d721b3a 100755 (executable)
--- a/src/libafsrpc/afsrpc.def
+++ b/src/libafsrpc/afsrpc.def
@@ -248,6 +248,7 @@ EXPORTS
         RXAFS_FsCmd                             @253
         rxi_CallError                           @254
         rx_GetLocalPeers                       @255
+        xdr_alloc                               @256
 
 ; for performance testing
         rx_TSFPQGlobSize                        @2001 DATA

diff --git a/src/libafsrpc/afsrpc.exp b/src/libafsrpc/afsrpc.exp
index 0b19b05..0355bc9 100755 (executable)
--- a/src/libafsrpc/afsrpc.exp
+++ b/src/libafsrpc/afsrpc.exp
@@ -167,3 +167,5 @@ RXAFS_DFSSymlink
 RXAFSCB_function_names
 RXAFS_FsCmd
 rx_GetLocalPeers
+xdr_free
+xdr_alloc

diff --git a/src/rx/xdr.c b/src/rx/xdr.c
index f11114b..de005d4 100644 (file)
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -582,7 +582,13 @@ xdr_wrapstring(XDR * xdrs, char **cpp)
 }
 #endif
 
-void 
+void *
+xdr_alloc(afs_int32 size)
+{
+    return osi_alloc(size);
+}
+
+void
 xdr_free(void *x, afs_int32 size)
 {
     osi_free(x, size);

diff --git a/src/rx/xdr_prototypes.h b/src/rx/xdr_prototypes.h
index a24f928..769fe22 100644 (file)
--- a/src/rx/xdr_prototypes.h
+++ b/src/rx/xdr_prototypes.h
@@ -58,6 +58,7 @@ extern bool_t xdr_union(XDR * xdrs, enum_t * dscmp, caddr_t unp,
                        struct xdr_discrim *choices, xdrproc_t dfault);
 extern bool_t xdr_string(XDR * xdrs, char **cpp, u_int maxsize);
 extern bool_t xdr_wrapstring(XDR * xdrs, char **cpp);
+extern void * xdr_alloc(afs_int32 size);
 extern void   xdr_free(void *x, afs_int32 size);