Browse Source

Expert advice tells me that we *do* have to explicitly state the

options even when we want to use the defaults.
tags/v0.9.3
Michael Brown 18 years ago
parent
commit
b9cbae58fa
1 changed files with 16 additions and 11 deletions
  1. 16
    11
      src/net/tcp/iscsi.c

+ 16
- 11
src/net/tcp/iscsi.c View File

@@ -259,17 +259,17 @@ static void iscsi_tx_data_out ( struct iscsi_session *iscsi ) {
259 259
  *     HeaderDigest=None
260 260
  *     DataDigest=None
261 261
  *     MaxConnections is irrelevant; we make only one connection anyway
262
- *     InitialR2T=Yes (default) [1]
262
+ *     InitialR2T=Yes [1]
263 263
  *     ImmediateData is irrelevant; we never send immediate data
264
- *     MaxRecvDataSegmentLength=8192 (default)
265
- *     MaxBurstLength=262144 (default)
266
- *     FirstBurstLength=262144 (default)
264
+ *     MaxRecvDataSegmentLength=8192 (default; we don't care)
265
+ *     MaxBurstLength=262144 (default; we don't care)
266
+ *     FirstBurstLength=262144 (default; we don't care)
267 267
  *     DefaultTime2Wait=0 [2]
268 268
  *     DefaultTime2Retain=0 [2]
269
- *     MaxOutstandingR2T=1 (default)
270
- *     DataPDUInOrder=Yes (default)
271
- *     DataSequenceInOrder=Yes (default)
272
- *     ErrorRecoveryLevel=0 (default)
269
+ *     MaxOutstandingR2T=1
270
+ *     DataPDUInOrder=Yes
271
+ *     DataSequenceInOrder=Yes
272
+ *     ErrorRecoveryLevel=0
273 273
  *
274 274
  * [1] InitialR2T has an OR resolution function, so the target may
275 275
  * force us to use it.  We therefore simplify our logic by always
@@ -285,12 +285,17 @@ static int iscsi_build_login_request_strings ( struct iscsi_session *iscsi,
285 285
 			  "InitiatorName=%s%c"
286 286
 			  "TargetName=%s%c"
287 287
 			  "SessionType=Normal%c"
288
-			  "DataDigest=None%c"
289 288
 			  "HeaderDigest=None%c"
289
+			  "DataDigest=None%c"
290
+			  "InitialR2T=Yes%c"
290 291
 			  "DefaultTime2Wait=0%c"
291
-			  "DefaultTime2Retain=0%c",
292
+			  "DefaultTime2Retain=0%c"
293
+			  "MaxOutstandingR2T=1%c"
294
+			  "DataPDUInOrder=Yes%c"
295
+			  "DataSequenceInOrder=Yes%c"
296
+			  "ErrorRecoveryLevel=0%c",
292 297
 			  iscsi->initiator, 0, iscsi->target, 0,
293
-			  0, 0, 0, 0, 0 );
298
+			  0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
294 299
 }
295 300
 
296 301
 /**

Loading…
Cancel
Save