 @@ -1,14 +1,14 @@
-/* $NetBSD: storage.h,v 1.5 2007/12/09 09:16:42 agc Exp $ */
+/* $NetBSD: storage.h,v 1.6 2009/06/23 05:11:46 agc Exp $ */
 /*
  * Copyright � 2006 Alistair Crooks.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
 @@ -22,46 +22,68 @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef STORAGE_H_
 #define STORAGE_H_
 #include "defs.h"
 /* Length of a node address (an IEEE 802 address). */
 #define NB_UUID_NODE_LEN		6
 /*
  * See also:
  *      http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
  *      http://www.opengroup.org/onlinepubs/009629399/apdxa.htm
+ *
  * A DCE 1.1 compatible source representation of UUIDs.
  */
 typedef struct nbuuid_t {
         uint32_t        time_low;
         uint16_t        time_mid;
         uint16_t        time_hi_and_version;
         uint8_t         clock_seq_hi_and_reserved;
         uint8_t         clock_seq_low;
         uint8_t         node[NB_UUID_NODE_LEN];
 } nbuuid_t;
 void    nbuuid_create(nbuuid_t *, uint32_t *);
 void    nbuuid_to_string(nbuuid_t *, char **, uint32_t *);
 enum {
 	DE_EXTENT,
 	DE_DEVICE
 };
 /* a device can be made up of an extent or another device */
 typedef struct disc_de_t {
 	int32_t		type;		/* device or extent */
 	uint64_t	size;		/* size of underlying extent or device */
 	union {
 		struct disc_extent_t	*xp;	/* pointer to extent */
 		struct disc_device_t	*dp;	/* pointer to device */
 	} u;
 } disc_de_t;
 /* this struct describes an extent of storage */
 typedef struct disc_extent_t {
 	char		*extent;	/* extent name */
 	char		*dev;		/* device associated with it */
-	uint64_t	sacred;		/* offset of extent from start of device */
+	uint64_t	sacred;		/* offset of extent from start of dev */
 	uint64_t	len;		/* size of extent */
 	int		fd;		/* in-core file descriptor */
 	int		used;		/* extent has been used in a device */
 } disc_extent_t;
 DEFINE_ARRAY(extv_t, disc_extent_t);
 /* this struct describes a device */
 typedef struct disc_device_t {
 	char		*dev;		/* device name */
 	int		raid;		/* RAID level */
 	uint64_t	off;		/* current offset in device */
 	uint64_t	len;		/* size of device */

 @@ -1,14 +1,14 @@
-/* $NetBSD: disk.c,v 1.39 2009/01/25 14:25:27 lukem Exp $ */
+/* $NetBSD: disk.c,v 1.40 2009/06/23 05:11:47 agc Exp $ */
 /*
  * Copyright � 2006 Alistair Crooks.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
 @@ -98,30 +98,26 @@
 #include <fcntl.h>
 #endif
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 #include <unistd.h>
 #ifdef HAVE_UUID_H
 #include <uuid.h>
 #endif
 #include "scsi_cmd_codes.h"
 #include "iscsi.h"
 #include "compat.h"
 #include "iscsiutil.h"
 #include "device.h"
 #include "target.h"
 #include "defs.h"
 #include "storage.h"
 #define CONFIG_DISK_NUM_LUNS_DFLT           1
 #define CONFIG_DISK_BLOCK_LEN_DFLT          512
 #define CONFIG_DISK_NUM_BLOCKS_DFLT         204800
 @@ -141,27 +137,27 @@ enum {
 };
 #define MB(x)	((x) * 1024 * 1024)
 /* this struct describes an iscsi LUN */
 typedef struct iscsi_disk_t {
 	int		 type;				/* type of disk - fs/mmap and fs */
 	char		 filename[MAXPATHLEN];		/* filename for the disk itself */
 	uint8_t		*buffer;			/* buffer for disk read/write ops */
 	uint64_t	 blockc;			/* # of blocks */
 	uint64_t	 blocklen;			/* block size */
 	uint64_t	 luns;				/* # of luns */
 	uint64_t	 size;				/* size of complete disk */
-	uuid_t		 uuid;				/* disk's uuid */
+	nbuuid_t	 uuid;				/* disk's uuid */
 	char		*uuid_string;			/* uuid string */
 	targv_t		*tv;				/* the component devices and extents */
 	uint32_t	 resc;				/* # of reservation keys */
 	uint64_t	 reskeys[MAX_RESERVATIONS];	/* the reservation keys */
 } iscsi_disk_t;
 DEFINE_ARRAY(disks_t, iscsi_disk_t);
 static disks_t		disks;
 static iscsi_disk_t	defaults;
 #ifndef FDATASYNC
 /*
 @@ -966,28 +962,28 @@ device_command(target_session_t * sess,
 				cp[1] = (INQUIRY_DEVICE_PIV << 7) | (INQUIRY_DEVICE_ASSOCIATION_TARGET_PORT << 4) | INQUIRY_DEVICE_IDENTIFIER_SCSI_NAME;
 				len = (uint8_t) snprintf((char *)&cp[4],
 							(unsigned)(*totsize - (int)(cp - &data[4])),
 							"%s,t,%#x",
 							sess->globals->targetname,
 							lun);
 				cp[3] = len;
 				*totlen += len + 4;
 				cp += len + 4;
 				/* add target port's IQN + LUN extension */
 				cp[0] = (INQUIRY_DEVICE_ISCSI_PROTOCOL << 4) | INQUIRY_DEVICE_CODESET_UTF8;
 				cp[1] = (INQUIRY_DEVICE_PIV << 7) | (INQUIRY_DEVICE_ASSOCIATION_LOGICAL_UNIT << 4) | INQUIRY_DEVICE_IDENTIFIER_SCSI_NAME;
 				if (disks.v[sess->d].uuid_string == NULL) {
-					uuid_create(&disks.v[sess->d].uuid, &status);
+					nbuuid_create(&disks.v[sess->d].uuid, &status);
-					uuid_to_string(&disks.v[sess->d].uuid, &disks.v[sess->d].uuid_string, &status);
+					nbuuid_to_string(&disks.v[sess->d].uuid, &disks.v[sess->d].uuid_string, &status);
+				}
 				len = (uint8_t) snprintf((char *)&cp[4],
 							(unsigned)(*totsize - (int)(cp - &data[4])),
 							"%s,L,0x%8.8s%4.4s%4.4s",
 							sess->globals->targetname,
 							disks.v[sess->d].uuid_string,
 							&disks.v[sess->d].uuid_string[9],
 							&disks.v[sess->d].uuid_string[14]);
 				cp[3] = len;
 				*totlen += len + 4;
 				cp += len + 4;
 				/* add target's uuid as a T10 identifier */
 				cp[0] = (INQUIRY_DEVICE_ISCSI_PROTOCOL << 4) | INQUIRY_DEVICE_CODESET_UTF8;

 @@ -1,14 +1,14 @@
-/* $NetBSD: uuid.c,v 1.3 2007/06/16 23:13:26 agc Exp $ */
+/* $NetBSD: uuid.c,v 1.4 2009/06/23 05:11:47 agc Exp $ */
 /*
  * Copyright � 2006 Alistair Crooks.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
 @@ -38,63 +38,56 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_UUID_H
+#include "storage.h"
 #include <uuid.h>
 #endif
 #include "compat.h"
 #include "defs.h"
 #ifndef HAVE_UUID_CREATE
 /* just fill the struct with random values for now */
 void
-uuid_create(uuid_t *uuid, uint32_t *status)
+nbuuid_create(nbuuid_t *uuid, uint32_t *status)
+{
 	uint64_t	ether;
 	time_t		t;
 	(void) time(&t);
-	ether = (random() << 32) | random();
+	ether = ((uint64_t)random() << 32) | random();
 	uuid->time_low = t;
 	uuid->time_mid = (uint16_t)(random() & 0xffff);
 	uuid->time_hi_and_version = (uint16_t)(random() & 0xffff);
 	uuid->clock_seq_low = random() & 0xff;
 	uuid->clock_seq_hi_and_reserved = random() & 0xff;
 	(void) memcpy(&uuid->node, &ether, sizeof(uuid->node));
 	*status = 0;
+}
 #endif
 #ifndef HAVE_UUID_TO_STRING
 /* convert the struct to a printable string */
 void
-uuid_to_string(uuid_t *uuid, char **str, uint32_t *status)
+nbuuid_to_string(nbuuid_t *uuid, char **str, uint32_t *status)
+{
 	char	s[64];
 	(void) snprintf(s, sizeof(s), "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
 		uuid->time_low,
 		uuid->time_mid,
 		uuid->time_hi_and_version,
 		uuid->clock_seq_hi_and_reserved,
 		uuid->clock_seq_low,
 		uuid->node[0],
 		uuid->node[1],
 		uuid->node[2],
 		uuid->node[3],
 		uuid->node[4],
 		uuid->node[5]);
 	*str = strdup(s);
 	*status = 0;
+}
 #endif

 @@ -64,38 +64,14 @@ size_t strlcpy(char *, const char *, siz
 #ifndef _DIAGASSERT
 #  ifndef __static_cast
 #  define __static_cast(x,y) (x)y
 #  endif
 #define _DIAGASSERT(e) (__static_cast(void,0))
 #endif
 /* Added for busybox, which doesn't define INFTIM */
 #ifndef INFTIM
 #define INFTIM	-1
 #endif
 #ifndef HAVE_UUID_H
 /* Length of a node address (an IEEE 802 address). */
 #define _UUID_NODE_LEN		6
 /*
  * See also:
  *      http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
  *      http://www.opengroup.org/onlinepubs/009629399/apdxa.htm
  * A DCE 1.1 compatible source representation of UUIDs.
  */
 typedef struct uuid_t {
         uint32_t        time_low;
         uint16_t        time_mid;
         uint16_t        time_hi_and_version;
         uint8_t         clock_seq_hi_and_reserved;
         uint8_t         clock_seq_low;
         uint8_t         node[_UUID_NODE_LEN];
 } uuid_t;
 void    uuid_create(uuid_t *, uint32_t *);
 void    uuid_to_string(uuid_t *, char **, uint32_t *);
 #endif
 #endif /* COMPAT_H_ */