Ticket #1457: patch6.diff

source/ControlSocket.cpp

@@ -522 +522 @@
                 op->op = USERCONTROL_CONNOP_MODIFY;
                 conndata->userid = m_userid;
                 conndata->pThread = m_pOwner;
+                conndata->bytes_total = 0;
+                conndata->bytes_transferred = 0;
+                conndata->speed = 0;
+                conndata->mode = 0;
                 
                 SOCKADDR_IN sockAddr;
                 memset(&sockAddr, 0, sizeof(sockAddr));
@@ -829 +833 @@
             }
             
             t_dirlisting *pResult;
-            int error = m_pOwner->m_pPermissions->GetDirectoryListing(m_status.user, m_CurrentServerDir, dirToList, pResult);
+            int error = m_pOwner->m_pPermissions->GetDirectoryListing(m_status.user, m_CurrentServerDir, dirToList, pResult, localname, ftpname);
             if (error & 1)
             {
                 Send("550 Permission denied");
@@ -842 +846 @@
             }
             else
             {
+                // let the interface know we list a directory
+                m_pOwner->PostThreadMessage(WM_FILEZILLA_THREADMSG, FTM_TRANSFERINIT, m_userid);
                 if (!m_transferstatus.pasv)
                 {
                     if (m_transferstatus.socket)
@@ -948 +954 @@
 
         
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_READ,result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_READ,localname,ftpname);
+            result = localname;
             if (error & 1)
             {
                 Send("550 Permission denied");
@@ -961 +968 @@
             }
             else
             {
+                // let the interface know a file is downloaded
+                m_pOwner->PostThreadMessage(WM_FILEZILLA_THREADMSG, FTM_TRANSFERINIT, m_userid);
                 if (!m_transferstatus.pasv)
                 {
                     if (m_transferstatus.socket)
@@ -1023 +1032 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,m_transferstatus.rest?FOP_APPEND:FOP_WRITE,result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,m_transferstatus.rest?FOP_APPEND:FOP_WRITE,localname,ftpname);
+            result = localname;
             if (error & 1)
             {
                 Send("550 Permission denied");
@@ -1036 +1046 @@
             }
             else
             {
+                // let the interface know a file is uploaded
+                m_pOwner->PostThreadMessage(WM_FILEZILLA_THREADMSG, FTM_TRANSFERINIT, m_userid);
                 if (!m_transferstatus.pasv)
                 {
                     CTransferSocket *transfersocket=new CTransferSocket(this);
@@ -1083 +1095 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_READ, result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_READ, localname, ftpname);
+            result = localname;
             if (error & 1)
                 Send("550 Permission denied");
             else if (error)
@@ -1110 +1123 @@
             }
 
             CStdString result;
-            int error=m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_DELETE,result);
+            int error=m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_DELETE,localname,ftpname);
+            result = localname;
             if (error & 1)
                 Send("550 Permission denied");
             else if (error)
@@ -1135 +1149 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user,args,m_CurrentServerDir,DOP_DELETE,result);
+            int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user,args,m_CurrentServerDir,DOP_DELETE,localname,ftpname);
+            result = localname;
             if (error & 1)
                 Send("550 Permission denied");
             else if (error)
@@ -1165 +1180 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args, m_CurrentServerDir, DOP_CREATE, result);
+            int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args, m_CurrentServerDir, DOP_CREATE, localname, ftpname);
+            result = localname;
             if (error & PERMISSION_DENIED)
                 Send("550 Can't create directory. Permission denied");
             else if (error & PERMISSION_DOESALREADYEXIST && (error & PERMISSION_FILENOTDIR)!=PERMISSION_FILENOTDIR)
@@ -1218 +1234 @@
             RenName = "";
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_DELETE, result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_DELETE, localname, ftpname);
+            result = localname;
             if (!error)
             {
                 RenName = result;
@@ -1230 +1247 @@
                 Send("550 Permission denied");
             else
             {
-                int error2 = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args,m_CurrentServerDir, DOP_DELETE, result);
+                int error2 = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args,m_CurrentServerDir, DOP_DELETE, localname, ftpname);
+                result = localname;
                 if (!error2)
                 {
                     RenName=result;
@@ -1263 +1281 @@
             if (bRenFile)
             {
                 CStdString result;
-                int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_CREATENEW, result);
+                int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_CREATENEW, localname, ftpname);
+                result = localname;
                 if (error)
                     RenName = "";
                 if (error & 1)
@@ -1283 +1302 @@
             else
             {
                 CStdString result;
-                int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args, m_CurrentServerDir, DOP_CREATE, result);
+                int error = m_pOwner->m_pPermissions->CheckDirectoryPermissions(m_status.user, args, m_CurrentServerDir, DOP_CREATE, localname, ftpname);
+                result = localname;
                 if (error)
                     RenName = "";
                 if (error & 1)
@@ -1311 +1331 @@
             }
             Send("226 ABOR command successful");
             ResetTransferstatus();
+
+            // send msg to interface
+            t_connectiondata *conndata = new t_connectiondata;
+            t_connop *op = new t_connop;
+            op->data = conndata;
+            op->op = USERCONTROL_CONNOP_MODIFY;
+            conndata->userid = m_userid;
+            conndata->user = GetUserName();
+            strncpy(conndata->ip,m_RemoteIP,16);
+            conndata->mode = 0;
+            conndata->pThread = m_pOwner;
+            m_pOwner->SendNotification(FSM_CONNECTIONDATA, (LPARAM)op);
         break;
         }
     case COMMAND_SYST:
@@ -1342 +1374 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_APPEND,result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user,args,m_CurrentServerDir,FOP_APPEND,localname,ftpname);
+            result = localname;
             if (error & 1)
             {
                 Send("550 Permission denied");
@@ -1361 +1394 @@
 
                 m_transferstatus.rest = size;
 
+                // let the interface know a file is uploaded
+                m_pOwner->PostThreadMessage(WM_FILEZILLA_THREADMSG, FTM_TRANSFERINIT, m_userid);
                 if (!m_transferstatus.pasv)
                 {
                     CTransferSocket *transfersocket = new CTransferSocket(this);
@@ -1468 +1503 @@
             }
             
             t_dirlisting *pResult;
-            int error = m_pOwner->m_pPermissions->GetShortDirectoryListing(m_status.user, m_CurrentServerDir, args, pResult);
+            int error = m_pOwner->m_pPermissions->GetShortDirectoryListing(m_status.user, m_CurrentServerDir, args, pResult, localname, ftpname);
             if (error & 1)
             {
                 Send("550 Permission denied");
@@ -1481 +1516 @@
             }
             else
             {
+                // let the interface know we list a directory
+                m_pOwner->PostThreadMessage(WM_FILEZILLA_THREADMSG, FTM_TRANSFERINIT, m_userid);
                 if (!m_transferstatus.pasv)
                 {
                     CTransferSocket *transfersocket = new CTransferSocket(this);
@@ -1529 +1566 @@
             }
 
             CStdString result;
-            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_READ, result);
+            int error = m_pOwner->m_pPermissions->CheckFilePermissions(m_status.user, args, m_CurrentServerDir, FOP_READ, localname, ftpname);
+            result = localname;
             if (error & 1)
                 Send("550 Permission denied");
             else if (error & 2)
@@ -2276 +2314 @@
     op->op = USERCONTROL_CONNOP_MODIFY;
     conndata->userid = m_userid;
     conndata->user = m_status.user;
+    conndata->mode = 0;
     conndata->pThread = m_pOwner;
 
     memset(&sockAddr, 0, sizeof(sockAddr));
@@ -2292 +2331 @@
     return TRUE;
 }
 
+CStdString CControlSocket::GetUserName() const
+{
+    return m_status.loggedon ? m_status.user : "";
+}
+
 void CControlSocket::Continue()
 {
     if (m_SlQuota.bContinueDownload)

source/ControlSocket.h

@@ -56 +56 @@
     void SendStatus(LPCTSTR status,int type);
     BOOL GetCommand(CStdString &command,CStdString &args);
 
+    CStdString GetUserName() const;
+
+    CStdString ftpname; // the current transferred data like /C/files or /C/file.txt
+    CStdString localname; // the current transferred data like c:\files or c:\file.txt
+
     virtual void OnReceive(int nErrorCode);
     virtual void OnClose(int nErrorCode);
     virtual void OnSend(int nErrorCode);

source/FileZilla

@@ -103 +103 @@
                 OmitFramePointers="TRUE"
                 OptimizeForProcessor="0"
                 OptimizeForWindowsApplication="TRUE"
-                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x410"
                 StringPooling="TRUE"
                 RuntimeLibrary="0"
                 BufferSecurityCheck="FALSE"
@@ -176 +176 @@
             <Tool
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x410"
                 MinimalRebuild="TRUE"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="1"
@@ -1017 +1017 @@
         </Filter>
     </Files>
     <Globals>
+        <Global
+            Name="RESOURCE_FILE"
+            Value="FileZilla server.rc"/>
     </Globals>
 </VisualStudioProject>

source/Permissions.cpp

@@ -254 +254 @@
     pDir->buffer[pDir->len++] = '\n';
 }
 
-int CPermissions::GetDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult)
+int CPermissions::GetDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult, CStdString& localdir, CStdString& ftpdir)
 {
     // Get user
     CUser user;
@@ -262 +262 @@
         return PERMISSION_DENIED;
 
     CStdString dir = CanonifyServerDir(currentDir, dirToDisplay);
+    ftpdir = dir;
 
     // Get directory from directory name
     t_directory directory;
@@ -372 +373 @@
             AddListingEntry(pDir, iter->second.name, true, 0, 0, directory);
     }
 
+    // prepare the result, the local directory this is referring to
+    localdir = directory.dir + sFileSpec;
+    if (localdir.Right(3) == "*.*")
+        localdir = localdir.Left(localdir.GetLength()-3);
+    else
+    if (localdir.Right(1) == "*")
+        localdir = localdir.Left(localdir.GetLength()-1);
+
     hFind = FindFirstFile(directory.dir + sFileSpec, &NextFindFileData);
     while (hFind != INVALID_HANDLE_VALUE)
     {
@@ -406 +415 @@
     return 0;
 }
 
-int CPermissions::CheckDirectoryPermissions(LPCTSTR username, CStdString dirname, CStdString currentdir, int op, CStdString &result)
+int CPermissions::CheckDirectoryPermissions(LPCTSTR username, CStdString dirname, CStdString currentdir, int op, CStdString& localdir, CStdString& ftpdir)
 {
     //Get user from username
     CUser user;
@@ -421 +430 @@
     int pos = dir.ReverseFind('/');
     if (pos == -1 || !dir[pos + 1])
         return PERMISSION_NOTFOUND;
+    ftpdir = dir;
     dirname = dir.Mid(pos + 1);
     dir = dir.Left(pos + 1);
 
@@ -465 +475 @@
 
     //Check if dir + dirname is a valid path
     int res2 = GetRealDirectory(dir + dirname + "/", user, directory, truematch);
-    result = directory.dir;
+    localdir = directory.dir; // ??? overwritten 6 lines below !!!
     if (!res2 && op&DOP_CREATE)
         res |= PERMISSION_DOESALREADYEXIST;
     else if (!(res2 & PERMISSION_NOTFOUND))
         return res | res2;
     realDirname.Replace("/", "\\");
-    result = realDir + realDirname + "\\";
+    localdir = realDir + realDirname + "\\";
     
     // check dir attributes
     dir.TrimRight("\\");
-    DWORD nAttributes = GetFileAttributes(result);
+    DWORD nAttributes = GetFileAttributes(localdir);
     if (nAttributes==0xFFFFFFFF && !(op&DOP_CREATE))
         res |= PERMISSION_NOTFOUND;
     else if (!(nAttributes&FILE_ATTRIBUTE_DIRECTORY))
@@ -485 +495 @@
     return res;
 }
 
-int CPermissions::CheckFilePermissions(LPCTSTR username, CStdString filename, CStdString currentdir, int op, CStdString &result)
+int CPermissions::CheckFilePermissions(LPCTSTR username, CStdString filename, CStdString currentdir, int op, CStdString& localfile, CStdString& ftpfile)
 {
     //Get user from username
     CUser user;
@@ -497 +507 @@
     int pos = dir.ReverseFind('/');
     if (pos == -1)
         return PERMISSION_NOTFOUND;
+    ftpfile = dir;
     
     filename = dir.Mid(pos + 1);
     dir = dir.Left(pos + 1);
@@ -518 +529 @@
     if (!directory.bFileWrite && op&(FOP_CREATENEW|FOP_WRITE|FOP_APPEND))
         res |= PERMISSION_DENIED;
 
-    result = directory.dir + filename;
-    DWORD nAttributes = GetFileAttributes(result);
+    localfile = directory.dir + filename;
+    DWORD nAttributes = GetFileAttributes(localfile);
     if (nAttributes==0xFFFFFFFF)
     {
         if (!(op&(FOP_WRITE|FOP_APPEND|FOP_CREATENEW)))
@@ -749 +760 @@
     return FALSE;
 }
 
-int CPermissions::GetShortDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult)
+int CPermissions::GetShortDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult, CStdString& localdir, CStdString& ftpdir)
 {
     // Get user from username
     CUser user;
@@ -757 +768 @@
         return PERMISSION_DENIED; // No user found
 
     CStdString dir = CanonifyServerDir(currentDir, dirToDisplay);
+    ftpdir = dir;
 
     t_directory directory;
     BOOL bTruematch;
@@ -876 +888 @@
         pDir->buffer[pDir->len++] = '\n';
     }
 
+    // prepare secondary result, the local directory this is referring to
+    localdir = directory.dir + "\\" + sFileSpec;
+    if (localdir.Right(3) == "*.*")
+        localdir = localdir.Left(localdir.GetLength()-3);
+    else
+    if (localdir.Right(1) == "*")
+        localdir = localdir.Left(localdir.GetLength()-1);
+
     WIN32_FIND_DATA FindFileData;
     WIN32_FIND_DATA NextFindFileData;
     HANDLE hFind;

source/Permissions.h

@@ -99 +99 @@
     int ChangeCurrentDir(LPCTSTR username, CStdString& currentdir, CStdString &dir);
     
     // Full directory listing with all details. Used by LIST command
-    int GetDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult);
+    int GetDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult, CStdString& localdir, CStdString& ftpdir);
 
     // Directory listing with just the filenames. Used by NLST command
-    int GetShortDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult);
+    int GetShortDirectoryListing(LPCTSTR username, CStdString currentDir, CStdString dirToDisplay, t_dirlisting *&pResult, CStdString& localdir, CStdString& ftpdir);
 
     CStdString GetHomeDir(LPCTSTR username, bool physicalPath = false) const;
     CStdString GetHomeDir(const CUser &user, bool physicalPath = false) const;
 
-    int CheckDirectoryPermissions(LPCTSTR username, CStdString dirname, CStdString currentdir, int op, CStdString &result);
-    int CheckFilePermissions(LPCTSTR username, CStdString filename, CStdString currentdir, int op, CStdString &result);
+    int CheckDirectoryPermissions(LPCTSTR username, CStdString dirname, CStdString currentdir, int op, CStdString& localdir, CStdString& ftpdir);
+    int CheckFilePermissions(LPCTSTR username, CStdString filename, CStdString currentdir, int op, CStdString& localfile, CStdString& ftpfile);
 
     BOOL GetUser(CStdString username, CUser &userdata) const;
     BOOL CheckUserLogin(LPCTSTR username, LPCTSTR pass, CUser &userdata, BOOL noPasswordCheck = FALSE);

source/Server.cpp

@@ -259 +259 @@
         }
         USES_CONVERSION;
         int userlen = pConnOp->data->user ? strlen(pConnOp->data->user) : 0;
-        int len = 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2;
+        int ftpfilenamelen = pConnOp->data->ftp_filename ? strlen(pConnOp->data->ftp_filename) : 0;
+        int localfilenamelen = pConnOp->data->local_filename ? strlen(pConnOp->data->local_filename) : 0;
+        int len = 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + localfilenamelen+2 + 8 + 8 + 4;
         unsigned char *buffer = new unsigned char[len];
         buffer[0] = USERCONTROL_CONNOP;
         buffer[1] = pConnOp->op;
@@ -272 +274 @@
         buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + 1]= userlen%256;
         if (pConnOp->data->user)
             memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + 2, T2CA(pConnOp->data->user), userlen);
+        buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2] = pConnOp->data->mode;
+        buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1] = ftpfilenamelen/256;
+        buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 2] = ftpfilenamelen%256;
+        if (pConnOp->data->ftp_filename)
+            memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + 2, T2CA(pConnOp->data->ftp_filename), ftpfilenamelen);
+        buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2] = localfilenamelen/256;
+        buffer[2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + 1] = localfilenamelen%256;
+        if (pConnOp->data->local_filename)
+            memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + 2, T2CA(pConnOp->data->local_filename), localfilenamelen);
+        memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + localfilenamelen+2,&pConnOp->data->bytes_total,8);
+        memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + localfilenamelen+2 + 8,&pConnOp->data->bytes_transferred,8);
+        memcpy(buffer + 2 + 4 + strlen(pConnOp->data->ip)+2 + 4 + userlen+2 + 1 + ftpfilenamelen+2 + localfilenamelen+2 + 8 + 8,&pConnOp->data->speed,4);
         m_pAdminInterface->SendCommand(2, 3, buffer, len);
         delete [] buffer;
         delete pConnOp->data;

source/ServerThread.cpp

@@ -320 +320 @@
         else if (wParam==FTM_TRANSFERMSG)
         {
             CControlSocket *socket=GetControlSocket(lParam);
-            if (socket)
+            if (socket) {
                 socket->ProcessTransferMsg();
+                // end of transfer
+                t_connectiondata *conndata = new t_connectiondata;
+                t_connop *op = new t_connop;
+                op->data = conndata;
+                op->op = USERCONTROL_CONNOP_MODIFY;
+                conndata->userid = lParam;
+                conndata->user = socket->GetUserName();
+                strncpy(conndata->ip,socket->m_RemoteIP,16);
+                conndata->mode = 0;
+                conndata->pThread = this;
+                SendNotification(FSM_CONNECTIONDATA, (LPARAM)op);
+            }
+        }
+        else if (wParam==FTM_TRANSFERINIT)
+        {
+            CControlSocket *socket=GetControlSocket(lParam);
+            if (socket) {
+                t_connectiondata *conndata = new t_connectiondata;
+                t_connop *op = new t_connop;
+                op->data = conndata;
+                op->op = USERCONTROL_CONNOP_MODIFY;
+                conndata->userid = lParam;
+                conndata->user = socket->GetUserName();
+                strncpy(conndata->ip,socket->m_RemoteIP,16);
+                conndata->mode = socket->GetTransferSocket()->GetMode();
+                conndata->local_filename = socket->localname;
+                conndata->ftp_filename = socket->ftpname;
+                conndata->bytes_total = socket->GetTransferSocket()->GetTotalSize();
+                conndata->bytes_transferred = 0;
+                conndata->speed = 0;
+                conndata->pThread = this;
+                SendNotification(FSM_CONNECTIONDATA, (LPARAM)op);
+            }
         }
         else if (wParam==FTM_GOOFFLINE)
         {
@@ -361 +394 @@
     if (wParam==m_timerid)
     {
         EnterCritSection(m_threadsync);
+        __int64 last_bytes, bytes;
+        CTransferSocket* transf;
         for (std::map<int, CControlSocket *>::iterator iter=m_LocalUserIDs.begin(); iter!=m_LocalUserIDs.end(); iter++)
+        {
+            transf = iter->second->GetTransferSocket();
+            if (transf != 0 && transf->Started() != 0) {
+                transf->GetTransferInfo(last_bytes,bytes);
+                if (bytes != 0) {
+                    t_connectiondata *conndata = new t_connectiondata;
+                    t_connop *op = new t_connop;
+                    op->data = conndata;
+                    op->op = USERCONTROL_CONNOP_MODIFY;
+                    conndata->userid = iter->first;
+                    conndata->user = iter->second->GetUserName();
+                    strncpy(conndata->ip,iter->second->m_RemoteIP,16);
+                    conndata->mode = transf->GetMode();
+                    conndata->local_filename = iter->second->localname;
+                    conndata->ftp_filename = iter->second->ftpname;
+                    conndata->bytes_total = transf->GetTotalSize();
+                    conndata->bytes_transferred = last_bytes+bytes;
+                    conndata->speed = (unsigned int) bytes;
+                    conndata->pThread = this;
+                    SendNotification(FSM_CONNECTIONDATA, (LPARAM)op);
+                }
+            }
             iter->second->CheckForTimeout();
+        }
         LeaveCritSection(m_threadsync);
 
         if (m_bIsMaster && !m_pExternalIpCheck)

source/StdAfx.h

@@ -72 +72 @@
 #define FTM_TRANSFERMSG 3
 #define FTM_GOOFFLINE 4
 #define FTM_CONTROL 5
+#define FTM_TRANSFERINIT 6
 
 #define USERCONTROL_GETLIST 0
 #define USERCONTROL_CONNOP 1
@@ -105 +106 @@
     CStdString user;
     TCHAR ip[16];
     unsigned int port;
+    unsigned char mode; // data transfer mode
+    CStdString local_filename; // like c:\file.txt
+    CStdString ftp_filename; // like /C/file.txt
+    __int64 bytes_total;
+    __int64 bytes_transferred;
+    unsigned int speed;
     CServerThread *pThread;
 } t_connectiondata;
 

source/TransferSocket.cpp

@@ -66 +66 @@
     m_zlibBytesOut = 0;
 
     m_pBuffer2 = 0;
+
+    m_nTotalSize = 0;
+    m_nLastTransferred = 0;
+    m_nBytesSinceThen = 0;
 }
 
 void CTransferSocket::Init(t_dirlisting *pDir, int nMode)
@@ -88 +92 @@
     if (m_hFile != INVALID_HANDLE_VALUE)
         CloseHandle(m_hFile);
     m_nBufferPos = 0;
+
+    m_nTotalSize = 0;
+    m_nLastTransferred = 0;
+    m_nBytesSinceThen = 0;
 }
 
 void CTransferSocket::Init(CStdString filename, int nMode, _int64 rest, BOOL bBinary /*=TRUE*/)
@@ -104 +112 @@
     if (m_pBuffer2)
         delete [] m_pBuffer2;
     m_pBuffer2 = 0;
+
+    m_nTotalSize = 0;
+    m_nLastTransferred = rest;
+    m_nBytesSinceThen = 0;
 }
 
 CTransferSocket::~CTransferSocket()
@@ -449 +461 @@
                 ((CServerThread *)m_pOwner->m_pOwner)->IncSendCount(numsent);
                 GetSystemTime(&m_LastActiveTime);
                 m_nBufferPos += numsent;
+                m_nBytesSinceThen += numsent;
 
                 if (!m_zlibStream.avail_in && m_hFile == INVALID_HANDLE_VALUE && m_zlibStream.avail_out &&
                     m_zlibStream.avail_out + m_nBufferPos == m_nBufSize && res == Z_STREAM_END)
@@ -546 +559 @@
                     m_pOwner->m_SlQuota.nDownloaded += numsent;
     
                 ((CServerThread *)m_pOwner->m_pOwner)->IncSendCount(numsent);
+                m_nBytesSinceThen += numsent;
                 GetSystemTime(&m_LastActiveTime);
 
                 //Check if there are other commands in the command queue.
@@ -783 +797 @@
             return;
         }
         ((CServerThread *)m_pOwner->m_pOwner)->IncRecvCount(numread);
+        m_nBytesSinceThen += numread;
 
         if (nLimit != -1 && GetState() != aborted)
             m_pOwner->m_SlQuota.nUploaded += numread;
@@ -972 +987 @@
             Close();
             return FALSE;
         }
+        ((PLARGE_INTEGER)&m_nTotalSize)->LowPart = GetFileSize(m_hFile,(LPDWORD)&((PLARGE_INTEGER)&m_nTotalSize)->HighPart);
         DWORD low=(DWORD)(m_nRest&0xFFFFFFFF);
         LONG high=(LONG)(m_nRest>>32);
         if (SetFilePointer(m_hFile, low, &high, FILE_BEGIN)==0xFFFFFFFF && GetLastError()!=NO_ERROR)
@@ -1026 +1042 @@
     return m_nMode;
 }
 
+CStdString CTransferSocket::GetFilename() const
+{
+    return m_Filename;
+}
+
 void CTransferSocket::UseGSS(CAsyncGssSocketLayer *pGssLayer)
 {
     m_pGssLayer = new CAsyncGssSocketLayer;
@@ -1070 +1091 @@
     
     return true;
 }
+ No newline at end of file
+
+void CTransferSocket::GetTransferInfo( __int64& lastTransferred, __int64& bytesSinceThen)
+{
+    lastTransferred = m_nLastTransferred;
+    m_nLastTransferred += (bytesSinceThen = m_nBytesSinceThen);
+    m_nBytesSinceThen = 0;
+}

source/TransferSocket.h

@@ -56 +56 @@
 // Überschreibungen
 public:
     int GetMode() const;
+    CStdString GetFilename() const;
     BOOL Started() const;
     BOOL CheckForTimeout();
     void PasvTransfer();
@@ -63 +64 @@
     bool InitZLib(int level);
     bool GetZlibStats(_int64 &bytesIn, _int64 &bytesOut) const;
 
+    void GetTransferInfo( __int64& lastTransferred, __int64& bytesSinceThen);
+    inline __int64 GetTotalSize() const { return m_nTotalSize; }
+
     BOOL pasv;
 // Implementierung
 protected:
@@ -98 +102 @@
     __int64 m_zlibBytesIn;
     __int64 m_zlibBytesOut;
 
+    volatile __int64 m_nTotalSize;
+    volatile __int64 m_nLastTransferred; // for statistics
+    volatile __int64 m_nBytesSinceThen; // for statistics
+
 };
 
 

source/GFtp/GFtp.vcproj

@@ -22 +22 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
                 InlineFunctionExpansion="1"
-                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GFTP_EXPORTS"
+                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GFTP_EXPORTS;WINVER=0x410"
                 StringPooling="TRUE"
                 RuntimeLibrary="0"
                 EnableFunctionLevelLinking="TRUE"
@@ -93 +93 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
                 AdditionalIncludeDirectories="c:\pismere\pismere\athena\auth\krb5\src\include"
-                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GFTP_EXPORTS"
+                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GFTP_EXPORTS;WINVER=0x410"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="1"
                 UsePrecompiledHeader="2"

source/Interface/FileZilla

@@ -22 +22 @@
             <Tool
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x410"
                 BasicRuntimeChecks="3"
                 RuntimeLibrary="1"
                 UsePrecompiledHeader="3"
@@ -90 +90 @@
                 Name="VCCLCompilerTool"
                 Optimization="1"
                 InlineFunctionExpansion="1"
-                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x410"
                 StringPooling="TRUE"
                 RuntimeLibrary="0"
                 EnableFunctionLevelLinking="TRUE"
@@ -109 +109 @@
             <Tool
                 Name="VCLinkerTool"
                 AdditionalDependencies="Shlwapi.lib version.lib ws2_32.lib"
-                OutputFile=".\Release/FileZilla Server Interface.exe"
+                OutputFile="..\..\FileZilla Server Interface.exe"
                 LinkIncremental="1"
                 SuppressStartupBanner="TRUE"
                 GenerateDebugInformation="TRUE"
@@ -127 +127 @@
                 TypeLibraryName=".\Release/FileZilla Server Interface.tlb"
                 HeaderFileName=""/>
             <Tool
-                Name="VCPostBuildEventTool"/>
+                Name="VCPostBuildEventTool"
+                Description="copying..."
+                CommandLine="copy &quot;..\..\FileZilla Server Interface.exe&quot; &quot;c:\progra~1\filezilla server&quot;"/>
             <Tool
                 Name="VCPreBuildEventTool"/>
             <Tool

source/Interface/FileZilla

@@ -1089 +1089 @@
 IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
 IDB_LEDS                BITMAP                  "res\\leds.bmp"
 IDB_DONATE              BITMAP                  "res\\donate.bmp"
+IDB_TRANSFERINFO        BITMAP                  "res\\transfer_modes.bmp"
+IDR_TRANSFER_TOOLS      BITMAP                  "res\\transfer_toolbar.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1106 +1108 @@
     BUTTON      ID_APP_ABOUT
 END
 
+IDR_TRANSFER_TOOLS TOOLBAR  16, 15
+BEGIN
+    BUTTON      ID_DISPLAY_HORIZONTALSPLITTER
+    BUTTON      ID_DISPLAY_VERTICALSPLITTER
+    SEPARATOR
+    BUTTON      ID_DISPLAY_FTPNAMES
+    BUTTON      ID_DISPLAY_LOCALNAMES
+    SEPARATOR
+    BUTTON      ID_DISPLAY_SORT
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1189 +1202 @@
     END
 END
 
+IDR_SORTMENU MENU 
+BEGIN
+    POPUP "popup"
+    BEGIN
+        MENUITEM "Sort by Account",             ID_DISPLAY_SORTBYACCOUNT
+        MENUITEM "Sort by IP",                  ID_DISPLAY_SORTBYIP
+        MENUITEM SEPARATOR
+        MENUITEM "Show Groups",                 ID_DISPLAY_GROUPED
+    END
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1403 +1427 @@
                             "Enter directory aliases|You have to enter the full physical path for each alias.\nExample: C:\\pub\\somedir will create the alias somedir in the folder c:\\pub\\ to the target folder.\nSeparate multiple aliases with the pipe character |"
 END
 
 #endif    // Deutsch (Deutschland) resources
+STRINGTABLE 
+BEGIN
+    ID_DISPLAY_FTPNAMES     "Displays FTP names"
+    ID_DISPLAY_LOCALNAMES   "Displays local filenames"
+    ID_DISPLAY_VERTICALSPLITTER "Use horizontal layout"
+    ID_DISPLAY_HORIZONTALSPLITTER "Use vertical layout"
+    ID_DISPLAY_SORT         "Select how to sort the user display"
+END
+
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Englisch (USA) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32

source/Interface/MainFrm.cpp

@@ -77 +77 @@
     ON_COMMAND(ID_MENU_EDIT_USERS, OnMenuEditUsers)
     ON_COMMAND(ID_MENU_EDIT_GROUPS, OnMenuEditGroups)
     ON_WM_DESTROY()
+
+    ON_COMMAND(ID_DISPLAY_FTPNAMES,OnDisplayFTPNames)
+    ON_COMMAND(ID_DISPLAY_LOCALNAMES,OnDisplayLocalNames)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_FTPNAMES,OnUpdateDisplayFTPNames)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_LOCALNAMES,OnUpdateDisplayLocalNames)
+    
+    ON_COMMAND(ID_DISPLAY_HORIZONTALSPLITTER,OnDisplayHorizontalSplitter)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_HORIZONTALSPLITTER,OnUpdateDisplayHorizontalSplitter)
+    ON_COMMAND(ID_DISPLAY_VERTICALSPLITTER,OnDisplayVerticalSplitter)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_VERTICALSPLITTER,OnUpdateDisplayVerticalSplitter)
+    
+    ON_COMMAND(ID_DISPLAY_SORT,OnDisplaySortMenu)
+    ON_NOTIFY(TBN_DROPDOWN, AFX_IDW_TOOLBAR, OnToolbarDropDown)
+
+    ON_COMMAND(ID_DISPLAY_SORTBYACCOUNT,OnDisplaySortByAccount)
+    ON_COMMAND(ID_DISPLAY_SORTBYIP,OnDisplaySortByIP)
+    ON_COMMAND(ID_DISPLAY_GROUPED,OnDisplayGrouped)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_SORTBYACCOUNT,OnUpdateDisplaySortByAccount)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_SORTBYIP,OnUpdateDisplaySortByIP)
+    ON_UPDATE_COMMAND_UI(ID_DISPLAY_GROUPED,OnUpdateDisplayGrouped)
     //}}AFX_MSG_MAP
     ON_WM_ERASEBKGND()
+    ON_WM_ENDSESSION()
 END_MESSAGE_MAP()
 
 static UINT indicators[] =
@@ -135 +156 @@
     
     SetupTrayIcon();
 
-    if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP
-        | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) ||
+    if (!m_wndReBar.Create(this)) return -1;
+
+    if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT| TBSTYLE_TRANSPARENT , WS_CHILD | WS_VISIBLE | CBRS_ALIGN_TOP
+        | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) ||
         !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
     {
         TRACE0("Symbolleiste konnte nicht erstellt werden\n");
         return -1;      // Fehler bei Erstellung
     }
 
+    if (!m_wndTransferTools.CreateEx(this,TBSTYLE_FLAT|TBSTYLE_TRANSPARENT,WS_CHILD|WS_VISIBLE|CBRS_ALIGN_TOP
+        |CBRS_TOOLTIPS|CBRS_FLYBY|CBRS_SIZE_DYNAMIC) ||
+        !m_wndTransferTools.LoadToolBar(IDR_TRANSFER_TOOLS))
+    {
+        TRACE0("Symbolleiste 2 konnte nicht erstellt werden\n");
+        return -1;      // Fehler bei Erstellung
+    }
+    m_wndTransferTools.GetToolBarCtrl().SetExtendedStyle(TBSTYLE_EX_DRAWDDARROWS);
+    DWORD dwStyle = m_wndToolBar.GetButtonStyle(m_wndTransferTools.CommandToIndex(ID_DISPLAY_SORT));
+    dwStyle |= TBSTYLE_DROPDOWN;
+    m_wndTransferTools.SetButtonStyle(m_wndTransferTools.CommandToIndex(ID_DISPLAY_SORT), dwStyle);
+
     if (!m_wndStatusBar.Create(this) ||
         !m_wndStatusBar.SetIndicators(indicators,
           sizeof(indicators)/sizeof(UINT)))
@@ -169 +204 @@
     m_wndStatusBar.SetPaneInfo(m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED),ID_INDICATOR_RECVLED,SBPS_NOBORDERS,6);
     m_wndStatusBar.SetPaneInfo(m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED),ID_INDICATOR_SENDLED,SBPS_NOBORDERS,6);
 
-    // ZU ERLEDIGEN: Löschen Sie diese drei Zeilen, wenn Sie nicht wollen, dass die Symbolleiste
-    //  andockbar ist.
-    m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
-    EnableDocking(CBRS_ALIGN_ANY);
-    DockControlBar(&m_wndToolBar);
+    m_wndReBar.AddBar(&m_wndToolBar);
+    m_wndReBar.AddBar(&m_wndTransferTools);
 
     ShowStatus(GetVersionString(), 0);
     ShowStatus("Copyright 2001 by Tim Kosse (Tim.Kosse@gmx.de)", 0);
@@ -294 +325 @@
 
 BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) 
 {
+    int rows=2, cols=1;
+    if (m_pOptions->GetOptionVal(IOPTION_PANELAYOUT)) {
+        rows=1; cols=2;
+    }
+
     // Unterteiltes Fenster erstellen
-    if (!m_wndSplitter.CreateStatic(this, 1, 2))
+    if (!m_wndSplitter.CreateStatic(this, rows, cols))
         return FALSE;
+    LARGE_INTEGER sizes;
+    sizes.QuadPart = m_pOptions->GetOptionVal(IOPTION_PANESIZES);
+    int s1,s2;
+    if (sizes.QuadPart == 0) {
     CRect rect;
-    GetWindowRect(rect);
-    if (!m_wndSplitter.CreateView(0, 0, RUNTIME_CLASS(CStatusView), CSize(rect.Width() - 225, 95), pContext))
+        GetClientRect(rect);
+        s2 = rect.Height()/3;
+        s1 = s2*2;
+    }
+    else
+    {
+        s1 = sizes.HighPart;
+        s2 = sizes.LowPart;
+    }
+    if (!m_wndSplitter.CreateView(0, 0, RUNTIME_CLASS(CStatusView), CSize(s1,s1), pContext))
     {
         m_wndSplitter.DestroyWindow();
         return FALSE;
     }
-    if (!m_wndSplitter.CreateView(0, 1, RUNTIME_CLASS(CUsersView), CSize(100, 95), pContext))
+    m_pStatusPane = (CStatusView*) m_wndSplitter.GetPane(0,0);
+    if (!m_wndSplitter.CreateView(rows-1, cols-1, RUNTIME_CLASS(CUsersView), CSize(s2,s2), pContext))
     {
         m_wndSplitter.DestroyWindow();
         return FALSE;
     }
+    m_pUsersPane = (CUsersView*) m_wndSplitter.GetPane(rows-1,cols-1);
+
+    // filename display option
+    GetUsersPane()->m_pListCtrl->SetDisplayLocalNames(m_pOptions->GetOptionVal(IOPTION_FILENAMEDISPLAY));
+
+    // set layout options
+    unsigned char usersorting = (unsigned char) m_pOptions->GetOptionVal(IOPTION_USERSORTING);
+    if (usersorting != 0) {
+        GetUsersPane()->m_pListCtrl->SetReportStyle(usersorting&0xF);
+        GetUsersPane()->m_pListCtrl->SetReportGrouping(((usersorting&0x10)!=0)?TRUE:FALSE);
+    }
+
     return CFrameWnd::OnCreateClient(lpcs, pContext);
 }
 
 CStatusView* CMainFrame::GetStatusPane()
 {
-    CWnd* pWnd = m_wndSplitter.GetPane(0, 0);
-    CStatusView* pView = DYNAMIC_DOWNCAST(CStatusView, pWnd);
-    return pView;
+    return m_pStatusPane;
 }
 
 CUsersView* CMainFrame::GetUsersPane()
 {
-    CWnd* pWnd = m_wndSplitter.GetPane(0, 1);
-    CUsersView* pView = DYNAMIC_DOWNCAST(CUsersView, pWnd);
-    return pView;
+    return m_pUsersPane;
 }
 
 void CMainFrame::OnSize(UINT nType, int cx, int cy) 
@@ -336 +393 @@
             m_wndStatusBar.SetPaneInfo(m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED),ID_INDICATOR_SENDLED,SBPS_NOBORDERS,10);
     }
 
-    if (m_wndSplitter.GetSafeHwnd())
-    {
-        //Hide the queue if visible
-        m_wndSplitter.HideColumn(1, 0);
-    }
     //Now only the main splitter gets resized
     CFrameWnd::OnSize(nType, cx, cy);
-    if (m_wndSplitter.GetSafeHwnd())
-    {
-        //Restore the queue
-        m_wndSplitter.ShowColumn(1);
-    }
     
     if (m_wndStatusBar.GetSafeHwnd())
     {
@@ -1148 +1195 @@
     pCmdUI->Enable(m_pAdminSocket && m_pAdminSocket->IsConnected());
 }
 
+// this function gets called whenever the user decides to quit the app
+// (by pressing the 'x' for example
 void CMainFrame::OnDestroy() 
 {
+    // save pane position
+    m_pOptions->SetOption(IOPTION_PANESIZES,m_wndSplitter.GetSizes());
+
     CloseAdminSocket(false);
     CFrameWnd::OnDestroy(); 
 }
 
+// when the system is shutdown while this app is running, we will not
+// get the OnDestroy message. in that case, this function is called
+// so we can still save settings.
+void CMainFrame::OnEndSession(BOOL bEnding)
+{
+    CFrameWnd::OnEndSession(bEnding);
+
+    if (bEnding) {
+        // save pane position
+        m_pOptions->SetOption(IOPTION_PANESIZES,m_wndSplitter.GetSizes());
+    }
+}
+
 BOOL CMainFrame::OnEraseBkgnd(CDC* pDC)
 {
     return TRUE;
@@ -1236 +1301 @@
         CloseAdminSocket();
     }
 }
+
+void CMainFrame::OnDisplayFTPNames()
+{
+    GetUsersPane()->m_pListCtrl->SetDisplayLocalNames(false);
+    m_pOptions->SetOption(IOPTION_FILENAMEDISPLAY,0);
+}
+
+void CMainFrame::OnDisplayLocalNames()
+{
+    GetUsersPane()->m_pListCtrl->SetDisplayLocalNames(true);
+    m_pOptions->SetOption(IOPTION_FILENAMEDISPLAY,1);
+}
+
+void CMainFrame::OnUpdateDisplayFTPNames(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(!GetUsersPane()->m_pListCtrl->GetDisplayLocalNames());
+}
+
+void CMainFrame::OnUpdateDisplayLocalNames(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(GetUsersPane()->m_pListCtrl->GetDisplayLocalNames());
+}
+
+void CMainFrame::OnDisplayHorizontalSplitter()
+{
+    if (!m_wndSplitter.BarIsHorizontal()) {
+        m_wndSplitter.ToggleLayout();
+        m_pOptions->SetOption(IOPTION_PANELAYOUT,0);
+    }
+}
+
+void CMainFrame::OnUpdateDisplayHorizontalSplitter(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(m_wndSplitter.BarIsHorizontal());
+}
+
+void CMainFrame::OnDisplayVerticalSplitter()
+{
+    if (m_wndSplitter.BarIsHorizontal()) {
+        m_wndSplitter.ToggleLayout();
+        m_pOptions->SetOption(IOPTION_PANELAYOUT,1);
+    }
+}
+
+void CMainFrame::OnUpdateDisplayVerticalSplitter(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(!m_wndSplitter.BarIsHorizontal());
+}
+
+void CMainFrame::OnDisplaySortMenu()
+{
+    // load and display popup menu
+    CMenu menu;
+    menu.LoadMenu(IDR_SORTMENU);
+    CMenu* pPopup = menu.GetSubMenu(0);
+    ASSERT(pPopup);
+
+    CRect rc;
+    m_wndTransferTools.GetItemRect(m_wndTransferTools.CommandToIndex(ID_DISPLAY_SORT),&rc);
+    m_wndTransferTools.ClientToScreen(&rc);
+
+    pPopup->TrackPopupMenu( TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL,
+        rc.left, rc.bottom, this, &rc);
+}
+
+void CMainFrame::OnToolbarDropDown(NMHDR* pnmh, LRESULT* plRes)
+{
+    NMTOOLBAR* pnmtb = (NMTOOLBAR*)pnmh;
+    if (pnmtb->iItem == ID_DISPLAY_SORT)
+        OnDisplaySortMenu();
+}
+
+void CMainFrame::OnDisplaySortByAccount()
+{
+    GetUsersPane()->m_pListCtrl->SetReportStyle(1);
+    bool grp = (GetUsersPane()->m_pListCtrl->IsGroupViewEnabled() != 0);
+    m_pOptions->SetOption(IOPTION_USERSORTING,(grp?0x10:0)+1);
+}
+
+void CMainFrame::OnDisplaySortByIP()
+{
+    GetUsersPane()->m_pListCtrl->SetReportStyle(2);
+    bool grp = (GetUsersPane()->m_pListCtrl->IsGroupViewEnabled() != 0);
+    m_pOptions->SetOption(IOPTION_USERSORTING,(grp?0x10:0)+2);
+}
+
+void CMainFrame::OnDisplayGrouped()
+{
+    if (GetUsersPane()->m_pListCtrl->IsGroupViewPossible()) {
+        bool grp = GetUsersPane()->m_pListCtrl->ToggleGroupView();
+        int sort = GetUsersPane()->m_pListCtrl->GetReportSorting();
+        m_pOptions->SetOption(IOPTION_USERSORTING,(grp?0x10:0)+sort);
+    }
+}
+
+void CMainFrame::OnUpdateDisplaySortByAccount(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(GetUsersPane()->m_pListCtrl->GetReportSorting()==1);
+}
+
+void CMainFrame::OnUpdateDisplaySortByIP(CCmdUI* pCmdUI)
+{
+    pCmdUI->SetRadio(GetUsersPane()->m_pListCtrl->GetReportSorting()==2);
+}
+
+void CMainFrame::OnUpdateDisplayGrouped(CCmdUI* pCmdUI)
+{
+    if (GetUsersPane()->m_pListCtrl->IsGroupViewPossible())
+        pCmdUI->SetCheck(GetUsersPane()->m_pListCtrl->IsGroupViewEnabled());
+    else
+        pCmdUI->Enable(FALSE);
+}
+
+

source/Interface/MainFrm.h

@@ -85 +85 @@
 protected:  // Eingebundene Elemente der Steuerleiste
     CAdminSocket *m_pAdminSocket;
     int m_nServerState;
+    CStatusView* m_pStatusPane;
+    CUsersView* m_pUsersPane;
 
     void CMainFrame::SetStatusbarText(int nIndex,CString str);
     CLed m_SendLed;
     CLed m_RecvLed;
+    CReBar      m_wndReBar;
     CStatusBar  m_wndStatusBar;
     CToolBar    m_wndToolBar;
+    CToolBar    m_wndTransferTools;
     CSplitterWndEx m_wndSplitter;
 
     //// Internal support functions
@@ -147 +151 @@
     afx_msg void OnUpdateUsers(CCmdUI* pCmdUI);
     afx_msg void OnUpdateGroups(CCmdUI* pCmdUI);
     afx_msg void OnDestroy();
+    afx_msg void OnDisplayFTPNames();
+    afx_msg void OnDisplayLocalNames();
+    afx_msg void OnUpdateDisplayFTPNames(CCmdUI* pCmdUI);
+    afx_msg void OnUpdateDisplayLocalNames(CCmdUI* pCmdUI);
+    afx_msg void OnDisplayHorizontalSplitter();
+    afx_msg void OnUpdateDisplayHorizontalSplitter(CCmdUI* pCmdUI);
+    afx_msg void OnDisplayVerticalSplitter();
+    afx_msg void OnUpdateDisplayVerticalSplitter(CCmdUI* pCmdUI);
+    afx_msg void OnDisplaySortMenu();
+    afx_msg void OnToolbarDropDown(NMHDR* pnmh, LRESULT* plRes);
+    afx_msg void OnDisplaySortByAccount();
+    afx_msg void OnDisplaySortByIP();
+    afx_msg void OnDisplayGrouped();
+    afx_msg void OnUpdateDisplaySortByAccount(CCmdUI* pCmdUI);
+    afx_msg void OnUpdateDisplaySortByIP(CCmdUI* pCmdUI);
+    afx_msg void OnUpdateDisplayGrouped(CCmdUI* pCmdUI);
     //}}AFX_MSG
     DECLARE_MESSAGE_MAP()
 public:
     afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 protected:
     virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+public:
+    afx_msg void OnEndSession(BOOL bEnding);
 };
 
 /////////////////////////////////////////////////////////////////////////////

source/Interface/Options.cpp

@@ -56 +56 @@
                                                 _T("Last Server Address"),      0,
                                                 _T("Last Server Port"),         1,
                                                 _T("Last Server Password"),     0,
-                                                _T("Always use last server"),   1
+                                                _T("Always use last server"),   1,
+                                                _T("Pane Layout"),              1,
+                                                _T("Pane Sizes"),               1,
+                                                _T("User Sorting"),             1,
+                                                _T("Filename Display"),         1
                                                 };
 
 void COptions::SetOption(int nOptionID, __int64 value)

source/Interface/Options.h

@@ -33 +33 @@
 #define IOPTION_LASTSERVERPORT 3
 #define IOPTION_LASTSERVERPASS 4
 #define IOPTION_ALWAYS 5
+#define IOPTION_PANELAYOUT 6
+#define IOPTION_PANESIZES 7
+#define IOPTION_USERSORTING 8
+#define IOPTION_FILENAMEDISPLAY 9
 
