#include "portab.h"
-static char UNUSED id[] = "$Id: irc-login.c,v 1.42 2005/03/21 22:22:09 alex Exp $";
+static char UNUSED id[] = "$Id: irc-login.c,v 1.54 2007/11/21 12:16:36 alex Exp $";
#include "imp.h"
#include <assert.h>
#include "irc-login.h"
-LOCAL bool Hello_User PARAMS(( CLIENT *Client ));
-LOCAL void Kill_Nick PARAMS(( char *Nick, char *Reason ));
+static bool Hello_User PARAMS(( CLIENT *Client ));
+static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
+/**
+ * Handler for the IRC command "PASS".
+ * See RFC 2813 section 4.1.1, and RFC 2812 section 3.1.1.
+ */
GLOBAL bool
IRC_PASS( CLIENT *Client, REQUEST *Req )
{
+ char *type, *orig_flags;
+ int protohigh, protolow;
+
assert( Client != NULL );
assert( Req != NULL );
- /* Fehler liefern, wenn kein lokaler Client */
- if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command );
+ /* Return an error if this is not a local client */
+ if (Client_Conn(Client) <= NONE)
+ return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG,
+ Client_ID(Client), Req->command);
- if(( Client_Type( Client ) == CLIENT_UNKNOWN ) && ( Req->argc == 1))
- {
- /* noch nicht registrierte unbekannte Verbindung */
- Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client ));
-
- /* Passwort speichern */
- Client_SetPassword( Client, Req->argv[0] );
-
- Client_SetType( Client, CLIENT_GOTPASS );
- return CONNECTED;
+ if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) {
+ /* Not yet registered "unknown" connection, PASS with one
+ * argument: either a regular client, service, or server
+ * using the old RFC 1459 section 4.1.1 syntax. */
+ LogDebug("Connection %d: got PASS command ...",
+ Client_Conn(Client));
+ } else if ((Client_Type(Client) == CLIENT_UNKNOWN ||
+ Client_Type(Client) == CLIENT_UNKNOWNSERVER) &&
+ (Req->argc == 3 || Req->argc == 4)) {
+ /* Not yet registered "unknown" connection or outgoing server
+ * link, PASS with three or four argument: server using the
+ * RFC 2813 section 4.1.1 syntax. */
+ LogDebug("Connection %d: got PASS command (new server link) ...",
+ Client_Conn(Client));
+ } else if (Client_Type(Client) == CLIENT_UNKNOWN ||
+ Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
+ /* Unregistered connection, but wrong number of arguments: */
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+ } else {
+ /* Registered connection, PASS command is not allowed! */
+ return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
+ Client_ID(Client));
}
- else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
- {
- char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
- int protohigh, protolow;
- /* noch nicht registrierte Server-Verbindung */
- Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
+ Client_SetPassword(Client, Req->argv[0]);
+ Client_SetType(Client, CLIENT_GOTPASS);
- /* Passwort speichern */
- Client_SetPassword( Client, Req->argv[0] );
+ /* Protocol version */
+ if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
+ int c2, c4;
- /* Protokollversion ermitteln */
- if( strlen( Req->argv[1] ) >= 4 )
- {
- c2 = Req->argv[1][2];
- c4 = Req->argv[1][4];
+ c2 = Req->argv[1][2];
+ c4 = Req->argv[1][4];
- Req->argv[1][4] = '\0';
- protolow = atoi( &Req->argv[1][2] );
- Req->argv[1][2] = '\0';
- protohigh = atoi( Req->argv[1] );
+ Req->argv[1][4] = '\0';
+ protolow = atoi(&Req->argv[1][2]);
+ Req->argv[1][2] = '\0';
+ protohigh = atoi(Req->argv[1]);
- Req->argv[1][2] = c2;
- Req->argv[1][4] = c4;
- }
- else protohigh = protolow = 0;
-
- /* Protokoll-Typ */
- if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
- else type = NULL;
+ Req->argv[1][2] = c2;
+ Req->argv[1][4] = c4;
+ } else
+ protohigh = protolow = 0;
+
+ /* Protocol type, see doc/Protocol.txt */
+ if (Req->argc >= 2 && strlen(Req->argv[1]) > 4)
+ type = &Req->argv[1][4];
+ else
+ type = NULL;
+
+ /* Protocol flags/options */
+ if (Req->argc >= 4)
+ orig_flags = Req->argv[3];
+ else
+ orig_flags = "";
- /* IRC-Flags (nach RFC 2813) */
- if( Req->argc >= 4 ) ircflags = Req->argv[3];
- else ircflags = "";
+ /* Implementation, version and IRC+ flags */
+ if (Req->argc >= 3) {
+ char *impl, *ptr, *serverver, *flags;
- /* Implementation, Version und ngIRCd-Flags */
impl = Req->argv[2];
- ptr = strchr( impl, '|' );
- if( ptr ) *ptr = '\0';
+ ptr = strchr(impl, '|');
+ if (ptr)
+ *ptr = '\0';
- if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
- {
- /* auf der anderen Seite laeuft ein Server, der
- * ebenfalls das IRC+-Protokoll versteht */
+ if (type && strcmp(type, PROTOIRCPLUS) == 0) {
+ /* The peer seems to be a server which supports the
+ * IRC+ protocol (see doc/Protocol.txt). */
serverver = ptr + 1;
- flags = strchr( serverver, ':' );
- if( flags )
- {
+ flags = strchr(serverver, ':');
+ if (flags) {
*flags = '\0';
flags++;
- }
- else flags = "";
- Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
- }
- else
- {
- /* auf der anderen Seite laeuft ein Server, der
- * nur das Originalprotokoll unterstuetzt */
+ } else
+ flags = "";
+ Log(LOG_INFO,
+ "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
+ impl, serverver, protohigh, protolow, flags);
+ } else {
+ /* The peer seems to be a server supporting the
+ * "original" IRC protocol (RFC 2813). */
serverver = "";
- if( strchr( ircflags, 'Z' )) flags = "Z";
- else flags = "";
- Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
+ if (strchr(orig_flags, 'Z'))
+ flags = "Z";
+ else
+ flags = "";
+ Log(LOG_INFO,
+ "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
+ impl, protohigh, protolow, flags);
}
-
- Client_SetType( Client, CLIENT_GOTPASSSERVER );
- Client_SetFlags( Client, flags );
-
- return CONNECTED;
+ Client_SetFlags(Client, flags);
}
- else if(( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
- {
- /* Falsche Anzahl Parameter? */
- return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- }
- else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+
+ return CONNECTED;
} /* IRC_PASS */
+/**
+ * IRC "NICK" command.
+ * This function implements the IRC command "NICK" which is used to register
+ * with the server, to change already registered nicknames and to introduce
+ * new users which are connected to other servers.
+ */
GLOBAL bool
IRC_NICK( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
assert( Req != NULL );
- /* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
#ifndef STRICT_RFC
- if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+ /* Some IRC clients, for example BitchX, send the NICK and USER
+ * commands in the wrong order ... */
+ if( Client_Type( Client ) == CLIENT_UNKNOWN
+ || Client_Type( Client ) == CLIENT_GOTPASS
+ || Client_Type( Client ) == CLIENT_GOTNICK
+ || Client_Type( Client ) == CLIENT_GOTUSER
+ || Client_Type( Client ) == CLIENT_USER
+ || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
#else
- if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+ if( Client_Type( Client ) == CLIENT_UNKNOWN
+ || Client_Type( Client ) == CLIENT_GOTPASS
+ || Client_Type( Client ) == CLIENT_GOTNICK
+ || Client_Type( Client ) == CLIENT_USER
+ || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
#endif
{
- /* User-Registrierung bzw. Nick-Aenderung */
+ /* User registration or change of nickname */
- /* Falsche Anzahl Parameter? */
- if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Wrong number of arguments? */
+ if( Req->argc != 1 )
+ return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID( Client ),
+ Req->command );
- /* "Ziel-Client" ermitteln */
+ /* Search "target" client */
if( Client_Type( Client ) == CLIENT_SERVER )
{
target = Client_Search( Req->prefix );
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+ if( ! target )
+ return IRC_WriteStrClient( Client,
+ ERR_NOSUCHNICK_MSG,
+ Client_ID( Client ),
+ Req->argv[0] );
}
else
{
- /* Ist der Client "restricted"? */
- if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
+ /* Is this a restricted client? */
+ if( Client_HasMode( Client, 'r' ))
+ return IRC_WriteStrClient( Client,
+ ERR_RESTRICTED_MSG,
+ Client_ID( Client ));
+
target = Client;
}
#ifndef STRICT_RFC
- /* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
- * wir nichts. So macht es das Original und mind. Snak hat probleme,
- * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
- if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
+ /* If the clients tries to change to its own nickname we won't
+ * do anything. This is how the original ircd behaves and some
+ * clients (for example Snak) expect it to be like this.
+ * But I doubt that this is "really the right thing" ... */
+ if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 )
+ return CONNECTED;
#endif
- /* pruefen, ob Nick bereits vergeben. Speziallfall: der Client
- * will nur die Gross- und Kleinschreibung aendern. Das darf
- * er natuerlich machen :-) */
+ /* Check that the new nickname is available. Special case:
+ * the client only changes from/to upper to lower case. */
if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 )
{
- if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED;
+ if( ! Client_CheckNick( target, Req->argv[0] ))
+ return CONNECTED;
}
- if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
+ if(( Client_Type( target ) != CLIENT_USER )
+ && ( Client_Type( target ) != CLIENT_SERVER ))
{
- /* Neuer Client */
- Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client ));
+ /* New client */
+ Log( LOG_DEBUG, "Connection %d: got valid NICK command ...",
+ Client_Conn( Client ));
- /* Client-Nick registrieren */
+ /* Register new nickname of this client */
Client_SetID( target, Req->argv[0] );
- /* schon ein USER da? Dann registrieren! */
- if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client );
- else Client_SetType( Client, CLIENT_GOTNICK );
+ /* If we received a valid USER command already then
+ * register the new client! */
+ if( Client_Type( Client ) == CLIENT_GOTUSER )
+ return Hello_User( Client );
+ else
+ Client_SetType( Client, CLIENT_GOTNICK );
}
else
{
- /* Nick-Aenderung */
+ /* Nickname change */
if( Client_Conn( target ) > NONE )
{
- /* lokaler Client */
- Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] );
+ /* Local client */
+ Log( LOG_INFO,
+ "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
+ Client_Mask( target ), Client_Conn( target ),
+ Client_ID( target ), Req->argv[0] );
}
else
{
- /* Remote-Client */
- Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+ /* Remote client */
+ Log( LOG_DEBUG,
+ "User \"%s\" changed nick: \"%s\" -> \"%s\".",
+ Client_Mask( target ), Client_ID( target ),
+ Req->argv[0] );
}
- /* alle betroffenen User und Server ueber Nick-Aenderung informieren */
- if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
- IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
- IRC_WriteStrRelatedPrefix( target, target, false, "NICK :%s", Req->argv[0] );
-
- /* neuen Client-Nick speichern */
+ /* Inform all users and servers (which have to know)
+ * of this nickname change */
+ if( Client_Type( Client ) == CLIENT_USER )
+ IRC_WriteStrClientPrefix( Client, Client,
+ "NICK :%s",
+ Req->argv[0] );
+ IRC_WriteStrServersPrefix( Client, target,
+ "NICK :%s", Req->argv[0] );
+ IRC_WriteStrRelatedPrefix( target, target, false,
+ "NICK :%s", Req->argv[0] );
+
+ /* Register old nickname for WHOWAS queries */
+ Client_RegisterWhowas( target );
+
+ /* Save new nickname */
Client_SetID( target, Req->argv[0] );
+
IRC_SetPenalty( target, 2 );
}
}
else if( Client_Type( Client ) == CLIENT_SERVER )
{
- /* Server fuehrt neuen Client ein */
+ /* Server introduces new client */
/* Falsche Anzahl Parameter? */
if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
IRC_QUIT( CLIENT *Client, REQUEST *Req )
{
CLIENT *target;
+ char quitmsg[LINE_LEN];
assert( Client != 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 )
{
/* 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 );
if( ! target )
{
return CONNECTED;
}
- if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, true);
- else Client_Destroy( target, "Got QUIT command.", Req->argv[0], true);
+ Client_Destroy( target, "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
return CONNECTED;
}
else
{
- /* User, Service, oder noch nicht registriert */
-
- /* Falsche Anzahl Parameter? */
- if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if (Req->argc == 1 && quitmsg[0] != '\"') {
+ /* " " to avoid confusion */
+ strlcpy(quitmsg, "\"", sizeof quitmsg);
+ 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);
- else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], true);
+ /* User, Service, oder noch nicht registriert */
+ Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
return DISCONNECTED;
}
GLOBAL bool
-IRC_PING( CLIENT *Client, REQUEST *Req )
+IRC_PING(CLIENT *Client, REQUEST *Req)
{
CLIENT *target, *from;
- assert( Client != NULL );
- assert( Req != NULL );
+ assert(Client != NULL);
+ assert(Req != NULL);
- /* Falsche Anzahl Parameter? */
- if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
+ /* Wrong number of arguments? */
+ if (Req->argc < 1)
+ return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
+ Client_ID(Client));
#ifdef STRICT_RFC
- if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Don't ignore additional arguments when in "strict" mode */
+ if (Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
#endif
- if( Req->argc > 1 )
- {
- /* es wurde ein Ziel-Client angegeben */
- target = Client_Search( Req->argv[1] );
- if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
- if( target != Client_ThisServer( ))
- {
- /* ok, forwarden */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
- else from = Client;
- if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
- return IRC_WriteStrClientPrefix( target, from, "PING %s :%s", Client_ID( from ), Req->argv[1] );
+ if (Req->argc > 1) {
+ /* A target has been specified ... */
+ target = Client_Search(Req->argv[1]);
+
+ if (!target || Client_Type(target) != CLIENT_SERVER)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client), Req->argv[1]);
+
+ if (target != Client_ThisServer()) {
+ /* Ok, we have to forward the PING */
+ if (Client_Type(Client) == CLIENT_SERVER)
+ from = Client_Search(Req->prefix);
+ else
+ from = Client;
+ if (!from)
+ return IRC_WriteStrClient(Client,
+ ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client), Req->prefix);
+
+ return IRC_WriteStrClientPrefix(target, from,
+ "PING %s :%s", Req->argv[0],
+ Req->argv[1] );
}
}
- Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client ));
- return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client ));
+ if (Client_Type(Client) == CLIENT_SERVER) {
+ if (Req->prefix)
+ from = Client_Search(Req->prefix);
+ else
+ from = Client;
+ } else
+ from = Client_ThisServer();
+ if (!from)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client), Req->prefix);
+
+ Log(LOG_DEBUG, "Connection %d: got PING, sending PONG ...",
+ Client_Conn(Client));
+
+#ifdef STRICT_RFC
+ return IRC_WriteStrClient(Client, "PONG %s :%s",
+ Client_ID(from), Client_ID(Client));
+#else
+ /* Some clients depend on the argument being returned in the PONG
+ * reply (not mentioned in any RFC, though) */
+ return IRC_WriteStrClient(Client, "PONG %s :%s",
+ Client_ID(from), Req->argv[0]);
+#endif
} /* IRC_PING */
GLOBAL bool
-IRC_PONG( CLIENT *Client, REQUEST *Req )
+IRC_PONG(CLIENT *Client, REQUEST *Req)
{
CLIENT *target, *from;
-
- assert( Client != NULL );
- assert( Req != NULL );
-
- /* Falsche Anzahl Parameter? */
- if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
- if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
- /* forwarden? */
- if( Req->argc == 2 )
- {
- target = Client_Search( Req->argv[1] );
- if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
- if( target != Client_ThisServer( ))
- {
- /* ok, forwarden */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
- else from = Client;
- if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
- return IRC_WriteStrClientPrefix( target, from, "PONG %s :%s", Client_ID( from ), Req->argv[1] );
+ char *s;
+
+ assert(Client != NULL);
+ assert(Req != NULL);
+
+ /* Wrong number of arguments? */
+ if (Req->argc < 1)
+ return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
+ Client_ID(Client));
+ if (Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ /* Forward? */
+ if (Req->argc == 2 && Client_Type(Client) == CLIENT_SERVER) {
+ target = Client_Search(Req->argv[0]);
+ if (!target)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client), Req->argv[0]);
+
+ from = Client_Search(Req->prefix);
+
+ if (target != Client_ThisServer() && target != from) {
+ /* Ok, we have to forward the message. */
+ if (!from)
+ return IRC_WriteStrClient(Client,
+ ERR_NOSUCHSERVER_MSG,
+ Client_ID(Client), Req->prefix);
+
+ if (Client_Type(Client_NextHop(target)) != CLIENT_SERVER)
+ s = Client_ID(from);
+ else
+ s = Req->argv[0];
+ return IRC_WriteStrClientPrefix(target, from,
+ "PONG %s :%s", s, Req->argv[1]);
}
}
- /* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
- * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+ /* The connection timestamp has already been updated when the data has
+ * been read from so socket, so we don't need to update it here. */
- if( Client_Conn( Client ) > NONE ) Log( LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", Client_Conn( Client ), time( NULL ) - Conn_LastPing( Client_Conn( Client )));
- else Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client ));
+ if (Client_Conn(Client) > NONE)
+ Log(LOG_DEBUG,
+ "Connection %d: received PONG. Lag: %ld seconds.",
+ Client_Conn(Client),
+ time(NULL) - Conn_LastPing(Client_Conn(Client)));
+ else
+ Log(LOG_DEBUG,
+ "Connection %d: received PONG.", Client_Conn(Client));
return CONNECTED;
} /* IRC_PONG */
-LOCAL bool
+static bool
Hello_User( CLIENT *Client )
{
#ifdef CVSDATE
if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false;
#endif
- /* Features */
- if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;
+ /* Features supported by this server (005 numeric, ISUPPORT),
+ * see <http://www.irc.org/tech_docs/005.html> for details. */
+ if (! IRC_Send_ISUPPORT(Client))
+ return DISCONNECTED;
Client_SetType( Client, CLIENT_USER );
} /* Hello_User */
-LOCAL void
+static void
Kill_Nick( char *Nick, char *Reason )
{
REQUEST r;
projects / ngircd-alex.git / blobdiff