From 6791ce30c239a1eeab591bb77a41afda9866791c Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Wed, 11 Feb 2015 00:41:45 +0100 Subject: Drop support for old tntnet versions: SSL/TLS support is no more optional. LIVE can be compiled only with versions of tntnet which support SSL/TLS connections. --- setup.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'setup.h') diff --git a/setup.h b/setup.h index 58b4a11..3b4e388 100644 --- a/setup.h +++ b/setup.h @@ -29,11 +29,9 @@ class Setup // commandline int GetServerPort() const { return m_serverPort; } -#if TNT_SSL_SUPPORT int GetServerSslPort() const { return m_serverSslPort; } std::string GetServerSslCert() const { return m_serverSslCert; } std::string GetServerSslKey() const { return m_serverSslKey; } -#endif IpList const& GetServerIps() const { return m_serverIps; } // vdr-setup int GetLastChannel() const { return m_lastChannel == 0 ? std::numeric_limits< int >::max() : m_lastChannel; } @@ -108,12 +106,10 @@ class Setup mutable std::string m_helpString; // commandline options int m_serverPort; -#if TNT_SSL_SUPPORT int m_serverSslPort; std::string m_serverSslCert; std::string m_serverSslKey; static std::string m_configDirectory; -#endif IpList m_serverIps; std::string m_epgimagedir; @@ -145,9 +141,7 @@ class Setup bool CheckServerPort(); bool CheckServerIps(); -#if TNT_SSL_SUPPORT bool CheckServerSslPort(); -#endif }; Setup& LiveSetup(); -- cgit v1.2.3