-#define IOPTIONS_NUM 5
+#define IOPTIONS_NUM 9
 
 class CMarkupSTL;
 class COptionsDlg;

source/Interface/StdAfx.h

@@ -65 +65 @@
 #define USERCONTROL_CONNOP_MODIFY 1
 #define USERCONTROL_CONNOP_REMOVE 2
 
+#define SPEED_MEAN_SECONDS 10
+
 typedef struct
 {
     int userid;
     CString user;
     CString ip;
     unsigned int port;
+    unsigned char mode; // data transfer mode
+    CString local_filename; // like c:\file.txt
+    CString ftp_filename; // like /C/file.txt
+    __int64 bytes_total;
+    __int64 bytes_transferred;
+    unsigned int speed;
+
+    inline void init_speed_mean() 
+        { for (int i=0;i<SPEED_MEAN_SECONDS;++i) speed_mean[i]=0; 
+        current_speed = speed_mean; }
+    inline void insert_speed( unsigned int speed )
+        { ++current_speed; if (current_speed >= speed_mean+SPEED_MEAN_SECONDS) current_speed = speed_mean;
+        *current_speed = speed; }
+    inline unsigned int get_current_speed() const
+        { return *current_speed; }
+    inline double get_mean_speed() const
+        { double speed = 0;
+        for (int i=0;i<SPEED_MEAN_SECONDS;++i) speed += speed_mean[i];
+        return speed / SPEED_MEAN_SECONDS; }
+
+private:
+    unsigned int speed_mean [SPEED_MEAN_SECONDS];
+    unsigned int *current_speed;
+
 } t_connectiondata;
 
 //{{AFX_INSERT_LOCATION}}

source/Interface/UsersListCtrl.cpp

@@ -24 +24 @@
 #include "UsersListCtrl.h"
 #include "mainfrm.h"
 
+#include <set>
+#include <string>
+using namespace std;
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
 static char THIS_FILE[] = __FILE__;
 #endif
 
+
+// to allow mixed windows 2k/xp controls, we need some definitions from
+// windows xp controls that we cannot include
+
+typedef struct tagLVITEMW_XP
+{
+    UINT mask;
+    int iItem;
+    int iSubItem;
+    UINT state;
+    UINT stateMask;
+    LPTSTR pszText;
+    int cchTextMax;
+    int iImage;
+    LPARAM lParam;
+    int iIndent;
+    int iGroupId;
+    UINT cColumns; // tile view columns
+    PUINT puColumns;
+} LVITEM_XP, *LPLVITEM_XP;
+
+// mask
+#define LVIF_GROUPID_XP 0x0100
+
+// style
+#define LVGF_HEADER_XP  0x00000001
+#define LVGF_GROUPID_XP 0x00000010
+
+typedef struct tagLVGROUP_XP
+{
+    UINT    cbSize;
+    UINT    mask;
+    LPWSTR  pszHeader;
+    int     cchHeader;
+
+    LPWSTR  pszFooter;
+    int     cchFooter;
+
+    int     iGroupId;
+
+    UINT    stateMask;
+    UINT    state;
+    UINT    uAlign;
+} LVGROUP_XP, *PLVGROUP_XP;
+
+
+// code to get the common controls version
+// from: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/versions.asp
+
+#define PACKVERSION(major,minor) MAKELONG(minor,major)
+DWORD GetDllVersion(LPCTSTR lpszDllName)
+{
+    HINSTANCE hinstDll;
+    DWORD dwVersion = 0;
+
+    /* For security purposes, LoadLibrary should be provided with a 
+       fully-qualified path to the DLL. The lpszDllName variable should be
+       tested to ensure that it is a fully qualified path before it is used. */
+    hinstDll = LoadLibrary(lpszDllName);
+    
+    if(hinstDll)
+    {
+        DLLGETVERSIONPROC pDllGetVersion;
+        pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll, 
+                          "DllGetVersion");
+
+        /* Because some DLLs might not implement this function, you
+        must test for it explicitly. Depending on the particular 
+        DLL, the lack of a DllGetVersion function can be a useful
+        indicator of the version. */
+
+        if(pDllGetVersion)
+        {
+            DLLVERSIONINFO dvi;
+            HRESULT hr;
+
+            ZeroMemory(&dvi, sizeof(dvi));
+            dvi.cbSize = sizeof(dvi);
+
+            hr = (*pDllGetVersion)(&dvi);
+
+            if(SUCCEEDED(hr))
+            {
+               dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion);
+            }
+        }
+
+        FreeLibrary(hinstDll);
+    }
+    return dwVersion;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CUsersListCtrl
 
@@ -37 +133 @@
 {
     ASSERT(pOwner);
     m_pOwner = pOwner;
+    localnames = false;
+
+    m_bGroupViewPossible = (GetDllVersion(TEXT("comctl32.dll")) >= PACKVERSION(6,00));
 }
 
 CUsersListCtrl::~CUsersListCtrl()
@@ -53 +152 @@
     ON_WM_CONTEXTMENU()
     ON_WM_SIZE()
     //}}AFX_MSG_MAP
+    ON_WM_SIZE()
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -63 +163 @@
     if (CListCtrl::OnCreate(lpCreateStruct) == -1)
         return -1;
     
+    CImageList* transfer_images = new CImageList;
+    transfer_images->Create(IDB_TRANSFERINFO,16,4,RGB(255,0,255));
+    SetImageList(transfer_images,LVSIL_SMALL);
+    
+    SetExtendedStyle(LVS_EX_SUBITEMIMAGES|LVS_EX_FULLROWSELECT);
     InsertColumn(0, "ID", LVCFMT_RIGHT, -1, 0);
     InsertColumn(1, "Account", LVCFMT_LEFT, -1, 1);
-    InsertColumn(2, "IP", LVCFMT_RIGHT, -1, 2);
+    InsertColumn(2,"IP/DNS",LVCFMT_RIGHT,-1,2);
+    InsertColumn(3,"Progress",LVCFMT_RIGHT,-1,3);
+    InsertColumn(4,"Bytes/s",LVCFMT_RIGHT,-1,4);
+    InsertColumn(5,"Transfer",LVCFMT_LEFT,-1,5);
+
+    EnableGroupView(true);
+    m_iSort = 1;
+    m_pCurrentSortFunc = SortByAccount;
     AutoResizeColumns();
+    SetColumnWidth(3,LVSCW_AUTOSIZE_USEHEADER);
+    SetColumnWidth(4,LVSCW_AUTOSIZE_USEHEADER);
 
     return 0;
 }
