iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-09 06:44:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add and use new config option "Listener"

Browse Source 
This is what each option does:

Listen on ipv4 and ipv6: Listener, Listen6
Listen on ipv4 only:     Listener4, Listen4, Listen
Listen on ipv6 only:     Listener6
Removed:     ListenPort (not used since at least 0.047)

(ZNC will only ever use Listener* by itself)

This was done to preserve the old meaning of "Listen" and "Listen6", so that
user configs don't break after update.

Thanks to DarthGandalf for thinking about and implementing this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1977 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-05-10 17:45:15 +00:00
parent b0bc22128e
commit ea269948e4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+6 -5
View File
@@ -575,7 +575,7 @@ bool CZNC::WriteConfig() {
break;
}
m_LockFile.Write("Listen" + s6 + " = " + sAcceptProtocol + sHostPortion +
m_LockFile.Write("Listener" + s6 + " = " + sAcceptProtocol + sHostPortion +
CString((pListener->IsSSL()) ? "+" : "") + CString(pListener->GetPort()) + "\n");
}
@@ -695,7 +695,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
sListenHost += " ";
}
vsLines.push_back("Listen" + s6 + " = " + sListenHost + sSSL + CString(uListenPort));
vsLines.push_back("Listener" + s6 + " = " + sListenHost + sSSL + CString(uListenPort));
// !Listen
set<CModInfo> ssGlobalMods;
@@ -1461,12 +1461,13 @@ bool CZNC::DoRehash(CString& sError)
}
}
} else {
if (sName.Equals("Listen") || sName.Equals("ListenPort") || sName.Equals("Listen6") || sName.Equals("Listen4")) {
if (sName.Equals("Listen") || sName.Equals("Listen6") || sName.Equals("Listen4")
|| sName.Equals("Listener") || sName.Equals("Listener6") || sName.Equals("Listener4")) {
EAddrType eAddr = ADDR_ALL;
if (sName.Equals("Listen4")) {
if (sName.Equals("Listen4") || sName.Equals("Listen") || sName.Equals("Listener4")) {
eAddr = ADDR_IPV4ONLY;
}
if (sName.Equals("Listen6")) {
if (sName.Equals("Listener6")) {
eAddr = ADDR_IPV6ONLY;
}