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

24
znc.cpp
View File

@@ -556,6 +556,12 @@ bool CZNC::WriteConfig() {
sHostPortion = sHostPortion.FirstLine() + " ";
}
CString sAcceptProtocol;
if(pListener->GetAcceptType() == CListener::ACCEPT_IRC)
sAcceptProtocol = "irc_only ";
else if(pListener->GetAcceptType() == CListener::ACCEPT_HTTP)
sAcceptProtocol = "web_only ";
CString s6;
switch (pListener->GetAddrType()) {
case ADDR_IPV4ONLY:
@@ -569,7 +575,8 @@ bool CZNC::WriteConfig() {
break;
}
m_LockFile.Write("Listen" + s6 + " = " + sHostPortion + CString((pListener->IsSSL()) ? "+" : "") + CString(pListener->GetPort()) + "\n");
m_LockFile.Write("Listen" + s6 + " = " + sAcceptProtocol + sHostPortion +
CString((pListener->IsSSL()) ? "+" : "") + CString(pListener->GetPort()) + "\n");
}
m_LockFile.Write("ConnectDelay = " + CString(m_uiConnectDelay) + "\n");
@@ -1455,7 +1462,6 @@ bool CZNC::DoRehash(CString& sError)
}
} else {
if (sName.Equals("Listen") || sName.Equals("ListenPort") || sName.Equals("Listen6") || sName.Equals("Listen4")) {
bool bSSL = false;
EAddrType eAddr = ADDR_ALL;
if (sName.Equals("Listen4")) {
eAddr = ADDR_IPV4ONLY;
@@ -1463,8 +1469,15 @@ bool CZNC::DoRehash(CString& sError)
if (sName.Equals("Listen6")) {
eAddr = ADDR_IPV6ONLY;
}
CString sPort;
CListener::EAcceptType eAccept = CListener::ACCEPT_ALL;
if (sValue.TrimPrefix("irc_only "))
eAccept = CListener::ACCEPT_IRC;
else if (sValue.TrimPrefix("web_only "))
eAccept = CListener::ACCEPT_HTTP;
bool bSSL = false;
CString sPort;
CString sBindHost;
if (ADDR_IPV4ONLY == eAddr) {
@@ -1544,10 +1557,11 @@ bool CZNC::DoRehash(CString& sError)
return false;
}
CListener* pListener = new CListener(uPort, sBindHost, bSSL, eAddr);
CListener* pListener = new CListener(uPort, sBindHost, bSSL, eAddr, eAccept);
if (!pListener->Listen()) {
sError = "Unable to bind [" + CString(strerror(errno)) + "]";
sError = (errno == 0 ? CString("unknown error, check the host name") : CString(strerror(errno)));
sError = "Unable to bind [" + sError + "]";
CUtils::PrintStatus(false, sError);
delete pListener;
return false;