CVS commit: src/sbin/iscsid
Module Name:src
Committed By: mlelstv
Date: Wed Dec 27 18:07:30 UTC 2023
Modified Files:
src/sbin/iscsid: iscsid_driverif.c
Log Message:
Treat port 0 (unset) as ISCSI_DEFAULT_PORT like before.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/iscsid/iscsid_driverif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsid/iscsid_driverif.c
diff -u src/sbin/iscsid/iscsid_driverif.c:1.9 src/sbin/iscsid/iscsid_driverif.c:1.10
--- src/sbin/iscsid/iscsid_driverif.c:1.9 Sat Nov 25 08:06:02 2023
+++ src/sbin/iscsid/iscsid_driverif.c Wed Dec 27 18:07:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_driverif.c,v 1.9 2023/11/25 08:06:02 mlelstv Exp $ */
+/* $NetBSD: iscsid_driverif.c,v 1.10 2023/12/27 18:07:30 mlelstv Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -285,7 +285,8 @@ make_connection(session_t * sess, iscsid
memset(, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- snprintf(portnum, sizeof(portnum), "%u", addr->port);
+ snprintf(portnum, sizeof(portnum), "%u", addr->port
+ ? addr->port : ISCSI_DEFAULT_PORT);
ret = getaddrinfo((char *)addr->address, portnum, , );
switch (ret) {
case 0:
@@ -553,7 +554,8 @@ event_recover_connection(uint32_t sid, u
memset(, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- snprintf(portnum, sizeof(portnum), "%u", addr->port);
+ snprintf(portnum, sizeof(portnum), "%u", addr->port
+ ? addr->port : ISCSI_DEFAULT_PORT);
ret = getaddrinfo((char *)addr->address, portnum, , );
if (ret) {
DEB(1, ("getaddrinfo failed (%s)", gai_strerror(ret)));
CVS commit: src/sbin/iscsid
Module Name:src Committed By: mlelstv Date: Wed Dec 27 18:07:30 UTC 2023 Modified Files: src/sbin/iscsid: iscsid_driverif.c Log Message: Treat port 0 (unset) as ISCSI_DEFAULT_PORT like before. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sbin/iscsid/iscsid_driverif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/iscsid
Module Name:src Committed By: pgoyette Date: Thu Apr 14 18:52:27 UTC 2022 Modified Files: src/sbin/iscsid: iscsid.8 Log Message: iscsid(8) no longer requires scsibus(4) and sd(4) to be built-in to the kernel. The scsi_subr module will be loaded if needed to resolve any dependencies. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsid/iscsid.8 diff -u src/sbin/iscsid/iscsid.8:1.13 src/sbin/iscsid/iscsid.8:1.14 --- src/sbin/iscsid/iscsid.8:1.13 Sun May 29 13:35:45 2016 +++ src/sbin/iscsid/iscsid.8 Thu Apr 14 18:52:27 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: iscsid.8,v 1.13 2016/05/29 13:35:45 mlelstv Exp $ +.\" $NetBSD: iscsid.8,v 1.14 2022/04/14 18:52:27 pgoyette Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 10, 2015 +.Dd April 14, 2022 .Dt ISCSID 8 .Os .Sh NAME @@ -77,13 +77,6 @@ utility, rather than directly over its c An example of setting up the in-kernel iSCSI initiator is shown in .Xr iscsictl 8 . -.Pp -.Nm -requires -.Xr scsibus 4 -and -.Xr sd 4 -compiled in the kernel to load the iscsi kernel module. .Sh SEE ALSO .Xr daemon 3 , .Xr isns 3 ,
CVS commit: src/sbin/iscsid
Module Name:src Committed By: pgoyette Date: Thu Apr 14 18:52:27 UTC 2022 Modified Files: src/sbin/iscsid: iscsid.8 Log Message: iscsid(8) no longer requires scsibus(4) and sd(4) to be built-in to the kernel. The scsi_subr module will be loaded if needed to resolve any dependencies. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
