generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-16 07:23:44 +02:00
Code Issues Projects Releases Wiki Activity

fix FTPS win build, license, header guards; fix few warnings

Browse Source
This commit is contained in:
Alex Fabijanic
2017-08-31 12:20:49 -05:00
parent dd573b98d8
commit c81de1d34b
6 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
NetSSL_OpenSSL/include/Poco/Net/FTPSClientSession.h
View File

@@ -1,10 +1,34 @@
#pragma once
//
// FTPSClientSession.h
//
// $Id: //poco/1.4/Net/include/Poco/Net/FTPSClientSession.h#1 $
//
// Library: Net
// Package: FTP
// Module: FTPSClientSession
//
// Definition of the FTPSClientSession class.
//
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef NetSSL_FTPSClientSession_INCLUDED
#define NetSSL_FTPSClientSession_INCLUDED
#include "Poco/Net/NetSSL.h"
#include "Poco/Net/FTPClientSession.h"
namespace Poco {
namespace Net {
class FTPSClientSession :
class NetSSL_API FTPSClientSession :
public Poco::Net::FTPClientSession
{
public:
@@ -56,6 +80,11 @@ private:
bool _bSecureDataConnection = false;
};
//
// inlines
//
inline bool FTPSClientSession::isSecure() const
{
if (_pControlSocket != nullptr)
@@ -63,4 +92,8 @@ inline bool FTPSClientSession::isSecure() const
return false;
}
}} // namespace Poco::Net
#endif // #define NetSSL_FTPSClientSession_INCLUDED

6
NetSSL_OpenSSL/include/Poco/Net/FTPSStreamFactory.h
View File

@@ -20,7 +20,7 @@
#define Net_FTPSStreamFactory_INCLUDED
#include "Poco/Net/Net.h"
#include "Poco/Net/NetSSL.h"
#include "Poco/Net/HTTPSession.h"
#include "Poco/URIStreamFactory.h"
@@ -29,7 +29,7 @@ namespace Poco {
namespace Net {
class Net_API FTPPasswordProvider
class NetSSL_API FTPPasswordProvider
/// The base class for all password providers.
/// An instance of a subclass of this class can be
/// registered with the FTPSStreamFactory to
@@ -45,7 +45,7 @@ protected:
};
class Net_API FTPSStreamFactory: public Poco::URIStreamFactory
class NetSSL_API FTPSStreamFactory: public Poco::URIStreamFactory
/// An implementation of the URIStreamFactory interface
/// that handles File Transfer Protocol (ftp) URIs.
///

16
NetSSL_OpenSSL/src/FTPSClientSession.cpp
View File

@@ -1,3 +1,19 @@
//
// FTPSClientSession.cpp
//
// $Id: //poco/1.4/Net/src/FTPSClientSession.cpp#1 $
//
// Library: Net
// Package: FTP
// Module: FTPSClientSession
//
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/Net/FTPSClientSession.h"
#include "Poco/Net/SecureStreamSocket.h"
#include "Poco/Net/SecureStreamSocketImpl.h"