albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

send RFC compliant netsplit messages.

This commit is contained in:
Florian Westphal 2005-06-04 12:32:09 +00:00
parent 517321807e
commit cac9f279fa
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -11,6 +11,7 @@
ngIRCd CVSHEAD ngIRCd CVSHEAD
- Make Netsplit Messages RFC compliant.
- Fix handling of QUIT Messages: send only one message, even if client - Fix handling of QUIT Messages: send only one message, even if client
is member of multiple channels. is member of multiple channels.
- Don't exit server if closing of a socket fails; instead ignore it and - Don't exit server if closing of a socket fails; instead ignore it and
@ -603,4 +604,4 @@ ngIRCd 0.0.1, 31.12.2001
-- --
$Id: ChangeLog,v 1.272 2005/06/04 11:53:24 fw Exp $ $Id: ChangeLog,v 1.273 2005/06/04 12:32:09 fw Exp $

8
src/ngircd/client.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: client.c,v 1.81 2005/05/17 23:18:54 alex Exp $"; static char UNUSED id[] = "$Id: client.c,v 1.82 2005/06/04 12:32:09 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -214,7 +214,11 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
if( ! txt ) txt = "Reason unknown."; if( ! txt ) txt = "Reason unknown.";
/* Netz-Split-Nachricht vorbereiten (noch nicht optimal) */ /* Netz-Split-Nachricht vorbereiten (noch nicht optimal) */
if( Client->type == CLIENT_SERVER ) snprintf( msg, sizeof( msg ), "%s: lost server %s", This_Server->id, Client->id ); if( Client->type == CLIENT_SERVER ) {
strlcpy(msg, This_Server->id, sizeof (msg));
strlcat(msg, " ", sizeof (msg));
strlcat(msg, Client->id, sizeof (msg));
}
last = NULL; last = NULL;
c = My_Clients; c = My_Clients;

31
src/ngircd/irc-login.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-login.c,v 1.43 2005/05/17 23:24:43 alex Exp $"; static char UNUSED id[] = "$Id: irc-login.c,v 1.44 2005/06/04 12:32:09 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -382,17 +382,21 @@ GLOBAL bool
IRC_QUIT( CLIENT *Client, REQUEST *Req ) IRC_QUIT( CLIENT *Client, REQUEST *Req )
{ {
CLIENT *target; CLIENT *target;
char quitmsg[LINE_LEN];
assert( Client != NULL ); assert( Client != NULL );
assert( Req != NULL ); assert( Req != NULL );
/* Wrong number of arguments? */
if( Req->argc > 1 )
return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
if (Req->argc == 1)
strlcpy(quitmsg, Req->argv[0], sizeof quitmsg);
if ( Client_Type( Client ) == CLIENT_SERVER ) if ( Client_Type( Client ) == CLIENT_SERVER )
{ {
/* Server */ /* Server */
/* Falsche Anzahl Parameter? */
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
target = Client_Search( Req->prefix ); target = Client_Search( Req->prefix );
if( ! target ) if( ! target )
{ {
@ -401,20 +405,21 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req )
return CONNECTED; return CONNECTED;
} }
if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, true); Client_Destroy( target, "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
else Client_Destroy( target, "Got QUIT command.", Req->argv[0], true);
return CONNECTED; return CONNECTED;
} }
else else
{ {
/* User, Service, oder noch nicht registriert */ if (Req->argc == 1 && quitmsg[0] != '\"') {
/* " " to avoid confusion */
/* Falsche Anzahl Parameter? */ strlcpy(quitmsg, "\"", sizeof quitmsg);
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); strlcat(quitmsg, Req->argv[0], sizeof quitmsg-1);
strlcat(quitmsg, "\"", sizeof quitmsg );
}
if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, true); /* User, Service, oder noch nicht registriert */
else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], true); Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
return DISCONNECTED; return DISCONNECTED;
} }