* 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.54 2002/02/11 23:33:35 alex Exp $
+ * $Id: irc.c,v 1.57 2002/02/13 23:05:29 alex Exp $
*
* irc.c: IRC-Befehle
*
* $Log: irc.c,v $
+ * Revision 1.57 2002/02/13 23:05:29 alex
+ * - Nach Connect eines Users werden LUSERS-Informationen angezeigt.
+ *
+ * Revision 1.56 2002/02/13 17:52:27 alex
+ * - es werden nun Channel- und User-Modes von Usern angenommen.
+ *
+ * Revision 1.55 2002/02/12 14:40:37 alex
+ * - via NJOIN gemeldete Benutzer wurden nicht in Channels bekannt gemacht.
+ *
* Revision 1.54 2002/02/11 23:33:35 alex
* - weitere Anpassungen an Channel-Modes und Channel-User-Modes.
*
LOCAL VOID Kill_Nick( CHAR *Nick );
LOCAL BOOLEAN Send_NAMES( CLIENT *Client, CHANNEL *Chan );
+LOCAL BOOLEAN Send_LUSERS( CLIENT *Client );
GLOBAL VOID IRC_Init( VOID )
if( Client_Conn( c ) > NONE )
{
/* Dem gefundenen Server gleich den neuen
- * Server bekannt machen */
+ * 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;
}
GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
{
+ CHAR *channame, *ptr, modes[8];
BOOLEAN is_op, is_voiced;
- CHAR *channame, *ptr;
CHANNEL *chan;
CLIENT *c;
if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
+
+ /* im Channel bekannt machen */
+ IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame );
+
+ /* Channel-User-Modes setzen */
+ strcpy( modes, Channel_UserModes( chan, c ));
+ if( modes[0] )
+ {
+ /* Modes im Channel bekannt machen */
+ IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
+ }
}
else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
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 ... */
-#ifndef STRICT_RFC
if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
#endif
/* Channel-User-Modes */
switch( *mode_ptr )
{
+ case 'o':
+ /* Channel Operator */
+ x[0] = 'o';
+ break;
+ case 'v':
+ /* Voice */
+ x[0] = 'v';
+ break;
default:
Log( LOG_DEBUG, "Unknown channel-user-mode \"%c%c\" from \"%s\" on \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Client_ID( chan_cl ), Channel_Name( chan ));
ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
/* Channel-Modes */
switch( *mode_ptr )
{
+ case 'a':
+ /* Anonymous */
+ x[0] = 'a';
+ break;
+ case 'm':
+ /* Moderated */
+ x[0] = 'm';
+ break;
+ case 'n':
+ /* kein Schreiben in den Channel von aussen */
+ x[0] = 'n';
+ break;
+ case 'p':
+ /* Private */
+ x[0] = 'p';
+ break;
+ case 'q':
+ /* Quite */
+ x[0] = 'q';
+ break;
+ case 's':
+ /* Secret */
+ x[0] = 's';
+ break;
+ case 't':
+ /* Topic Lock */
+ x[0] = 't';
+ break;
default:
Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan ));
ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from;
- INT cnt;
assert( Client != NULL );
assert( Req != NULL );
else target = Client;
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
- /* Users, Services und Serevr im Netz */
- if( ! IRC_WriteStrClient( target, RPL_LUSERCLIENT_MSG, Client_ID( target ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED;
-
- /* IRC-Operatoren im Netz */
- cnt = Client_OperCount( );
- if( cnt > 0 )
- {
- if( ! IRC_WriteStrClient( target, RPL_LUSEROP_MSG, Client_ID( target ), cnt )) return DISCONNECTED;
- }
-
- /* Unbekannt Verbindungen */
- cnt = Client_UnknownCount( );
- if( cnt > 0 )
- {
- if( ! IRC_WriteStrClient( target, RPL_LUSERUNKNOWN_MSG, Client_ID( target ), cnt )) return DISCONNECTED;
- }
-
- /* Channels im Netz */
- if( ! IRC_WriteStrClient( target, RPL_LUSERCHANNELS_MSG, Client_ID( target ), Channel_Count( ))) return DISCONNECTED;
-
- /* Channels im Netz */
- if( ! IRC_WriteStrClient( target, RPL_LUSERME_MSG, Client_ID( target ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED;
+ Send_LUSERS( target );
return CONNECTED;
} /* IRC_LUSERS */
Client_SetType( Client, CLIENT_USER );
- return Show_MOTD( Client );
+ if( ! Send_LUSERS( Client )) return DISCONNECTED;
+ if( ! Show_MOTD( Client )) return DISCONNECTED;
+
+ return CONNECTED;
} /* Hello_User */
} /* Send_NAMES */
+LOCAL BOOLEAN Send_LUSERS( CLIENT *Client )
+{
+ INT cnt;
+
+ assert( Client != NULL );
+
+ /* Users, Services und Serevr im Netz */
+ if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED;
+
+ /* IRC-Operatoren im Netz */
+ cnt = Client_OperCount( );
+ if( cnt > 0 )
+ {
+ if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+ }
+
+ /* Unbekannt Verbindungen */
+ cnt = Client_UnknownCount( );
+ if( cnt > 0 )
+ {
+ if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+ }
+
+ /* Channels im Netz */
+ if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED;
+
+ /* Channels im Netz */
+ if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED;
+
+ return CONNECTED;
+} /* Send_LUSERS */
+
+
/* -eof- */