xnu-2050.48.11.tar.gz

[apple/xnu.git] / bsd / nfs / nfsdiskless.h

diff --git a/bsd/nfs/nfsdiskless.h b/bsd/nfs/nfsdiskless.h
index 3fa123d7fbb054e9890afa247e4d85f30b1cd58e..69f03e73a12f1ef118264a2a582a3a2d9d70e9c1 100644 (file)
--- a/bsd/nfs/nfsdiskless.h
+++ b/bsd/nfs/nfsdiskless.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -66,78 +72,18 @@
 #include <sys/appleapiopts.h>
 
 #ifdef __APPLE_API_PRIVATE
 #include <sys/appleapiopts.h>
 
 #ifdef __APPLE_API_PRIVATE

-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel. Whether or not the swap area is nfs mounted is
- * determined by the value in swdevt[0]. (equal to NODEV --> swap over nfs)
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-       struct ifaliasreq myif;                 /* Default interface */
-       struct sockaddr_in mygateway;           /* Default gateway */
-       struct nfs_args swap_args;              /* Mount args for swap file */
-       int             swap_fhsize;            /* Size of file handle */
-       u_char          swap_fh[NFSX_V3FHMAX];  /* Swap file's file handle */
-       struct sockaddr_in swap_saddr;          /* Address of swap server */
-       char            swap_hostnam[MNAMELEN]; /* Host name for mount pt */
-       int             swap_nblks;             /* Size of server swap file */
-       struct ucred    swap_ucred;             /* Swap credentials */
-       struct nfs_args root_args;              /* Mount args for root fs */
-       int             root_fhsize;            /* Size of root file handle */
-       u_char          root_fh[NFSX_V3FHMAX];  /* File handle of root dir */
-       struct sockaddr_in root_saddr;          /* Address of root server */
-       char            root_hostnam[MNAMELEN]; /* Host name for mount pt */
-       long            root_time;              /* Timestamp of root fs */
-       char            my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};

 
 struct nfs_dlmount {
        struct sockaddr_in ndm_saddr;           /* Address of file server */
 
 struct nfs_dlmount {
        struct sockaddr_in ndm_saddr;           /* Address of file server */

-       char            ndm_host[MNAMELEN];     /* Host name for mount pt */
+       char            ndm_host[MAXHOSTNAMELEN];/* Host name for mount pt */

        char            *ndm_path;              /* path name for mount pt */
        char            *ndm_path;              /* path name for mount pt */

-       u_long          ndm_nfsv3;              /* NFSv3 or NFSv2? */
-       u_long          ndm_fhlen;              /* length of file handle */
+       char            *ndm_mntfrom;           /* mntfromname for mount pt */
+       u_int32_t               ndm_nfsv3;              /* NFSv3 or NFSv2? */
+       u_int32_t               ndm_sotype;             /* SOCK_STREAM or SOCK_DGRAM? */
+       u_int32_t               ndm_fhlen;              /* length of file handle */

        u_char          ndm_fh[NFSX_V3FHMAX];   /* The file's file handle */
 };
 
        u_char          ndm_fh[NFSX_V3FHMAX];   /* The file's file handle */
 };
 

-/*
- * Old arguments to mount NFS
- */
-struct onfs_args {
-       struct sockaddr *addr;          /* file server address */
-       int             addrlen;        /* length of address */
-       int             sotype;         /* Socket type */
-       int             proto;          /* and Protocol */
-       u_char          *fh;            /* File handle to be mounted */
-       int             fhsize;         /* Size, in bytes, of fh */
-       int             flags;          /* flags */
-       int             wsize;          /* write size in bytes */
-       int             rsize;          /* read size in bytes */
-       int             readdirsize;    /* readdir size in bytes */
-       int             timeo;          /* initial timeout in .1 secs */
-       int             retrans;        /* times to retry send */
-       int             maxgrouplist;   /* Max. size of group list */
-       int             readahead;      /* # of blocks to readahead */
-       int             leaseterm;      /* Term (sec) of lease */
-       int             deadthresh;     /* Retrans threshold */
-       char            *hostname;      /* server's name */
-};
-

 struct nfs_diskless {
        struct nfs_dlmount nd_root;     /* Mount info for root */
        struct nfs_dlmount nd_private;  /* Mount info for private */
 struct nfs_diskless {
        struct nfs_dlmount nd_root;     /* Mount info for root */
        struct nfs_dlmount nd_private;  /* Mount info for private */