From 47a86bca2d2241a5126350e70d117564890a3f01 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Thu, 26 Jul 2007 02:13:38 +0100
Subject: Prepare for iBFT merge when possible.  iscsiboot.c contains a really,
 really ugly hack at present, but that doesn't hugely matter since I'm aiming
 to change the interface to iSCSI devices anyway within the next week.

---
 src/include/gpxe/errfile.h | 1 +
 src/include/gpxe/iscsi.h   | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'src/include')

diff --git a/src/include/gpxe/errfile.h b/src/include/gpxe/errfile.h
index 0615818f1..744ae5b26 100644
--- a/src/include/gpxe/errfile.h
+++ b/src/include/gpxe/errfile.h
@@ -115,6 +115,7 @@
 #define ERRFILE_cipher		      ( ERRFILE_OTHER | 0x00090000 )
 #define ERRFILE_image_cmd	      ( ERRFILE_OTHER | 0x000a0000 )
 #define ERRFILE_uri_test	      ( ERRFILE_OTHER | 0x000b0000 )
+#define ERRFILE_ibft		      ( ERRFILE_OTHER | 0x000c0000 )
 
 /** @} */
 
diff --git a/src/include/gpxe/iscsi.h b/src/include/gpxe/iscsi.h
index d9dd43079..e4df68494 100644
--- a/src/include/gpxe/iscsi.h
+++ b/src/include/gpxe/iscsi.h
@@ -8,6 +8,7 @@
  */
 
 #include <stdint.h>
+#include <gpxe/socket.h>
 #include <gpxe/scsi.h>
 #include <gpxe/chap.h>
 #include <gpxe/refcnt.h>
@@ -501,6 +502,8 @@ struct iscsi_session {
 	char *target_iqn;
 	/** Logical Unit Number (LUN) */
 	uint64_t lun;
+	/** Target socket address (recorded only for iBFT) */
+	struct sockaddr target_sockaddr;
 
 	/** Session status
 	 *
@@ -514,6 +517,11 @@ struct iscsi_session {
 	 * Reset upon a successful connection.
 	 */
 	int retry_count;
+
+	/** Username (if any) */
+	char *username;
+	/** Password (if any) */
+	char *password;
 	/** CHAP challenge/response */
 	struct chap_challenge chap;
 
@@ -641,5 +649,6 @@ struct iscsi_session {
 
 extern int iscsi_attach ( struct scsi_device *scsi, const char *root_path );
 extern void iscsi_detach ( struct scsi_device *scsi );
+extern const char * iscsi_initiator_iqn ( void );
 
 #endif /* _GPXE_ISCSI_H */
-- 
cgit v1.2.3-55-g7522