iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Partly undo psychon's last commit in favor of just removing all the

Browse Source 
setter methods. Suggested by psychon himself.
The second and more important part of this patch adds an optional
web_only/irc_only token to the Listen config setting. Using this,
you can make Listen ports listen for IRC or Web/HTTP connections
only (or for both if you don't add any of the _only tokens).
Examples:
Listen = irc_only 3000
Listen4 = web_only +3001
Listen6 = ::1 6000
and so on.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1973 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-05-09 18:55:13 +00:00
parent f6716d08c7
commit 6bc45bf80f
3 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Listener.cpp
View File

@@ -13,39 +13,6 @@ CListener::~CListener() {
CZNC::Get().GetManager().DelSockByAddr(m_pListener);
}
// Settings may not be changed when we are already listening
#define CHECK() if (m_pListener) return;
void CListener::SetSSL(bool b) {
CHECK();
m_bSSL = b;
}
void CListener::SetAddrType(EAddrType eAddr) {
CHECK();
m_eAddr = eAddr;
}
void CListener::SetPort(unsigned short u) {
CHECK();
m_uPort = u;
}
void CListener::SetBindHost(const CString& s) {
CHECK();
m_sBindHost = s;
}
void CListener::SetRealListener(CRealListener* p) {
CHECK();
m_pListener = p;
}
void CListener::SetAcceptType(AcceptType a) {
CHECK();
m_eAcceptType = a;
}
bool CListener::Listen() {
if (!m_uPort || m_pListener) {
return false;
@@ -65,8 +32,12 @@ bool CListener::Listen() {
m_pListener, 0, m_eAddr);
}
void CListener::ResetRealListener() {
m_pListener = NULL;
}
CRealListener::~CRealListener() {
m_pParent->SetRealListener(NULL);
m_pParent->ResetRealListener();
}
bool CRealListener::ConnectionFrom(const CString& sHost, unsigned short uPort) {
@@ -96,7 +67,7 @@ void CRealListener::SockError(int iErrno) {
}
}
CIncomingConnection::CIncomingConnection(const CString& sHostname, unsigned short uPort, CListener::AcceptType eAcceptType) : CZNCSock(sHostname, uPort) {
CIncomingConnection::CIncomingConnection(const CString& sHostname, unsigned short uPort, CListener::EAcceptType eAcceptType) : CZNCSock(sHostname, uPort) {
m_eAcceptType = eAcceptType;
// The socket will time out in 120 secs, no matter what.
// This has to be fixed up later, if desired.