* 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.29 2002/01/05 23:24:54 alex Exp $
*
* irc.c: IRC-Befehle
*
* $Log: irc.c,v $
+ * 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 );
{
CHAR str[LINE_LEN], *ptr;
CLIENT *c;
+ INT i;
assert( Client != NULL );
assert( Req != NULL );
/* Falsche Anzahl Parameter? */
if( 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_ALERT, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
+ Conn_Close( Client_Conn( Client ), "Server not configured here!" );
+ return DISCONNECTED;
+ }
+ if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 )
+ {
+ /* Falsches Passwort */
+ Log( LOG_ALERT, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
+ Conn_Close( Client_Conn( Client ), "Bad password!" );
+ return DISCONNECTED;
+ }
+
/* Ist ein Server mit dieser ID bereits registriert? */
if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
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 */
}
/* 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.
/* 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 ));
/* FIXME: das SQUIT muss an alle Server weiter-
* geleitet werden ... */
- if( Client_Conn( target ) > NONE ) Conn_Close( Client_Conn( target ), Req->argv[1] );
- else Client_Destroy( target );
- return DISCONNECTED;
+ if( Client_Conn( target ) > NONE )
+ {
+ Conn_Close( Client_Conn( target ), Req->argv[1] );
+ return DISCONNECTED;
+ }
+ else
+ {
+ Client_Destroy( target );
+ return CONNECTED;
+ }
} /* IRC_SQUIT */
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;
+
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;
+
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 */
GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
{
- CLIENT *c;
+ CLIENT *from, *target, *c;
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 )
+ {
+ /* Ziel-Server suchen */
+ target = Client_GetFromID( Req->argv[1] );
+ if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+ else return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] );
+ }
/* 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 */
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 ) );
projects / ngircd-alex.git / blobdiff