X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/38e6acddad741b38a475fe3d10dfffb3c6d6c639..9cb932632f02f6ae516bd3f12aab98ff861c3b70:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index 3b5cd27..40dbc54 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,16 +31,14 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "send.h"
 #include "msg.h"
 #include "s_conf.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "packet.h"
 
@@ -163,7 +161,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* didnt find any matching client, issue a kill */
 			if(from == NULL)
 			{
-				ServerStats->is_unpf++;
+				ServerStats.is_unpf++;
 				remove_unknown(client_p, sender, pbuffer);
 				return;
 			}
@@ -173,7 +171,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* fake direction, hmm. */
 			if(from->from != client_p)
 			{
-				ServerStats->is_wrdi++;
+				ServerStats.is_wrdi++;
 				cancel_clients(client_p, from, pbuffer);
 				return;
 			}
@@ -184,7 +182,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 
 	if(*ch == '\0')
 	{
-		ServerStats->is_empt++;
+		ServerStats.is_empt++;
 		return;
 	}
 
@@ -205,7 +203,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	{
 		mptr = NULL;
 		numeric = ch;
-		ServerStats->is_num++;
+		ServerStats.is_num++;
 		s = ch + 3;	/* I know this is ' ' from above if */
 		*s++ = '\0';	/* blow away the ' ', and point s to next part */
 	}
@@ -249,7 +247,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 						   me.name, from->name, ch);
 				}
 			}
-			ServerStats->is_unco++;
+			ServerStats.is_unco++;
 			return;
 		}
 
@@ -510,7 +508,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Message for %s[%s] from %s",
 				     source_p->name, source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 	else
 	{
@@ -520,7 +518,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 				     source_p->username,
 				     source_p->host,
 				     source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 }
 
@@ -545,7 +543,7 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 	{
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Unknown prefix (%s) from %s, Squitting %s",
-				     lbuffer, get_server_name(client_p, SHOW_IP), lsender);
+				     lbuffer, client_p->name, lsender);
 
 		sendto_one(client_p,
 			   ":%s SQUIT %s :(Unknown prefix (%s) from %s)",