inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to the CIFS protocol handlers to use the new authentication code.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2761 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2006-05-04 15:34:49 +00:00
parent d021b46d07
commit a937dfa608
15 changed files with 381 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSLanaMonitor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 Alfresco, Inc.
* Copyright (C) 2005-2006 Alfresco, Inc.
*
* Licensed under the Mozilla Public License version 1.1
* with a permitted attribution clause. You may obtain a
@@ -179,7 +179,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS register listener for LANA " + lana);
logger.debug("Win32 NetBIOS register listener for LANA " + lana);
}
/**
@@ -221,7 +221,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS initialization error", ex);
logger.debug("Win32 NetBIOS initialization error", ex);
// Shutdown the LANA monitor thread
@@ -273,7 +273,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS found new LANA, " + lana);
logger.debug("Win32 NetBIOS found new LANA, " + lana);
// Create a single Win32 NetBIOS session handler using the specified LANA
@@ -289,7 +289,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS failed to create session handler for LANA " + lana,
logger.debug("Win32 NetBIOS failed to create session handler for LANA " + lana,
ex);
// Clear the session handler
@@ -316,7 +316,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS created session handler on LANA " + lana);
logger.debug("Win32 NetBIOS created session handler on LANA " + lana);
// Check if a host announcer should be enabled
@@ -336,7 +336,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS host announcer enabled on LANA " + lana);
logger.debug("Win32 NetBIOS host announcer enabled on LANA " + lana);
}
// Set the LANA in the available LANA list, and set the current status to online
@@ -364,7 +364,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS LANA online - " + lana);
logger.debug("Win32 NetBIOS LANA online - " + lana);
}
}
}
@@ -378,7 +378,7 @@ public class Win32NetBIOSLanaMonitor extends Thread
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS LANA offline - " + i);
logger.debug("Win32 NetBIOS LANA offline - " + i);
// Change the LANA status

50
source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSSessionSocketHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 Alfresco, Inc.
* Copyright (C) 2005-2006 Alfresco, Inc.
*
* Licensed under the Mozilla Public License version 1.1
* with a permitted attribution clause. You may obtain a
@@ -134,7 +134,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS server " + m_srvName + " (using " +
logger.debug("Win32 NetBIOS server " + m_srvName + " (using " +
(isUsingWinsock() ? "Winsock" : "Netbios() API") + ")");
// Set the LANA offline polling interval
@@ -176,7 +176,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS server " + m_srvName + " (using " +
logger.debug("Win32 NetBIOS server " + m_srvName + " (using " +
(isUsingWinsock() ? "Winsock" : "Netbios() API") + ")");
// Set the LANA offline polling interval
@@ -215,7 +215,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS server " + m_srvName + " (using " +
logger.debug("Win32 NetBIOS server " + m_srvName + " (using " +
(isUsingWinsock() ? "Winsock" : "Netbios() API") + ")");
// Set the LANA offline polling interval
@@ -504,7 +504,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
if (logger.isDebugEnabled() && hasDebug())
{
logger.debug("[SMB] Win32 NetBIOS Failed To ReInitialize LANA");
logger.debug("Win32 NetBIOS Failed To ReInitialize LANA");
logger.debug(" " + ex.getMessage());
}
}
@@ -512,7 +512,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && hasDebug() && isLANAValid())
logger.debug("[SMB] Win32 NetBIOS LANA " + getLANANumber() + " Back Online");
logger.debug("Win32 NetBIOS LANA " + getLANANumber() + " Back Online");
}
}
}
@@ -524,7 +524,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
if (hasShutdown() == false)
{
logger.debug("[SMB] Win32 NetBIOS Server error : " + ex.toString());
logger.debug("Win32 NetBIOS Server error : " + ex.toString());
logger.debug(ex);
}
}
@@ -532,7 +532,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS session handler closed");
logger.debug("Win32 NetBIOS session handler closed");
}
/**
@@ -546,7 +546,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Waiting for Win32 NetBIOS session request (Netbios API) ...");
logger.debug("Waiting for Win32 NetBIOS session request (Netbios API) ...");
// Clear the caller name
@@ -585,7 +585,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS session request received, lsn=" + lsn + ", caller=["
logger.debug("Win32 NetBIOS session request received, lsn=" + lsn + ", caller=["
+ callerName + "]");
// Create a packet handler for the session
@@ -616,7 +616,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS Failed to create session, " + ex.toString());
logger.debug("Win32 NetBIOS Failed to create session, " + ex.toString());
}
}
else
@@ -637,10 +637,10 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS LANA offline/disabled, LANA=" + getLANANumber());
logger.debug("Win32 NetBIOS LANA offline/disabled, LANA=" + getLANANumber());
}
else if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Win32 NetBIOS Listen error, 0x" + Integer.toHexString(-lsn) + ", "
logger.debug("Win32 NetBIOS Listen error, 0x" + Integer.toHexString(-lsn) + ", "
+ NetBIOS.getErrorString(-lsn));
}
}
@@ -656,7 +656,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Waiting for Win32 NetBIOS session request (Winsock) ...");
logger.debug("Waiting for Win32 NetBIOS session request (Winsock) ...");
// Wait for a new NetBIOS session
@@ -700,7 +700,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Winsock NetBIOS network down, LANA=" + m_lana);
logger.debug("Winsock NetBIOS network down, LANA=" + m_lana);
}
}
else
@@ -708,7 +708,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (hasShutdown() == false && logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Winsock NetBIOS listen error, " + ex.getMessage());
logger.debug("Winsock NetBIOS listen error, " + ex.getMessage());
}
}
@@ -730,7 +730,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Winsock NetBIOS session request received, caller="
logger.debug("Winsock NetBIOS session request received, caller="
+ sessSock.getName());
// Create a packet handler for the session
@@ -761,7 +761,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// Debug
if (logger.isDebugEnabled() && hasDebug())
logger.debug("[SMB] Winsock NetBIOS Failed to create session, " + ex.toString());
logger.debug("Winsock NetBIOS Failed to create session, " + ex.toString());
}
}
}
@@ -794,7 +794,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
lanaStr.append(" ");
}
}
logger.debug("[SMB] Win32 NetBIOS Available LANAs: " + lanaStr.toString());
logger.debug("Win32 NetBIOS Available LANAs: " + lanaStr.toString());
}
// Check if the Win32 NetBIOS session handler should use a particular LANA/network adapter
@@ -821,7 +821,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
if (logger.isDebugEnabled() && sockDbg)
{
logger.debug("[SMB] Win32 NetBIOS failed to create session handler for LANA "
logger.debug("Win32 NetBIOS failed to create session handler for LANA "
+ config.getWin32LANA());
logger.debug(" " + ex.getMessage());
}
@@ -840,7 +840,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && sockDbg)
logger.debug("[SMB] Win32 NetBIOS created session handler on LANA " + config.getWin32LANA());
logger.debug("Win32 NetBIOS created session handler on LANA " + config.getWin32LANA());
// Check if a host announcer should be enabled
@@ -879,7 +879,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && sockDbg)
logger.debug("[SMB] Win32 NetBIOS host announcer enabled on LANA " + config.getWin32LANA());
logger.debug("Win32 NetBIOS host announcer enabled on LANA " + config.getWin32LANA());
}
// Check if the session handler implements the LANA listener interface
@@ -921,7 +921,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
if (logger.isDebugEnabled() && sockDbg)
{
logger.debug("[SMB] Win32 NetBIOS failed to create session handler for LANA " + lana);
logger.debug("Win32 NetBIOS failed to create session handler for LANA " + lana);
logger.debug(" " + ex.getMessage());
}
}
@@ -939,7 +939,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && sockDbg)
logger.debug("[SMB] Win32 NetBIOS created session handler on LANA " + lana);
logger.debug("Win32 NetBIOS created session handler on LANA " + lana);
// Check if a host announcer should be enabled
@@ -978,7 +978,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
// DEBUG
if (logger.isDebugEnabled() && sockDbg)
logger.debug("[SMB] Win32 NetBIOS host announcer enabled on LANA " + lana);
logger.debug("Win32 NetBIOS host announcer enabled on LANA " + lana);
}
// Check if the session handler implements the LANA listener interface

7
source/java/org/alfresco/filesys/smb/server/win32/WinsockNetBIOSPacketHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 Alfresco, Inc.
* Copyright (C) 2005-2006 Alfresco, Inc.
*
* Licensed under the Mozilla Public License version 1.1
* with a permitted attribution clause. You may obtain a
@@ -127,6 +127,8 @@ public class WinsockNetBIOSPacketHandler extends PacketHandler
int rxlen2 = m_sessSock.read(pkt.getBuffer(), rxlen + 4, pkt.getBufferLength() - (rxlen + 4));
System.out.println("Winsock rx2 len=" + rxlen2);
if ( rxlen2 == ReceiveBufferSizeError)
throw new WinsockNetBIOSException(WinsockError.WsaEMsgSize);
@@ -140,7 +142,8 @@ public class WinsockNetBIOSPacketHandler extends PacketHandler
{
// Check if the remote client has closed the socket
if ( ex.getErrorCode() == WinsockError.WsaEConnReset)
if ( ex.getErrorCode() == WinsockError.WsaEConnReset ||
ex.getErrorCode() == WinsockError.WsaEDiscon)
{
// Indicate that the socket has been closed