X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flists.c;h=fce351a9ea52fcdaadca8096c9f73b5d344c4b15;hb=3da942e2374449248b1359222564db8f9997b090;hp=e3020634e36e2c90afc529dfa3a0fa33b7aae9db;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e;p=ngircd-alex.git diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index e3020634..fce351a9 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2005 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: lists.c,v 1.10 2002/12/12 12:24:18 alex Exp $"; +static char UNUSED id[] = "$Id: lists.c,v 1.16 2005/01/26 13:23:24 alex Exp $"; #include "imp.h" #include @@ -30,6 +30,7 @@ static char UNUSED id[] = "$Id: lists.c,v 1.10 2002/12/12 12:24:18 alex Exp $"; #include #include +#include #include "exp.h" #include "lists.h" @@ -101,19 +102,24 @@ Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan ) GLOBAL BOOLEAN -Lists_AddInvited( CLIENT *From, CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ) +Lists_IsInviteEntry( CHAR *Mask, CHANNEL *Chan ) +{ + assert( Mask != NULL ); + assert( Chan != NULL ); + + return Already_Registered( My_Invites, Mask, Chan ); +} /* Lists_IsInviteEntry */ + + +GLOBAL BOOLEAN +Lists_AddInvited( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ) { C2C *c2c; assert( Mask != NULL ); assert( Chan != NULL ); - if( Already_Registered( My_Invites, Mask, Chan )) - { - /* Eintrag ist bereits vorhanden */ - IRC_WriteStrClient( From, RPL_INVITELIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask ); - return FALSE; - } + if( Already_Registered( My_Invites, Mask, Chan )) return TRUE; c2c = New_C2C( Mask, Chan, OnlyOnce ); if( ! c2c ) @@ -180,6 +186,40 @@ Lists_ShowInvites( CLIENT *Client, CHANNEL *Channel ) } /* Lists_ShowInvites */ +GLOBAL BOOLEAN +Lists_SendInvites( CLIENT *Client ) +{ + C2C *c2c; + + assert( Client != NULL ); + + c2c = My_Invites; + while( c2c ) + { + if( ! IRC_WriteStrClient( Client, "MODE %s +I %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED; + c2c = c2c->next; + } + return CONNECTED; +} /* Lists_SendInvites */ + + +GLOBAL BOOLEAN +Lists_SendBans( CLIENT *Client ) +{ + C2C *c2c; + + assert( Client != NULL ); + + c2c = My_Bans; + while( c2c ) + { + if( ! IRC_WriteStrClient( Client, "MODE %s +b %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED; + c2c = c2c->next; + } + return CONNECTED; +} /* Lists_SendBans */ + + GLOBAL BOOLEAN Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan ) { @@ -188,19 +228,24 @@ Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan ) GLOBAL BOOLEAN -Lists_AddBanned( CLIENT *From, CHAR *Mask, CHANNEL *Chan ) +Lists_IsBanEntry( CHAR *Mask, CHANNEL *Chan ) +{ + assert( Mask != NULL ); + assert( Chan != NULL ); + + return Already_Registered( My_Bans, Mask, Chan ); +} /* Lists_IsBanEntry */ + + +GLOBAL BOOLEAN +Lists_AddBanned( CHAR *Mask, CHANNEL *Chan ) { C2C *c2c; assert( Mask != NULL ); assert( Chan != NULL ); - if( Already_Registered( My_Bans, Mask, Chan )) - { - /* Eintrag ist bereits vorhanden */ - IRC_WriteStrClient( From, RPL_BANLIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask ); - return FALSE; - } + if( Already_Registered( My_Bans, Mask, Chan )) return TRUE; c2c = New_C2C( Mask, Chan, FALSE ); if( ! c2c ) @@ -315,9 +360,10 @@ Lists_DeleteChannel( CHANNEL *Chan ) GLOBAL CHAR * Lists_MakeMask( CHAR *Pattern ) { - /* Hier wird aus einem "beliebigen" Pattern eine gueltige IRC-Mask erzeugt. - * Diese ist aber nur bis zum naechsten Aufruf von Lists_MakeMask() gueltig, - * da ein einziger globaler Puffer verwendet wird. ->Umkopieren!*/ + /* This function generats a valid IRC mask of "any" string. This + * mask is only valid until the next call to Lists_MakeMask(), + * because a single global buffer is used. You have to copy the + * generated mask to some sane location yourself! */ STATIC CHAR TheMask[MASK_LEN]; CHAR *excl, *at; @@ -331,37 +377,32 @@ Lists_MakeMask( CHAR *Pattern ) if(( ! at ) && ( ! excl )) { - /* weder ! noch @Êvorhanden: als Nick annehmen */ - strncpy( TheMask, Pattern, MASK_LEN - 5 ); - TheMask[MASK_LEN - 5] = '\0'; - strcat( TheMask, "!*@*" ); + /* Neither "!" nor "@" found: use string as nick name */ + strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 ); + strlcat( TheMask, "!*@*", sizeof( TheMask )); return TheMask; } if(( ! at ) && ( excl )) { - /* Domain fehlt */ - strncpy( TheMask, Pattern, MASK_LEN - 3 ); - TheMask[MASK_LEN - 3] = '\0'; - strcat( TheMask, "@*" ); + /* Domain part is missing */ + strlcpy( TheMask, Pattern, sizeof( TheMask ) - 3 ); + strlcat( TheMask, "@*", sizeof( TheMask )); return TheMask; } if(( at ) && ( ! excl )) { - /* User fehlt */ + /* User name is missing */ *at = '\0'; at++; - strncpy( TheMask, Pattern, MASK_LEN - 4 ); - TheMask[MASK_LEN - 4] = '\0'; - strcat( TheMask, "!*@" ); - strncat( TheMask, at, strlen( TheMask ) - MASK_LEN - 1 ); - TheMask[MASK_LEN - 1] = '\0'; + strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 ); + strlcat( TheMask, "!*@", sizeof( TheMask )); + strlcat( TheMask, at, sizeof( TheMask )); return TheMask; } - /* alle Teile vorhanden */ - strncpy( TheMask, Pattern, MASK_LEN - 1 ); - TheMask[MASK_LEN - 1] = '\0'; + /* All parts (nick, user and domain name) are given */ + strlcpy( TheMask, Pattern, sizeof( TheMask )); return TheMask; } /* Lists_MakeMask */ @@ -375,14 +416,14 @@ New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ) assert( Chan != NULL ); /* Speicher fuer Eintrag anfordern */ - c2c = malloc( sizeof( C2C )); + c2c = (C2C *)malloc( sizeof( C2C )); if( ! c2c ) { Log( LOG_EMERG, "Can't allocate memory! [New_C2C]" ); return NULL; } - strncpy( c2c->mask, Mask, MASK_LEN ); + strlcpy( c2c->mask, Mask, sizeof( c2c->mask )); c2c->channel = Chan; c2c->onlyonce = OnlyOnce;