diff options
| author | mnc <mnc@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2007-05-05 08:01:45 +0000 |
|---|---|---|
| committer | mnc <mnc@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2007-05-05 08:01:45 +0000 |
| commit | 7e8dbe16077ee659b72a19f6338552d09cbef51c (patch) | |
| tree | 777a73e48faf3ee2817aeced49c61372e79be0c0 /usr | |
| parent | 8db7004f65d0d2ac409b13176516e7cde4acdd1c (diff) | |
| download | open-iscsi-7e8dbe16077ee659b72a19f6338552d09cbef51c.tar.gz | |
rm TCP_WINDOW_SIZE and print unknown for some values we could not get
git-svn-id: svn://svn.berlios.de/open-iscsi@832 d7303112-9cec-0310-bdd2-e83a94d6c2b6
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/config.h | 3 | ||||
| -rw-r--r-- | usr/iscsi_settings.h | 3 | ||||
| -rw-r--r-- | usr/iscsiadm.c | 5 | ||||
| -rw-r--r-- | usr/util.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/usr/config.h b/usr/config.h index 418e158..d231a1b 100644 --- a/usr/config.h +++ b/usr/config.h @@ -31,9 +31,6 @@ #define DRIVER_ISID_1 0x02 #define DRIVER_ISID_2 0x3D -/* default window size */ -#define TCP_WINDOW_SIZE (256 * 1024) - /* number of possible connections per session */ #define ISCSI_CONN_MAX 1 /* number of possible interfaces to manually enter */ diff --git a/usr/iscsi_settings.h b/usr/iscsi_settings.h index 5cf480b..4ff4a6d 100644 --- a/usr/iscsi_settings.h +++ b/usr/iscsi_settings.h @@ -19,6 +19,9 @@ #define PORTAL_GROUP_TAG_UNKNOWN -1 +/* default window size */ +#define TCP_WINDOW_SIZE (512 * 1024) + /* default iSCSI port number */ #define ISCSI_DEFAULT_PORT 3260 diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c index ef68e90..9d786ee 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -718,8 +718,11 @@ static int print_iscsi_state(int sid) req.command = MGMT_IPC_SESSION_INFO; req.u.session.sid = sid; - if (do_iscsid(&req, &rsp)) + if (do_iscsid(&req, &rsp)) { + printf("\t\tiSCSI Connection State: Unknown\n"); + printf("\t\tInternal iscsid Session State: Unknown\n"); return ENODEV; + } /* * for drivers like qla4xxx, iscsid does not display @@ -198,7 +198,7 @@ void idbm_node_setup_defaults(node_rec_t *rec) for (i=0; i<ISCSI_CONN_MAX; i++) { rec->conn[i].startup = 0; rec->conn[i].port = DEF_ISCSI_PORT; - rec->conn[i].tcp.window_size = 512 * 1024; + rec->conn[i].tcp.window_size = TCP_WINDOW_SIZE; rec->conn[i].tcp.type_of_service = 0; rec->conn[i].timeo.login_timeout= DEF_LOGIN_TIMEO; rec->conn[i].timeo.logout_timeout= DEF_LOGOUT_TIMEO; |