diff --git a/Client.cpp b/Client.cpp index c22b53a1..7b1097ad 100644 --- a/Client.cpp +++ b/Client.cpp @@ -766,7 +766,7 @@ CString CClient::GetNickMask() const { return GetIRCSock()->GetNickMask(); } - CString sHost = m_pUser->GetVHost(); + CString sHost = m_pUser->GetBindHost(); if (sHost.empty()) { sHost = "irc.znc.in"; } diff --git a/ClientCommand.cpp b/ClientCommand.cpp index 5b38e56f..7f35d951 100644 --- a/ClientCommand.cpp +++ b/ClientCommand.cpp @@ -801,85 +801,85 @@ void CClient::UserCommand(CString& sLine) { PutStatus("Done, but there were errors, some users no longer have [" + sMod + "] loaded"); } - } else if (sCommand.Equals("ADDVHOST") && m_pUser->IsAdmin()) { - CString sVHost = sLine.Token(1); + } else if ((sCommand.Equals("ADDBINDHOST") || sCommand.Equals("ADDVHOST")) && m_pUser->IsAdmin()) { + CString sHost = sLine.Token(1); - if (sVHost.empty()) { - PutStatus("Usage: AddVHost "); + if (sHost.empty()) { + PutStatus("Usage: AddBindHost "); return; } - if (CZNC::Get().AddVHost(sVHost)) { + if (CZNC::Get().AddBindHost(sHost)) { PutStatus("Done"); } else { - PutStatus("The VHost [" + sVHost + "] is already in the list"); + PutStatus("The host [" + sHost + "] is already in the list"); } - } else if ((sCommand.Equals("REMVHOST") || sCommand.Equals("DELVHOST")) && m_pUser->IsAdmin()) { - CString sVHost = sLine.Token(1); + } else if ((sCommand.Equals("REMBINDHOST") || sCommand.Equals("REMVHOST") || sCommand.Equals("DELVHOST")) && m_pUser->IsAdmin()) { + CString sHost = sLine.Token(1); - if (sVHost.empty()) { - PutStatus("Usage: RemVHost "); + if (sHost.empty()) { + PutStatus("Usage: RemBindHost "); return; } - if (CZNC::Get().RemVHost(sVHost)) { + if (CZNC::Get().RemBindHost(sHost)) { PutStatus("Done"); } else { - PutStatus("The VHost [" + sVHost + "] is not in the list"); + PutStatus("The host [" + sHost + "] is not in the list"); } - } else if (sCommand.Equals("LISTVHOSTS") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) { - const VCString& vsVHosts = CZNC::Get().GetVHosts(); + } else if ((sCommand.Equals("LISTBINDHOSTS") || sCommand.Equals("LISTVHOSTS")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) { + const VCString& vsHosts = CZNC::Get().GetBindHosts(); - if (vsVHosts.empty()) { - PutStatus("No VHosts configured"); + if (vsHosts.empty()) { + PutStatus("No bind hosts configured"); return; } CTable Table; - Table.AddColumn("VHost"); + Table.AddColumn("Host"); VCString::const_iterator it; - for (it = vsVHosts.begin(); it != vsVHosts.end(); ++it) { + for (it = vsHosts.begin(); it != vsHosts.end(); ++it) { Table.AddRow(); - Table.SetCell("VHost", *it); + Table.SetCell("Host", *it); } PutStatus(Table); - } else if (sCommand.Equals("SETVHOST") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) { - CString sVHost = sLine.Token(1); + } else if ((sCommand.Equals("SETBINDHOST") || sCommand.Equals("SETVHOST")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) { + CString sHost = sLine.Token(1); - if (sVHost.empty()) { - PutStatus("Usage: SetVHost "); + if (sHost.empty()) { + PutStatus("Usage: SetBindHost "); return; } - if (sVHost.Equals(m_pUser->GetVHost())) { - PutStatus("You already have this VHost!"); + if (sHost.Equals(m_pUser->GetBindHost())) { + PutStatus("You already have this bind host!"); return; } - const VCString& vsVHosts = CZNC::Get().GetVHosts(); - if (!m_pUser->IsAdmin() && !vsVHosts.empty()) { + const VCString& vsHosts = CZNC::Get().GetBindHosts(); + if (!m_pUser->IsAdmin() && !vsHosts.empty()) { VCString::const_iterator it; bool bFound = false; - for (it = vsVHosts.begin(); it != vsVHosts.end(); ++it) { - if (sVHost.Equals(*it)) { + for (it = vsHosts.begin(); it != vsHosts.end(); ++it) { + if (sHost.Equals(*it)) { bFound = true; break; } } if (!bFound) { - PutStatus("You may not use this VHost. See [ListVHosts] for a list"); + PutStatus("You may not use this bind host. See [ListBindHosts] for a list"); return; } } - m_pUser->SetVHost(sVHost); - PutStatus("Set VHost to [" + m_pUser->GetVHost() + "]"); - } else if (sCommand.Equals("CLEARVHOST") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) { - m_pUser->SetVHost(""); - PutStatus("VHost Cleared"); + m_pUser->SetBindHost(sHost); + PutStatus("Set bind host to [" + m_pUser->GetBindHost() + "]"); + } else if ((sCommand.Equals("CLEARBINDHOST") || sCommand.Equals("CLEARVHOST")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) { + m_pUser->SetBindHost(""); + PutStatus("Bind Host Cleared"); } else if (sCommand.Equals("PLAYBUFFER")) { CString sChan = sLine.Token(1); @@ -1194,29 +1194,29 @@ void CClient::HelpUser() { if (m_pUser->IsAdmin()) { Table.AddRow(); - Table.SetCell("Command", "AddVHost"); - Table.SetCell("Arguments", ""); - Table.SetCell("Description", "Adds a VHost for normal users to use"); + Table.SetCell("Command", "AddBindHost"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Adds a bind host for normal users to use"); Table.AddRow(); - Table.SetCell("Command", "RemVHost"); - Table.SetCell("Arguments", ""); - Table.SetCell("Description", "Removes a VHost from the list"); + Table.SetCell("Command", "RemBindHost"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Removes a bind host from the list"); } - if (m_pUser->IsAdmin() || !m_pUser->DenySetVHost()) { + if (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost()) { Table.AddRow(); - Table.SetCell("Command", "ListVHosts"); - Table.SetCell("Description", "Shows the configured list of vhosts"); + Table.SetCell("Command", "ListBindHosts"); + Table.SetCell("Description", "Shows the configured list of bind hosts"); Table.AddRow(); - Table.SetCell("Command", "SetVHost"); - Table.SetCell("Arguments", ""); - Table.SetCell("Description", "Set the VHost for this connection"); + Table.SetCell("Command", "SetBindHost"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Set the bind host for this connection"); Table.AddRow(); - Table.SetCell("Command", "ClearVHost"); - Table.SetCell("Description", "Clear the VHost for this connection"); + Table.SetCell("Command", "ClearBindHost"); + Table.SetCell("Description", "Clear the bind host for this connection"); } Table.AddRow(); diff --git a/IRCSock.cpp b/IRCSock.cpp index ce42ee60..8ca6e02c 100644 --- a/IRCSock.cpp +++ b/IRCSock.cpp @@ -21,7 +21,7 @@ CIRCSock::CIRCSock(CUser* pUser) : CZNCSock() { m_bUHNames = false; EnableReadLine(); m_Nick.SetIdent(pUser->GetIdent()); - m_Nick.SetHost(pUser->GetVHost()); + m_Nick.SetHost(pUser->GetBindHost()); m_uMaxNickLen = 9; m_sPerms = "*!@%+"; @@ -959,7 +959,7 @@ void CIRCSock::SockError(int iErrno) { CString sError; if (iErrno == EDOM) { - sError = "Your VHost could not be resolved"; + sError = "Your bind host could not be resolved"; } else if (iErrno == EADDRNOTAVAIL) { // Csocket uses this if it can't resolve the dest host name // ...but it also does generate this if bind() fails -.- @@ -967,7 +967,7 @@ void CIRCSock::SockError(int iErrno) { if (GetBindHost().empty()) sError += " (Is your IRC server's host name valid?)"; else - sError += " (Is your IRC server's host name and vhost valid?)"; + sError += " (Is your IRC server's host name and znc bind host valid?)"; } else { sError = strerror(iErrno); } diff --git a/Socket.cpp b/Socket.cpp index db8e3ec0..6ad314b8 100644 --- a/Socket.cpp +++ b/Socket.cpp @@ -94,11 +94,11 @@ bool CSocket::Connect(const CString& sHostname, unsigned short uPort, bool bSSL, CUser* pUser = m_pModule->GetUser(); CString sSockName = "MOD::C::" + m_pModule->GetModName(); - CString sVHost; + CString sBindHost; if (pUser) { sSockName += "::" + pUser->GetUserName(); - sVHost = m_pModule->GetUser()->GetVHost(); + sBindHost = m_pModule->GetUser()->GetBindHost(); } // Don't overwrite the socket name if one is already set @@ -106,7 +106,7 @@ bool CSocket::Connect(const CString& sHostname, unsigned short uPort, bool bSSL, sSockName = GetSockName(); } - return m_pModule->GetManager()->Connect(sHostname, uPort, sSockName, uTimeout, bSSL, sVHost, this); + return m_pModule->GetManager()->Connect(sHostname, uPort, sSockName, uTimeout, bSSL, sBindHost, this); } bool CSocket::Listen(unsigned short uPort, bool bSSL, unsigned int uTimeout) { diff --git a/User.cpp b/User.cpp index 54522f42..3384816b 100644 --- a/User.cpp +++ b/User.cpp @@ -70,7 +70,7 @@ CUser::CUser(const CString& sUserName) { m_bDenyLoadMod = false; m_bAdmin= false; m_bIRCAway = false; - m_bDenySetVHost= false; + m_bDenySetBindHost= false; m_sStatusPrefix = "*"; m_sChanPrefixes = ""; m_uBufferCount = 50; @@ -195,7 +195,8 @@ CString& CUser::ExpandString(const CString& sStr, CString& sRet) const { sRet.Replace("%altnick%", GetAltNick()); sRet.Replace("%ident%", GetIdent()); sRet.Replace("%realname%", GetRealName()); - sRet.Replace("%vhost%", GetVHost()); + sRet.Replace("%vhost%", GetBindHost()); + sRet.Replace("%bindhost%", GetBindHost()); sRet.Replace("%version%", CZNC::GetVersion()); sRet.Replace("%time%", sTime); sRet.Replace("%uptime%", CZNC::Get().GetUptime()); @@ -348,8 +349,8 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet, bool bCloneChans) { SetIdent(User.GetIdent(false)); SetRealName(User.GetRealName()); SetStatusPrefix(User.GetStatusPrefix()); - SetVHost(User.GetVHost()); - SetDCCVHost(User.GetDCCVHost()); + SetBindHost(User.GetBindHost()); + SetDCCBindHost(User.GetDCCBindHost()); SetQuitMsg(User.GetQuitMsg()); SetSkinName(User.GetSkinName()); SetDefaultChanModes(User.GetDefaultChanModes()); @@ -451,7 +452,7 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet, bool bCloneChans) { SetUseClientIP(User.UseClientIP()); SetDenyLoadMod(User.DenyLoadMod()); SetAdmin(User.IsAdmin()); - SetDenySetVHost(User.DenySetVHost()); + SetDenySetBindHost(User.DenySetBindHost()); SetTimestampAppend(User.GetTimestampAppend()); SetTimestampPrepend(User.GetTimestampPrepend()); SetTimestampFormat(User.GetTimestampFormat()); @@ -638,8 +639,8 @@ bool CUser::WriteConfig(CFile& File) { PrintLine(File, "AltNick", GetAltNick()); PrintLine(File, "Ident", GetIdent()); PrintLine(File, "RealName", GetRealName()); - PrintLine(File, "VHost", GetVHost()); - PrintLine(File, "DCCVHost", GetDCCVHost()); + PrintLine(File, "BindHost", GetBindHost()); + PrintLine(File, "DCCBindHost", GetDCCBindHost()); PrintLine(File, "QuitMsg", GetQuitMsg()); if (CZNC::Get().GetStatusPrefix() != GetStatusPrefix()) PrintLine(File, "StatusPrefix", GetStatusPrefix()); @@ -651,7 +652,7 @@ bool CUser::WriteConfig(CFile& File) { PrintLine(File, "BounceDCCs", CString(BounceDCCs())); PrintLine(File, "DenyLoadMod", CString(DenyLoadMod())); PrintLine(File, "Admin", CString(IsAdmin())); - PrintLine(File, "DenySetVHost", CString(DenySetVHost())); + PrintLine(File, "DenySetBindHost", CString(DenySetBindHost())); PrintLine(File, "DCCLookupMethod", CString((UseClientIP()) ? "client" : "default")); PrintLine(File, "TimestampFormat", GetTimestampFormat()); PrintLine(File, "AppendTimestamp", CString(GetTimestampAppend())); @@ -981,8 +982,8 @@ CString CUser::GetLocalIP() { } CString CUser::GetLocalDCCIP() { - if (!GetDCCVHost().empty()) - return GetDCCVHost(); + if (!GetDCCBindHost().empty()) + return GetDCCBindHost(); return GetLocalIP(); } @@ -1162,8 +1163,8 @@ void CUser::SetNick(const CString& s) { m_sNick = s; } void CUser::SetAltNick(const CString& s) { m_sAltNick = s; } void CUser::SetIdent(const CString& s) { m_sIdent = s; } void CUser::SetRealName(const CString& s) { m_sRealName = s; } -void CUser::SetVHost(const CString& s) { m_sVHost = s; } -void CUser::SetDCCVHost(const CString& s) { m_sDCCVHost = s; } +void CUser::SetBindHost(const CString& s) { m_sBindHost = s; } +void CUser::SetDCCBindHost(const CString& s) { m_sDCCBindHost = s; } void CUser::SetPass(const CString& s, eHashType eHash, const CString& sSalt) { m_sPass = s; m_eHashType = eHash; @@ -1174,7 +1175,7 @@ void CUser::SetBounceDCCs(bool b) { m_bBounceDCCs = b; } void CUser::SetUseClientIP(bool b) { m_bUseClientIP = b; } void CUser::SetDenyLoadMod(bool b) { m_bDenyLoadMod = b; } void CUser::SetAdmin(bool b) { m_bAdmin = b; } -void CUser::SetDenySetVHost(bool b) { m_bDenySetVHost = b; } +void CUser::SetDenySetBindHost(bool b) { m_bDenySetBindHost = b; } void CUser::SetDefaultChanModes(const CString& s) { m_sDefaultChanModes = s; } void CUser::SetIRCServer(const CString& s) { m_sIRCServer = s; } void CUser::SetQuitMsg(const CString& s) { m_sQuitMsg = s; } @@ -1227,8 +1228,8 @@ const CString& CUser::GetNick(bool bAllowDefault) const { return (bAllowDefault const CString& CUser::GetAltNick(bool bAllowDefault) const { return (bAllowDefault && m_sAltNick.empty()) ? GetCleanUserName() : m_sAltNick; } const CString& CUser::GetIdent(bool bAllowDefault) const { return (bAllowDefault && m_sIdent.empty()) ? GetCleanUserName() : m_sIdent; } const CString& CUser::GetRealName() const { return m_sRealName.empty() ? m_sUserName : m_sRealName; } -const CString& CUser::GetVHost() const { return m_sVHost; } -const CString& CUser::GetDCCVHost() const { return m_sDCCVHost; } +const CString& CUser::GetBindHost() const { return m_sBindHost; } +const CString& CUser::GetDCCBindHost() const { return m_sDCCBindHost; } const CString& CUser::GetPass() const { return m_sPass; } CUser::eHashType CUser::GetPassHashType() const { return m_eHashType; } const CString& CUser::GetPassSalt() const { return m_sPassSalt; } @@ -1250,7 +1251,7 @@ bool CUser::ConnectPaused() { bool CUser::UseClientIP() const { return m_bUseClientIP; } bool CUser::DenyLoadMod() const { return m_bDenyLoadMod; } bool CUser::IsAdmin() const { return m_bAdmin; } -bool CUser::DenySetVHost() const { return m_bDenySetVHost; } +bool CUser::DenySetBindHost() const { return m_bDenySetBindHost; } bool CUser::MultiClients() const { return m_bMultiClients; } bool CUser::BounceDCCs() const { return m_bBounceDCCs; } const CString& CUser::GetStatusPrefix() const { return m_sStatusPrefix; } diff --git a/User.h b/User.h index e762eaf5..558fbad2 100644 --- a/User.h +++ b/User.h @@ -141,15 +141,15 @@ public: void SetAltNick(const CString& s); void SetIdent(const CString& s); void SetRealName(const CString& s); - void SetVHost(const CString& s); - void SetDCCVHost(const CString& s); + void SetBindHost(const CString& s); + void SetDCCBindHost(const CString& s); void SetPass(const CString& s, eHashType eHash, const CString& sSalt = ""); void SetBounceDCCs(bool b); void SetMultiClients(bool b); void SetUseClientIP(bool b); void SetDenyLoadMod(bool b); void SetAdmin(bool b); - void SetDenySetVHost(bool b); + void SetDenySetBindHost(bool b); bool SetStatusPrefix(const CString& s); void SetDefaultChanModes(const CString& s); void SetIRCNick(const CNick& n); @@ -181,8 +181,8 @@ public: const CString& GetAltNick(bool bAllowDefault = true) const; const CString& GetIdent(bool bAllowDefault = true) const; const CString& GetRealName() const; - const CString& GetVHost() const; - const CString& GetDCCVHost() const; + const CString& GetBindHost() const; + const CString& GetDCCBindHost() const; const CString& GetPass() const; eHashType GetPassHashType() const; const CString& GetPassSalt() const; @@ -201,7 +201,7 @@ public: bool UseClientIP() const; bool DenyLoadMod() const; bool IsAdmin() const; - bool DenySetVHost() const; + bool DenySetBindHost() const; bool BounceDCCs() const; bool MultiClients() const; const CString& GetStatusPrefix() const; @@ -233,8 +233,8 @@ protected: CString m_sAltNick; CString m_sIdent; CString m_sRealName; - CString m_sVHost; - CString m_sDCCVHost; + CString m_sBindHost; + CString m_sDCCBindHost; CString m_sPass; CString m_sPassSalt; CString m_sStatusPrefix; @@ -262,7 +262,7 @@ protected: bool m_bUseClientIP; bool m_bDenyLoadMod; bool m_bAdmin; - bool m_bDenySetVHost; + bool m_bDenySetBindHost; bool m_bKeepBuffer; bool m_bBeingDeleted; bool m_bAppendTimestamp; diff --git a/modules/admin.cpp b/modules/admin.cpp index f41d1b7f..c2387afc 100644 --- a/modules/admin.cpp +++ b/modules/admin.cpp @@ -70,12 +70,12 @@ class CAdminMod : public CModule { {"Altnick", string}, {"Ident", string}, {"RealName", string}, - {"VHost", string}, + {"BindHost", string}, {"MultiClients", boolean}, {"BounceDCCs", boolean}, {"UseClientIP", boolean}, {"DenyLoadMod", boolean}, - {"DenySetVHost", boolean}, + {"DenySetBindHost", boolean}, {"DefaultChanModes", string}, {"QuitMsg", string}, {"BufferCount", integer}, @@ -87,7 +87,7 @@ class CAdminMod : public CModule { {"Admin", boolean}, {"AppendTimestamp", boolean}, {"PrependTimestamp", boolean}, - {"DCCVHost", boolean} + {"DCCBindHost", boolean} }; for (unsigned int i = 0; i != ARRAY_SIZE(vars); ++i) { VarTable.AddRow(); @@ -160,8 +160,8 @@ class CAdminMod : public CModule { PutModule("Ident = " + pUser->GetIdent()); else if (sVar == "realname") PutModule("RealName = " + pUser->GetRealName()); - else if (sVar == "vhost") - PutModule("VHost = " + pUser->GetVHost()); + else if (sVar == "bindhost") + PutModule("BindHost = " + pUser->GetBindHost()); else if (sVar == "multiclients") PutModule("MultiClients = " + CString(pUser->MultiClients())); else if (sVar == "bouncedccs") @@ -170,8 +170,8 @@ class CAdminMod : public CModule { PutModule("UseClientIP = " + CString(pUser->UseClientIP())); else if (sVar == "denyloadmod") PutModule("DenyLoadMod = " + CString(pUser->DenyLoadMod())); - else if (sVar == "denysetvhost") - PutModule("DenySetVHost = " + CString(pUser->DenySetVHost())); + else if (sVar == "denysetbindhost") + PutModule("DenySetBindHost = " + CString(pUser->DenySetBindHost())); else if (sVar == "defaultchanmodes") PutModule("DefaultChanModes = " + pUser->GetDefaultChanModes()); else if (sVar == "quitmsg") @@ -190,8 +190,8 @@ class CAdminMod : public CModule { PutModule("AppendTimestamp = " + CString(pUser->GetTimestampAppend())); else if (sVar == "preprendtimestamp") PutModule("PreprendTimestamp = " + CString(pUser->GetTimestampPrepend())); - else if (sVar == "dccvhost") - PutModule("DCCVHost = " + CString(pUser->GetDCCVHost())); + else if (sVar == "dccbindhost") + PutModule("DCCBindHost = " + CString(pUser->GetDCCBindHost())); else if (sVar == "admin") PutModule("Admin = " + CString(pUser->IsAdmin())); else @@ -228,10 +228,10 @@ class CAdminMod : public CModule { pUser->SetRealName(sValue); PutModule("RealName = " + sValue); } - else if (sVar == "vhost") { - if(!pUser->DenySetVHost() || m_pUser->IsAdmin()) { - pUser->SetVHost(sValue); - PutModule("VHost = " + sValue); + else if (sVar == "bindhost") { + if(!pUser->DenySetBindHost() || m_pUser->IsAdmin()) { + pUser->SetBindHost(sValue); + PutModule("BindHost = " + sValue); } else { PutModule("Access denied!"); } @@ -260,11 +260,11 @@ class CAdminMod : public CModule { PutModule("Access denied!"); } } - else if (sVar == "denysetvhost") { + else if (sVar == "denysetbindhost") { if(m_pUser->IsAdmin()) { bool b = sValue.ToBool(); - pUser->SetDenySetVHost(b); - PutModule("DenySetVHost = " + CString(b)); + pUser->SetDenySetBindHost(b); + PutModule("DenySetBindHost = " + CString(b)); } else { PutModule("Access denied!"); } @@ -332,10 +332,10 @@ class CAdminMod : public CModule { pUser->SetTimestampAppend(b); PutModule("AppendTimestamp = " + CString(b)); } - else if (sVar == "dccvhost") { - if(!pUser->DenySetVHost() || m_pUser->IsAdmin()) { - pUser->SetDCCVHost(sValue); - PutModule("DCCVHost = " + sValue); + else if (sVar == "dccbindhost") { + if(!pUser->DenySetBindHost() || m_pUser->IsAdmin()) { + pUser->SetDCCBindHost(sValue); + PutModule("DCCBindHost = " + sValue); } else { PutModule("Access denied!"); } @@ -456,7 +456,7 @@ class CAdminMod : public CModule { Table.AddColumn("Nick"); Table.AddColumn("AltNick"); Table.AddColumn("Ident"); - Table.AddColumn("VHost"); + Table.AddColumn("BindHost"); for (map::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) { Table.AddRow(); @@ -469,7 +469,7 @@ class CAdminMod : public CModule { Table.SetCell("Nick", it->second->GetNick()); Table.SetCell("AltNick", it->second->GetAltNick()); Table.SetCell("Ident", it->second->GetIdent()); - Table.SetCell("VHost", it->second->GetVHost()); + Table.SetCell("BindHost", it->second->GetBindHost()); } PutModule(Table); diff --git a/modules/extra/listsockets.cpp b/modules/extra/listsockets.cpp index f0f88180..fe4819b3 100644 --- a/modules/extra/listsockets.cpp +++ b/modules/extra/listsockets.cpp @@ -149,14 +149,14 @@ public: Table.SetCell("Name", pSocket->GetSockName()); - CString sVHost; + CString sBindHost; if (bShowHosts) { - sVHost = pSocket->GetBindHost(); + sBindHost = pSocket->GetBindHost(); } - if (sVHost.empty()) { - sVHost = pSocket->GetLocalIP(); + if (sBindHost.empty()) { + sBindHost = pSocket->GetLocalIP(); } - Table.SetCell("Local", sVHost + " " + CString(pSocket->GetLocalPort())); + Table.SetCell("Local", sBindHost + " " + CString(pSocket->GetLocalPort())); CString sHost; if (!bShowHosts) { diff --git a/modules/extra/modtcl.cpp b/modules/extra/modtcl.cpp index 3a10e9de..7150a256 100644 --- a/modules/extra/modtcl.cpp +++ b/modules/extra/modtcl.cpp @@ -93,7 +93,8 @@ public: Tcl_CreateCommand(interp, "GetCurNick", tcl_GetCurNick, this, NULL); Tcl_CreateCommand(interp, "GetUsername", tcl_GetUsername, this, NULL); Tcl_CreateCommand(interp, "GetRealName", tcl_GetRealName, this, NULL); - Tcl_CreateCommand(interp, "GetVHost", tcl_GetVHost, this, NULL); + Tcl_CreateCommand(interp, "GetVHost", tcl_GetBindHost, this, NULL); + Tcl_CreateCommand(interp, "GetBindHost", tcl_GetBindHost, this, NULL); Tcl_CreateCommand(interp, "GetChans", tcl_GetChans, this, NULL); Tcl_CreateCommand(interp, "GetChannelUsers", tcl_GetChannelUsers, this, NULL); Tcl_CreateCommand(interp, "GetChannelModes", tcl_GetChannelModes, this, NULL); @@ -260,9 +261,9 @@ private: return TCL_OK; } - static int tcl_GetVHost STDVAR { + static int tcl_GetBindHost STDVAR { CModTcl *mod = static_cast(cd); - Tcl_SetResult(irp, (char *)mod->m_pUser->GetVHost().c_str(), TCL_VOLATILE); + Tcl_SetResult(irp, (char *)mod->m_pUser->GetBindHost().c_str(), TCL_VOLATILE); return TCL_OK; } diff --git a/modules/modperl.cpp b/modules/modperl.cpp index 1f015a0b..069b2d24 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -704,7 +704,7 @@ XS(XS_ZNC_GetString) else if (sName == "AltNick") sReturn = pUser->GetAltNick(); else if (sName == "Ident") sReturn = pUser->GetIdent(); else if (sName == "RealName") sReturn = pUser->GetRealName(); - else if (sName == "VHost") sReturn = pUser->GetVHost(); + else if (sName == "VHost" || sName == "BindHost") sReturn = pUser->GetBindHost(); else if (sName == "Pass") sReturn = pUser->GetPass(); else if (sName == "CurPath") sReturn = CZNC::Get().GetCurPath(); else if (sName == "DLPath") sReturn = pUser->GetDLPath(); diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 0a93c2b4..998154be 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -196,7 +196,7 @@ public: if (pChannel->IsInChannel(sNick)) continue; - CString sHost = m_pUser->GetVHost(); + CString sHost = m_pUser->GetBindHost(); const set& ssNicks = pChannel->GetNicks(); if (sHost.empty()) { @@ -319,7 +319,7 @@ public: pChannel->DelFixedNick(pUser->GetUserName()); const set& ssNicks = pChannel->GetNicks(); - CString sHost = pUser->GetVHost(); + CString sHost = pUser->GetBindHost(); if (sHost.empty()) { sHost = pUser->GetIRCNick().GetHost(); @@ -377,7 +377,7 @@ public: const CString& sNick = pUser->GetUserName(); pChannel->AddNick(sNick); - CString sHost = pUser->GetVHost(); + CString sHost = pUser->GetBindHost(); if (sHost.empty()) { sHost = pUser->GetIRCNick().GetHost(); @@ -408,7 +408,7 @@ public: return CONTINUE; } - CString sHost = m_pUser->GetVHost(); + CString sHost = m_pUser->GetBindHost(); if (sHost.empty()) { sHost = m_pUser->GetIRCNick().GetHost(); diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index d9b04571..87101121 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -198,14 +198,14 @@ public: sArg = WebSock.GetParam("chanmodes"); if (!sArg.empty()) { pNewUser->SetDefaultChanModes(sArg); } sArg = WebSock.GetParam("timestampformat"); if (!sArg.empty()) { pNewUser->SetTimestampFormat(sArg); } - sArg = WebSock.GetParam("vhost"); - // To change VHosts be admin or don't have DenySetVHost - if (spSession->IsAdmin() || !spSession->GetUser()->DenySetVHost()) { + sArg = WebSock.GetParam("bindhost"); + // To change BindHosts be admin or don't have DenySetBindHost + if (spSession->IsAdmin() || !spSession->GetUser()->DenySetBindHost()) { if (!sArg.empty()) { - pNewUser->SetVHost(sArg); + pNewUser->SetBindHost(sArg); } } else if (pUser){ - pNewUser->SetVHost(pUser->GetVHost()); + pNewUser->SetBindHost(pUser->GetBindHost()); } // First apply the old limit in case the new one is too high @@ -226,10 +226,10 @@ public: if (spSession->IsAdmin()) { pNewUser->SetDenyLoadMod(WebSock.GetParam("denyloadmod").ToBool()); - pNewUser->SetDenySetVHost(WebSock.GetParam("denysetvhost").ToBool()); + pNewUser->SetDenySetBindHost(WebSock.GetParam("denysetbindhost").ToBool()); } else if (pUser) { pNewUser->SetDenyLoadMod(pUser->DenyLoadMod()); - pNewUser->SetDenySetVHost(pUser->DenySetVHost()); + pNewUser->SetDenySetBindHost(pUser->DenySetBindHost()); } // If pUser is not NULL, we are editing an existing user. @@ -630,27 +630,27 @@ public: Tmpl["IRCConnectEnabled"] = "true"; } - // To change VHosts be admin or don't have DenySetVHost - const VCString& vsVHosts = CZNC::Get().GetVHosts(); - bool bFoundVHost = false; - if (spSession->IsAdmin() || !spSession->GetUser()->DenySetVHost()) { - for (unsigned int b = 0; b < vsVHosts.size(); b++) { - const CString& sVHost = vsVHosts[b]; - CTemplate& l = Tmpl.AddRow("VHostLoop"); + // To change BindHosts be admin or don't have DenySetBindHost + const VCString& vsBindHosts = CZNC::Get().GetBindHosts(); + bool bFoundBindHost = false; + if (spSession->IsAdmin() || !spSession->GetUser()->DenySetBindHost()) { + for (unsigned int b = 0; b < vsBindHosts.size(); b++) { + const CString& sBindHost = vsBindHosts[b]; + CTemplate& l = Tmpl.AddRow("BindHostLoop"); - l["VHost"] = sVHost; + l["BindHost"] = sBindHost; - if (pUser && pUser->GetVHost() == sVHost) { + if (pUser && pUser->GetBindHost() == sBindHost) { l["Checked"] = "true"; - bFoundVHost = true; + bFoundBindHost = true; } } - // If our current vhost is not in the global list... - if (pUser && !bFoundVHost && !pUser->GetVHost().empty()) { - CTemplate& l = Tmpl.AddRow("VHostLoop"); + // If our current bindhost is not in the global list... + if (pUser && !bFoundBindHost && !pUser->GetBindHost().empty()) { + CTemplate& l = Tmpl.AddRow("BindHostLoop"); - l["VHost"] = pUser->GetVHost(); + l["BindHost"] = pUser->GetBindHost(); l["Checked"] = "true"; } } @@ -733,9 +733,9 @@ public: if (pUser && pUser == CZNC::Get().FindUser(WebSock.GetUser())) { o10["Disabled"] = "true"; } CTemplate& o11 = Tmpl.AddRow("OptionLoop"); - o11["Name"] = "denysetvhost"; - o11["DisplayName"] = "Deny SetVHost"; - if (pUser && pUser->DenySetVHost()) { o11["Checked"] = "true"; } + o11["Name"] = "denysetbindhost"; + o11["DisplayName"] = "Deny SetBindHost"; + if (pUser && pUser->DenySetBindHost()) { o11["Checked"] = "true"; } } return true; @@ -876,17 +876,17 @@ public: bool SettingsPage(CWebSock& WebSock, CTemplate& Tmpl) { if (!WebSock.GetParam("submitted").ToUInt()) { - CString sVHosts, sMotd; + CString sBindHosts, sMotd; Tmpl["Action"] = "settings"; Tmpl["Title"] = "Settings"; Tmpl["StatusPrefix"] = CZNC::Get().GetStatusPrefix(); Tmpl["ISpoofFile"] = CZNC::Get().GetISpoofFile(); Tmpl["ISpoofFormat"] = CZNC::Get().GetISpoofFormat(); - const VCString& vsVHosts = CZNC::Get().GetVHosts(); - for (unsigned int a = 0; a < vsVHosts.size(); a++) { - CTemplate& l = Tmpl.AddRow("VHostLoop"); - l["VHost"] = vsVHosts[a]; + const VCString& vsBindHosts = CZNC::Get().GetBindHosts(); + for (unsigned int a = 0; a < vsBindHosts.size(); a++) { + CTemplate& l = Tmpl.AddRow("BindHostLoop"); + l["BindHost"] = vsBindHosts[a]; } const VCString& vsMotd = CZNC::Get().GetMotd(); @@ -981,11 +981,11 @@ public: CZNC::Get().AddMotd(vsArgs[a].TrimRight_n()); } - WebSock.GetRawParam("vhosts").Split("\n", vsArgs); - CZNC::Get().ClearVHosts(); + WebSock.GetRawParam("bindhosts").Split("\n", vsArgs); + CZNC::Get().ClearBindHosts(); for (a = 0; a < vsArgs.size(); a++) { - CZNC::Get().AddVHost(vsArgs[a].Trim_n()); + CZNC::Get().AddBindHost(vsArgs[a].Trim_n()); } CZNC::Get().SetSkinName(WebSock.GetParam("skin")); diff --git a/modules/webadmin/tmpl/add_edit_user.tmpl b/modules/webadmin/tmpl/add_edit_user.tmpl index 0165cfbb..fa54d224 100644 --- a/modules/webadmin/tmpl/add_edit_user.tmpl +++ b/modules/webadmin/tmpl/add_edit_user.tmpl @@ -71,12 +71,12 @@
- +
-
VHost:
- - +
diff --git a/modules/webadmin/tmpl/settings.tmpl b/modules/webadmin/tmpl/settings.tmpl index 7738ec7e..a553a169 100644 --- a/modules/webadmin/tmpl/settings.tmpl +++ b/modules/webadmin/tmpl/settings.tmpl @@ -87,8 +87,8 @@
-
VHosts:
-

One host name or IP entry per line. diff --git a/znc.cpp b/znc.cpp index 77f6ece1..f5fdd197 100644 --- a/znc.cpp +++ b/znc.cpp @@ -165,7 +165,7 @@ bool CZNC::ConnectUser(CUser *pUser) { return false; ); - if (!m_Manager.Connect(pServer->GetName(), pServer->GetPort(), sSockName, 120, bSSL, pUser->GetVHost(), pIRCSock)) { + if (!m_Manager.Connect(pServer->GetName(), pServer->GetPort(), sSockName, 120, bSSL, pUser->GetBindHost(), pIRCSock)) { ReleaseISpoof(); pUser->PutStatus("Unable to connect. (Bad host?)"); } @@ -594,8 +594,8 @@ bool CZNC::WriteConfig() { m_LockFile.Write("Motd = " + m_vsMotd[m].FirstLine() + "\n"); } - for (unsigned int v = 0; v < m_vsVHosts.size(); v++) { - m_LockFile.Write("VHost = " + m_vsVHosts[v].FirstLine() + "\n"); + for (unsigned int v = 0; v < m_vsBindHosts.size(); v++) { + m_LockFile.Write("BindHost = " + m_vsBindHosts[v].FirstLine() + "\n"); } CGlobalModules& Mods = GetModules(); @@ -771,9 +771,9 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) { vsLines.push_back("\tIdent = " + sAnswer); CUtils::GetInput("Real Name", sAnswer, "Got ZNC?"); vsLines.push_back("\tRealName = " + sAnswer); - CUtils::GetInput("VHost", sAnswer, "", "optional"); + CUtils::GetInput("Bind Host", sAnswer, "", "optional"); if (!sAnswer.empty()) { - vsLines.push_back("\tVHost = " + sAnswer); + vsLines.push_back("\tBindHost = " + sAnswer); } // todo: Possibly add motd @@ -1068,7 +1068,7 @@ bool CZNC::DoRehash(CString& sError) CUtils::PrintStatus(true); - m_vsVHosts.clear(); + m_vsBindHosts.clear(); m_vsMotd.clear(); // Delete all listeners @@ -1344,8 +1344,8 @@ bool CZNC::DoRehash(CString& sError) } else if (sName.Equals("Admin")) { pUser->SetAdmin(sValue.Equals("true")); continue; - } else if (sName.Equals("DenySetVHost")) { - pUser->SetDenySetVHost(sValue.Equals("true")); + } else if (sName.Equals("DenySetBindHost") || sName.Equals("DenySetVHost")) { + pUser->SetDenySetBindHost(sValue.Equals("true")); continue; } else if (sName.Equals("StatusPrefix")) { if (!pUser->SetStatusPrefix(sValue)) { @@ -1368,11 +1368,11 @@ bool CZNC::DoRehash(CString& sError) } else if (sName.Equals("ChanModes")) { pUser->SetDefaultChanModes(sValue); continue; - } else if (sName.Equals("VHost")) { - pUser->SetVHost(sValue); + } else if (sName.Equals("BindHost") || sName.Equals("VHost")) { + pUser->SetBindHost(sValue); continue; - } else if (sName.Equals("DCCVHost")) { - pUser->SetDCCVHost(sValue); + } else if (sName.Equals("DCCBindHost") || sName.Equals("DCCVHost")) { + pUser->SetDCCBindHost(sValue); continue; } else if (sName.Equals("Allow")) { pUser->AddAllowedHost(sValue); @@ -1589,8 +1589,8 @@ bool CZNC::DoRehash(CString& sError) } else if (sName.Equals("MOTD")) { AddMotd(sValue); continue; - } else if (sName.Equals("VHost")) { - AddVHost(sValue); + } else if (sName.Equals("BindHost") || sName.Equals("VHost")) { + AddBindHost(sValue); continue; } else if (sName.Equals("PidFile")) { m_sPidFile = sValue; @@ -1746,30 +1746,30 @@ bool CZNC::DoRehash(CString& sError) return true; } -void CZNC::ClearVHosts() { - m_vsVHosts.clear(); +void CZNC::ClearBindHosts() { + m_vsBindHosts.clear(); } -bool CZNC::AddVHost(const CString& sHost) { +bool CZNC::AddBindHost(const CString& sHost) { if (sHost.empty()) { return false; } - for (unsigned int a = 0; a < m_vsVHosts.size(); a++) { - if (m_vsVHosts[a].Equals(sHost)) { + for (unsigned int a = 0; a < m_vsBindHosts.size(); a++) { + if (m_vsBindHosts[a].Equals(sHost)) { return false; } } - m_vsVHosts.push_back(sHost); + m_vsBindHosts.push_back(sHost); return true; } -bool CZNC::RemVHost(const CString& sHost) { +bool CZNC::RemBindHost(const CString& sHost) { VCString::iterator it; - for (it = m_vsVHosts.begin(); it != m_vsVHosts.end(); ++it) { + for (it = m_vsBindHosts.begin(); it != m_vsBindHosts.end(); ++it) { if (sHost.Equals(*it)) { - m_vsVHosts.erase(it); + m_vsBindHosts.erase(it); return true; } } diff --git a/znc.h b/znc.h index d777350e..240eb3f5 100644 --- a/znc.h +++ b/znc.h @@ -53,9 +53,9 @@ public: static CString GetVersion(); static CString GetTag(bool bIncludeVersion = true); CString GetUptime() const; - void ClearVHosts(); - bool AddVHost(const CString& sHost); - bool RemVHost(const CString& sHost); + void ClearBindHosts(); + bool AddBindHost(const CString& sHost); + bool RemBindHost(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; } @@ -106,7 +106,7 @@ public: bool WritePemFile(); const CString& GetISpoofFile() const { return m_sISpoofFile; } const CString& GetISpoofFormat() const { return m_sISpoofFormat; } - const VCString& GetVHosts() const { return m_vsVHosts; } + const VCString& GetBindHosts() const { return m_vsBindHosts; } const vector& GetListeners() const { return m_vpListeners; } time_t TimeStarted() const { return m_TimeStarted; } unsigned int GetMaxBufferSize() const { return m_uiMaxBufferSize; } @@ -169,7 +169,7 @@ protected: CString m_sISpoofFormat; CString m_sPidFile; CString m_sSSLCertFile; - VCString m_vsVHosts; + VCString m_vsBindHosts; VCString m_vsMotd; CFile m_LockFile; CFile* m_pISpoofLockFile;