*
* $Id$
*
+ *
+ * This file should be edited in a window with a width of 141 characters
+ * ick
*/
#include "IPcheck.h"
#include "client.h"
#include "ircd.h"
-#include "numnicks.h"
+#include "numnicks.h" /* NumNick, NumServ (GODMODE) */
#include "ircd_alloc.h"
-#include "msg.h"
-#include "s_bsd.h"
-#include "s_debug.h"
-#include "s_user.h"
+#include "s_bsd.h" /* SetIPChecked */
+#include "s_debug.h" /* Debug */
+#include "s_user.h" /* TARGET_DELAY */
#include "send.h"
#include <assert.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-#if 0
-#warning Nick collisions are horribly broken in
-#warning this version, and its known to core on
-#warning a whim. If your even concidering
-#warning running this on something resembling a
-#warning production network, dont bother, its
-#warning not worth your time. To those of you
-#warning who grabbed the latest CVS version to
-#warning bug test it, thanks, but I recommend
-#warning you stick to previous versions for the
-#warning time being.
-#error --- Broken code ---
-#endif
+
struct IPTargetEntry {
int count;
};
struct IPRegistryEntry {
- struct IPRegistryEntry *next;
- struct IPTargetEntry *target;
+ struct IPRegistryEntry* next;
+ struct IPTargetEntry* target;
unsigned int addr;
- time_t last_connect;
- unsigned char connected;
+ int last_connect;
+ unsigned short connected;
unsigned char attempts;
};
-
/*
* Hash table for IPv4 address registry
*
* Hash table size must be a power of 2
* Use 64K hash table to conserve memory
*/
-/*----------------------------------------------------------------------------
- * Compile-time Configuration
- *--------------------------------------------------------------------------*/
#define IP_REGISTRY_TABLE_SIZE 0x10000
#define MASK_16 0xffff
-/* We allow 6 connections in 60 seconds */
-#define IPCHECK_CLONE_LIMIT 6
-#define IPCHECK_CLONE_PERIOD 60
-#define IPCHECK_CLONE_DELAY 600
-
-
-/*----------------------------------------------------------------------------
- * Handy Macros
- *--------------------------------------------------------------------------*/
-#define NOW (CurrentTime)
-#define CONNECTED_SINCE(x) (NOW - (x->last_connect))
+#define NOW ((unsigned short)(CurrentTime & MASK_16))
+#define CONNECTED_SINCE(x) (NOW - (x))
+#define IPCHECK_CLONE_LIMIT 4
+#define IPCHECK_CLONE_PERIOD 40
+#define IPCHECK_CLONE_DELAY 600
-/*----------------------------------------------------------------------------
- * Global Data (ugly!)
- *--------------------------------------------------------------------------*/
-static struct IPRegistryEntry *hashTable[IP_REGISTRY_TABLE_SIZE];
-static struct IPRegistryEntry *freeList = 0;
+static struct IPRegistryEntry* hashTable[IP_REGISTRY_TABLE_SIZE];
+static struct IPRegistryEntry* freeList = 0;
-/*----------------------------------------------------------------------------
- * ip_registry_hash: Create a hash key for an IP registry entry and return
- * the value. (Is unsigned int really a good type to give
- * to the IP argument? Ugly. This should probably be a
- * struct in_addr. This is asking for trouble. --ZS)
- *--------------------------------------------------------------------------*/
static unsigned int ip_registry_hash(unsigned int ip)
{
return ((ip >> 16) ^ ip) & (IP_REGISTRY_TABLE_SIZE - 1);
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_find: Find a given IP registry entry and return it.
- *--------------------------------------------------------------------------*/
-static struct IPRegistryEntry *ip_registry_find(unsigned int ip)
+static struct IPRegistryEntry* ip_registry_find(unsigned int ip)
{
- struct IPRegistryEntry *entry = 0;
-
- for (entry = hashTable[ip_registry_hash(ip)]; entry; entry = entry->next) {
+ struct IPRegistryEntry* entry = hashTable[ip_registry_hash(ip)];
+ for ( ; entry; entry = entry->next) {
if (entry->addr == ip)
- return entry;
+ break;
}
-
- return NULL;
+ return entry;
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_add: Add an entry to the IP registry
- *--------------------------------------------------------------------------*/
-static void ip_registry_add(struct IPRegistryEntry *entry)
+static void ip_registry_add(struct IPRegistryEntry* entry)
{
unsigned int bucket = ip_registry_hash(entry->addr);
-
entry->next = hashTable[bucket];
hashTable[bucket] = entry;
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_remove: Remove an entry from the IP registry
- *--------------------------------------------------------------------------*/
-static void ip_registry_remove(struct IPRegistryEntry* entry)
+static void ip_registry_remove(struct IPRegistryEntry* entry)
{
unsigned int bucket = ip_registry_hash(entry->addr);
-
if (hashTable[bucket] == entry)
hashTable[bucket] = entry->next;
else {
- struct IPRegistryEntry *prev;
-
- for (prev = hashTable[bucket]; prev; prev = prev->next) {
+ struct IPRegistryEntry* prev = hashTable[bucket];
+ for ( ; prev; prev = prev->next) {
if (prev->next == entry) {
prev->next = entry->next;
break;
}
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_new_entry(): Creates and initializes an IP Registry entry.
- * NOW ALSO ADDS IT TO THE LIST! --ZS
- *--------------------------------------------------------------------------*/
-static struct IPRegistryEntry *ip_registry_new_entry(unsigned int addr, int attempt)
+static struct IPRegistryEntry* ip_registry_new_entry()
{
struct IPRegistryEntry* entry = freeList;
-
if (entry)
freeList = entry->next;
else
- entry = (struct IPRegistryEntry *)MyMalloc(sizeof(struct IPRegistryEntry));
+ entry = (struct IPRegistryEntry*) MyMalloc(sizeof(struct IPRegistryEntry));
assert(0 != entry);
-
memset(entry, 0, sizeof(struct IPRegistryEntry));
entry->last_connect = NOW; /* Seconds since last connect attempt */
entry->connected = 1; /* connected clients for this IP */
- entry->attempts = attempt; /* Number attempts for this IP */
- entry->addr = addr; /* Entry's IP Address */
-
- ip_registry_add(entry);
-
+ entry->attempts = 1; /* Number attempts for this IP */
return entry;
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_delete_entry: Frees an entry and adds the structure to a list
- * of free structures. (We should probably reclaim
- * the freelist every once in a while! This is
- * potentially a way to DoS the server... -ZS)
- *--------------------------------------------------------------------------*/
-static void ip_registry_delete_entry(struct IPRegistryEntry *entry)
+static void ip_registry_delete_entry(struct IPRegistryEntry* entry)
{
if (entry->target)
MyFree(entry->target);
-
entry->next = freeList;
freeList = entry;
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_update_free_targets:
- *--------------------------------------------------------------------------*/
-static unsigned int ip_registry_update_free_targets(struct IPRegistryEntry *entry)
+static unsigned int ip_registry_update_free_targets(struct IPRegistryEntry* entry)
{
unsigned int free_targets = STARTTARGETS;
if (entry->target) {
- free_targets = (entry->target->count +
- (CONNECTED_SINCE(entry) / TARGET_DELAY));
-
+ free_targets = entry->target->count + (CONNECTED_SINCE(entry->last_connect) / TARGET_DELAY);
if (free_targets > STARTTARGETS)
free_targets = STARTTARGETS;
-
entry->target->count = free_targets;
}
-
return free_targets;
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_expire_entry: expire an IP entry if it needs to be. If an
- * entry isn't expired, then also check the target
- * list to see if it needs to be expired.
- *--------------------------------------------------------------------------*/
-static void ip_registry_expire_entry(struct IPRegistryEntry *entry)
+static void ip_registry_expire_entry(struct IPRegistryEntry* entry)
{
/*
* Don't touch this number, it has statistical significance
* XXX - blah blah blah
- * ZS - Just -what- statistical significance does it -have-?
- * Iso - Noone knows, we've just been told not to touch it.
*/
- if (CONNECTED_SINCE(entry) > 120 && 0 != entry->target) {
- MyFree(entry->target);
- entry->target = 0;
- }
- if (CONNECTED_SINCE(entry) > 600) {
+ if (CONNECTED_SINCE(entry->last_connect) > 600) {
+ /*
+ * expired
+ */
ip_registry_remove(entry);
ip_registry_delete_entry(entry);
}
+ else if (CONNECTED_SINCE(entry->last_connect) > 120 && 0 != entry->target) {
+ /*
+ * Expire storage of targets
+ */
+ MyFree(entry->target);
+ entry->target = 0;
+ }
}
-
-/*----------------------------------------------------------------------------
- * ip_registry_expire: Expire all of the needed entries in the hash table
- *--------------------------------------------------------------------------*/
-void ip_registry_expire(void)
+/*
+ * ip_registry_expire
+ */
+static void ip_registry_expire()
{
- struct IPRegistryEntry *entry;
- struct IPRegistryEntry *entry_next;
- static time_t next_expire = 0;
int i;
-
- /* Only do this if we're ready to */
- if (next_expire >= CurrentTime)
- return;
+ struct IPRegistryEntry* entry;
+ struct IPRegistryEntry* entry_next;
for (i = 0; i < IP_REGISTRY_TABLE_SIZE; ++i) {
for (entry = hashTable[i]; entry; entry = entry_next) {
ip_registry_expire_entry(entry);
}
}
-
- next_expire = CurrentTime + 60;
}
-
-/*----------------------------------------------------------------------------
+/*
+ * IPcheck_local_connect
*
* Event:
* A new connection was accept()-ed with IP number `cptr->ip.s_addr'.
*
* Throttling:
*
- * A connection should be rejected when a connection from the same IP
- * number was received IPCHECK_CLONE_LIMIT times before this connect
- * attempt, with reconnect intervals of IPCHECK_CLONE_PERIOD seconds
- * or less.
+ * A connection should be rejected when a connection from the same IP number was
+ * received IPCHECK_CLONE_LIMIT times before this connect attempt, with
+ * reconnect intervals of IPCHECK_CLONE_PERIOD seconds or less.
*
* Free target inheritance:
*
* structure, or left at STARTTARGETS. This can be done by changing
* cptr->nexttarget to be `now - (TARGET_DELAY * (FREE_TARGETS - 1))',
* where FREE_TARGETS may range from 0 till STARTTARGETS.
- *--------------------------------------------------------------------------*/
-int ip_registry_check_local(unsigned int addr, time_t *next_target_out)
+ */
+int ip_registry_check_local(unsigned int addr, time_t* next_target_out)
{
- struct IPRegistryEntry *entry = ip_registry_find(addr);
+ struct IPRegistryEntry* entry = ip_registry_find(addr);
unsigned int free_targets = STARTTARGETS;
- assert(0 != next_target_out);
-
- /* If they've never connected before, let them on */
if (0 == entry) {
- Debug((DEBUG_DEBUG,"IPcheck: Local user allowed - unseen"));
- entry = ip_registry_new_entry(addr, 1);
+ entry = ip_registry_new_entry();
+ entry->addr = addr; /* The IP number of registry entry */
+ ip_registry_add(entry);
return 1;
}
-
- /* Keep track of how many people have connected */
- entry->connected++;
-
- /* Do not allow more than 250 connects from a single IP, EVER. */
- if (250 <= entry->connected) {
- Debug((DEBUG_DEBUG,"IPcheck: Local user disallowed - Too many connections"));
- entry->connected--;
+ /* Note that this also connects server connects.
+ * It is hard and not interesting, to change that.
+ *
+ * Don't allow more then 255 connects from one IP number, ever
+ */
+ if (0 == ++entry->connected)
return 0;
- }
- /* If our threshhold has elapsed, reset the counter so we don't throttle,
- * IPCHECK_CLONE_LIMIT connections every IPCHECK_CLONE_PERIOD
- */
- if (CONNECTED_SINCE(entry) > IPCHECK_CLONE_PERIOD) {
+ if (CONNECTED_SINCE(entry->last_connect) > IPCHECK_CLONE_PERIOD)
entry->attempts = 0;
- entry->last_connect = NOW;
- }
-
- /* Count the number of recent attempts */
- entry->attempts++;
-
- if (250 <= entry->attempts)
- --entry->attempts; /* Disallow overflow */
-
free_targets = ip_registry_update_free_targets(entry);
+ entry->last_connect = NOW;
+
+ if (0 == ++entry->attempts) /* Check for overflow */
+ --entry->attempts;
- /* Have they connected less than IPCHECK_CLONE_LIMIT times && next_target_out */
- if (entry->attempts < IPCHECK_CLONE_LIMIT && next_target_out) {
+ if (entry->attempts < IPCHECK_CLONE_LIMIT) {
+ if (next_target_out)
*next_target_out = CurrentTime - (TARGET_DELAY * free_targets - 1);
- entry->last_connect = NOW;
- Debug((DEBUG_DEBUG,"IPcheck: Local user allowed"));
- return 1;
}
-
- /* If the server is younger than IPCHECK_CLONE_DELAY then the person
- * is allowed on.
- */
- if ((CurrentTime - me.since) < IPCHECK_CLONE_DELAY) {
- Debug((DEBUG_DEBUG,"IPcheck: Local user allowed during server startup"));
+ else if ((CurrentTime - me.since) > IPCHECK_CLONE_DELAY) {
+ /*
+ * Don't refuse connection when we just rebooted the server
+ */
+#ifdef NOTHROTTLE
return 1;
+#else
+ --entry->connected;
+ return 0;
+#endif
}
-
- /* Otherwise they're throttled */
- entry->connected--;
- Debug((DEBUG_DEBUG,"IPcheck: Throttling local user"));
- return 0;
+ return 1;
}
/*
- * Add someone to the ip registry without throttling them.
- * This is used for server connections.
+ * IPcheck_remote_connect
+ *
+ * Event:
+ * A remote client connected to Undernet, with IP number `cptr->ip.s_addr'
+ * and hostname `hostname'.
+ *
+ * Action:
+ * Update the IPcheck registry.
+ * Return 0 on failure, 1 on success.
*/
-void ip_registry_add_local(unsigned int addr)
+int ip_registry_check_remote(struct Client* cptr, int is_burst)
{
- struct IPRegistryEntry *entry = ip_registry_find(addr);
-
- /* If they've never connected before, let them on */
+ struct IPRegistryEntry* entry = ip_registry_find(cptr->ip.s_addr);
+
+ /*
+ * Mark that we did add/update an IPregistry entry
+ */
+ SetIPChecked(cptr);
if (0 == entry) {
- Debug((DEBUG_DEBUG,"IPcheck: Local user allowed - unseen"));
- entry = ip_registry_new_entry(addr, 1);
- return;
+ entry = ip_registry_new_entry();
+ entry->addr = cptr->ip.s_addr;
+ if (is_burst)
+ entry->attempts = 0;
+ ip_registry_add(entry);
}
-
- /* Keep track of how many people have connected */
- entry->connected++;
-
- assert(250 <= entry->connected);
-
- return;
+ else {
+ if (0 == ++entry->connected) {
+ /*
+ * Don't allow more then 255 connects from one IP number, ever
+ */
+ return 0;
+ }
+ if (CONNECTED_SINCE(entry->last_connect) > IPCHECK_CLONE_PERIOD)
+ entry->attempts = 0;
+ if (!is_burst) {
+ if (0 == ++entry->attempts) {
+ /*
+ * Check for overflow
+ */
+ --entry->attempts;
+ }
+ ip_registry_update_free_targets(entry);
+ entry->last_connect = NOW;
+ }
+ }
+ return 1;
}
-/*----------------------------------------------------------------------------
- * ip_registry_remote_connect
+/*
+ * IPcheck_connect_fail
*
- * Does anything that needs to be done once we actually have a client
- * structure to play with on a remote connection.
- * returns:
- * 1 - allowed to connect
- * 0 - disallowed.
- *--------------------------------------------------------------------------*/
-int ip_registry_remote_connect(struct Client *cptr)
+ * Event:
+ * This local client failed to connect due to legal reasons.
+ *
+ * Action:
+ * Neutralize the effect of calling IPcheck_local_connect, in such
+ * a way that the client won't be penalized when trying to reconnect
+ * again.
+ */
+void ip_registry_connect_fail(unsigned int addr)
{
- struct IPRegistryEntry *entry = ip_registry_find(cptr->ip.s_addr);
- assert(0 != cptr);
-
- /* If they've never connected before, let them on */
- if (0 == entry) {
- entry = ip_registry_new_entry(cptr->ip.s_addr, 1);
- SetIPChecked(cptr);
- Debug((DEBUG_DEBUG,"IPcheck: First remote connection. connected=%i",entry->connected));
- return 1;
- }
-
- /* Keep track of how many people have connected */
- entry->connected++;
- SetIPChecked(cptr);
-
- /* Do not allow more than 250 connections from one IP.
- * This can happen by having 128 clients on one server, and 128 on another
- * and then the servers joining after a netsplit
- */
- if (250 <= entry->connected) {
- sendto_ops("IPcheck Ghost! [%s]",inet_ntoa(cptr->ip));
- Debug((DEBUG_DEBUG,"IPcheck: Too many connected from IP: %i",entry->connected));
- return 0;
- }
-
- Debug((DEBUG_DEBUG,"IPcheck: %i people connected",entry->connected));
-
- /* They are allowed to connect */
- return 1;
+ struct IPRegistryEntry* entry = ip_registry_find(addr);
+ if (entry)
+ --entry->attempts;
}
-/*----------------------------------------------------------------------------
+/*
* IPcheck_connect_succeeded
*
* Event:
* A client succeeded to finish the registration.
*
* Finish IPcheck registration of a successfully, locally connected client.
- *--------------------------------------------------------------------------*/
+ */
void ip_registry_connect_succeeded(struct Client *cptr)
{
+ const char* tr = "";
unsigned int free_targets = STARTTARGETS;
- struct IPRegistryEntry *entry;
-
- assert(cptr);
-
- entry = ip_registry_find(cptr->ip.s_addr);
-
-
- assert(entry);
+ struct IPRegistryEntry* entry = ip_registry_find(cptr->ip.s_addr);
+ if (!entry) {
+ Debug((DEBUG_ERROR, "Missing registry entry for: %s", cptr->sock_ip));
+ return;
+ }
if (entry->target) {
memcpy(cptr->targets, entry->target->targets, MAXTARGETS);
free_targets = entry->target->count;
+ tr = " tr";
}
-
- sendcmdto_one(&me, CMD_NOTICE, cptr, "%C :connected %u attempts %u/%u free targets %u/%u%s"
- " IPcheck: %s",
- cptr, entry->connected, entry->attempts, IPCHECK_CLONE_LIMIT,
- free_targets, STARTTARGETS,
- ((entry->target) ? " [Inherited Targets]" : ""),
- ((CurrentTime - me.since) < IPCHECK_CLONE_DELAY) ? "Disabled" : "Enabled");
-
- SetIPChecked(cptr);
+ sendto_one(cptr, ":%s NOTICE %s :on %u ca %u(%u) ft %u(%u)%s",
+ me.name, cptr->name, entry->connected, entry->attempts,
+ IPCHECK_CLONE_LIMIT, free_targets, STARTTARGETS, tr);
}
-
-/*----------------------------------------------------------------------------
+/*
* IPcheck_disconnect
*
* Event:
- * A local client disconnected.
+ * A local client disconnected or a remote client left Undernet.
*
* Action:
* Update the IPcheck registry.
* Remove all expired IPregistry structures from the hash bucket
* that belongs to this clients IP number.
- *--------------------------------------------------------------------------*/
-void ip_registry_local_disconnect(struct Client *cptr)
+ */
+void ip_registry_disconnect(struct Client *cptr)
{
- struct IPRegistryEntry *entry;
- unsigned int free_targets;
-
- assert(0 != cptr);
-
- entry = ip_registry_find(cptr->ip.s_addr);
-
- Debug((DEBUG_DEBUG,"IPcheck: Local Disconnect"));
-
- assert(IsIPChecked(cptr));
-
- assert(entry);
-
- assert(entry->connected > 0);
-
- if (entry->connected > 0) {
- entry->connected--;
+ struct IPRegistryEntry* entry = ip_registry_find(cptr->ip.s_addr);
+ if (0 == entry) {
+ /*
+ * trying to find an entry for a server causes this to happen,
+ * servers should never have FLAGS_IPCHECK set
+ */
+ return;
}
-
/*
- * If this was the last one, set `last_connect' to disconnect time
- * (used for expiration) Note that we reset attempts here as well if our
- * threshhold hasn't been crossed.
+ * If this was the last one, set `last_connect' to disconnect time (used for expiration)
*/
- if (0 == entry->connected) {
+ if (0 == --entry->connected) {
+ if (CONNECTED_SINCE(entry->last_connect) > IPCHECK_CLONE_LIMIT * IPCHECK_CLONE_PERIOD) {
+ /*
+ * Otherwise we'd penetalize for this old value if the client reconnects within 20 seconds
+ */
+ entry->attempts = 0;
+ }
ip_registry_update_free_targets(entry);
entry->last_connect = NOW;
}
-
- assert(MyConnect(cptr));
-
- if (0 == entry->target) {
- entry->target = (struct IPTargetEntry *)MyMalloc(sizeof(struct IPTargetEntry));
+ if (MyConnect(cptr)) {
+ unsigned int free_targets;
+ /*
+ * Copy the clients targets
+ */
+ if (0 == entry->target) {
+ entry->target = (struct IPTargetEntry*) MyMalloc(sizeof(struct IPTargetEntry));
+ entry->target->count = STARTTARGETS;
+ }
assert(0 != entry->target);
- entry->target->count = STARTTARGETS;
- }
- memcpy(entry->target->targets, cptr->targets, MAXTARGETS);
- /*
- * This calculation can be pretty unfair towards large multi-user hosts,
- * but there is "nothing" we can do without also allowing spam bots to
- * send more messages or by drastically increasing the ammount of memory
- * used in the IPregistry.
- *
- * The problem is that when a client disconnects, leaving no free targets,
- * then the next client from that IP number has to pay for it (getting no
- * free targets). But ALSO the next client, and the next client, and the
- * next client etc - until another client disconnects that DOES leave free
- * targets. The reason for this is that if there are 10 SPAM bots, and
- * they all disconnect at once, then they ALL should get no free targets
- * when reconnecting. We'd need to store an entry per client (instead of
- * per IP number) to avoid this.
- */
- if (cptr->nexttarget < CurrentTime)
- free_targets = (CurrentTime - cptr->nexttarget) / TARGET_DELAY + 1;
- else
- free_targets = 0;
-
- /* Add bonus, if you've been connected for more than 10 minutes you
- * get a free target every TARGET_DELAY seconds.
- * this is pretty fuzzy, but it will help in some cases.
- */
- if ((CurrentTime - cptr->firsttime) > 600)
- free_targets += (CurrentTime - cptr->firsttime - 600) / TARGET_DELAY;
+ memcpy(entry->target->targets, cptr->targets, MAXTARGETS);
+ /*
+ * This calculation can be pretty unfair towards large multi-user hosts, but
+ * there is "nothing" we can do without also allowing spam bots to send more
+ * messages or by drastically increasing the ammount of memory used in the IPregistry.
+ *
+ * The problem is that when a client disconnects, leaving no free targets, then
+ * the next client from that IP number has to pay for it (getting no free targets).
+ * But ALSO the next client, and the next client, and the next client etc - until
+ * another client disconnects that DOES leave free targets. The reason for this
+ * is that if there are 10 SPAM bots, and they all disconnect at once, then they
+ * ALL should get no free targets when reconnecting. We'd need to store an entry
+ * per client (instead of per IP number) to avoid this.
+ */
+ if (cptr->nexttarget < CurrentTime) {
+ /*
+ * Number of free targets
+ */
+ free_targets = (CurrentTime - cptr->nexttarget) / TARGET_DELAY + 1;
+ }
+ else
+ free_targets = 0;
+ /*
+ * Add bonus, this is pretty fuzzy, but it will help in some cases.
+ */
+ if ((CurrentTime - cptr->firsttime) > 600)
+ /*
+ * Was longer then 10 minutes online?
+ */
+ free_targets += (CurrentTime - cptr->firsttime - 600) / TARGET_DELAY;
+ /*
+ * Finally, store smallest value for Judgement Day
+ */
+ if (free_targets < entry->target->count)
+ entry->target->count = free_targets;
+ }
+}
- /* Finally, store smallest value for Judgement Day */
- if (free_targets < entry->target->count)
- entry->target->count = free_targets;
-
+/*
+ * IPcheck_nr
+ *
+ * Returns number of clients with the same IP number
+ */
+int ip_registry_count(unsigned int addr)
+{
+ struct IPRegistryEntry* entry = ip_registry_find(addr);
+ return (entry) ? entry->connected : 0;
}
-/*----------------------------------------------------------------------------
- * ip_registry_remote_disconnect
+/*
+ * IPcheck_local_connect
*
* Event:
- * A remote client disconnected.
+ * A new connection was accept()-ed with IP number `cptr->ip.s_addr'.
*
* Action:
* Update the IPcheck registry.
- * Remove all expired IPregistry structures from the hash bucket
- * that belongs to this clients IP number.
- *--------------------------------------------------------------------------*/
-void ip_registry_remote_disconnect(struct Client *cptr)
+ * Return:
+ * 1 : You're allowed to connect.
+ * 0 : You're not allowed to connect.
+ *
+ * Throttling:
+ *
+ * A connection should be rejected when a connection from the same IP number was
+ * received IPCHECK_CLONE_LIMIT times before this connect attempt, with
+ * reconnect intervals of IPCHECK_CLONE_PERIOD seconds or less.
+ *
+ * Free target inheritance:
+ *
+ * When the client is accepted, then the number of Free Targets
+ * of the cptr is set to the value stored in the found IPregistry
+ * structure, or left at STARTTARGETS. This can be done by changing
+ * cptr->nexttarget to be `now - (TARGET_DELAY * (FREE_TARGETS - 1))',
+ * where FREE_TARGETS may range from 0 till STARTTARGETS.
+ */
+int IPcheck_local_connect(struct in_addr a, time_t* next_target_out)
{
- struct IPRegistryEntry *entry;
+ assert(0 != next_target_out);
+ return ip_registry_check_local(a.s_addr, next_target_out);
+}
+/*
+ * IPcheck_remote_connect
+ *
+ * Event:
+ * A remote client connected to Undernet, with IP number `cptr->ip.s_addr'
+ * and hostname `hostname'.
+ *
+ * Action:
+ * Update the IPcheck registry.
+ * Return 0 on failure, 1 on success.
+ */
+int IPcheck_remote_connect(struct Client *cptr, int is_burst)
+{
assert(0 != cptr);
+ return ip_registry_check_remote(cptr, is_burst);
+}
- entry = ip_registry_find(cptr->ip.s_addr);
-
- assert(entry);
-
- assert(entry->connected > 0);
- Debug((DEBUG_DEBUG,"IPcheck: Remote Disconnect"));
+/*
+ * IPcheck_connect_fail
+ *
+ * Event:
+ * This local client failed to connect due to legal reasons.
+ *
+ * Action:
+ * Neutralize the effect of calling IPcheck_local_connect, in such
+ * a way that the client won't be penalized when trying to reconnect
+ * again.
+ */
+void IPcheck_connect_fail(struct in_addr a)
+{
+ ip_registry_connect_fail(a.s_addr);
+}
- if (entry->connected > 0) {
- entry->connected--;
- }
+/*
+ * IPcheck_connect_succeeded
+ *
+ * Event:
+ * A client succeeded to finish the registration.
+ *
+ * Finish IPcheck registration of a successfully, locally connected client.
+ */
+void IPcheck_connect_succeeded(struct Client *cptr)
+{
+ assert(0 != cptr);
+ ip_registry_connect_succeeded(cptr);
+}
- /*
- * If this was the last one, set `last_connect' to disconnect time
- * (used for expiration) Note that we reset attempts here as well if our
- * threshhold hasn't been crossed.
- */
- if (0 == entry->connected) {
- ip_registry_update_free_targets(entry);
- entry->last_connect=NOW;
- }
+/*
+ * IPcheck_disconnect
+ *
+ * Event:
+ * A local client disconnected or a remote client left Undernet.
+ *
+ * Action:
+ * Update the IPcheck registry.
+ * Remove all expired IPregistry structures from the hash bucket
+ * that belongs to this clients IP number.
+ */
+void IPcheck_disconnect(struct Client *cptr)
+{
+ assert(0 != cptr);
+ ip_registry_disconnect(cptr);
}
-/*----------------------------------------------------------------------------
+/*
* IPcheck_nr
*
* Returns number of clients with the same IP number
- *--------------------------------------------------------------------------*/
-int ip_registry_count(unsigned int addr)
+ */
+unsigned short IPcheck_nr(struct Client *cptr)
{
- struct IPRegistryEntry *entry = ip_registry_find(addr);
- return (entry) ? entry->connected : 0;
+ assert(0 != cptr);
+ return ip_registry_count(cptr->ip.s_addr);
}
+
+void IPcheck_expire()
+{
+ static time_t next_expire = 0;
+ if (next_expire < CurrentTime) {
+ ip_registry_expire();
+ next_expire = CurrentTime + 60;
+ }
+}
+
+
projects / ircu2.10.12-pk.git / blobdiff