* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: client.c 3514 2007-06-06 16:25:21Z nenolod $
*/
#include "stdinc.h"
#include "config.h"
#include "blacklist.h"
#include "reject.h"
#include "scache.h"
-#include "irc_dictionary.h"
+#include "rb_dictionary.h"
#include "sslproc.h"
#include "s_assert.h"
rb_event_addish("exit_aborted_clients", exit_aborted_clients, NULL, 1);
rb_event_add("flood_recalc", flood_recalc, NULL, 1);
- nd_dict = irc_dictionary_create("nickdelay", irccmp);
+ nd_dict = rb_dictionary_create("nickdelay", irccmp);
}
** already been sent. we make sure to exit a server's dependent clients
** and servers before the server itself; exit_one_client takes care of
** actually removing things off llists. tweaked from +CSr31 -orabidoo
-*/
+ */
/*
* added sanity test code.... source_p->serv might be NULL...
*/
** Remove *everything* that depends on source_p, from all lists, and sending
** all necessary SQUITs. source_p itself is still on the lists,
** and its SQUITs have been sent except for the upstream one -orabidoo
-*/
+ */
static void
remove_dependents(struct Client *client_p,
struct Client *source_p,
/*
* dead_link - Adds client to a list of clients that need an exit_client()
- *
*/
void
dead_link(struct Client *client_p, int sendqex)
**
** CLIENT_EXITED if (client_p == source_p)
** 0 if (client_p != source_p)
-*/
+ */
int
exit_client(struct Client *client_p, /* The local client originating the
* exit or NULL, if this exit is
char *
generate_uid(void)
{
+ static int flipped = 0;
int i;
+uid_restart:
for(i = 8; i > 3; i--)
{
if(current_uid[i] == 'Z')
{
current_uid[i] = '0';
- return current_uid;
+ goto out;
}
else if(current_uid[i] != '9')
{
current_uid[i]++;
- return current_uid;
+ goto out;
}
else
current_uid[i] = 'A';
if(current_uid[3] == 'Z')
{
current_uid[i] = 'A';
- s_assert(0);
+ flipped = 1;
}
else
current_uid[i]++;
-
+out:
+ /* if this happens..well, i'm not sure what to say, but lets handle it correctly */
+ if(rb_unlikely(flipped))
+ {
+ /* this slows down uid generation a bit... */
+ if(find_id(current_uid) != NULL)
+ goto uid_restart;
+ }
return current_uid;
}
else
ServerStats.is_ni++;
+ del_from_cli_connid_hash(client_p);
+
if(client_p->localClient->F != NULL)
{
/* attempt to flush any pending dbufs. Evil, but .. -- adrian */
if(!IsIOError(client_p))
send_queued(client_p);
- del_from_cli_connid_hash(client_p);
rb_close(client_p->localClient->F);
client_p->localClient->F = NULL;
}