* 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.83 2002/02/28 00:48:26 alex Exp $
+ * $Id: irc.c,v 1.98 2002/10/09 13:35:32 alex Exp $
*
* irc.c: IRC-Befehle
- *
- * $Log: irc.c,v $
- * Revision 1.83 2002/02/28 00:48:26 alex
- * - Forwarding von TOPIC an andere Server gefixed. Hoffentlich ;-)
- *
- * Revision 1.82 2002/02/27 23:26:36 alex
- * - einige Funktionen in irc-xxx-Module ausgegliedert.
- *
- * Revision 1.81 2002/02/27 20:55:44 alex
- * - Channel-Topics werden nun auch korrekt von anderen Server angenommen.
- *
- * Revision 1.80 2002/02/27 20:33:13 alex
- * - Channel-Topics implementiert.
- *
- * Revision 1.79 2002/02/27 18:57:21 alex
- * - PRIVMSG zeugt nun bei Texten an User an, wenn diese "away" sind.
- *
- * Revision 1.78 2002/02/27 18:23:45 alex
- * - IRC-Befehl "AWAY" implementert.
- *
- * Revision 1.77 2002/02/27 17:05:41 alex
- * - PRIVMSG beachtet nun die Channel-Modes "n" und "m".
- *
- * Revision 1.76 2002/02/27 16:04:14 alex
- * - Bug bei belegtem Nickname bei User-Registrierung (NICK-Befehl) behoben.
- *
- * Revision 1.75 2002/02/27 15:23:27 alex
- * - NAMES beachtet nun das "invisible" Flag ("i") von Usern.
- *
- * Revision 1.74 2002/02/27 03:44:53 alex
- * - gerade eben in SQUIT eingefuehrten Bug behoben: entfernte Server werden nun
- * nur noch geloescht, die Verbindung, von der SQUIT kam, bleibt wieder offen.
- *
- * Revision 1.73 2002/02/27 03:08:05 alex
- * - Log-Meldungen bei SQUIT erneut ueberarbeitet ...
- *
- * Revision 1.72 2002/02/27 02:26:58 alex
- * - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging.
- *
- * Revision 1.71 2002/02/27 00:50:05 alex
- * - einige unnoetige Client_NextHop()-Aufrufe entfernt.
- * - NAMES korrigiert und komplett implementiert.
- *
- * Revision 1.70 2002/02/26 22:06:40 alex
- * - Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben.
*/
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
-#include <imp.h>
+#include "imp.h"
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include "ngircd.h"
-#include "channel.h"
+#include "conn.h"
#include "client.h"
+#include "channel.h"
+#include "resolve.h"
#include "conf.h"
#include "conn.h"
#include "irc-write.h"
#include "log.h"
#include "messages.h"
+#include "parse.h"
#include "tool.h"
-#include <exp.h>
+#include "exp.h"
#include "irc.h"
-GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_MOTD( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
assert( Req != NULL );
} /* IRC_MOTD */
-GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
{
- BOOLEAN is_member, has_voice, is_op, ok;
CLIENT *cl, *from;
CHANNEL *chan;
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 );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
else from = Client;
if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
cl = Client_Search( Req->argv[0] );
if( cl )
{
+ /* Okay, Ziel ist ein Client. Aber ist es auch ein User? */
+ if( Client_Type( cl ) != CLIENT_USER ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
+
/* Okay, Ziel ist ein User */
if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' )))
{
}
chan = Channel_Search( Req->argv[0] );
- if( chan )
- {
- /* Okay, Ziel ist ein Channel */
- is_member = has_voice = is_op = FALSE;
- if( Channel_IsMemberOf( chan, from ))
- {
- is_member = TRUE;
- if( strchr( Channel_UserModes( chan, from ), 'v' )) has_voice = TRUE;
- if( strchr( Channel_UserModes( chan, from ), 'o' )) is_op = TRUE;
- }
-
- /* pruefen, ob Client in Channel schreiben darf */
- ok = TRUE;
- if( strchr( Channel_Modes( chan ), 'n' ) && ( ! is_member )) ok = FALSE;
- if( strchr( Channel_Modes( chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
-
- if( ! ok ) return IRC_WriteStrClient( from, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( from ), Req->argv[0] );
-
- /* Text senden */
- if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
- return IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] );
- }
+ if( chan ) return Channel_Write( chan, from, Client, Req->argv[1] );
return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
} /* IRC_PRIVMSG */
-GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_NOTICE( CLIENT *Client, REQUEST *Req )
{
CLIENT *to, *from;
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 ));
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return CONNECTED;
/* Falsche Anzahl Parameter? */
if( Req->argc != 2 ) return CONNECTED;
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( 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 )
+ if(( to ) && ( Client_Type( to ) == CLIENT_USER ))
{
/* Okay, Ziel ist ein User */
return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
} /* IRC_NOTICE */
-GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
-{
- INT i;
-
- 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 );
-
- /* Operator suchen */
- for( i = 0; i < Conf_Oper_Count; i++)
- {
- 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 )
- {
- 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 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_WriteStrClient( 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, "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 ));
-} /* IRC_OPER */
-
-
-GLOBAL BOOLEAN IRC_DIE( 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 != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
- if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
-
- Log( LOG_NOTICE, "Got DIE command from \"%s\", going down!", Client_Mask( Client ));
- NGIRCd_Quit = TRUE;
- return CONNECTED;
-} /* IRC_DIE */
-
-
-GLOBAL BOOLEAN IRC_RESTART( 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 != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
- if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
-
- Log( LOG_NOTICE, "Got RESTART command from \"%s\", going down!", Client_Mask( Client ));
- NGIRCd_Restart = TRUE;
- return CONNECTED;
-} /* IRC_RESTART */
-
-
-GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_NAMES( CLIENT *Client, REQUEST *Req )
{
CHAR rpl[COMMAND_LEN], *ptr;
CLIENT *target, *from, *c;
if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
/* From aus Prefix ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ 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 );
if( Req->argc == 2 )
{
/* an anderen Server forwarden */
- target = Client_GetFromID( Req->argv[1] );
+ target = Client_Search( Req->argv[1] );
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
if( target != Client_ThisServer( ))
if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
{
/* Zeile wird zu lang: senden! */
- if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
}
}
if( rpl[strlen( rpl ) - 1] != ':')
{
/* es wurden User gefunden */
- if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
}
return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
} /* IRC_NAMES */
-GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_ISON( CLIENT *Client, REQUEST *Req )
{
CHAR rpl[COMMAND_LEN];
CLIENT *c;
while( ptr )
{
ngt_TrimStr( ptr );
- c = Client_GetFromID( ptr );
+ c = Client_Search( ptr );
if( c && ( Client_Type( c ) == CLIENT_USER ))
{
/* Dieser Nick ist "online" */
}
if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
- return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+ return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
} /* IRC_ISON */
-GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_WHOIS( CLIENT *Client, REQUEST *Req )
{
CLIENT *from, *target, *c;
CHAR str[LINE_LEN + 1], *ptr = NULL;
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[Req->argc - 1] );
+ c = Client_Search( 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 );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
else from = Client;
if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
if( Req->argc > 1 )
{
/* angegebenen Ziel-Server suchen */
- target = Client_GetFromID( Req->argv[1] );
+ target = Client_Search( Req->argv[1] );
if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
ptr = Req->argv[1];
}
/* Channel-Name anhaengen */
if( str[strlen( str ) - 1] != ':' ) strcat( str, " " );
- if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
if( strchr( Channel_UserModes( chan, c ), 'o' )) strcat( str, "@" );
+ else if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
strcat( str, Channel_Name( chan ));
if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
{
/* Zeile wird zu lang: senden! */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
}
if( str[strlen( str ) - 1] != ':')
{
/* Es sind noch Daten da, die gesendet werden muessen */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
}
/* IRC-Operator? */
} /* IRC_WHOIS */
-GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_WHO( CLIENT *Client, REQUEST *Req )
+{
+ BOOLEAN ok, only_ops;
+ CHAR flags[8], *ptr;
+ CL2CHAN *cl2chan;
+ CHANNEL *chan;
+ CLIENT *c;
+
+ 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 );
+
+ only_ops = FALSE;
+ chan = NULL;
+
+ if( Req->argc == 2 )
+ {
+ /* Nur OPs anzeigen? */
+ if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE;
+#ifdef STRICT_RFC
+ else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#endif
+ }
+
+ if( Req->argc >= 1 )
+ {
+ /* wurde ein Channel oder Nick-Mask angegeben? */
+ chan = Channel_Search( Req->argv[0] );
+ }
+
+ if( chan )
+ {
+ /* User eines Channels ausgeben */
+ if( ! IRC_Send_WHO( Client, chan, only_ops )) return DISCONNECTED;
+ }
+
+ c = Client_First( );
+ while( c )
+ {
+ if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' )))
+ {
+ ok = FALSE;
+ if( Req->argc == 0 ) ok = TRUE;
+ else
+ {
+ if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = TRUE;
+ else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = TRUE;
+ }
+
+ if( ok && (( ! only_ops ) || ( strchr( Client_Modes( c ), 'o' ))))
+ {
+ /* Flags zusammenbasteln */
+ strcpy( flags, "H" );
+ if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
+
+ /* ausgeben */
+ cl2chan = Channel_FirstChannelOf( c );
+ if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan ));
+ else ptr = "*";
+ if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+ }
+ }
+
+ /* naechster Client */
+ c = Client_Next( c );
+ }
+
+ if( chan ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Channel_Name( chan ));
+ else if( Req->argc == 0 ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), "*" );
+ else return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Req->argv[0] );
+} /* IRC_WHO */
+
+
+GLOBAL BOOLEAN
+IRC_USERHOST( CLIENT *Client, REQUEST *Req )
{
CHAR rpl[COMMAND_LEN];
CLIENT *c;
strcpy( rpl, RPL_USERHOST_MSG );
for( i = 0; i < max; i++ )
{
- c = Client_GetFromID( Req->argv[i] );
+ c = Client_Search( Req->argv[i] );
if( c && ( Client_Type( c ) == CLIENT_USER ))
{
/* Dieser Nick ist "online" */
}
if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
- return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+ return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
} /* IRC_USERHOST */
-GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_ERROR( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
assert( Req != NULL );
} /* IRC_ERROR */
-GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_LUSERS( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from;
if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
/* Absender ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( 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[1] );
+ target = Client_Search( Req->argv[1] );
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LUSERS %s %s", Req->argv[0], Req->argv[1] );
}
/* Wer ist der Absender? */
- if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+ if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
else target = Client;
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
} /* IRC_LUSERS */
-GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_LINKS( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from, *c;
CHAR *mask;
else mask = "*";
/* Absender ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( 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] );
+ target = Client_Search( 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 );
+ if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
else target = Client;
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
} /* IRC_LINKS */
-GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_VERSION( CLIENT *Client, REQUEST *Req )
{
- CHAR *channame, *flags, *topic, modes[8];
- BOOLEAN is_new_chan;
- CLIENT *target;
- CHANNEL *chan;
+ CLIENT *target, *prefix;
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 > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- /* 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 );
+ /* Ziel suchen */
+ if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+ else target = Client_ThisServer( );
+
+ /* Prefix ermitteln */
+ if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
+ else prefix = Client;
+ if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
- /* Channel-Namen durchgehen */
- channame = strtok( Req->argv[0], "," );
- while( channame )
+ /* An anderen Server weiterleiten? */
+ if( target != Client_ThisServer( ))
{
- /* wird der Channel neu angelegt? */
- flags = NULL;
-
- if( Channel_Search( channame )) is_new_chan = FALSE;
- else is_new_chan = TRUE;
-
- /* Hat ein Server Channel-User-Modes uebergeben? */
- if( Client_Type( Client ) == CLIENT_SERVER )
- {
- /* Channel-Flags extrahieren */
- flags = strchr( channame, 0x7 );
- if( flags ) *flags++ = '\0';
- }
-
- /* neuer Channel udn lokaler Client? */
- if( is_new_chan && ( Client_Type( Client ) == CLIENT_USER ))
- {
- /* Dann soll der Client Channel-Operator werden! */
- flags = "o";
- }
-
- /* Channel joinen (und ggf. anlegen) */
- if( ! Channel_Join( target, channame ))
- {
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
- continue;
- }
- chan = Channel_Search( channame );
- assert( chan != NULL );
-
- /* Modes setzen (wenn vorhanden) */
- while( flags && *flags )
- {
- Channel_UserModeAdd( chan, target, *flags );
- flags++;
- }
-
- /* Muessen Modes an andere Server gemeldet werden? */
- strcpy( &modes[1], Channel_UserModes( chan, target ));
- if( modes[1] ) modes[0] = 0x7;
- else modes[0] = '\0';
-
- /* An andere Server weiterleiten */
- IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
-
- /* im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
- if( modes[1] )
- {
- /* Modes im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s %s :%s", channame, modes, Client_ID( target ));
- }
-
- if( Client_Type( Client ) == CLIENT_USER )
- {
- /* an Client bestaetigen */
- IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
-
- /* Topic an Client schicken */
- topic = Channel_Topic( chan );
- if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+ if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
- /* Mitglieder an Client Melden */
- IRC_Send_NAMES( Client, chan );
- IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
- }
-
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ /* forwarden */
+ IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
+ return CONNECTED;
}
- return CONNECTED;
-} /* IRC_JOIN */
-
-
-GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
-{
- CLIENT *target;
- CHAR *chan;
- 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 );
-
- /* 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 );
-
- /* Channel-Namen durchgehen */
- chan = strtok( Req->argv[0], "," );
- while( chan )
- {
- if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target )))
- {
- /* naechsten Namen ermitteln */
- chan = strtok( NULL, "," );
- continue;
- }
-
- /* naechsten Namen ermitteln */
- chan = strtok( NULL, "," );
- }
- return CONNECTED;
-} /* IRC_PART */
+ /* mit Versionsinfo antworten */
+ return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE, VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+} /* IRC_VERSION */
-GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_KILL( CLIENT *Client, REQUEST *Req )
{
- CHANNEL *chan;
- CLIENT *from;
- CHAR *topic;
+ CLIENT *prefix, *c;
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 ));
+ if( 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 );
-
- 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 );
-
- /* Welcher Channel? */
- chan = Channel_Search( Req->argv[0] );
- if( ! chan ) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
-
- /* Ist der User Mitglied in dem Channel? */
- if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+ if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- if( Req->argc == 1 )
+ prefix = Client_Search( Req->prefix );
+ if( ! prefix )
{
- /* Topic erfragen */
- topic = Channel_Topic( chan );
- if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
- else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+ Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix );
+ prefix = Client_ThisServer( );
}
+
+ Log( LOG_NOTICE, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+
+ /* andere Server benachrichtigen */
+ IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], Req->argv[1] );
- if( strchr( Channel_Modes( chan ), 't' ))
+ /* haben wir selber einen solchen Client? */
+ c = Client_Search( Req->argv[0] );
+ if( c )
{
- /* Topic Lock. Ist der User ein Channel Operator? */
- if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
+ /* Ja, wir haben einen solchen Client */
+ if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
+ else Client_Destroy( c, NULL, Req->argv[1], TRUE );
}
+ else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
- /* Topic setzen */
- Channel_SetTopic( chan, Req->argv[1] );
- Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
-
- /* im Channel bekannt machen und an Server weiterleiten */
- IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-
- if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
- else return CONNECTED;
-} /* IRC_TOPIC */
+ return CONNECTED;
+} /* IRC_KILL */
-GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_ADMIN(CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *prefix;
-
+
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 > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
/* Ziel suchen */
- if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] );
+ if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
else target = Client_ThisServer( );
/* Prefix ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_GetFromID( Req->prefix );
+ if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
else prefix = Client;
if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
-
+
/* An anderen Server weiterleiten? */
if( target != Client_ThisServer( ))
{
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
/* forwarden */
- IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
+ IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
return CONNECTED;
}
/* mit Versionsinfo antworten */
- return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
-} /* IRC_VERSION */
-
-
-GLOBAL BOOLEAN IRC_KILL( CLIENT *Client, REQUEST *Req )
-{
- CLIENT *prefix, *c;
-
- assert( Client != NULL );
- assert( Req != NULL );
-
- if( 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 );
-
- prefix = Client_GetFromID( Req->prefix );
- if( ! prefix )
- {
- Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix );
- prefix = Client_ThisServer( );
- }
-
- Log( LOG_NOTICE, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
-
- /* andere Server benachrichtigen */
- IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], Req->argv[1] );
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINME_MSG, Client_ID( prefix ), Conf_ServerName )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC1_MSG, Client_ID( prefix ), Conf_ServerAdmin1 )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
- /* haben wir selber einen solchen Client? */
- c = Client_GetFromID( Req->argv[0] );
- if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
-
return CONNECTED;
-} /* IRC_KILL */
+} /* IRC_ADMIN */
-GLOBAL BOOLEAN IRC_Show_MOTD( CLIENT *Client )
+
+GLOBAL BOOLEAN
+IRC_Show_MOTD( CLIENT *Client )
{
BOOLEAN ok;
CHAR line[127];
} /* IRC_Show_MOTD */
-GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
+GLOBAL BOOLEAN
+IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
{
BOOLEAN is_visible, is_member;
CHAR str[LINE_LEN + 1];
{
/* Nick anhaengen */
if( str[strlen( str ) - 1] != ':' ) strcat( str, " " );
- if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" );
if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strcat( str, "@" );
+ else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" );
strcat( str, Client_ID( cl ));
if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
{
/* Zeile wird zu lang: senden! */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
}
}
if( str[strlen( str ) - 1] != ':')
{
/* Es sind noch Daten da, die gesendet werden muessen */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
}
return CONNECTED;
} /* IRC_Send_NAMES */
-GLOBAL BOOLEAN IRC_Send_LUSERS( CLIENT *Client )
+GLOBAL BOOLEAN
+IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
+{
+ BOOLEAN is_visible, is_member;
+ CL2CHAN *cl2chan;
+ CHAR flags[8];
+ CLIENT *c;
+
+ assert( Client != NULL );
+ assert( Chan != NULL );
+
+ if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
+ else is_member = FALSE;
+
+ /* Alle Mitglieder suchen */
+ cl2chan = Channel_FirstMember( Chan );
+ while( cl2chan )
+ {
+ c = Channel_GetClient( cl2chan );
+
+ if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE;
+ else is_visible = TRUE;
+
+ if( is_member || is_visible )
+ {
+ /* Flags zusammenbasteln */
+ strcpy( flags, "H" );
+ if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
+ if( strchr( Channel_UserModes( Chan, c ), 'o' )) strcat( flags, "@" );
+ else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" );
+
+ /* ausgeben */
+ if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' )))
+ {
+ if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), Channel_Name( Chan ), Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+ }
+ }
+
+ /* naechstes Mitglied suchen */
+ cl2chan = Channel_NextMember( Chan, cl2chan );
+ }
+ return CONNECTED;
+} /* IRC_Send_WHO */
+
+
+GLOBAL BOOLEAN
+IRC_Send_LUSERS( CLIENT *Client )
{
INT cnt;
projects / ngircd-alex.git / blobdiff