aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/CMakeLists.txt14
-rw-r--r--src/modules/context/libkvicontext.cpp2
-rw-r--r--src/modules/dcc/libkvidcc.cpp2
-rw-r--r--src/modules/dcc/marshal.cpp30
-rw-r--r--src/modules/dcc/marshal.h2
-rw-r--r--src/modules/dcc/requests.cpp2
-rw-r--r--src/modules/dcc/utils.cpp8
-rw-r--r--src/modules/ident/libkviident.cpp34
-rw-r--r--src/modules/ident/libkviident.h4
-rw-r--r--src/modules/my/libkvimy.cpp2
-rw-r--r--src/modules/objects/class_socket.cpp38
-rw-r--r--src/modules/objects/class_socket.h4
-rw-r--r--src/modules/options/optw_connection.cpp14
-rw-r--r--src/modules/options/optw_proxy.cpp32
-rw-r--r--src/modules/options/optw_proxy.h2
-rw-r--r--src/modules/options/optw_servers.cpp24
-rw-r--r--src/modules/options/optw_servers.h2
17 files changed, 108 insertions, 108 deletions
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 92c8cc453..85fafc2f9 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -46,12 +46,12 @@ SUBDIRS(
# perl, perlcore
# forgotten ?
- # offer
+ # offer, proxydb, serverdb
)
-
-# this is currently broken on MINGW because of some virtual functions
-# messing up linker's brain
-
-IF(NOT MINGW)
- ADD_SUBDIRECTORY( rijndael )
+
+# this is currently broken on MINGW because of some virtual functions
+# messing up linker's brain
+
+IF(NOT MINGW)
+ ADD_SUBDIRECTORY(rijndael)
ENDIF() \ No newline at end of file
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 6f3851c38..81af9f75f 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -185,7 +185,7 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
context_kvs_fnc_serverIsIPV6,
- c->returnValue()->setBoolean(pConnection->target()->server()->isIpV6())
+ c->returnValue()->setBoolean(pConnection->target()->server()->isIPv6())
)
/*
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 70f3358a4..f362f2f94 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -1255,7 +1255,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
} else {
if(d->console()->isConnected())
{
- d->console()->socket()->getLocalHostIp(d->szListenIp,d->console()->isIpV6Connection());
+ d->console()->socket()->getLocalHostIp(d->szListenIp,d->console()->isIPv6Connection());
} else d->szListenIp = "127.0.0.1"; // huh ? :)
}
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index b970f6334..5f6aa6b3b 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -41,7 +41,7 @@ KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
m_pSn = 0;
m_fd = KVI_INVALID_SOCKET;
m_pTimeoutTimer = 0;
- m_bIpV6 = false;
+ m_bIPv6 = false;
m_pOutputContext = ctx;
#ifdef COMPILE_SSL_SUPPORT
m_pSSL = 0;
@@ -99,7 +99,7 @@ void KviDccMarshal::reset()
delete m_pTimeoutTimer;
m_pTimeoutTimer = 0;
}
- m_bIpV6 = false;
+ m_bIPv6 = false;
}
int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
@@ -145,7 +145,7 @@ void KviDccMarshal::doListen()
{
emit error(KviError_invalidIpAddress);
return;
- } else m_bIpV6 = true;
+ } else m_bIPv6 = true;
#else
emit error(KviError_invalidIpAddress);
return;
@@ -161,16 +161,16 @@ void KviDccMarshal::doListen()
}
#ifndef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
- emit error(KviError_noIpV6Support);
+ emit error(KviError_noIPv6Support);
return;
}
#endif
#ifdef COMPILE_IPV6_SUPPORT
- m_fd = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+ m_fd = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#else
m_fd = kvi_socket_create(KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
@@ -185,7 +185,7 @@ void KviDccMarshal::doListen()
if((!KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)) || (m_uPort != 0))
{
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
#else
KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
@@ -210,7 +210,7 @@ void KviDccMarshal::doListen()
bool bBindSuccess;
do {
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
#else
KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
@@ -256,7 +256,7 @@ void KviDccMarshal::doListen()
// Reread the port in case we're binding to a random one (0)
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sareal(0,m_bIpV6);
+ KviSockaddr sareal(0,m_bIPv6);
#else
KviSockaddr sareal(0,false);
#endif
@@ -336,7 +336,7 @@ void KviDccMarshal::doConnect()
{
emit error(KviError_invalidIpAddress);
return;
- } else m_bIpV6 = true;
+ } else m_bIPv6 = true;
#else
emit error(KviError_invalidIpAddress);
return;
@@ -354,7 +354,7 @@ void KviDccMarshal::doConnect()
// create the socket
#ifdef COMPILE_IPV6_SUPPORT
- m_fd = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+ m_fd = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#else
m_fd = kvi_socket_create(KVI_SOCKET_PF_INET,
@@ -378,7 +378,7 @@ void KviDccMarshal::doConnect()
// fill the sockaddr structure
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
#else
KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
@@ -453,7 +453,7 @@ void KviDccMarshal::snActivated(int)
struct sockaddr * addr = (struct sockaddr *)&hostSockAddr;
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
addr = (struct sockaddr *)&hostSockAddr6;
size = sizeof(hostSockAddr6);
@@ -486,7 +486,7 @@ void KviDccMarshal::snActivated(int)
m_szSecondaryPort = __tr2qs_ctx("unknown","dcc");
} else {
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
@@ -509,7 +509,7 @@ void KviDccMarshal::snActivated(int)
delete m_pSn;
m_pSn = 0;
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h
index b7d19e7fe..9470a7862 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/marshal.h
@@ -60,7 +60,7 @@ protected:
QString m_szIp; // Dcc initiator ip address (the one that listens)
QString m_szPort; // Dcc initiator port (the one that listens)
// other info
- bool m_bIpV6; // Dcc mode
+ bool m_bIPv6; // Dcc mode
kvi_u32_t m_uPort; // Dcc initiator port
bool m_bOutgoing; // true if WE have connected to the remote host (so m_szIp is the remote host ip)
QString m_szSecondaryIp; // Ip of the client that has connected to the remote host
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 308b084df..5828a7dd9 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -185,7 +185,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
struct in6_addr addr6;
if(kvi_stringIpToBinaryIp_V6(ipaddr,&addr6))
{
- dcc->bIpV6 = true;
+ dcc->bIPv6 = true;
return true; // IPV6 address.
}
#endif
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index 9f8e10735..f6e0bf721 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -47,7 +47,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
{
if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
{
- // Try to find the first available IpV4 interface
+ // Try to find the first available IPv4 interface
if(!kvi_getLocalHostAddress(szListenIp))
{
if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
@@ -87,7 +87,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
if(pConsole->isConnected())
{
//#warning "The IPV6 choice is not OK here.... and maybe allow to bind to specified ports"
- pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIpV6Connection());
+ pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIPv6Connection());
} else {
szListenIp = "0.0.0.0"; // huh ? :)
}
@@ -115,7 +115,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
{
if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
{
- // Try to find the first available IpV4 interface
+ // Try to find the first available IPv4 interface
if(!kvi_getLocalHostAddress(szListenIp))
{
if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
@@ -155,7 +155,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
if(pConsole->isConnected())
{
//#warning "The IPV6 choice is not OK here.... and maybe allow to bind to specified ports"
- pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIpV6Connection());
+ pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIPv6Connection());
} else {
szListenIp = "0.0.0.0"; // huh ? :)
}
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 7fff2cb42..b3c69af91 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -151,11 +151,11 @@ KviIdentDaemon::KviIdentDaemon()
if(m_szUser.isEmpty())m_szUser = "kvirc";
m_uPort = KVI_OPTION_UINT(KviOption_uintIdentdPort);
#ifdef COMPILE_IPV6_SUPPORT
- m_bEnableIpV6 = KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6);
+ m_bEnableIPv6 = KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6);
#else
- m_bEnableIpV6 = false;
+ m_bEnableIPv6 = false;
#endif
- m_bIpV6ContainsIpV4 = KVI_OPTION_BOOL(KviOption_boolIdentdIpV6ContainsIpV4);
+ m_bIPv6ContainsIPv4 = KVI_OPTION_BOOL(KviOption_boolIdentdIPv6ContainsIPv4);
// debug("Thread constructor done");
}
@@ -204,7 +204,7 @@ void KviIdentDaemon::run()
#ifdef COMPILE_IPV6_SUPPORT
// If we have enabled ipv6 and we have to use a single socket: this one is IPV6
// otherwise this one is IPV4
- KviSockaddr sa(m_uPort,m_bEnableIpV6 && m_bIpV6ContainsIpV4);
+ KviSockaddr sa(m_uPort,m_bEnableIPv6 && m_bIPv6ContainsIPv4);
#else
KviSockaddr sa(m_uPort,false);
#endif
@@ -212,7 +212,7 @@ void KviIdentDaemon::run()
KviIdentRequest * r;
#ifdef COMPILE_IPV6_SUPPORT
- m_sock = kvi_socket_create((m_bEnableIpV6 && m_bIpV6ContainsIpV4) ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
+ m_sock = kvi_socket_create((m_bEnableIPv6 && m_bIPv6ContainsIPv4) ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#else
m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#endif
@@ -249,7 +249,7 @@ void KviIdentDaemon::run()
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bEnableIpV6 && (!m_bIpV6ContainsIpV4))
+ if(m_bEnableIPv6 && (!m_bIPv6ContainsIPv4))
{
// Need to start the IPV6 socket too
KviSockaddr sa6(m_uPort,true);
@@ -257,13 +257,13 @@ void KviIdentDaemon::run()
if(m_sock6 == KVI_INVALID_SOCKET)
{
- postMessage(__tr("Can't start the ident service on IpV6 : socket() failed"),0);
+ postMessage(__tr("Can't start the ident service on IPv6 : socket() failed"),0);
goto ipv6_failure;
}
if(!kvi_socket_setNonBlocking(m_sock6))
{
- postMessage(__tr("Can't start the ident service on IpV6 : async setting failed"),0);
+ postMessage(__tr("Can't start the ident service on IPv6 : async setting failed"),0);
kvi_socket_close(m_sock6);
m_sock6 = KVI_INVALID_SOCKET;
goto ipv6_failure;
@@ -271,7 +271,7 @@ void KviIdentDaemon::run()
if(!sa6.socketAddress())
{
- postMessage(__tr("Can't enable the ident service on IpV6 : can't setup the listen address"),0);
+ postMessage(__tr("Can't enable the ident service on IPv6 : can't setup the listen address"),0);
kvi_socket_close(m_sock6);
m_sock6 = KVI_INVALID_SOCKET;
goto ipv6_failure;
@@ -279,7 +279,7 @@ void KviIdentDaemon::run()
if(!kvi_socket_bind(m_sock6,sa6.socketAddress(),((int)(sa6.addressLength()))))
{
- postMessage(__tr("Can't start the ident service on IpV6 : bind() failed"),0);
+ postMessage(__tr("Can't start the ident service on IPv6 : bind() failed"),0);
kvi_socket_close(m_sock6);
m_sock6 = KVI_INVALID_SOCKET;
goto ipv6_failure;
@@ -288,7 +288,7 @@ void KviIdentDaemon::run()
if(!kvi_socket_listen(m_sock6,128))
{
- postMessage(__tr("Can't start the ident service on IpV6 : listen() failed"),0);
+ postMessage(__tr("Can't start the ident service on IPv6 : listen() failed"),0);
kvi_socket_close(m_sock6);
m_sock6 = KVI_INVALID_SOCKET;
goto ipv6_failure;
@@ -300,23 +300,23 @@ void KviIdentDaemon::run()
ipv6_failure:
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bEnableIpV6)
+ if(m_bEnableIPv6)
{
if(m_sock6 != KVI_INVALID_SOCKET) {
if(_OUTPUT_PARANOIC)
- postMessage(__tr("Starting identd service (IpV4/V6 on separate namespaces)"),0);
+ postMessage(__tr("Starting identd service (IPv4/V6 on separate namespaces)"),0);
} else {
if(_OUTPUT_PARANOIC)
- postMessage(__tr("Starting identd service (IpV4/V6 in IpV6 namespace)"),0);
+ postMessage(__tr("Starting identd service (IPv4/V6 in IPv6 namespace)"),0);
}
} else {
if(_OUTPUT_PARANOIC)
- postMessage(__tr("Starting identd service (IpV4)"),0);
+ postMessage(__tr("Starting identd service (IPv4)"),0);
}
#else //!COMPILE_IPV6_SUPPORT
if(_OUTPUT_PARANOIC)
- postMessage(__tr("Service startup (IpV4)"),0);
+ postMessage(__tr("Service startup (IPv4)"),0);
#endif //!COMPILE_IPV6_SUPPORT
@@ -372,7 +372,7 @@ ipv6_failure:
if(FD_ISSET(m_sock,&rs))
{
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr satmp(0,m_bEnableIpV6 && m_bIpV6ContainsIpV4);
+ KviSockaddr satmp(0,m_bEnableIPv6 && m_bIPv6ContainsIPv4);
#else
KviSockaddr satmp(0,false);
#endif
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 422a9e517..64725fe87 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -71,8 +71,8 @@ public:
private:
KviStr m_szUser;
kvi_u32_t m_uPort;
- bool m_bEnableIpV6;
- bool m_bIpV6ContainsIpV4;
+ bool m_bEnableIPv6;
+ bool m_bIPv6ContainsIPv4;
kvi_socket_t m_sock;
kvi_socket_t m_sock6;
KviPointerList<KviIdentRequest> * m_pRequestList;
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 5109c62d3..adfeb713f 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -288,7 +288,7 @@ static bool my_kvs_fnc_serverIsIPV6(KviKvsModuleFunctionCall * c)
if(wnd)
{
if(wnd->connection())
- c->returnValue()->setBoolean(wnd->connection()->server()->isIpV6());
+ c->returnValue()->setBoolean(wnd->connection()->server()->isIPv6());
}
return true;
}
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 3996091c8..aabfdbcda 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -69,7 +69,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip
m_uInDataLen = 0;
m_pOutBuffer = new KviDataBuffer();
m_pFlushTimer = new QTimer();
- m_bIpV6 = false;
+ m_bIPv6 = false;
m_uLocalPort = 0;
m_secondarySock = KVI_INVALID_SOCKET;
connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(tryFlush()));
@@ -133,7 +133,7 @@ void KviScriptSocketObject::reset()
m_szRemoteIp.clear();
m_uLocalPort = 0;
m_szLocalIp.clear();
- m_bIpV6 = false;
+ m_bIPv6 = false;
}
/*
@@ -410,7 +410,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
m_uInDataLen = 0;
m_pOutBuffer = new KviDataBuffer();
m_pFlushTimer = new QTimer();
- m_bIpV6 = false;
+ m_bIPv6 = false;
m_uLocalPort = 0;
m_secondarySock = KVI_INVALID_SOCKET;
connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(tryFlush()));
@@ -634,16 +634,16 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
}
kvs_uint_t uLocalPort;
QString m_szLocalIp;
- bool m_bIpV6;
+ bool m_bIPv6;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("local_port",KVS_PT_UNSIGNEDINTEGER,0,uLocalPort)
KVSO_PARAMETER("local_ip",KVS_PT_STRING,KVS_PF_OPTIONAL,m_szLocalIp)
- KVSO_PARAMETER("bool_ipV6",KVS_PT_BOOLEAN,KVS_PF_OPTIONAL,m_bIpV6)
+ KVSO_PARAMETER("bool_ipV6",KVS_PT_BOOLEAN,KVS_PF_OPTIONAL,m_bIPv6)
KVSO_PARAMETERS_END(c)
m_uLocalPort=uLocalPort;
#ifndef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
c->warning(__tr2qs("No IPV6 support in this executable"));
c->returnValue()->setBoolean(false);
@@ -664,7 +664,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
if(kvi_isValidStringIp_V6(m_szLocalIp.toUtf8().data()))
{
bGotIp = true;
- m_bIpV6 = true;
+ m_bIPv6 = true;
} else {
#else
c->warning(__tr2qs("Invalid IP address specified ('%Q')"),&m_szLocalIp);
@@ -680,7 +680,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
#ifdef COMPILE_IPV6_SUPPORT
- m_sock = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+ m_sock = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#else
m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
@@ -697,7 +697,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
if(!m_szLocalIp.isEmpty())
{
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,m_bIpV6,m_bUdp);
+ KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,m_bIPv6,m_bUdp);
#else
KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,false,m_bUdp);
#endif
@@ -718,7 +718,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
}
} else {
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_uLocalPort,m_bIpV6,m_bUdp);
+ KviSockaddr sa(m_uLocalPort,m_bIPv6,m_bUdp);
#else
KviSockaddr sa(m_uLocalPort,false,m_bUdp);
#endif
@@ -752,7 +752,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
// Reread the port in case we're binding to a random one (0)
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+ KviSockaddr sareal(0,m_bIPv6,m_bUdp);
#else
KviSockaddr sareal(0,false,m_bUdp);
#endif
@@ -787,7 +787,7 @@ void KviKvsObject_socket::incomingConnection(int)
struct sockaddr * addr = (struct sockaddr *)&hostSockAddr;
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
addr = (struct sockaddr *)&hostSockAddr6;
size = sizeof(hostSockAddr6);
@@ -800,7 +800,7 @@ void KviKvsObject_socket::incomingConnection(int)
{
// Connected
#ifdef COMPILE_IPV6_SUPPORT
- if(m_bIpV6)
+ if(m_bIPv6)
{
m_uSecondaryPort = ntohs(((struct sockaddr_in6 *)addr)->sin6_port);
if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
@@ -833,7 +833,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
m_uRemotePort = uPort;
m_szRemoteIp = szIp;
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+ KviSockaddr sareal(0,m_bIPv6,m_bUdp);
#else
KviSockaddr sareal(0,false,m_bUdp);
#endif
@@ -892,10 +892,10 @@ debug ("Socket created");
// create the socket
#ifdef COMPILE_IPV6_SUPPORT
- m_bIpV6 = sa.isIpV6();
- m_sock = kvi_socket_create(sa.isIpV6() ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
+ m_bIPv6 = sa.isIPv6();
+ m_sock = kvi_socket_create(sa.isIPv6() ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#else
- m_bIpV6 = false;
+ m_bIPv6 = false;
m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
#endif
@@ -1056,7 +1056,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
m_pSn->setEnabled(true);
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+ KviSockaddr sareal(0,m_bIPv6,m_bUdp);
#else
KviSockaddr sareal(0,false,m_bUdp);
#endif
@@ -1261,7 +1261,7 @@ void KviKvsObject_socket::reset()
m_szRemoteIp="";
m_uLocalPort = 0;
m_szLocalIp="";
- m_bIpV6 = false;
+ m_bIPv6 = false;
}
unsigned int KviKvsObject_socket::readGetLength(KviKvsObjectFunctionCall *c)
{
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 28e078613..6a18bf51c 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -58,7 +58,7 @@ protected:
char * m_pInBuffer;
unsigned int m_uInBufferLen;
unsigned int m_uInDataLen;
- bool m_bIpV6;
+ bool m_bIPv6;
unsigned int m_uConnectionId;
KviDataBuffer * m_pOutBuffer;
@@ -132,7 +132,7 @@ protected:
char * m_pInBuffer;
unsigned int m_uInBufferLen;
unsigned int m_uInDataLen;
- bool m_bIpV6;
+ bool m_bIPv6;
unsigned int m_uConnectionId;
kvs_uint_t m_uRemotePort;
KviDataBuffer * m_pOutBuffer;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 22cea828d..5063d3795 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -152,12 +152,12 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
- b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress);
- KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress));
+ b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress);
+ KviStringSelector * s = addStringSelector(g,"",KviOption_stringIPv4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress));
connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
#ifdef COMPILE_IPV6_SUPPORT
- b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress);
- s = addStringSelector(g,"",KviOption_stringIpV6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress));
+ b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress);
+ s = addStringSelector(g,"",KviOption_stringIPv6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress));
connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
#endif //!COMPILE_IPV6_SUPPORT
@@ -222,7 +222,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
gbox = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),
- KviOption_boolIdentdEnableIpV6,
+ KviOption_boolIdentdEnableIPv6,
KVI_OPTION_BOOL(KviOption_boolUseIdentService));
#ifdef COMPILE_IPV6_SUPPORT
connect(m_pEnableIdent,SIGNAL(toggled(bool)),m_pEnableIpv6,SLOT(setEnabled(bool)));
@@ -231,8 +231,8 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
m_pEnableIpv6->setEnabled(false);
#endif
m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"),
- KviOption_boolIdentdIpV6ContainsIpV4,
- KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6));
+ KviOption_boolIdentdIPv6ContainsIPv4,
+ KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6));
connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
addLabel(0,4,0,4,
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 209ac489a..5edabb8d7 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -110,7 +110,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
m_pPortEdit = new QLineEdit(gbox);
m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:","options"),gbox);
- m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IpV4);
+ m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IPv4);
m_pUserLabel = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
m_pUserEdit = new QLineEdit(gbox);
m_pPassLabel = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
@@ -123,10 +123,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
m_pProtocolBox->addItems(l);
- m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
- connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
+ m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+ connect(m_pIPv6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
#ifndef COMPILE_IPV6_SUPPORT
- m_pIpV6Check->setEnabled(false);
+ m_pIPv6Check->setEnabled(false);
#endif
m_pLastEditedItem = 0;
@@ -145,7 +145,7 @@ KviProxyOptionsWidget::~KviProxyOptionsWidget()
void KviProxyOptionsWidget::ipV6CheckToggled(bool bEnabled)
{
- m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+ m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
}
void KviProxyOptionsWidget::fillProxyList()
@@ -185,9 +185,9 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
m_pPortEdit->setEnabled(m_pLastEditedItem);
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpV6Check->setEnabled(m_pLastEditedItem);
+ m_pIPv6Check->setEnabled(m_pLastEditedItem);
#else
- m_pIpV6Check->setEnabled(false);
+ m_pIPv6Check->setEnabled(false);
#endif
if(m_pLastEditedItem)
{
@@ -204,18 +204,18 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
}
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpV6Check->setChecked(m_pLastEditedItem->m_pProxyData->isIpV6());
- m_pIpEditor->setAddressType(m_pLastEditedItem->m_pProxyData->isIpV6() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+ m_pIPv6Check->setChecked(m_pLastEditedItem->m_pProxyData->isIPv6());
+ m_pIpEditor->setAddressType(m_pLastEditedItem->m_pProxyData->isIPv6() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
#else
- m_pIpV6Check->setChecked(false);
- m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+ m_pIPv6Check->setChecked(false);
+ m_pIpEditor->setAddressType(KviIpEditor::IPv4);
#endif
if(!m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->m_szIp.ptr()))
{
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->isIpV6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
+ m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->isIPv6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
#else
m_pIpEditor->setAddress("0.0.0.0");
#endif
@@ -231,7 +231,7 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
m_pPassEdit->setText("");
m_pPortEdit->setText("");
m_pIpEditor->setAddress("0.0.0.0");
- m_pIpV6Check->setEnabled(false);
+ m_pIPv6Check->setEnabled(false);
}
}
@@ -244,9 +244,9 @@ void KviProxyOptionsWidget::saveLastItem()
m_pLastEditedItem->setText(0,tmp.ptr());
m_pLastEditedItem->m_pProxyData->m_szHostname = tmp;
#ifdef COMPILE_IPV6_SUPPORT
- m_pLastEditedItem->m_pProxyData->m_bIsIpV6 = m_pIpV6Check->isChecked();
+ m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = m_pIPv6Check->isChecked();
#else
- m_pLastEditedItem->m_pProxyData->m_bIsIpV6 = false;
+ m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = false;
#endif
m_pLastEditedItem->m_pProxyData->m_szIp = "";
KviStr tmpAddr = m_pIpEditor->address();
@@ -254,7 +254,7 @@ void KviProxyOptionsWidget::saveLastItem()
if(!m_pIpEditor->hasEmptyFields())
{
#ifdef COMPILE_IPV6_SUPPORT
- if(m_pIpV6Check->isChecked())
+ if(m_pIPv6Check->isChecked())
{
if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) &&
kvi_isValidStringIp_V6(tmpAddr.ptr()))
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index f94e09673..54bc0eeb7 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -75,7 +75,7 @@ protected:
QLabel * m_pProtocolLabel;
QComboBox * m_pProtocolBox;
KviTalPopupMenu * m_pContextPopup;
- QCheckBox * m_pIpV6Check;
+ QCheckBox * m_pIPv6Check;
KviProxyOptionsTreeWidgetItem * m_pLastEditedItem;
private:
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 9c2662ad0..8afb894f4 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -544,22 +544,22 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
l = new QLabel(__tr2qs_ctx("IP address:","options"),tab);
gl->addWidget(l,1,0);
- m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IpV4);
+ m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IPv4);
gl->addWidget(m_pIpEditor,1,1);
KviTalToolTip::add(m_pIpEditor,__tr2qs_ctx("<center>This is the <b>IP address</b> of this server, it is here for caching purposes.<br>" \
"If you leave this field empty, KVIrc will fill it in the first time it connects to the server. " \
"If you enable the \"cache IP address\" option below, KVIrc will use it as a \"cached result\" " \
"and avoid looking it up again.</center>","options"));
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpEditor->setAddressType(s->isIpV6() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+ m_pIpEditor->setAddressType(s->isIPv6() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
#else
- m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+ m_pIpEditor->setAddressType(KviIpEditor::IPv4);
#endif
if(!m_pIpEditor->setAddress(s->m_szIp))
{
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpEditor->setAddress(s->isIpV6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
+ m_pIpEditor->setAddress(s->isIPv6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
#else
m_pIpEditor->setAddress("0.0.0.0");
#endif
@@ -581,7 +581,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
gl->addWidget(m_pUseIPV6Check,3,0,1,2);
// gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1);
#ifdef COMPILE_IPV6_SUPPORT
- m_pUseIPV6Check->setChecked(s->isIpV6());
+ m_pUseIPV6Check->setChecked(s->isIPv6());
#else
m_pUseIPV6Check->setEnabled(false);
#endif
@@ -791,9 +791,9 @@ KviServerDetailsWidget::~KviServerDetailsWidget()
void KviServerDetailsWidget::useIPV6CheckToggled(bool)
{
#ifdef COMPILE_IPV6_SUPPORT
- m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+ m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
#else
- m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+ m_pIpEditor->setAddressType(KviIpEditor::IPv4);
#endif
setHeaderLabelText();
}
@@ -878,7 +878,7 @@ void KviServerDetailsWidget::fillData(KviServer * s)
if(!m_pIpEditor->hasEmptyFields())
{
#ifdef COMPILE_IPV6_SUPPORT
- if(s->isIpV6())
+ if(s->isIPv6())
{
if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) && kvi_isValidStringIp_V6(tmpAddr.ptr()))
{
@@ -1082,13 +1082,13 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
/*
- m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+ m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
#ifndef COMPILE_IPV6_SUPPORT
- m_pIpV6Check->setEnabled(false);
+ m_pIPv6Check->setEnabled(false);
#endif
- KviTalToolTip::add(m_pIpV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
+ KviTalToolTip::add(m_pIPv6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
"(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options"));
m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
@@ -1483,7 +1483,7 @@ void KviServerOptionsWidget::importServer(const KviServer &s,const QString &netw
srv=(KviServerOptionsTreeWidgetItem *) net->child(i);
if((srv)->m_pServerData->useSSL() == s.useSSL())
{
- if(srv->m_pServerData->isIpV6() == s.isIpV6())
+ if(srv->m_pServerData->isIPv6() == s.isIPv6())
{
if(KviQString::equalCI(srv->m_pServerData->hostName(),s.hostName()))
{
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 5de91f72a..a64e992f5 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -167,7 +167,7 @@ protected:
KviTalPopupMenu * m_pContextPopup;
KviTalPopupMenu * m_pImportPopup;
KviServer * m_pClipboard;
- //QCheckBox * m_pIpV6Check;
+ //QCheckBox * m_pIPv6Check;
QPushButton * m_pConnectCurrent;
QPushButton * m_pConnectNew;
KviServerOptionsTreeWidgetItem * m_pLastEditedItem;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 05:59:24 +0000