/*
* 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)
*
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: lists.c,v 1.7 2002/09/08 00:55:45 alex Exp $
- *
- * lists.c: Verwaltung der "IRC-Listen": Ban, Invite, ...
+ * Management of IRC lists: ban, invite, ...
*/
#include "portab.h"
+static char UNUSED id[] = "$Id: lists.c,v 1.17 2005/03/19 18:43:49 fw Exp $";
+
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "exp.h"
#include "lists.h"
typedef struct _C2C
{
struct _C2C *next;
- CHAR mask[MASK_LEN];
+ char mask[MASK_LEN];
CHANNEL *channel;
- BOOLEAN onlyonce;
+ bool onlyonce;
} C2C;
LOCAL C2C *My_Invites, *My_Bans;
-LOCAL C2C *New_C2C PARAMS(( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
+LOCAL C2C *New_C2C PARAMS(( char *Mask, CHANNEL *Chan, bool OnlyOnce ));
-LOCAL BOOLEAN Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
+LOCAL bool Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
+LOCAL bool Already_Registered PARAMS(( C2C *Cl2Chan, char *Mask, CHANNEL *Chan ));
-GLOBAL VOID
-Lists_Init( VOID )
+GLOBAL void
+Lists_Init( void )
{
/* Modul initialisieren */
} /* Lists_Init */
-GLOBAL VOID
-Lists_Exit( VOID )
+GLOBAL void
+Lists_Exit( void )
{
/* Modul abmelden */
} /* Lists_Exit */
-GLOBAL BOOLEAN
+GLOBAL bool
Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan )
{
return Check_List( &My_Invites, Client, Chan );
} /* Lists_CheckInvited */
-GLOBAL BOOLEAN
-Lists_AddInvited( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+GLOBAL bool
+Lists_IsInviteEntry( char *Mask, CHANNEL *Chan )
+{
+ assert( Mask != NULL );
+ assert( Chan != NULL );
+
+ return Already_Registered( My_Invites, Mask, Chan );
+} /* Lists_IsInviteEntry */
+
+
+GLOBAL bool
+Lists_AddInvited( char *Mask, CHANNEL *Chan, bool OnlyOnce )
{
C2C *c2c;
assert( Mask != NULL );
assert( Chan != NULL );
+ if( Already_Registered( My_Invites, Mask, Chan )) return true;
+
c2c = New_C2C( Mask, Chan, OnlyOnce );
if( ! c2c )
{
Log( LOG_ERR, "Can't add new invite list entry!" );
- return FALSE;
+ return false;
}
/* verketten */
My_Invites = c2c;
Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Mask, Channel_Name( Chan ));
- return TRUE;
+ return true;
} /* Lists_AddInvited */
-GLOBAL VOID
-Lists_DelInvited( CHAR *Mask, CHANNEL *Chan )
+GLOBAL void
+Lists_DelInvited( char *Mask, CHANNEL *Chan )
{
C2C *c2c, *last, *next;
} /* Lists_DelInvited */
-GLOBAL BOOLEAN
+GLOBAL bool
Lists_ShowInvites( CLIENT *Client, CHANNEL *Channel )
{
C2C *c2c;
} /* Lists_ShowInvites */
-GLOBAL BOOLEAN
+GLOBAL bool
+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 bool
+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 bool
Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan )
{
return Check_List( &My_Bans, Client, Chan );
} /* Lists_CheckBanned */
-GLOBAL BOOLEAN
-Lists_AddBanned( CHAR *Mask, CHANNEL *Chan )
+GLOBAL bool
+Lists_IsBanEntry( char *Mask, CHANNEL *Chan )
+{
+ assert( Mask != NULL );
+ assert( Chan != NULL );
+
+ return Already_Registered( My_Bans, Mask, Chan );
+} /* Lists_IsBanEntry */
+
+
+GLOBAL bool
+Lists_AddBanned( char *Mask, CHANNEL *Chan )
{
C2C *c2c;
assert( Mask != NULL );
assert( Chan != NULL );
- c2c = New_C2C( Mask, Chan, FALSE );
+ if( Already_Registered( My_Bans, Mask, Chan )) return true;
+
+ c2c = New_C2C( Mask, Chan, false );
if( ! c2c )
{
Log( LOG_ERR, "Can't add new ban list entry!" );
- return FALSE;
+ return false;
}
/* verketten */
My_Bans = c2c;
Log( LOG_DEBUG, "Added \"%s\" to ban list for \"%s\".", Mask, Channel_Name( Chan ));
- return TRUE;
+ return true;
} /* Lists_AddBanned */
-GLOBAL VOID
-Lists_DelBanned( CHAR *Mask, CHANNEL *Chan )
+GLOBAL void
+Lists_DelBanned( char *Mask, CHANNEL *Chan )
{
C2C *c2c, *last, *next;
} /* Lists_DelBanned */
-GLOBAL BOOLEAN
+GLOBAL bool
Lists_ShowBans( CLIENT *Client, CHANNEL *Channel )
{
C2C *c2c;
} /* Lists_ShowBans */
-GLOBAL VOID
+GLOBAL void
Lists_DeleteChannel( CHANNEL *Chan )
{
/* Channel wurde geloescht, Invite- und Ban-Lists aufraeumen */
} /* Lists_DeleteChannel */
-GLOBAL CHAR *
-Lists_MakeMask( CHAR *Pattern )
+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;
+ static char TheMask[MASK_LEN];
+ char *excl, *at;
- assert( Pattern );
+ assert( Pattern != NULL );
excl = strchr( Pattern, '!' );
at = strchr( 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 */
LOCAL C2C *
-New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+New_C2C( char *Mask, CHANNEL *Chan, bool OnlyOnce )
{
C2C *c2c;
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;
} /* New_C2C */
-LOCAL BOOLEAN
+LOCAL bool
Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
{
C2C *c2c, *last;
else *Cl2Chan = c2c->next;
free( c2c );
}
- return TRUE;
+ return true;
}
}
last = c2c;
c2c = c2c->next;
}
- return FALSE;
+ return false;
} /* Check_List */
+LOCAL bool
+Already_Registered( C2C *List, char *Mask, CHANNEL *Chan )
+{
+ C2C *c2c;
+
+ c2c = List;
+ while( c2c )
+ {
+ if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 )) return true;
+ c2c = c2c->next;
+ }
+ return false;
+} /* Already_Registered */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff