Moved logout logic to a separate partial class

ISCSI/ISCSI.Server/ISCSIServer.Logout.cs

@@ -0,0 +1,83 @@
+/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+ * 
+ * You can redistribute this program and/or modify it under the terms of
+ * the GNU Lesser Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ */
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using Utilities;
+
+namespace ISCSI.Server
+{
+    public partial class ISCSIServer
+    {
+        private ISCSIPDU GetLogoutResponsePDU(LogoutRequestPDU request, ConnectionParameters connection)
+        {
+            Log(Severity.Verbose, "[{0}] Logour Request", connection.ConnectionIdentifier);
+            if (connection.Session.IsDiscovery && request.ReasonCode != LogoutReasonCode.CloseTheSession)
+            {
+                // RFC 3720: Discovery-session: The target MUST ONLY accept [..] logout request with the reason "close the session"
+                RejectPDU reject = new RejectPDU();
+                reject.Reason = RejectReason.ProtocolError;
+                reject.Data = ByteReader.ReadBytes(request.GetBytes(), 0, 48);
+                return reject;
+            }
+            else
+            {
+                List<ConnectionState> connectionsToClose = new List<ConnectionState>();
+                if (request.ReasonCode == LogoutReasonCode.CloseTheSession)
+                {
+                    connectionsToClose = m_connectionManager.GetSessionConnections(connection.Session);
+                }
+                else if (request.ReasonCode == LogoutReasonCode.CloseTheConnection)
+                {
+                    // RFC 3720: A Logout for a CID may be performed on a different transport connection when the TCP connection for the CID has already been terminated.
+                    ConnectionState existingConnection = m_connectionManager.FindConnection(connection.Session, request.CID);
+                    if (existingConnection != null)
+                    {
+                        connectionsToClose.Add(existingConnection);
+                    }
+                    else
+                    {
+                        return ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.CIDNotFound);
+                    }
+                }
+                else if (request.ReasonCode == LogoutReasonCode.RemoveTheConnectionForRecovery)
+                {
+                    return ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.ConnectionRecoveryNotSupported);
+                }
+                else
+                {
+                    // Unknown LogoutRequest ReasonCode
+                    RejectPDU reject = new RejectPDU();
+                    reject.Reason = RejectReason.ProtocolError;
+                    reject.Data = ByteReader.ReadBytes(request.GetBytes(), 0, 48);
+                    return reject;
+                }
+
+                foreach (ConnectionState connectionToClose in connectionsToClose)
+                {
+                    // Wait for pending I/O to complete.
+                    connectionToClose.RunningSCSICommands.WaitUntilZero();
+                    if (connectionToClose.ConnectionParameters != connection)
+                    {
+                        SocketUtils.ReleaseSocket(connectionToClose.ClientSocket);
+                    }
+                    m_connectionManager.RemoveConnection(connectionToClose);
+                }
+
+                if (request.ReasonCode == LogoutReasonCode.CloseTheSession)
+                {
+                    Log(Severity.Verbose, "[{0}] Session has been closed", connection.Session.SessionIdentifier);
+                    m_sessionManager.RemoveSession(connection.Session, SessionTerminationReason.Logout);
+                }
+
+                return ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.ClosedSuccessfully);
+                // connection will be closed after a LogoutResponsePDU has been sent.
+            }
+        }
+    }
+}

ISCSI/ISCSI.Server/ISCSIServer.PDUProcessor.cs

