class RFC1413 : public InspSocket
{
protected:
- Server* Srv; // Server* class used for core communications
- sockaddr_in sock_us; // our port number
- sockaddr_in sock_them; // their port number
+ // Server* class used for core communications
+ insp_sockaddr sock_us; // our port number
+ insp_sockaddr sock_them; // their port number
socklen_t uslen; // length of our port number
socklen_t themlen; // length of their port number
char ident_request[128]; // buffer used to make up the request string
public:
userrec* u; // user record that the lookup is associated with
+ int ufd;
- RFC1413(userrec* user, int maxtime, Server* S) : InspSocket((char*)inet_ntoa(user->ip4), 113, false, maxtime), Srv(S), u(user)
+ RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user)
{
- Srv->Log(DEBUG,"Ident: associated.");
+ ufd = user->GetFd();
}
virtual void OnTimeout()
{
// When we timeout, the connection failed within the allowed timeframe,
// so we just display a notice, and tidy off the ident_data.
- if (u)
+ if (u && (Instance->SE->GetRef(ufd) == u))
{
+ char newident[MAXBUF];
u->Shrink("ident_data");
- Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");
+ u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using ~"+std::string(u->ident)+" instead.");
+ strcpy(newident,"~");
+ strlcat(newident,u->ident,IDENTMAX);
+ strlcpy(u->ident,newident,IDENTMAX);
}
}
*j = '\0'; // truncate at invalid chars
if (*section)
{
- if (u)
+ if (u && (Instance->SE->GetRef(ufd) == u))
{
- strlcpy(u->ident,section,IDENTMAX);
- Srv->Log(DEBUG,"IDENT SET: "+std::string(u->ident));
- Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
+ if (this->Instance->IsIdent(section))
+ {
+ strlcpy(u->ident,section,IDENTMAX);
+ Instance->Log(DEBUG,"IDENT SET: "+std::string(u->ident));
+ u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
+ }
}
}
return false;
{
// tidy up after ourselves when the connection is done.
// We receive this event straight after a timeout, too.
- if (u)
+ //
+ //
+ // OK, now listen up. The weird looking check here is
+ // REQUIRED. Don't try and optimize it away.
+ //
+ // When a socket is closed, it is not immediately removed
+ // from the socket list, there can be a short delay
+ // before it is culled from the list. This means that
+ // without this check, there is a chance that a user
+ // may not exist when we come to ::Shrink them, which
+ // results in a segfault. The value of "u" may not
+ // always be NULL at this point, so, what we do is
+ // check against the fd_ref_table, to see if (1) the user
+ // exists, and (2) its the SAME user, on the same file
+ // descriptor that they were when the lookup began.
+ //
+ // Fixes issue reported by webs, 7 Jun 2006
+ if (u && (Instance->SE->GetRef(ufd) == u))
{
u->Shrink("ident_data");
}
virtual void OnError(InspSocketError e)
{
- if (u)
+ if (u && (Instance->SE->GetRef(ufd) == u))
{
u->Shrink("ident_data");
}
virtual bool OnConnected()
{
- uslen = sizeof(sock_us);
- themlen = sizeof(sock_them);
- if ((getsockname(this->u->fd,(sockaddr*)&sock_us,&uslen) || getpeername(this->u->fd, (sockaddr*)&sock_them, &themlen)))
+ Instance->Log(DEBUG,"Ident: connected");
+ if (u && (Instance->SE->GetRef(ufd) == u))
{
- Srv->Log(DEBUG,"Ident: failed to get socket names, bailing");
- return false;
+ uslen = sizeof(sock_us);
+ themlen = sizeof(sock_them);
+ if ((getsockname(this->u->GetFd(),(sockaddr*)&sock_us,&uslen) || getpeername(this->u->GetFd(), (sockaddr*)&sock_them, &themlen)))
+ {
+ Instance->Log(DEBUG,"Ident: failed to get socket names, bailing");
+ return false;
+ }
+ else
+ {
+ // send the request in the following format: theirsocket,oursocket
+#ifdef IPV6
+ snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin6_port),ntohs(sock_us.sin6_port));
+#else
+ snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port));
+#endif
+ this->Write(ident_request);
+ Instance->Log(DEBUG,"Sent ident request, waiting for reply");
+ return true;
+ }
}
else
{
- // send the request in the following format: theirsocket,oursocket
- snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port));
- this->Write(ident_request);
- Srv->Log(DEBUG,"Sent ident request, waiting for reply");
return true;
}
}
{
ConfigReader* Conf;
- Server* Srv;
+
int IdentTimeout;
public:
void ReadSettings()
{
- Conf = new ConfigReader;
+ Conf = new ConfigReader(ServerInstance);
IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
if (!IdentTimeout)
IdentTimeout = 1;
- delete Conf;
+ DELETE(Conf);
}
- ModuleIdent(Server* Me)
+ ModuleIdent(InspIRCd* Me)
: Module::Module(Me)
{
- Srv = Me;
+
ReadSettings();
}
* is derived from InspSocket, and inserting it into the socket engine using the
* Server::AddSocket() call.
*/
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
- RFC1413* ident = new RFC1413(user, IdentTimeout, Srv);
- if (ident->GetState() != I_ERROR)
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
+ RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout);
+ if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED))
{
user->Extend("ident_data", (char*)ident);
- Srv->AddSocket(ident);
}
else
{
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead.");
+ char newident[MAXBUF];
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using ~"+std::string(user->ident)+" instead.");
+ strcpy(newident,"~");
+ strlcat(newident,user->ident,IDENTMAX);
+ strlcpy(user->ident,newident,IDENTMAX);
delete ident;
}
}
* either due to timeout or due to closing, so, we just hold them until they dont
* have an ident field any more.
*/
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- return (!ident);
+ RFC1413* ident;
+ return (!user->GetExt("ident_data", ident));
}
virtual void OnCleanup(int target_type, void* item)
if (target_type == TYPE_USER)
{
userrec* user = (userrec*)item;
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- if (ident)
+ RFC1413* ident;
+ if (user->GetExt("ident_data", ident))
{
// FIX: If the user record is deleted, the socket wont be removed
// immediately so there is chance of the socket trying to write to
// a user which has now vanished! To prevent this, set ident::u
// to NULL and check it so that we dont write users who have gone away.
ident->u = NULL;
- Srv->RemoveSocket(ident);
}
}
}
* who have quit, as class RFC1459 is only loosely bound to userrec* via a pair of pointers
* and this would leave at least one of the invalid ;)
*/
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- if (ident)
+ RFC1413* ident;
+ if (user->GetExt("ident_data", ident))
{
- Srv->RemoveSocket(ident);
+ ident->u = NULL;
}
}
virtual Version GetVersion()
{
- return Version(1,5,0,0,VF_VENDOR);
+ return Version(1,5,0,0,VF_VENDOR,API_VERSION);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleIdent(Me);
}
projects / user / henk / code / inspircd.git / blobdiff