X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/529088a022cb8351b88a4c30d87111d45fd4a13e..ca89e98e0309a81155c0690cf0a516f75e285929:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 67a69da..2a21973 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -561,63 +561,75 @@ expire_tgchange(void *unused)
 	}
 }
 
-static int
-add_target(struct Client *source_p, struct Client *target_p)
-{
-	unsigned int i, j;
-	/* messaging themselves, doesnt incur any penalties */
-	if(source_p == target_p)
-		return 1;
-
-	if(USED_TARGETS(source_p))
-	{
-		/* hunt for an existing target */
-		for(i = PREV_FREE_TARGET(source_p), j = USED_TARGETS(source_p);
-			j;
-			--j, PREV_TARGET(i))
-		{
-			if(source_p->localClient->targets[i] == target_p)
-				return 1;
-		}
-
-		/* first message after connect, we may only start clearing
-		 * slots after this message --anfl
-		 */
-		if(!IsTGChange(source_p))
-		{
-			SetTGChange(source_p);
-			source_p->localClient->target_last = rb_current_time();
-		}
-		/* clear as many targets as we can */
-		else if((i = (rb_current_time() - source_p->localClient->target_last) / 60))
-		{
-			if(i > USED_TARGETS(source_p))
-				USED_TARGETS(source_p) = 0;
-			else
-				USED_TARGETS(source_p) -= i;
-
-			source_p->localClient->target_last = rb_current_time();
-		}
-		/* cant clear any, full target list */
-		else if(USED_TARGETS(source_p) == 10)
-		{
-			add_tgchange(source_p->sockhost);
-			return 0;
-		}
-	}
-	/* no targets in use, reset their target_last so that they cant
-	 * abuse a long idle to get targets back more quickly
-	 */
-	else
-	{
-		source_p->localClient->target_last = rb_current_time();
-		SetTGChange(source_p);
-	}
-
-	source_p->localClient->targets[FREE_TARGET(source_p)] = target_p;
-	NEXT_TARGET(FREE_TARGET(source_p));
-	++USED_TARGETS(source_p);
-	return 1;
+static int
+add_target(struct Client *source_p, struct Client *target_p)
+{
+	int i, j;
+	uint32_t hashv;
+
+	/* can msg themselves or services without using any target slots */
+	if(source_p == target_p || IsService(target_p))
+		return 1;
+
+	/* special condition for those who have had PRIVMSG crippled to allow them
+	 * to talk to IRCops still.
+	 *
+	 * XXX: is this controversial?
+	 */
+	if(source_p->localClient->target_last > rb_current_time() && IsOper(target_p))
+		return 1;
+
+	hashv = fnv_hash_upper((const unsigned char *)use_id(target_p), 32);
+
+	if(USED_TARGETS(source_p))
+	{
+		/* hunt for an existing target */
+		for(i = PREV_FREE_TARGET(source_p), j = USED_TARGETS(source_p);
+		    j; --j, PREV_TARGET(i))
+		{
+			if(source_p->localClient->targets[i] == hashv)
+				return 1;
+		}
+
+		/* first message after connect, we may only start clearing
+		 * slots after this message --anfl
+		 */
+		if(!IsTGChange(source_p))
+		{
+			SetTGChange(source_p);
+			source_p->localClient->target_last = rb_current_time();
+		}
+		/* clear as many targets as we can */
+		else if((i = (rb_current_time() - source_p->localClient->target_last) / 60))
+		{
+			if(i > USED_TARGETS(source_p))
+				USED_TARGETS(source_p) = 0;
+			else
+				USED_TARGETS(source_p) -= i;
+
+			source_p->localClient->target_last = rb_current_time();
+		}
+		/* cant clear any, full target list */
+		else if(USED_TARGETS(source_p) == 10)
+		{
+			ServerStats.is_tgch++;
+			add_tgchange(source_p->sockhost);
+			return 0;
+		}
+	}
+	/* no targets in use, reset their target_last so that they cant
+	 * abuse a long idle to get targets back more quickly
+	 */
+	else
+	{
+		source_p->localClient->target_last = rb_current_time();
+		SetTGChange(source_p);
+	}
+
+	source_p->localClient->targets[FREE_TARGET(source_p)] = hashv;
+	NEXT_TARGET(FREE_TARGET(source_p));
+	++USED_TARGETS(source_p);
+	return 1;
 }
 
 /*