Print this page
NEX-7907 uts/common/sys/scsi/scsi_names.h should define IQN as 223 bytes, not utf-8 characters
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
NEX-2756 iscsit should fold the case of scsi names that we get from initiators
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/sys/scsi/scsi_names.h
+++ new/usr/src/uts/common/sys/scsi/scsi_names.h
1 1 /*
2 2 * This file and its contents are supplied under the terms of the
3 3 * Common Development and Distribution License ("CDDL"), version 1.0.
4 4 * You may only use this file in accordance with the terms of version
5 5 * 1.0 of the CDDL.
6 6 *
7 7 * A full copy of the text of the CDDL should have accompanied this
8 8 * source. A copy of the CDDL is also available via the Internet at
9 9 * http://www.illumos.org/license/CDDL.
10 10 */
11 11
12 12 /*
13 13 * Copyright 2016 Nexenta Systems, Inc.
14 14 */
15 15
16 16 #ifndef _SYS_SCSI_SCSI_NAMES_H_
17 17 #define _SYS_SCSI_SCSI_NAMES_H_
18 18
19 19 #ifdef __cplusplus
20 20 extern "C" {
21 21 #endif
22 22
23 23 /* SCSI Name Strings */
24 24 #define SNS_EUI "eui"
25 25 #define SNS_IQN "iqn"
26 26 #define SNS_MAC "mac"
27 27 #define SNS_NAA "naa"
|
↓ open down ↓ |
27 lines elided |
↑ open up ↑ |
28 28 #define SNS_WWN "wwn"
29 29
30 30 /* SCSI Name String maximum length definitions */
31 31 #define SNS_EUI_16 16
32 32 #define SNS_IQN_223 223
33 33 #define SNS_MAC_12 12
34 34 #define SNS_NAA_16 16
35 35 #define SNS_NAA_32 32
36 36 #define SNS_WWN_16 16
37 37
38 -/*
39 - * Maximum number of bytes needed to store SCSI Name Strings in UTF-8 format,
40 - * assuming that (per RFC3629) one UTF-8 character can take up to 4 bytes.
41 - */
42 -#define SNS_EUI_U8_LEN_MAX (SNS_EUI_16 * 4)
43 -#define SNS_IQN_U8_LEN_MAX (SNS_IQN_223 * 4)
44 -#define SNS_NAA_U8_LEN_MAX (SNS_NAA_32 * 4)
38 +#define SNS_EUI_LEN_MAX sizeof (SNS_EUI) + SNS_EUI_16
39 +#define SNS_IQN_LEN_MAX SNS_IQN_223
40 +#define SNS_MAC_LEN_MAX sizeof (SNS_MAC) + SNS_MAC_12
41 +#define SNS_NAA_LEN_MAX sizeof (SNS_NAA) + SNS_NAA_32
42 +#define SNS_WWN_LEN_MAX sizeof (SNS_WWN) + SNS_WWN_16
45 43
44 +#define SNS_LEN_MAX SNS_IQN_LEN_MAX
45 +
46 46 #ifdef __cplusplus
47 47 }
48 48 #endif
49 49
50 50 #endif /* _SYS_SCSI_SCSI_NAMES_H_ */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX