Index: /trunk/include/iprt/ftp.h =================================================================== --- /trunk/include/iprt/ftp.h (revision 82698) +++ /trunk/include/iprt/ftp.h (revision 82699) @@ -189,5 +189,5 @@ * @param pCallbacks Callback table to use. */ -RTR3DECL(int) RTFTPServerCreate(PRTFTPSERVER phFTPServer, const char *pcszAddress, uint16_t uPort, +RTR3DECL(int) RTFtpServerCreate(PRTFTPSERVER phFTPServer, const char *pcszAddress, uint16_t uPort, PRTFTPSERVERCALLBACKS pCallbacks); @@ -198,5 +198,5 @@ * @param hFTPServer Handle to the FTP server handle. */ -RTR3DECL(int) RTFTPServerDestroy(RTFTPSERVER hFTPServer); +RTR3DECL(int) RTFtpServerDestroy(RTFTPSERVER hFTPServer); RT_C_DECLS_END Index: /trunk/include/iprt/mangling.h =================================================================== --- /trunk/include/iprt/mangling.h (revision 82698) +++ /trunk/include/iprt/mangling.h (revision 82699) @@ -1035,6 +1035,6 @@ # define RTFsIsoMakerCmdEx RT_MANGLER(RTFsIsoMakerCmdEx) # define RTFsNtfsVolOpen RT_MANGLER(RTFsNtfsVolOpen) -# define RTFTPServerCreate RT_MANGLER(RTFTPServerCreate) -# define RTFTPServerDestroy RT_MANGLER(RTFTPServerDestroy) +# define RTFtpServerCreate RT_MANGLER(RTFtpServerCreate) +# define RTFtpServerDestroy RT_MANGLER(RTFtpServerDestroy) # define RTFuzzCmdMaster RT_MANGLER(RTFuzzCmdMaster) # define RTFuzzCtxCfgGetBehavioralFlags RT_MANGLER(RTFuzzCtxCfgGetBehavioralFlags) Index: /trunk/src/VBox/Runtime/generic/ftp-server.cpp =================================================================== --- /trunk/src/VBox/Runtime/generic/ftp-server.cpp (revision 82698) +++ /trunk/src/VBox/Runtime/generic/ftp-server.cpp (revision 82699) @@ -189,18 +189,18 @@ * Function prototypes for command handlers. */ -static FNRTFTPSERVERCMD rtFTPServerHandleABOR; -static FNRTFTPSERVERCMD rtFTPServerHandleCDUP; -static FNRTFTPSERVERCMD rtFTPServerHandleCWD; -static FNRTFTPSERVERCMD rtFTPServerHandleLIST; -static FNRTFTPSERVERCMD rtFTPServerHandleMODE; -static FNRTFTPSERVERCMD rtFTPServerHandleNOOP; -static FNRTFTPSERVERCMD rtFTPServerHandlePORT; -static FNRTFTPSERVERCMD rtFTPServerHandlePWD; -static FNRTFTPSERVERCMD rtFTPServerHandleQUIT; -static FNRTFTPSERVERCMD rtFTPServerHandleRETR; -static FNRTFTPSERVERCMD rtFTPServerHandleRGET; -static FNRTFTPSERVERCMD rtFTPServerHandleSTAT; -static FNRTFTPSERVERCMD rtFTPServerHandleSYST; -static FNRTFTPSERVERCMD rtFTPServerHandleTYPE; +static FNRTFTPSERVERCMD rtFtpServerHandleABOR; +static FNRTFTPSERVERCMD rtFtpServerHandleCDUP; +static FNRTFTPSERVERCMD rtFtpServerHandleCWD; +static FNRTFTPSERVERCMD rtFtpServerHandleLIST; +static FNRTFTPSERVERCMD rtFtpServerHandleMODE; +static FNRTFTPSERVERCMD rtFtpServerHandleNOOP; +static FNRTFTPSERVERCMD rtFtpServerHandlePORT; +static FNRTFTPSERVERCMD rtFtpServerHandlePWD; +static FNRTFTPSERVERCMD rtFtpServerHandleQUIT; +static FNRTFTPSERVERCMD rtFtpServerHandleRETR; +static FNRTFTPSERVERCMD rtFtpServerHandleRGET; +static FNRTFTPSERVERCMD rtFtpServerHandleSTAT; +static FNRTFTPSERVERCMD rtFtpServerHandleSYST; +static FNRTFTPSERVERCMD rtFtpServerHandleTYPE; /** @@ -222,18 +222,18 @@ const RTFTPSERVER_CMD_ENTRY g_aCmdMap[] = { - { RTFTPSERVER_CMD_ABOR, "ABOR", rtFTPServerHandleABOR }, - { RTFTPSERVER_CMD_CDUP, "CDUP", rtFTPServerHandleCDUP }, - { RTFTPSERVER_CMD_CWD, "CWD", rtFTPServerHandleCWD }, - { RTFTPSERVER_CMD_LIST, "LIST", rtFTPServerHandleLIST }, - { RTFTPSERVER_CMD_MODE, "MODE", rtFTPServerHandleMODE }, - { RTFTPSERVER_CMD_NOOP, "NOOP", rtFTPServerHandleNOOP }, - { RTFTPSERVER_CMD_PORT, "PORT", rtFTPServerHandlePORT }, - { RTFTPSERVER_CMD_PWD, "PWD", rtFTPServerHandlePWD }, - { RTFTPSERVER_CMD_QUIT, "QUIT", rtFTPServerHandleQUIT }, - { RTFTPSERVER_CMD_RETR, "RETR", rtFTPServerHandleRETR }, - { RTFTPSERVER_CMD_RGET, "RGET", rtFTPServerHandleRGET }, - { RTFTPSERVER_CMD_STAT, "STAT", rtFTPServerHandleSTAT }, - { RTFTPSERVER_CMD_SYST, "SYST", rtFTPServerHandleSYST }, - { RTFTPSERVER_CMD_TYPE, "TYPE", rtFTPServerHandleTYPE }, + { RTFTPSERVER_CMD_ABOR, "ABOR", rtFtpServerHandleABOR }, + { RTFTPSERVER_CMD_CDUP, "CDUP", rtFtpServerHandleCDUP }, + { RTFTPSERVER_CMD_CWD, "CWD", rtFtpServerHandleCWD }, + { RTFTPSERVER_CMD_LIST, "LIST", rtFtpServerHandleLIST }, + { RTFTPSERVER_CMD_MODE, "MODE", rtFtpServerHandleMODE }, + { RTFTPSERVER_CMD_NOOP, "NOOP", rtFtpServerHandleNOOP }, + { RTFTPSERVER_CMD_PORT, "PORT", rtFtpServerHandlePORT }, + { RTFTPSERVER_CMD_PWD, "PWD", rtFtpServerHandlePWD }, + { RTFTPSERVER_CMD_QUIT, "QUIT", rtFtpServerHandleQUIT }, + { RTFTPSERVER_CMD_RETR, "RETR", rtFtpServerHandleRETR }, + { RTFTPSERVER_CMD_RGET, "RGET", rtFtpServerHandleRGET }, + { RTFTPSERVER_CMD_STAT, "STAT", rtFtpServerHandleSTAT }, + { RTFTPSERVER_CMD_SYST, "SYST", rtFtpServerHandleSYST }, + { RTFTPSERVER_CMD_TYPE, "TYPE", rtFtpServerHandleTYPE }, { RTFTPSERVER_CMD_LAST, "", NULL } }; @@ -251,5 +251,5 @@ * @param enmReply Reply code to send. */ -static int rtFTPServerSendReplyRc(PRTFTPSERVERCLIENT pClient, RTFTPSERVER_REPLY enmReply) +static int rtFtpServerSendReplyRc(PRTFTPSERVERCLIENT pClient, RTFTPSERVER_REPLY enmReply) { char szReply[32]; @@ -266,5 +266,5 @@ * @param pcszStr String to reply. */ -static int rtFTPServerSendReplyStr(PRTFTPSERVERCLIENT pClient, const char *pcszStr) +static int rtFtpServerSendReplyStr(PRTFTPSERVERCLIENT pClient, const char *pcszStr) { char *pszReply; @@ -287,5 +287,5 @@ * @param pcszUser User name to look up. */ -static int rtFTPServerLookupUser(PRTFTPSERVERCLIENT pClient, const char *pcszUser) +static int rtFtpServerLookupUser(PRTFTPSERVERCLIENT pClient, const char *pcszUser) { RTFTPSERVER_HANDLE_CALLBACK_VA_RET(pfnOnUserConnect, pcszUser); @@ -302,5 +302,5 @@ * @param pcszPassword Password to authenticate with. */ -static int rtFTPServerAuthenticate(PRTFTPSERVERCLIENT pClient, const char *pcszUser, const char *pcszPassword) +static int rtFtpServerAuthenticate(PRTFTPSERVERCLIENT pClient, const char *pcszUser, const char *pcszPassword) { RTFTPSERVER_HANDLE_CALLBACK_VA_RET(pfnOnUserAuthenticate, pcszUser, pcszPassword); @@ -314,21 +314,21 @@ *********************************************************************************************************************************/ -static int rtFTPServerHandleABOR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleCDUP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleCWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandleABOR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleCDUP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleCWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { AssertPtrReturn(apcszArgs, VERR_INVALID_POINTER); @@ -342,5 +342,5 @@ } -static int rtFTPServerHandleLIST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandleLIST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { RT_NOREF(cArgs, apcszArgs); @@ -354,13 +354,13 @@ } -static int rtFTPServerHandleMODE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleNOOP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandleMODE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleNOOP(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { RT_NOREF(pClient, cArgs, apcszArgs); @@ -370,13 +370,13 @@ } -static int rtFTPServerHandlePORT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandlePWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandlePORT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandlePWD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { RT_NOREF(cArgs, apcszArgs); @@ -399,37 +399,37 @@ } -static int rtFTPServerHandleQUIT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleRETR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleRGET(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleSTAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) -{ - RT_NOREF(pClient, cArgs, apcszArgs); - - /** @todo Anything to do here? */ - return VINF_SUCCESS; -} - -static int rtFTPServerHandleSYST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandleQUIT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleRETR(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleRGET(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleSTAT(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +{ + RT_NOREF(pClient, cArgs, apcszArgs); + + /** @todo Anything to do here? */ + return VINF_SUCCESS; +} + +static int rtFtpServerHandleSYST(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { RT_NOREF(cArgs, apcszArgs); @@ -438,10 +438,10 @@ int rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szOSInfo, sizeof(szOSInfo)); if (RT_SUCCESS(rc)) - rc = rtFTPServerSendReplyStr(pClient, szOSInfo); + rc = rtFtpServerSendReplyStr(pClient, szOSInfo); return rc; } -static int rtFTPServerHandleTYPE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) +static int rtFtpServerHandleTYPE(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs) { RT_NOREF(pClient, cArgs, apcszArgs); @@ -462,10 +462,10 @@ * @param pClient Client to handle login procedure for. */ -static int rtFTPServerDoLogin(PRTFTPSERVERCLIENT pClient) +static int rtFtpServerDoLogin(PRTFTPSERVERCLIENT pClient) { LogFlowFuncEnter(); /* Send welcome message. */ - int rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_READY_FOR_NEW_USER); + int rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_READY_FOR_NEW_USER); if (RT_SUCCESS(rc)) { @@ -476,8 +476,8 @@ if (RT_SUCCESS(rc)) { - rc = rtFTPServerLookupUser(pClient, szUser); + rc = rtFtpServerLookupUser(pClient, szUser); if (RT_SUCCESS(rc)) { - rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_USERNAME_OKAY_NEED_PASSWORD); + rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_USERNAME_OKAY_NEED_PASSWORD); if (RT_SUCCESS(rc)) { @@ -487,8 +487,8 @@ if (RT_SUCCESS(rc)) { - rc = rtFTPServerAuthenticate(pClient, szUser, szPass); + rc = rtFtpServerAuthenticate(pClient, szUser, szPass); if (RT_SUCCESS(rc)) { - rc = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_LOGGED_IN_PROCEED); + rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_LOGGED_IN_PROCEED); } } @@ -501,5 +501,5 @@ if (RT_FAILURE(rc)) { - int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_NOT_LOGGED_IN); + int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_NOT_LOGGED_IN); if (RT_SUCCESS(rc)) rc = rc2; @@ -515,7 +515,7 @@ * @param pcszCmdParms Pointer to command arguments, if any. Can be NULL if no arguments are given. * @param pcArgs Returns the number of parsed arguments, separated by a space (hex 0x20). - * @param ppapcszArgs Returns the string array of parsed arguments. Needs to be free'd with rtFTPServerCmdArgsFree(). - */ -static int rtFTPServerCmdArgsParse(const char *pcszCmdParms, uint8_t *pcArgs, char ***ppapcszArgs) + * @param ppapcszArgs Returns the string array of parsed arguments. Needs to be free'd with rtFtpServerCmdArgsFree(). + */ +static int rtFtpServerCmdArgsParse(const char *pcszCmdParms, uint8_t *pcArgs, char ***ppapcszArgs) { *pcArgs = 0; @@ -544,9 +544,9 @@ /** - * Frees a formerly argument string array parsed by rtFTPServerCmdArgsParse(). + * Frees a formerly argument string array parsed by rtFtpServerCmdArgsParse(). * * @param ppapcszArgs Argument string array to free. */ -static void rtFTPServerCmdArgsFree(char **ppapcszArgs) +static void rtFtpServerCmdArgsFree(char **ppapcszArgs) { RTGetOptArgvFree(ppapcszArgs); @@ -559,5 +559,5 @@ * @param pClient Client to process commands for. */ -static int rtFTPServerProcessCommands(PRTFTPSERVERCLIENT pClient) +static int rtFtpServerProcessCommands(PRTFTPSERVERCLIENT pClient) { int rc; @@ -589,5 +589,5 @@ uint8_t cArgs = 0; char **papszArgs = NULL; - rc = rtFTPServerCmdArgsParse(pszCmdParms, &cArgs, &papszArgs); + rc = rtFtpServerCmdArgsParse(pszCmdParms, &cArgs, &papszArgs); if (RT_SUCCESS(rc)) { @@ -605,9 +605,9 @@ } - rtFTPServerCmdArgsFree(papszArgs); + rtFtpServerCmdArgsFree(papszArgs); if (i == RT_ELEMENTS(g_aCmdMap)) { - int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_IMPL); + int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_IMPL); if (RT_SUCCESS(rc)) rc = rc2; @@ -622,5 +622,5 @@ else { - int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_INVALID_PARAMETERS); + int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_INVALID_PARAMETERS); if (RT_SUCCESS(rc)) rc = rc2; @@ -629,5 +629,5 @@ else { - int rc2 = rtFTPServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_RECOGNIZED); + int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_ERROR_CMD_NOT_RECOGNIZED); if (RT_SUCCESS(rc)) rc = rc2; @@ -643,5 +643,5 @@ * @param pState Client state to reset. */ -static void rtFTPServerClientStateReset(PRTFTPSERVERCLIENTSTATE pState) +static void rtFtpServerClientStateReset(PRTFTPSERVERCLIENTSTATE pState) { pState->tsLastCmdMs = RTTimeMilliTS(); @@ -655,5 +655,5 @@ * @param pvUser User-provided arguments. Of type PRTFTPSERVERINTERNAL. */ -static DECLCALLBACK(int) rtFTPServerClientThread(RTSOCKET hSocket, void *pvUser) +static DECLCALLBACK(int) rtFtpServerClientThread(RTSOCKET hSocket, void *pvUser) { PRTFTPSERVERINTERNAL pThis = (PRTFTPSERVERINTERNAL)pvUser; @@ -666,12 +666,12 @@ Client.hSocket = hSocket; - rtFTPServerClientStateReset(&Client.State); - - int rc = rtFTPServerDoLogin(&Client); + rtFtpServerClientStateReset(&Client.State); + + int rc = rtFtpServerDoLogin(&Client); if (RT_SUCCESS(rc)) { ASMAtomicIncU32(&pThis->cClients); - rc = rtFTPServerProcessCommands(&Client); + rc = rtFtpServerProcessCommands(&Client); ASMAtomicDecU32(&pThis->cClients); @@ -681,5 +681,5 @@ } -RTR3DECL(int) RTFTPServerCreate(PRTFTPSERVER phFTPServer, const char *pcszAddress, uint16_t uPort, +RTR3DECL(int) RTFtpServerCreate(PRTFTPSERVER phFTPServer, const char *pcszAddress, uint16_t uPort, PRTFTPSERVERCALLBACKS pCallbacks) { @@ -698,5 +698,5 @@ rc = RTTcpServerCreate(pcszAddress, uPort, RTTHREADTYPE_DEFAULT, "ftpsrv", - rtFTPServerClientThread, pThis /* pvUser */, &pThis->pTCPServer); + rtFtpServerClientThread, pThis /* pvUser */, &pThis->pTCPServer); } else @@ -706,5 +706,5 @@ } -RTR3DECL(int) RTFTPServerDestroy(RTFTPSERVER hFTPServer) +RTR3DECL(int) RTFtpServerDestroy(RTFTPSERVER hFTPServer) { if (hFTPServer == NIL_RTFTPSERVER) Index: /trunk/src/VBox/Runtime/tools/RTFTPServer.cpp =================================================================== --- /trunk/src/VBox/Runtime/tools/RTFTPServer.cpp (revision 82698) +++ /trunk/src/VBox/Runtime/tools/RTFTPServer.cpp (revision 82699) @@ -304,5 +304,5 @@ RTFTPSERVER hFTPServer; - rc = RTFTPServerCreate(&hFTPServer, szAddress, uPort, &Callbacks); + rc = RTFtpServerCreate(&hFTPServer, szAddress, uPort, &Callbacks); if (RT_SUCCESS(rc)) { @@ -322,5 +322,5 @@ RTPrintf("Stopping FTP server ...\n"); - int rc2 = RTFTPServerDestroy(hFTPServer); + int rc2 = RTFtpServerDestroy(hFTPServer); if (RT_SUCCESS(rc)) rc = rc2;