@@ -74 +188 @@
 void CUsersListCtrl::AutoResizeColumns()
 {
     SetColumnWidth(0,LVSCW_AUTOSIZE_USEHEADER);
-    SetColumnWidth(1,LVSCW_AUTOSIZE_USEHEADER);
-    SetColumnWidth(2,LVSCW_AUTOSIZE_USEHEADER);
+    if ((m_iSort==1) && IsGroupViewEnabled()) SetColumnWidth(1,0);
+    else SetColumnWidth(1,LVSCW_AUTOSIZE_USEHEADER);
+    if ((m_iSort==2) && IsGroupViewEnabled()) SetColumnWidth(2,0);
+    else SetColumnWidth(2,LVSCW_AUTOSIZE_USEHEADER);
+    SetColumnWidth(5,LVSCW_AUTOSIZE_USEHEADER);
+}
+
+int GetHostName( const CString& ip, CString& hostname )
+{
+#if 0
+    // this generates an error under win2k: getnameinfo not found
+    // TODO: use this route but allow dynamic loading of the winsock dll so
+    // we can fallback on win2k. alternatively, we could drop win2k support ;-)
+    sockaddr_in saHost;
+    // Set up the sockaddr structure
+    saHost.sin_family = AF_INET;
+    saHost.sin_addr.s_addr = inet_addr(ip);
+    int err = getnameinfo((sockaddr*)&saHost,sizeof(saHost),hostname.GetBuffer(NI_MAXHOST),NI_MAXHOST,0,0,NI_NAMEREQD);
+    hostname.ReleaseBuffer();
+    return err;
+#else 
+    // this alternative route works under win2k+win9x, but does not allow IPv6
+    hostent* remoteHost;
+    unsigned int addr;
+    addr = inet_addr(ip);
+    remoteHost = gethostbyaddr((char *) &addr, 4, AF_INET);
+    if (remoteHost == 0) return WSAGetLastError();
+    hostname = remoteHost->h_name;
+    return 0;
+#endif
 }
 
 void CUsersListCtrl::ProcessConnOp(int op, const t_connectiondata &connectionData)
 {
     if (op == USERCONTROL_CONNOP_ADD)
     {
+        // get the hostname for that ip
+        CString hostname;
+        int err = GetHostName(connectionData.ip,hostname);
+        if (err == 0)
+            hostname += " (" + connectionData.ip + ")";
+        else
+            hostname = connectionData.ip;
+        int group_id = GenerateGroupID(connectionData);
+
         CString str_id;
         str_id.Format("%06d", connectionData.userid);
-        int index = InsertItem(GetItemCount(), str_id);
+        t_connectiondata *pData = new t_connectiondata;
+        *pData = connectionData;
+        pData->init_speed_mean();
+        int index;
+        if (IsGroupViewPossible()) {
+            LVITEM_XP lvitem;
+            lvitem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_GROUPID_XP | LVIF_PARAM;
+            lvitem.iItem = GetItemCount();
+            lvitem.iSubItem = 0;
+            lvitem.pszText = (LPTSTR) (LPCTSTR) str_id;
+            lvitem.iImage = 4;
+            lvitem.lParam = (DWORD) pData;
+            lvitem.iGroupId = group_id;
+            index = InsertItem((LVITEM*)&lvitem);
+        } else {
+            LVITEM lvitem;
+            lvitem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
+            lvitem.iItem = GetItemCount();
+            lvitem.iSubItem = 0;
+            lvitem.pszText = (LPTSTR) (LPCTSTR) str_id;
+            lvitem.iImage = 4;
+            lvitem.lParam = (DWORD) pData;
+            index = InsertItem(&lvitem);
+        }
         if (connectionData.user == "")
             SetItemText(index,1,"(not logged in)");
         else
         SetItemText(index,1,connectionData.user);
-        SetItemText(index,2,connectionData.ip);
-        t_connectiondata *pData = new t_connectiondata;
-        *pData = connectionData;
-        SetItemData(index, (DWORD)pData);
+        SetItemText(index,2,hostname);
+
+        SortItems(m_pCurrentSortFunc,0); 
         AutoResizeColumns();
 
         if (GetItemCount() == 1)
@@ -105 +278 @@
             t_connectiondata *pData = (t_connectiondata *)GetItemData(i);
             if (pData->userid == connectionData.userid)
             {
-                *pData = connectionData;
-
-                CString str_id;
-                str_id.Format("%06d",connectionData.userid);
-                SetItemText(i,0,str_id);
-                if (connectionData.user=="")
-                    SetItemText(i,1,"(not logged in)");
-                else
+                bool must_be_sorted = false;
+                if ((pData->user == "") && (connectionData.user!="")) {
+                    // this seems to be the first "modify" message after logging in,
+                    // so set the account name and generate a group id if the current sort mode is "ip"
+                    if ((m_iSort == 1) && IsGroupViewPossible()) {
+                        LVITEM_XP lvitem;
+                        lvitem.mask = LVIF_GROUPID_XP;
+                        lvitem.iItem = i;
+                        lvitem.iSubItem = 0;
+                        lvitem.iGroupId = GenerateGroupID(connectionData);
+                        SetItem((LVITEM*)&lvitem);
+                        must_be_sorted = true;
+                    }
                     SetItemText(i,1,connectionData.user);
-                AutoResizeColumns();
+                    if ((m_iSort!=1) || !IsGroupViewEnabled()) SetColumnWidth(1,LVSCW_AUTOSIZE_USEHEADER);
+                    pData->user = connectionData.user;
+                }
 
+                if (connectionData.mode==0) {
+                    SetItem(i,5,LVIF_TEXT|LVIF_IMAGE,"",0,0,0,0);
+                    SetItemText(i,3,"");
+                    SetItemText(i,4,"");
+                    if (pData->mode != 0) {
+                        SetColumnWidth(5,LVSCW_AUTOSIZE_USEHEADER);
+                        pData->mode = 0;
+                        pData->ftp_filename = "";
+                        pData->local_filename = "";
+                        pData->init_speed_mean();
+                    }
+                }
+                else {
+                    pData->mode = connectionData.mode;
+                    pData->bytes_total = connectionData.bytes_total;
+                    pData->bytes_transferred = connectionData.bytes_transferred;
+                    if (pData->local_filename != connectionData.local_filename) {
+                        SetItem(i,5,LVIF_TEXT|LVIF_IMAGE,
+                            localnames?connectionData.local_filename:connectionData.ftp_filename,
+                            connectionData.mode,0,0,0);
+                        SetColumnWidth(5,LVSCW_AUTOSIZE_USEHEADER);
+                        pData->local_filename = connectionData.local_filename;
+                        pData->ftp_filename   = connectionData.ftp_filename;
+                    }
+                    double percent = 0;
+                    if (connectionData.bytes_total != 0 && connectionData.bytes_transferred != 0)
+                        percent = 100.0 * ((double)connectionData.bytes_transferred / connectionData.bytes_total);
+                    CString transfer;
+                    transfer.Format("%2.1f%%",percent);
+                    CString speed;
+                    pData->insert_speed(connectionData.speed);
+                    double speed_mean = pData->get_mean_speed();
+                    if (speed_mean > 1024*1024)
+                        speed.Format("%2.1fM",speed_mean/(1024*1024));
+                    else if (speed_mean > 1024)
+                        speed.Format("%2.1fK",speed_mean/1024.0);
+                    else
+                        speed.Format("%1.0f",speed_mean);
+                    SetItemText(i,3,transfer);
+                    SetItemText(i,4,speed);
+                }
+                if (must_be_sorted) SortItems(m_pCurrentSortFunc,0); 
                 break;
             }
         }
@@ -228 +450 @@
                 connectionData.user.ReleaseBuffer(len);
                 pos+=len;
 
+                connectionData.mode = 0;
+
                 ProcessConnOp(USERCONTROL_CONNOP_ADD, connectionData);
             }
         }
@@ -263 +487 @@
             memcpy(connectionData.user.GetBuffer(len), pData + pos, len);
             connectionData.user.ReleaseBuffer(len);
             pos += len;
+
+            if (pos + 3 > dwDataLength)
+                return FALSE;
+            connectionData.mode = pData[pos];
+            len = pData[pos+1] * 256 + pData[pos+2];
+            pos += 3;
+            if (pos + len > dwDataLength)
+                return FALSE;
+            memcpy(connectionData.ftp_filename.GetBuffer(len), pData + pos, len);
+            connectionData.ftp_filename.ReleaseBuffer(len);
+            pos += len;
+
+            if (pos + 2 > dwDataLength)
+                return FALSE;
+            len = pData[pos] * 256 + pData[pos+1];
+            pos += 2;
+            if (pos + len > dwDataLength)
+                return FALSE;
+            memcpy(connectionData.local_filename.GetBuffer(len), pData + pos, len);
+            connectionData.local_filename.ReleaseBuffer(len);
+            pos += len;
+
+            if (pos+8+8+4 > dwDataLength)
+                return FALSE;
+            memcpy(&connectionData.bytes_total,pData+pos,8);
+            memcpy(&connectionData.bytes_transferred,pData+pos+8,8);
+            memcpy(&connectionData.speed,pData+pos+8+8,4);
+            pos += 8 + 8 + 4;
             ProcessConnOp(pData[1], connectionData);
         }
         else
@@ -284 +536 @@
 
     AutoResizeColumns();
 }
