* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc.c,v 1.24 2002/01/04 17:58:44 alex Exp $
+ * $Id: irc.c,v 1.36 2002/01/11 23:50:55 alex Exp $
*
* irc.c: IRC-Befehle
*
* $Log: irc.c,v $
+ * Revision 1.36 2002/01/11 23:50:55 alex
+ * - LINKS implementiert, LUSERS begonnen.
+ *
+ * Revision 1.35 2002/01/09 21:30:45 alex
+ * - WHOIS wurde faelschlicherweise an User geforwarded statt vom Server beantwortet.
+ *
+ * Revision 1.34 2002/01/09 01:09:58 alex
+ * - WHOIS wird im "Strict-RFC-Mode" nicht mehr automatisch geforwarded,
+ * - andere Server werden nun ueber bisherige Server und User informiert.
+ *
+ * Revision 1.33 2002/01/07 23:42:12 alex
+ * - Es werden fuer alle Server eigene Token generiert,
+ * - QUIT von einem Server fuer einen User wird an andere Server geforwarded,
+ * - ebenso NICK-Befehle, die "fremde" User einfuehren.
+ *
+ * Revision 1.32 2002/01/07 16:02:36 alex
+ * - Loglevel von Remote-Mode-Aenderungen angepasst (nun Debug).
+ * - Im Debug-Mode werden nun auch PING's protokolliert.
+ *
+ * Revision 1.31 2002/01/07 15:39:46 alex
+ * - Server nimmt nun Server-Links an: PASS und SERVER entsprechend angepasst.
+ * - MODE und NICK melden nun die Aenderungen an andere Server.
+ *
+ * Revision 1.30 2002/01/06 15:21:29 alex
+ * - Loglevel und Meldungen nochmals ueberarbeitet.
+ * - QUIT und SQUIT forwarden nun den Grund der Trennung,
+ * - WHOIS wird nun immer an den "Original-Server" weitergeleitet.
+ *
+ * Revision 1.29 2002/01/05 23:24:54 alex
+ * - WHOIS erweitert: Anfragen koennen an andere Server weitergeleitet werden.
+ * - Vorbereitungen fuer Ident-Abfragen bei neuen Client-Strukturen.
+ *
+ * Revision 1.28 2002/01/05 20:08:02 alex
+ * - Div. Aenderungen fuer die Server-Links (u.a. WHOIS, QUIT, NICK angepasst).
+ * - Neue Funktionen IRC_WriteStrServer() und IRC_WriteStrServerPrefix().
+ *
+ * Revision 1.27 2002/01/05 19:15:03 alex
+ * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert.
+ *
+ * Revision 1.26 2002/01/05 16:51:18 alex
+ * - das Passwort von Servern wird nun ueberprueft (PASS- und SERVER-Befehl).
+ *
+ * Revision 1.25 2002/01/05 00:48:33 alex
+ * - bei SQUIT wurde immer die Verbindung getrennt, auch bei Remote-Servern.
+ *
* Revision 1.24 2002/01/04 17:58:44 alex
* - IRC_WriteStrXXX()-Funktionen eingefuehrt, groessere Anpassungen daran.
* - neuer Befehl SQUIT, QUIT an Server-Links angepasst.
/* Text an Clients, lokal bzw. remote, senden. */
CHAR buffer[1000];
- BOOLEAN ok = CONNECTED;
- CONN_ID send_to;
va_list ap;
assert( Client != NULL );
assert( Format != NULL );
+ assert( Prefix != NULL );
va_start( ap, Format );
vsnprintf( buffer, 1000, Format, ap );
va_end( ap );
- if( Client_Conn( Client ) != NONE ) send_to = Client_Conn( Client );
- else send_to = Client_Conn( Client_Introducer( Client ));
-
- if( Prefix ) ok = Conn_WriteStr( send_to, ":%s %s", Client_Mask( Prefix ), buffer );
- else ok = Conn_WriteStr( send_to, buffer );
-
- return ok;
+ return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Client_ID( Prefix ), buffer );
} /* IRC_WriteStrClientPrefix */
/* an den Client selber */
ok = IRC_WriteStrClient( Client, buffer );
+ /* FIXME */
+
return ok;
} /* IRC_WriteStrRelated */
+GLOBAL VOID IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... )
+{
+ CHAR buffer[1000];
+ va_list ap;
+
+ assert( Format != NULL );
+
+ va_start( ap, Format );
+ vsnprintf( buffer, 1000, Format, ap );
+ va_end( ap );
+
+ /* an den Client selber */
+ return IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer );
+} /* IRC_WriteStrServers */
+
+
+GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... )
+{
+ CHAR buffer[1000];
+ CLIENT *c;
+ va_list ap;
+
+ assert( Format != NULL );
+ assert( Prefix != NULL );
+
+ va_start( ap, Format );
+ vsnprintf( buffer, 1000, Format, ap );
+ va_end( ap );
+
+ c = Client_First( );
+ while( c )
+ {
+ if(( Client_Type( c ) == CLIENT_SERVER ) && ( Client_Conn( c ) > NONE ) && ( c != Client_ThisServer( )) && ( c != ExceptOf ))
+ {
+ /* Ziel-Server gefunden */
+ IRC_WriteStrClientPrefix( c, Prefix, buffer );
+ }
+ c = Client_Next( c );
+ }
+} /* IRC_WriteStrServersPrefix */
+
+
GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
{
CHAR str[LINE_LEN], *ptr;
+ BOOLEAN ok;
CLIENT *c;
+ INT i;
assert( Client != NULL );
assert( Req != NULL );
Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client ));
/* Falsche Anzahl Parameter? */
- if( Req->argc != 3 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Ist dieser Server bei uns konfiguriert? */
+ for( i = 0; i < Conf_Server_Count; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
+ if( i >= Conf_Server_Count )
+ {
+ /* Server ist nicht konfiguriert! */
+ Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
+ Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", TRUE );
+ return DISCONNECTED;
+ }
+ if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 )
+ {
+ /* Falsches Passwort */
+ Log( LOG_ERR, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
+ Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
+ return DISCONNECTED;
+ }
+
/* Ist ein Server mit dieser ID bereits registriert? */
if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
/* Server-Strukturen fuellen ;-) */
Client_SetID( Client, Req->argv[0] );
- Client_SetToken( Client, atoi( Req->argv[1] ));
- Client_SetInfo( Client, Req->argv[2] );
Client_SetHops( Client, 1 );
+ Client_SetInfo( Client, Req->argv[Req->argc - 1] );
+
+ /* Meldet sich der Server bei uns an? */
+ if( Req->argc == 2 )
+ {
+ /* Unseren SERVER- und PASS-Befehl senden */
+ ok = TRUE;
+ if( ! IRC_WriteStrClient( Client, "PASS %s "PASSSERVERADD, Conf_Server[i].pwd )) ok = FALSE;
+ else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
+ if( ! ok )
+ {
+ Conn_Close( Client_Conn( Client ), "Unexpected server behavior!", NULL, FALSE );
+ return DISCONNECTED;
+ }
+ Client_SetIntroducer( Client, Client );
+ Client_SetToken( Client, 1 );
+ }
+ else Client_SetToken( Client, atoi( Req->argv[1] ));
Log( LOG_NOTICE, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
Client_SetType( Client, CLIENT_SERVER );
+
+ /* Alle bisherigen Server dem neuen Server bekannt machen,
+ * die bisherigen Server ueber den neuen informierenn */
+ c = Client_First( );
+ while( c )
+ {
+ if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( )))
+ {
+ if( Client_Conn( c ) > NONE )
+ {
+ /* Dem gefundenen Server gleich den neuen
+ * Server bekannt machen */
+ if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED;
+ }
+
+ /* Den neuen Server ueber den alten informieren */
+ if( ! IRC_WriteStrClientPrefix( Client, Client_Introducer( c ), "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ))) return DISCONNECTED;
+ }
+ c = Client_Next( c );
+ }
+
+ /* alle User dem neuen Server bekannt machen */
+ c = Client_First( );
+ while( c )
+ {
+ if( Client_Type( c ) == CLIENT_USER )
+ {
+ /* User an neuen Server melden */
+ if( ! IRC_WriteStrClient( Client, "NICK %s %d %s %s %d +%s :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_User( c ), Client_Hostname( c ), Client_MyToken( Client_Introducer( c )), Client_Modes( c ), Client_Info( c ))) return DISCONNECTED;
+ }
+ c = Client_Next( c );
+ }
+
return CONNECTED;
}
else if( Client_Type( Client ) == CLIENT_SERVER )
if( ! ptr ) ptr = Req->argv[3];
/* Neue Client-Struktur anlegen */
- c = Client_NewRemoteServer( Client, Req->argv[0], atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr );
+ c = Client_NewRemoteServer( Client, Req->argv[0], atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, TRUE );
if( ! c )
{
/* Neue Client-Struktur konnte nicht angelegt werden */
- Log( LOG_ALERT, "Can't allocate client structure for server! (on connection %d)", Client_Conn( Client ));
- Conn_Close( Client_Conn( Client ), "Can't allocate client structure for remote server!" );
+ Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client ));
+ Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", TRUE );
return DISCONNECTED;
}
GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
{
- CLIENT *intr_c, *c;
+ CLIENT *intr_c, *target, *c;
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 )
+ 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 )
+ 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 */
/* Falsche Anzahl Parameter? */
if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- /* Ist der Client "restricted"? */
- if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
+ /* "Ziel-Client" ermitteln */
+ if( Client_Type( Client ) == CLIENT_SERVER )
+ {
+ target = Client_GetFromID( Req->prefix );
+ 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 ));
+ target = Client;
+ }
/* 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 ... */
#ifndef STRICT_RFC
- if( strcmp( Client_ID( Client ), Req->argv[0] ) == 0 ) return CONNECTED;
+ 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 :-) */
- if( strcasecmp( Client_ID( Client ), Req->argv[0] ) != 0 )
+ if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 )
{
- if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED;
+ if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED;
}
if( Client_Type( Client ) == CLIENT_USER )
{
/* Nick-Aenderung: allen mitteilen! */
- Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( Client ), Client_ID( Client ), Req->argv[0] );
+ Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] );
+ IRC_WriteStrServersPrefix( NULL, Client, "NICK :%s", Req->argv[0] );
}
-
+ else if( Client_Type( Client ) == CLIENT_SERVER )
+ {
+ /* Nick-Aenderung: allen mitteilen! */
+ Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+ IRC_WriteStrServersPrefix( Client, Client, "NICK :%s", Req->argv[0] );
+ }
+
/* Client-Nick registrieren */
- Client_SetID( Client, Req->argv[0] );
+ Client_SetID( target, Req->argv[0] );
- if( Client_Type( Client ) != CLIENT_USER )
+ if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
{
/* Neuer Client */
Log( LOG_DEBUG, "Connection %d: got NICK command ...", Client_Conn( Client ));
/* Der neue Nick ist auf diesem Server bereits registriert:
* sowohl der neue, als auch der alte Client muessen nun
* disconnectiert werden. */
- Log( LOG_ALERT, "Server %s introduces already registered nick %s!", Client_ID( Client ), Req->argv[0] );
+ Log( LOG_ERR, "Server %s introduces already registered nick \"%s\"!", Client_ID( Client ), Req->argv[0] );
Kill_Nick( Req->argv[0] );
return CONNECTED;
}
intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] ));
if( ! intr_c )
{
- Log( LOG_ALERT, "Server %s introduces nick %s with unknown host server!?", Client_ID( Client ), Req->argv[0] );
+ Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] );
Kill_Nick( Req->argv[0] );
return CONNECTED;
}
/* Neue Client-Struktur anlegen */
- c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5], Req->argv[6] );
+ c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5], Req->argv[6], TRUE );
if( ! c )
{
/* Eine neue Client-Struktur konnte nicht angelegt werden.
* Der Client muss disconnectiert werden, damit der Netz-
* status konsistent bleibt. */
- Log( LOG_ALERT, "Can't allocate client structure! (on connection %d)", Client_Conn( Client ));
+ Log( LOG_ALERT, "Can't create client structure! (on connection %d)", Client_Conn( Client ));
Kill_Nick( Req->argv[0] );
return CONNECTED;
}
- Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_ID( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
+ Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
+
+ /* Andere Server, ausser dem Introducer, informieren */
+ IRC_WriteStrServersPrefix( Client, Client, "NICK %s %d %s %s %d %s :%s", Req->argv[0], atoi( Req->argv[1] ) + 1, Req->argv[2], Req->argv[3], Client_MyToken( intr_c ), Req->argv[5], Req->argv[6] );
return CONNECTED;
}
/* Falsche Anzahl Parameter? */
if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- Client_SetUser( Client, Req->argv[0] );
+ Client_SetUser( Client, Req->argv[0], FALSE );
Client_SetInfo( Client, Req->argv[3] );
Log( LOG_DEBUG, "Connection %d: got USER command ...", Client_Conn( Client ));
/* Falsche Anzahl Parameter? */
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- Conn_Close( Client_Conn( Client ), "Client wants to quit." );
+ 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 );
+
return DISCONNECTED;
}
else if ( Client_Type( Client ) == CLIENT_SERVER )
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
target = Client_Search( Req->prefix );
- if( ! target ) Log( LOG_ALERT, "Got QUIT from %s for unknown server!?", Client_ID( Client ));
- else Client_Destroy( target );
+ if( ! target )
+ {
+ Log( LOG_ERR, "Got QUIT from %s for unknown client!?", Client_ID( Client ));
+ return CONNECTED;
+ }
+
+ if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL );
+ else Client_Destroy( target, "Got QUIT command.", Req->argv[0] );
+
return CONNECTED;
}
else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
target = Client_GetFromID( Req->argv[0] );
if( ! target )
{
- Log( LOG_ALERT, "Got SQUIT from %s for unknown server \%s\"!?", Client_ID( Client ), Req->argv[0] );
+ Log( LOG_ERR, "Got SQUIT from %s for unknown server \%s\"!?", Client_ID( Client ), Req->argv[0] );
return CONNECTED;
}
- if( target == Client ) Log( LOG_NOTICE, "Got SQUIT from %s: %s", Client_ID( Client ), Req->argv[1] );
- else Log( LOG_NOTICE, "Got SQUIT from %s for %s: %s", Client_ID( Client ), Client_ID( target ), Req->argv[1] );
+ if( target == Client ) Log( LOG_DEBUG, "Got SQUIT from %s: %s", Client_ID( Client ), Req->argv[1] );
+ else Log( LOG_DEBUG, "Got SQUIT from %s for %s: %s", Client_ID( Client ), Client_ID( target ), Req->argv[1] );
- /* FIXME: das SQUIT muss an alle Server weiter-
- * geleitet werden ... */
+ /* SQUIT an alle Server weiterleiten */
+ IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] );
- if( Client_Conn( target ) > NONE ) Conn_Close( Client_Conn( target ), Req->argv[1] );
- else Client_Destroy( target );
- return DISCONNECTED;
+ if( Client_Conn( target ) > NONE )
+ {
+ if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), "Got SQUIT command.", Req->argv[1], TRUE );
+ else Conn_Close( Client_Conn( target ), "Got SQUIT command.", NULL, TRUE );
+ return DISCONNECTED;
+ }
+ else
+ {
+ Client_Destroy( target, "Got SQUIT command.", Req->argv[1] );
+ return CONNECTED;
+ }
} /* IRC_SQUIT */
if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ 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 ));
} /* IRC_PING */
GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
{
- CLIENT *to;
+ CLIENT *to, *from;
assert( Client != NULL );
assert( Req != NULL );
- if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
/* Falsche Anzahl Parameter? */
if( Req->argc == 0 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command );
if( Req->argc == 1 ) return IRC_WriteStrClient( Client, ERR_NOTEXTTOSEND_MSG, Client_ID( Client ));
if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ else from = Client;
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
to = Client_Search( Req->argv[0] );
if( to )
{
/* Okay, Ziel ist ein User */
- if( Client_Conn( Client ) >= 0 ) Conn_UpdateIdle( Client_Conn( Client ));
- return IRC_WriteStrClientPrefix( to, Client, "PRIVMSG %s :%s", Client_ID( to ), Req->argv[1] );
+ if( Client_Conn( from ) >= 0 ) Conn_UpdateIdle( Client_Conn( from ));
+ return IRC_WriteStrClientPrefix( to, from, "PRIVMSG %s :%s", Client_ID( to ), Req->argv[1] );
}
-
- return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+ else return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
} /* IRC_PRIVMSG */
GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req )
{
- CLIENT *to;
+ CLIENT *to, *from;
assert( Client != NULL );
assert( Req != NULL );
- if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
/* Falsche Anzahl Parameter? */
if( Req->argc != 2 ) return CONNECTED;
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ else from = Client;
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
to = Client_Search( Req->argv[0] );
if( to )
{
/* Okay, Ziel ist ein User */
- return IRC_WriteStrClientPrefix( to, Client, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
+ return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
}
-
- return CONNECTED;
+ else return CONNECTED;
} /* IRC_NOTICE */
if( Client_Type( Client ) == CLIENT_SERVER )
{
/* Modes an andere Server forwarden */
- /* FIXME */
+ IRC_WriteStrServersPrefix( Client, Client, "MODE %s :%s", Client_ID( target ), new_modes );
}
else
{
- /* Bestaetigung an Client schicken */
+ /* Bestaetigung an Client schicken & andere Server informieren */
ok = IRC_WriteStrRelated( Client, "MODE %s :%s", Client_ID( target ), new_modes );
+ IRC_WriteStrServers( Client, "MODE %s :%s", Client_ID( target ), new_modes );
}
Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( target ), Client_Modes( target ));
}
{
if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
}
- if( i >= Conf_Oper_Count ) return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+ if( i >= Conf_Oper_Count )
+ {
+ Log( LOG_WARNING, "Got invalid OPER from \"%s\": Name \"%s\" not configured!", Client_Mask( Client ), Req->argv[0] );
+ return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+ }
- /* Stimmt der Name und das Passwort? */
- if(( strcmp( Conf_Oper[i].name, Req->argv[0] ) != 0 ) || ( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )) return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+ /* Stimmt das Passwort? */
+ if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )
+ {
+ Log( LOG_WARNING, "Got invalid OPER from \"%s\": Bad password for \"%s\"!", Client_Mask( Client ), Conf_Oper[i].name );
+ return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client ));
+ }
if( ! Client_HasMode( Client, 'o' ))
{
/* noch kein o-Mode gesetzt */
Client_ModeAdd( Client, 'o' );
if( ! IRC_WriteStrRelated( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED;
+ IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client ));
}
- if( ! Client_OperByMe( Client )) Log( LOG_NOTICE, "User \"%s\" is now an IRC Operator.", Client_Mask( Client ));
+ if( ! Client_OperByMe( Client )) Log( LOG_NOTICE, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client ));
Client_SetOperByMe( Client, TRUE );
return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client ));
GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
{
- CLIENT *c;
+ CLIENT *from, *target, *c;
+ CHAR *ptr = NULL;
assert( Client != NULL );
assert( Req != NULL );
- if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
/* Falsche Anzahl Parameter? */
if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
/* Client suchen */
- c = Client_GetFromID( Req->argv[0] );
- if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+ c = Client_GetFromID( Req->argv[Req->argc - 1] );
+ if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[Req->argc - 1] );
+
+ /* Empfaenger des WHOIS suchen */
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ else from = Client;
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+ /* Forwarden an anderen Server? */
+ if( Req->argc > 1 )
+ {
+ /* angegebenen Ziel-Server suchen */
+ target = Client_GetFromID( Req->argv[1] );
+ if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+ ptr = Req->argv[1];
+ }
+#ifndef STRICT_RFC
+ else if( Client_Conn( c ) == NONE )
+ {
+ /* Client ist nicht von uns. Ziel-Server suchen */
+ target = c;
+ ptr = Req->argv[0];
+ }
+#endif
+ else target = NULL;
+
+ if( target && ( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr );
/* Nick, User und Name */
- if( ! IRC_WriteStrClient( Client, RPL_WHOISUSER_MSG, Client_ID( Client ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED;
/* Server */
- if( ! IRC_WriteStrClient( Client, RPL_WHOISSERVER_MSG, Client_ID( Client ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;
/* IRC-Operator? */
if( Client_HasMode( c, 'o' ))
{
- if( ! IRC_WriteStrClient( Client, RPL_WHOISOPERATOR_MSG, Client_ID( Client ), Client_ID( c ))) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
}
/* Idle (nur lokale Clients) */
if( Client_Conn( c ) > NONE )
{
- if( ! IRC_WriteStrClient( Client, RPL_WHOISIDLE_MSG, Client_ID( Client ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED;
}
/* End of Whois */
- return IRC_WriteStrClient( Client, RPL_ENDOFWHOIS_MSG, Client_ID( Client ), Client_ID( c ));
+ return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c ));
} /* IRC_WHOIS */
} /* IRC_ERROR */
+GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req )
+{
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+ /* Falsche Anzahl Parameter? */
+ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+ return CONNECTED;
+} /* IRC_LUSERS */
+
+
+GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req )
+{
+ CLIENT *target, *from, *c;
+ CHAR *mask;
+
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+ /* Falsche Anzahl Parameter? */
+ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+ /* Server-Mask ermitteln */
+ if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1];
+ else mask = "*";
+
+ /* Absender ermitteln */
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ else from = Client;
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+ /* An anderen Server forwarden? */
+ if( Req->argc == 2 )
+ {
+ target = Client_GetFromID( Req->argv[0] );
+ if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+ else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] );
+ }
+
+ /* Wer ist der Absender? */
+ if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+ else target = Client;
+ if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+ c = Client_First( );
+ while( c )
+ {
+ if( Client_Type( c ) == CLIENT_SERVER )
+ {
+ if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+ }
+ c = Client_Next( c );
+ }
+
+ return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
+} /* IRC_LINKS */
+
+
LOCAL BOOLEAN Hello_User( CLIENT *Client )
{
assert( Client != NULL );
if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
{
/* Falsches Passwort */
- Log( LOG_ALERT, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
- Conn_Close( Client_Conn( Client ), "Bad password!" );
+ Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
+ Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
return DISCONNECTED;
}
Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
- IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ));
- IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )));
- IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr );
- IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )));
+ /* Andere Server informieren */
+ IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
+
+ if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
+ if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE;
+ if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
+ if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE;
Client_SetType( Client, CLIENT_USER );
{
if( ! fgets( line, 126, fd )) break;
if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0';
- IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line );
+ if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
+ {
+ fclose( fd );
+ return FALSE;
+ }
}
ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) );
LOCAL VOID Kill_Nick( CHAR *Nick )
{
- Log( LOG_ALERT, "User(s) with nick \"%s\" will be disconnected!", Nick );
+ Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected!", Nick );
/* FIXME */
Log( LOG_ALERT, "[Kill_Nick() not implemented - OOOPS!]" );
} /* Kill_Nick */
projects / ngircd-alex.git / blobdiff