update for 4.4BSD from Rick Macklem

[unix-history] / usr / src / sys / nfs / xdr_subs.h

diff --git a/usr/src/sys/nfs/xdr_subs.h b/usr/src/sys/nfs/xdr_subs.h
index da6b82a..8bbf14c 100644 (file)
--- a/usr/src/sys/nfs/xdr_subs.h
+++ b/usr/src/sys/nfs/xdr_subs.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)xdr_subs.h  7.3 (Berkeley) %G%
+ *     @(#)xdr_subs.h  7.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,17 +15,72 @@
  * These use the MACHINE DEPENDENT routines ntohl, htonl
  * As defined by "XDR: External Data Representation Standard" RFC1014
  */
  * These use the MACHINE DEPENDENT routines ntohl, htonl
  * As defined by "XDR: External Data Representation Standard" RFC1014
  */

-/* From xdr to machine */
+#if BYTE_ORDER == LITTLE_ENDIAN

 #define fxdr_unsigned(t, v)    ((t)ntohl((long)(v)))
 #define fxdr_unsigned(t, v)    ((t)ntohl((long)(v)))

-#define        fxdr_time(f, t)         {((struct timeval *)(t))->tv_sec=ntohl( \
-                               ((struct timeval *)(f))->tv_sec); \
-                               ((struct timeval *)(t))->tv_usec=ntohl( \
-                               ((struct timeval *)(f))->tv_usec);}
+#define        fxdr_nfstime(f, t) { \
+       (t)->ts_sec = \
+               ntohl(((struct nfsv2_time *)(f))->nfs_sec); \
+       (t)->ts_nsec = 1000 * \
+               ntohl(((struct nfsv2_time *)(f))->nfs_usec); \
+}
+
+#define        fxdr_nqtime(f, t) { \
+       (t)->ts_sec = \
+               ntohl(((struct nqnfs_time *)(f))->nq_sec); \
+       (t)->ts_nsec = \
+               ntohl(((struct nqnfs_time *)(f))->nq_nsec); \
+}
+
+/*
+ * To handle quad conversions, define a struct of two longs and use
+ * ntohl and htonl. Maybe someday there should be ntohq and htonq?
+ */
+union _hq {
+       quad_t  hq;
+       struct {
+               long val[2];
+       } lq;
+};
+#define        fxdr_hyper(f, t) { \
+       ((union _hq *)(t))->lq.val[1] = ntohl(((union _hq *)(f))->lq.val[0]); \
+       ((union _hq *)(t))->lq.val[0] = ntohl(((union _hq *)(f))->lq.val[1]); \
+}
+#define        txdr_hyper(f, t) { \
+       ((union _hq *)(t))->lq.val[0] = htonl(((union _hq *)(f))->lq.val[1]); \
+       ((union _hq *)(t))->lq.val[1] = htonl(((union _hq *)(f))->lq.val[0]); \
+}

 
 

-/* from machine to xdr */

 #define        txdr_unsigned(v)        (htonl((long)(v)))
 #define        txdr_unsigned(v)        (htonl((long)(v)))

-#define        txdr_time(f, t)         {((struct timeval *)(t))->tv_sec=htonl( \
-                               ((struct timeval *)(f))->tv_sec); \
-                               ((struct timeval *)(t))->tv_usec=htonl( \
-                               ((struct timeval *)(f))->tv_usec);}
+#define        txdr_nqtime(f, t) { \
+       ((struct nqnfs_time *)(t))->nq_sec = \
+               htonl((f)->ts_sec); \
+       ((struct nqnfs_time *)(t))->nq_nsec = \
+               htonl((f)->ts_nsec); \
+}
+#define        txdr_nfstime(f, t) { \
+       ((struct nfsv2_time *)(t))->nfs_sec = \
+               htonl((f)->ts_sec); \
+       ((struct nfsv2_time *)(t))->nfs_usec = \
+               htonl((f)->ts_nsec) / 1000; \
+}
+#else  /* BIG_ENDIAN */
+#define fxdr_unsigned(t, v)    ((t)(v))
+#define        fxdr_nqtime(f, t) \
+       *(t) = *((struct timespec *)(f))
+#define        fxdr_nfstime(f, t) { \
+       (t)->ts_sec = ((struct nfsv2_time *)(f))->nfs_sec; \
+       (t)->ts_nsec = ((struct nfsv2_time *)(f))->nfs_usec * 1000; \
+}
+#define        fxdr_hyper(f, t) \
+       *((quad_t *)(t)) = *((quad_t *)(f))

 
 

+#define        txdr_unsigned(v)        ((long)(v))
+#define        txdr_nqtime(f, t) \
+       *(t) = *((struct nqnfs_time *)(f))
+#define        txdr_nfstime(f, t) { \
+       ((struct nfsv2_time *)(t))->nfs_sec = (f)->ts_sec; \
+       ((struct nfsv2_time *)(t))->nfs_usec = (f)->ts_nsec / 1000; \
+}
+#define        txdr_hyper(f, t) \
+       *((quad_t *)(t)) = *((quad_t *)(f))
+#endif /* ENDIAN */