Changeset 37688 in vbox

Timestamp:

Jun 29, 2011 3:26:05 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72548

Message:

Storage/iSCSI: log opening and closing of connections, with local port number to ease problem investigation

File:

• trunk/src/VBox/Storage/ISCSI.cpp (modified) (6 diffs)

trunk/src/VBox/Storage/ISCSI.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -585 +585 @@
     /** Pointer to the target hostname. */
     char                *pszHostname;
-    /** Pointer to the target hostname. */
+    /** Port to use on the target host. */
     uint32_t            uPort;
     /** Socket handle of the TCP connection. */
@@ -911 +911 @@
             return VERR_NO_MEMORY;
     }
+    LogRel(("iSCSI: connect from initiator %s with source port %u\n", pImage->pszInitiatorName, pImage->ISID & 65535));
     return VINF_SUCCESS;
+}
+
+
+static int iscsiTransportClose(PISCSIIMAGE pImage)
+{
+    int rc;
+
+    LogFlowFunc(("(%s:%d)\n", pImage->pszHostname, pImage->uPort));
+    if (iscsiIsClientConnected(pImage))
+    {
+        LogRel(("iSCSI: disconnect from initiator %s with source port %u\n", pImage->pszInitiatorName, pImage->ISID & 65535));
+        rc = pImage->pInterfaceNetCallbacks->pfnClientClose(pImage->Socket);
+    }
+    else
+        rc = VINF_SUCCESS;
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
 }
 
@@ -958 +976 @@
             {
                 /* The other end has closed the connection. */
-                pImage->pInterfaceNetCallbacks->pfnClientClose(pImage->Socket);
+                iscsiTransportClose(pImage);
                 pImage->state = ISCSISTATE_FREE;
                 rc = VERR_NET_CONNECTION_RESET;
@@ -1116 +1134 @@
 
     /* Clean up previous connection data. */
-    if (iscsiIsClientConnected(pImage))
-    {
-        pImage->pInterfaceNetCallbacks->pfnClientClose(pImage->Socket);
-    }
+    iscsiTransportClose(pImage);
     if (pImage->pszHostname)
     {
@@ -1207 +1222 @@
     }
 
-    LogFlowFunc(("returns %Rrc\n", rc));
-    return rc;
-}
-
-
-static int iscsiTransportClose(PISCSIIMAGE pImage)
-{
-    int rc;
-
-    LogFlowFunc(("(%s:%d)\n", pImage->pszHostname, pImage->uPort));
-    if (iscsiIsClientConnected(pImage))
-    {
-        rc = pImage->pInterfaceNetCallbacks->pfnClientClose(pImage->Socket);
-    }
-    else
-        rc = VINF_SUCCESS;
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;