X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=cdacdc5c2ab52f126e59a093306e7f3bf8071310;hb=9a7af3161c2531c88424d43a88cee6eccf7d6117;hp=80515ffb8aa8e1afb9b0483d41428846bda76180;hpb=e20a0915892b965b345db80d25fed25b8ef3a52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 80515ffb8..cdacdc5c2 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -191,7 +191,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance Penalty = 0; lines_in = lastping = signon = idle_lastmsg = nping = registered = 0; ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0; - is4in6 = quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false; + quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false; fd = -1; recvq.clear(); sendq.clear(); @@ -1030,8 +1030,6 @@ void User::SetSockAddr(int protocol_family, const char* sip, int port) ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick); break; } - - is4in6 = !strncmp(GetIPString(), "0::ffff:", 8); } int User::GetPort() @@ -1098,7 +1096,7 @@ const char* User::GetIPString(bool translate4in6) { strlcpy(&temp[1], buf, sizeof(temp) - 1); *temp = '0'; - if (translate4in6 && is4in6) + if (translate4in6 && !strncmp(temp, "0::ffff:", 8)) { this->cachedip = temp + 8; return temp + 8;