adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-07 02:11:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/349/head' of github.com:znc/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2013-11-14 08:27:50 +04:00
parent 2a7bc29fcc 7ee853afaa
commit ccbc469168
6 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/HTTPSock.h
+1
View File
@@ -111,6 +111,7 @@ protected:
CString m_sPass;
CString m_sContentType;
CString m_sDocRoot;
CString m_sForwardedIP;
std::map<CString, VCString> m_msvsPOSTParams;
std::map<CString, VCString> m_msvsGETParams;
MCString m_msHeaders;
include/znc/WebModules.h
+1
View File
@@ -130,6 +130,7 @@ public:
CSmartPtr<CWebSession> GetSession();
virtual CString GetRemoteIP();
virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
static CString GetSkinPath(const CString& sSkinName);
CModule* GetModule() const { return (CModule*) m_pModule; }
include/znc/znc.h
+5
View File
@@ -66,6 +66,9 @@ public:
void ClearBindHosts();
bool AddBindHost(const CString& sHost);
bool RemBindHost(const CString& sHost);
void ClearAllowProxy();
bool AddAllowProxy(const CString& sHost);
bool RemAllowProxy(const CString& sHost);
void Broadcast(const CString& sMessage, bool bAdminOnly = false,
CUser* pSkipUser = NULL, CClient* pSkipClient = NULL);
void AddBytesRead(unsigned long long u) { m_uBytesRead += u; }
@@ -117,6 +120,7 @@ public:
const CString& GetConfigFile() const { return m_sConfigFile; }
bool WritePemFile();
const VCString& GetBindHosts() const { return m_vsBindHosts; }
const VCString& GetAllowProxies() const { return m_vsAllowProxies; }
const std::vector<CListener*>& GetListeners() const { return m_vpListeners; }
time_t TimeStarted() const { return m_TimeStarted; }
unsigned int GetMaxBufferSize() const { return m_uiMaxBufferSize; }
@@ -204,6 +208,7 @@ protected:
CString m_sPidFile;
CString m_sSSLCertFile;
VCString m_vsBindHosts;
VCString m_vsAllowProxies;
VCString m_vsMotd;
CFile* m_pLockFile;
unsigned int m_uiConnectDelay;