zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-08-13 10:49:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMBServer: Store the share name for each open file

Browse source
This commit is contained in:
Tal Aloni 2017-07-30 15:18:39 +03:00
parent c3fecea934
commit 4c84a297f8
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SMBLibrary/Server/ConnectionState/OpenFileObject.cs
View file

@ -14,12 +14,14 @@ namespace SMBLibrary.Server
internal class OpenFileObject internal class OpenFileObject
{ {
public uint TreeID; public uint TreeID;
public string ShareName;
public string Path; public string Path;
public object Handle; public object Handle;
public OpenFileObject(uint treeID, string path, object handle) public OpenFileObject(uint treeID, string shareName, string path, object handle)
{ {
TreeID = treeID; TreeID = treeID;
ShareName = shareName;
Path = path; Path = path;
Handle = handle; Handle = handle;
} }

8
SMBLibrary/Server/ConnectionState/SMB1Session.cs
View file

@ -87,19 +87,19 @@ namespace SMBLibrary.Server
/// <param name="relativePath">Should include the path relative to the share</param> /// <param name="relativePath">Should include the path relative to the share</param>
/// <returns>FileID</returns> /// <returns>FileID</returns>
public ushort? AddOpenFile(ushort treeID, string relativePath) public ushort? AddOpenFile(ushort treeID, string shareName, string relativePath)
{ {
return AddOpenFile(treeID, relativePath, null); return AddOpenFile(treeID, shareName, relativePath, null);
} }
public ushort? AddOpenFile(ushort treeID, string relativePath, object handle) public ushort? AddOpenFile(ushort treeID, string shareName, string relativePath, object handle)
{ {
ushort? fileID = m_connection.AllocateFileID(); ushort? fileID = m_connection.AllocateFileID();
if (fileID.HasValue) if (fileID.HasValue)
{ {
lock (m_openFiles) lock (m_openFiles)
{ {
m_openFiles.Add(fileID.Value, new OpenFileObject(treeID, relativePath, handle)); m_openFiles.Add(fileID.Value, new OpenFileObject(treeID, shareName, relativePath, handle));
} }
} }
return fileID; return fileID;

4
SMBLibrary/Server/ConnectionState/SMB2Session.cs
View file

@ -129,7 +129,7 @@ namespace SMBLibrary.Server
return null; return null;
} }
public FileID? AddOpenFile(uint treeID, string relativePath, object handle) public FileID? AddOpenFile(uint treeID, string shareName, string relativePath, object handle)
{ {
ulong? volatileFileID = AllocateVolatileFileID(); ulong? volatileFileID = AllocateVolatileFileID();
if (volatileFileID.HasValue) if (volatileFileID.HasValue)
@ -141,7 +141,7 @@ namespace SMBLibrary.Server
fileID.Persistent = volatileFileID.Value; fileID.Persistent = volatileFileID.Value;
lock (m_openFiles) lock (m_openFiles)
{ {
m_openFiles.Add(volatileFileID.Value, new OpenFileObject(treeID, relativePath, handle)); m_openFiles.Add(volatileFileID.Value, new OpenFileObject(treeID, shareName, relativePath, handle));
} }
return fileID; return fileID;
} }

2
SMBLibrary/Server/SMB1/NTCreateHelper.cs
View file

@ -51,7 +51,7 @@ namespace SMBLibrary.Server.SMB1
} }
state.LogToServer(Severity.Verbose, "Create: Opened '{0}{1}'.", share.Name, path); state.LogToServer(Severity.Verbose, "Create: Opened '{0}{1}'.", share.Name, path);
ushort? fileID = session.AddOpenFile(header.TID, path, handle); ushort? fileID = session.AddOpenFile(header.TID, share.Name, path, handle);
if (!fileID.HasValue) if (!fileID.HasValue)
{ {
share.FileStore.CloseFile(handle); share.FileStore.CloseFile(handle);

5
SMBLibrary/Server/SMB1/NotifyChangeHelper.cs
View file

@ -47,11 +47,10 @@ namespace SMBLibrary.Server.SMB1
SMB1Session session = connection.GetSession(asyncContext.UID); SMB1Session session = connection.GetSession(asyncContext.UID);
if (session != null) if (session != null)
{ {
ISMBShare share = session.GetConnectedTree(asyncContext.TID);
OpenFileObject openFile = session.GetOpenFileObject(asyncContext.FileID); OpenFileObject openFile = session.GetOpenFileObject(asyncContext.FileID);
if (share != null && openFile != null) if (openFile != null)
{ {
connection.LogToServer(Severity.Verbose, "NotifyChange: Monitoring of '{0}{1}' completed. NTStatus: {2}. PID: {3}. MID: {4}.", share.Name, openFile.Path, status, asyncContext.PID, asyncContext.MID); connection.LogToServer(Severity.Verbose, "NotifyChange: Monitoring of '{0}{1}' completed. NTStatus: {2}. PID: {3}. MID: {4}.", openFile.ShareName, openFile.Path, status, asyncContext.PID, asyncContext.MID);
} }
} }
SMB1Header header = new SMB1Header(); SMB1Header header = new SMB1Header();

2
SMBLibrary/Server/SMB1/OpenAndXHelper.cs
View file

@ -64,7 +64,7 @@ namespace SMBLibrary.Server.SMB1
} }
state.LogToServer(Severity.Verbose, "OpenAndX: Opened '{0}{1}'.", share.Name, path); state.LogToServer(Severity.Verbose, "OpenAndX: Opened '{0}{1}'.", share.Name, path);
ushort? fileID = session.AddOpenFile(header.TID, path, handle); ushort? fileID = session.AddOpenFile(header.TID, share.Name, path, handle);
if (!fileID.HasValue) if (!fileID.HasValue)
{ {
share.FileStore.CloseFile(handle); share.FileStore.CloseFile(handle);

5
SMBLibrary/Server/SMB2/ChangeNotifyHelper.cs
View file

@ -48,11 +48,10 @@ namespace SMBLibrary.Server.SMB2
SMB2Session session = connection.GetSession(asyncContext.SessionID); SMB2Session session = connection.GetSession(asyncContext.SessionID);
if (session != null) if (session != null)
{ {
ISMBShare share = session.GetConnectedTree(asyncContext.TreeID);
OpenFileObject openFile = session.GetOpenFileObject(asyncContext.FileID); OpenFileObject openFile = session.GetOpenFileObject(asyncContext.FileID);
if (share != null && openFile != null) if (openFile != null)
{ {
connection.LogToServer(Severity.Verbose, "NotifyChange: Monitoring of '{0}{1}' completed. NTStatus: {2}. AsyncID: {3}", share.Name, openFile.Path, status, asyncContext.AsyncID); connection.LogToServer(Severity.Verbose, "NotifyChange: Monitoring of '{0}{1}' completed. NTStatus: {2}. AsyncID: {3}", openFile.ShareName, openFile.Path, status, asyncContext.AsyncID);
} }
} }

2
SMBLibrary/Server/SMB2/CreateHelper.cs
View file

@ -45,7 +45,7 @@ namespace SMBLibrary.Server.SMB2
} }
state.LogToServer(Severity.Verbose, "Create: Opened '{0}{1}'.", share.Name, path); state.LogToServer(Severity.Verbose, "Create: Opened '{0}{1}'.", share.Name, path);
FileID? fileID = session.AddOpenFile(request.Header.TreeID, path, handle); FileID? fileID = session.AddOpenFile(request.Header.TreeID, share.Name, path, handle);
if (fileID == null) if (fileID == null)
{ {
share.FileStore.CloseFile(handle); share.FileStore.CloseFile(handle);