+
+void CUsersListCtrl::SetDisplayLocalNames( bool show_localnames )
+{
+    localnames = show_localnames;
+    // iterate through all items and set column 3 (transfer) to
+    // the appropriate value
+    for (int i=0;i<GetItemCount();i++)
+    {
+        t_connectiondata *pData=(t_connectiondata *)GetItemData(i);
+        SetItemText(i,5,localnames?pData->local_filename:pData->ftp_filename);
+    }
+}
+
+bool CUsersListCtrl::GetDisplayLocalNames()
+{
+    return localnames;
+}
+
+int CUsersListCtrl::GenerateGroupID(const t_connectiondata& connectionData)
+{
+    int group_id;
+    switch (m_iSort) {
+        case 1:
+            // sort by account
+            group_id = (int) &*accounts.insert((const char*)connectionData.user).first;
+            if (!HasGroup(group_id)) {
+                // we have to create this group
+                USES_CONVERSION;
+                LVGROUP_XP group;
+                group.cbSize = sizeof(LVGROUP_XP);
+                group.mask = LVGF_GROUPID_XP | LVGF_HEADER_XP;
+                group.iGroupId = group_id;
+                if (connectionData.user=="") {
+                    group.pszHeader = T2W( "Not Logged In" );
+                    group.cchHeader = 13;
+                } else {
+                    group.pszHeader = T2W( "Account: "+connectionData.user );
+                    group.cchHeader = 9+connectionData.user.GetLength();
+                }
+                InsertGroup(-1,&group);
+            }
+            return group_id;
+        case 2:
+            // sort by ip
+            group_id = inet_addr(connectionData.ip);
+            if (!HasGroup(group_id)) {
+                // get the hostname for that ip
+                CString hostname;
+                int err = GetHostName(connectionData.ip,hostname);
+                if (err == 0)
+                    hostname += " (" + connectionData.ip + ")";
+                else
+                    hostname = connectionData.ip;
+                // we have to create this group
+                USES_CONVERSION;
+                LVGROUP_XP group;
+                group.cbSize = sizeof(LVGROUP_XP);
+                group.mask = LVGF_GROUPID_XP | LVGF_HEADER_XP;
+                group.pszHeader = T2W( "Connections to "+hostname );
+                group.cchHeader = 15+hostname.GetLength();
+                group.iGroupId = group_id;
+                InsertGroup(-1,&group);
+            }
+            return group_id;
+    }
+    return 0;
+}
+
+int CUsersListCtrl::SortByAccount(LPARAM lParam1, LPARAM lParam2, LPARAM /*lParamSort*/)
+{
+    t_connectiondata *item1 = (t_connectiondata*) lParam1;
+    t_connectiondata *item2 = (t_connectiondata*) lParam2;
+    return item1->user.Compare(item2->user);
+}
+
+int CUsersListCtrl::SortByIP     (LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+{
+    t_connectiondata *item1 = (t_connectiondata*) lParam1;
+    t_connectiondata *item2 = (t_connectiondata*) lParam2;
+    return inet_addr(item1->ip) - inet_addr(item2->ip);
+}
+
+void CUsersListCtrl::SetReportStyle( int sort )
+{
+    // skip if nothing changes
+    if (sort == GetReportSorting()) return;
+    m_iSort = sort;
+
+    // sort the list
+    switch (sort) {
+        case 1: 
+            // sort by account
+            m_pCurrentSortFunc = SortByAccount;
+            break;
+        case 2:
+            // sort by ip
+            m_pCurrentSortFunc = SortByIP;
+            break;
+    }
+    SortItems(m_pCurrentSortFunc,0); 
+
+    if (IsGroupViewPossible()) {
+        // recreate groups
+        BOOL grouped = IsGroupViewEnabled(); // RemoveAllGroups seems to kill that flag, so we'll reset it later
+        RemoveAllGroups();
+        LVITEM_XP item;
+        item.mask = LVIF_GROUPID_XP;
+        item.iSubItem = 0;
+        for (int i=0;i<GetItemCount();i++)
+        {
+            t_connectiondata *pData=(t_connectiondata *)GetItemData(i);
+            item.iGroupId = GenerateGroupID(*pData);
+            item.iItem = i;
+            SetItem((LVITEM*)&item);
+        }
+        EnableGroupView(grouped);
+    }
+
+    AutoResizeColumns();
+}
+
+
+
+BOOL CUsersListCtrl::IsGroupViewEnabled() const
+{
+    if (IsGroupViewPossible()) {
+        return (BOOL)SNDMSG(*this, LVM_FIRST+175, 0, 0);
+    }
+    return FALSE;
+}
+
+LRESULT CUsersListCtrl::EnableGroupView(BOOL fEnable)
+{
+    if (IsGroupViewPossible()) {
+        return SNDMSG(*this, LVM_FIRST+157, (WPARAM)fEnable, 0);
+    }
+    return 0L;
+}
+
+BOOL CUsersListCtrl::HasGroup(int iGroupId) const
+{
+    if (IsGroupViewPossible()) {
+        return SNDMSG(*this, LVM_FIRST+161, iGroupId, 0);
+    }
+    return FALSE;
+}
+
+void CUsersListCtrl::RemoveAllGroups()
+{
+    if (IsGroupViewPossible()) {
+        SNDMSG(*this, LVM_FIRST+160, 0, 0);
+    }
+}
+
+LRESULT CUsersListCtrl::InsertGroup(int index, void* pgrp)
+{
+    if (IsGroupViewPossible()) {
+        return SNDMSG(*this, LVM_FIRST+145, (WPARAM)index, (LPARAM)pgrp);
+    }
+    return 0L;
+}
+
+
+
+
+
+
+
+
+
+

source/Interface/UsersListCtrl.h

@@ -19 +19 @@
 #if !defined(AFX_USERSLISTCTRL_H__C939FF91_7A57_4E36_927B_00B917F6ECED__INCLUDED_)
 #define AFX_USERSLISTCTRL_H__C939FF91_7A57_4E36_927B_00B917F6ECED__INCLUDED_
 
+#include <set>
+#include <string>
+
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
@@ -43 +46 @@
 public:
     BOOL ParseUserControlCommand(unsigned char *pData, DWORD dwDataLength);
     void AutoResizeColumns();
+    void SetDisplayLocalNames( bool show_localnames );
+    bool GetDisplayLocalNames();
+
+    // these work only in win xp, they do nothing for win 2k
+    BOOL IsGroupViewEnabled() const;
+    LRESULT EnableGroupView(BOOL fEnable);
+    BOOL HasGroup(int iGroupId) const;
+    void RemoveAllGroups();
+    LRESULT InsertGroup(int index, void* pgrp);
+    // true if win >= xp, false for win <= 2k
+    inline bool IsGroupViewPossible() const { return m_bGroupViewPossible; }
+
+    void SetReportStyle( int sort );
+    inline int GetReportSorting() const { return m_iSort; }
+    inline void SetReportGrouping( BOOL grp )
+        { if ((IsGroupViewEnabled()-grp) != 0) ToggleGroupView(); }
+    inline bool ToggleGroupView() 
+        { bool ret; EnableGroupView(ret=!IsGroupViewEnabled()); 
+        AutoResizeColumns(); return ret; }
 
 // Überschreibungen
     // Vom Klassen-Assistenten generierte virtuelle Funktionsüberschreibungen
@@ -52 +74 @@
 // Implementierung
 protected:
     void ProcessConnOp(int op, const t_connectiondata &connectionData);
+    int GenerateGroupID(const t_connectiondata& connectionData);
 
     CMainFrame *m_pOwner;
+    bool localnames; // true: display local filenames, false: display ftp names
+    int m_iSort; // 1: sort by account; 2: sort by ip
+
+private:
+    std::set<std::string> accounts; // used to give every account name a unique id
+    PFNLVCOMPARE m_pCurrentSortFunc;
+    static int CALLBACK SortByAccount(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
+    static int CALLBACK SortByIP     (LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
+    bool m_bGroupViewPossible;
+
 
     // Generierte Nachrichtenzuordnungsfunktionen
 protected:

source/Interface/UsersView.cpp

@@ -95 +95 @@
     
     CMainFrame *pMainFrame = (CMainFrame *)AfxGetMainWnd();
     m_pListCtrl=new CUsersListCtrl(pMainFrame);
-    m_pListCtrl->Create(LVS_REPORT | WS_CHILD | WS_VISIBLE | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_VSCROLL, CRect(0,0,0,0), this, 0);
+    m_pListCtrl->Create( WS_CHILD | WS_VISIBLE | WS_VSCROLL | 
+        LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER, 
+        CRect(0,0,0,0), this, 0);
     
     return 0;
 }

source/Interface/resource.h

@@ -73 +73 @@
 #define IDS_OPTIONSPAGE_COMPRESSION     156
 #define IDS_OPTIONSPAGE_GENERAL_IPBINDINGS 157
 #define IDS_OPTIONSPAGE_GENERAL_IPFILTER 158
+#define IDB_TRANSFERINFO                158
+#define IDR_TRANSFER_TOOLS              161
+#define IDR_SORTMENU                    163
 #define IDC_CAPTION_BAR                 1000
 #define IDS_SHAREDFOLDERS_ENTERALIASES  1000
 #define IDC_CHECK_DAY1                  1001
@@ -264 +267 @@
 #define ID_USERVIEWCONTEXT_KICK         32799
 #define ID_DIRMENU_EDITALIASES          32800
 #define ID_DIRMENU_SETASHOMEDIR         32801
+#define ID_DISPLAY_FTPNAMES             32802
+#define ID_DISPLAY_LOCALNAMES           32803
+#define ID_DISPLAY_VERTICALSPLITTER     32805
+#define ID_DISPLAY_HORIZONTALSPLITTER   32806
+#define ID_DISPLAY_SORT                 32807
+#define ID_DISPLAY_GROUPED              32811
+#define ID_DISPLAY_SORTBYIP             32812
+#define ID_DISPLAY_SORTBYACCOUNT        32813
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         32802
+#define _APS_NEXT_RESOURCE_VALUE        164
+#define _APS_NEXT_COMMAND_VALUE         32814
 #define _APS_NEXT_CONTROL_VALUE         1162
 #define _APS_NEXT_SYMED_VALUE           1227
 #endif

source/Interface/splitex.cpp

@@ -7 +7 @@
 #include "stdafx.h"
 #include "splitex.h"
 
+#include <algorithm>
+using namespace std;
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -444 +447 @@
         cyMin=0;
     }
 }
+
+void CSplitterWndEx::ToggleLayout()
+{
+    ASSERT( m_nRows <= 2 );
+    ASSERT( m_nCols <= 2 );
+    int cur0, cur1, min0, min1;
+    CRect rc;
+    float w_relative_h;
+    GetClientRect(rc);
+    w_relative_h = (float)rc.Width()/rc.Height();
+
+    if ( BarIsHorizontal() )
+    {
+        GetRowInfo( 0, cur0, min0 );
+        GetRowInfo( 1, cur1, min1 );
+        SetWindowLong( GetPane( 1, 0 )->m_hWnd, GWL_ID, AFX_IDW_PANE_FIRST + 1 );
+        m_nRows = m_nMaxRows = 1;
+        m_nCols = m_nMaxCols = 2;
+        swap(m_pRowInfo,m_pColInfo);
+        SetColumnInfo( 0, int(cur0*w_relative_h), int(min0*w_relative_h) );
+        SetColumnInfo( 1, int(cur1*w_relative_h), int(min1*w_relative_h) );
+    }
+    else
+    {
+        GetColumnInfo( 0, cur0, min0 );
+        GetColumnInfo( 1, cur1, min1 );
+        SetWindowLong( GetPane( 0, 1 )->m_hWnd, GWL_ID, AFX_IDW_PANE_FIRST + 16 );
+        m_nRows = m_nMaxRows = 2;
+        m_nCols = m_nMaxCols = 1;
+        swap(m_pRowInfo,m_pColInfo);
+        SetRowInfo( 0, int(cur0/w_relative_h), int(min0/w_relative_h) );
+        SetRowInfo( 1, int(cur1/w_relative_h), int(min1/w_relative_h) );
+    }
+    RecalcLayout();
+}
+
+__int64 CSplitterWndEx::GetSizes() const
+{
+    LARGE_INTEGER v;
+    int dummy;
+    int s1,s2;
+    if (BarIsHorizontal())
+    {
+        GetRowInfo(0,s1,dummy);
+        GetRowInfo(1,s2,dummy);
+        v.HighPart = s1;
+        v.LowPart = s2;
+    }
+    else
+    {
+        GetColumnInfo(0,s1,dummy);
+        GetColumnInfo(1,s2,dummy);
+        v.HighPart = s1;
+        v.LowPart = s2;
+    }
+    return v.QuadPart;
+}
+
+
+

source/Interface/splitex.h

@@ -24 +24 @@
 
     virtual ~CSplitterWndEx();
 
+    inline BOOL BarIsHorizontal() const { return m_nCols < m_nRows; }
+    void ToggleLayout();
+    __int64 GetSizes() const;
 
     void ShowRow(int row);
     void ShowColumn(int row);