@@ -102,75 +102,9 @@ namespace ISCSI.Server
                 }
                 else if (pdu is LogoutRequestPDU)
                 {
-                    Log(Severity.Verbose, "[{0}] Logour Request", state.ConnectionIdentifier);
                     LogoutRequestPDU request = (LogoutRequestPDU)pdu;
-                    if (state.Session.IsDiscovery && request.ReasonCode != LogoutReasonCode.CloseTheSession)
-                    {
-                        // RFC 3720: Discovery-session: The target MUST ONLY accept [..] logout request with the reason "close the session"
-                        RejectPDU reject = new RejectPDU();
-                        reject.Reason = RejectReason.ProtocolError;
-                        reject.Data = ByteReader.ReadBytes(pdu.GetBytes(), 0, 48);
-                        state.SendQueue.Enqueue(reject);
-                    }
-                    else
-                    {
-                        List<ConnectionState> connectionsToClose = new List<ConnectionState>();
-                        if (request.ReasonCode == LogoutReasonCode.CloseTheSession)
-                        {
-                            connectionsToClose = m_connectionManager.GetSessionConnections(state.Session);
-                        }
-                        else if (request.ReasonCode == LogoutReasonCode.CloseTheConnection)
-                        {
-                            // RFC 3720: A Logout for a CID may be performed on a different transport connection when the TCP connection for the CID has already been terminated.
-                            ConnectionState existingConnection = m_connectionManager.FindConnection(state.Session, request.CID);
-                            if (existingConnection != null)
-                            {
-                                connectionsToClose.Add(existingConnection);
-                            }
-                            else
-                            {
-                                LogoutResponsePDU response = ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.CIDNotFound);
-                                state.SendQueue.Enqueue(response);
-                                return;
-                            }
-                        }
-                        else if (request.ReasonCode == LogoutReasonCode.RemoveTheConnectionForRecovery)
-                        {
-                            LogoutResponsePDU response = ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.ConnectionRecoveryNotSupported);
-                            state.SendQueue.Enqueue(response);
-                            return;
-                        }
-                        else
-                        {
-                            // Unknown LogoutRequest ReasonCode
-                            RejectPDU reject = new RejectPDU();
-                            reject.Reason = RejectReason.ProtocolError;
-                            reject.Data = ByteReader.ReadBytes(pdu.GetBytes(), 0, 48);
-                            state.SendQueue.Enqueue(reject);
-                            return;
-                        }
-
-                        foreach (ConnectionState connection in connectionsToClose)
-                        {
-                            // Wait for pending I/O to complete.
-                            connection.RunningSCSICommands.WaitUntilZero();
-                            if (connection != state)
-                            {
-                                SocketUtils.ReleaseSocket(connection.ClientSocket);
-                            }
-                            m_connectionManager.RemoveConnection(connection);
-                        }
-
-                        if (request.ReasonCode == LogoutReasonCode.CloseTheSession)
-                        {
-                            Log(Severity.Verbose, "[{0}] Session has been closed", state.Session.SessionIdentifier);
-                            m_sessionManager.RemoveSession(state.Session, SessionTerminationReason.Logout);
-                        }
-
-                        LogoutResponsePDU successResponse = ServerResponseHelper.GetLogoutResponsePDU(request, LogoutResponse.ClosedSuccessfully);
-                        state.SendQueue.Enqueue(successResponse);
-                        // connection will be closed after a LogoutResponsePDU has been sent.
-                    }
+                    ISCSIPDU response = GetLogoutResponsePDU(request, state.ConnectionParameters);
+                    state.SendQueue.Enqueue(response);
                 }
                 else if (state.Session.IsDiscovery)
                 {

ISCSI/ISCSI.csproj

@@ -70,6 +70,7 @@
     <Compile Include="ISCSI.Server\Exceptions\InvalidTargetTransferTagException.cs" />
     <Compile Include="ISCSI.Server\ISCSIServer.cs" />
     <Compile Include="ISCSI.Server\ISCSIServer.Login.cs" />
+    <Compile Include="ISCSI.Server\ISCSIServer.Logout.cs" />
     <Compile Include="ISCSI.Server\ISCSIServer.Parameters.cs" />
     <Compile Include="ISCSI.Server\ISCSIServer.PDUProcessor.cs" />
     <Compile Include="ISCSI.Server\ISCSIServer.TextRequest.cs" />