X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=dc757c80328d8e8acf3bb2fa590a0d582dcb585a;hb=406ab09f22f46a6cee5559e96f0325768188ffa4;hp=bd2c5798389db9fab4083b3e0bfb0a18a3474730;hpb=57dce2bd64a74275b5188df66d29f35da012cea1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index bd2c57983..dc757c803 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2362,7 +2362,7 @@ void handle_hash(char token,char* params,serverrec* source,serverrec* reply, cha
 	char* create_time = strtok(NULL," ");
 	char* duration = strtok(NULL," :");
 	char* reason = strtok(NULL,"\r\n");
-	add_gline(atoi(duration),who,reason,mask);
+	add_gline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask);
 	// we must update the creation time on this gline
 	// now that we've added it, or it wont expire at the right time.
 	gline_set_creation_time(mask,atoi(create_time));
@@ -2384,7 +2384,7 @@ void handle_dot(char token,char* params,serverrec* source,serverrec* reply, char
 	char* who = strtok(NULL," ");
 	if (mask)
 	{
-		if (del_gline(mask))
+		if (del_gline((const char*)mask))
 		{
 			if (who)
 			{
@@ -2403,7 +2403,7 @@ void handle_add_sqline(char token,char* params,serverrec* source,serverrec* repl
 	char* create_time = strtok(NULL," ");
 	char* duration = strtok(NULL," :");
 	char* reason = strtok(NULL,"\r\n");
-	add_qline(atoi(duration),who,reason,mask);
+	add_qline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask);
 	// we must update the creation time on this gline
 	// now that we've added it, or it wont expire at the right time.
 	qline_set_creation_time(mask,atoi(create_time));
@@ -2426,7 +2426,7 @@ void handle_del_sqline(char token,char* params,serverrec* source,serverrec* repl
 	char* who = strtok(NULL," ");
 	if (mask)
 	{
-		if (del_qline(mask))
+		if (del_qline((const char*)mask))
 		{
 			if (who)
 			{
@@ -2445,7 +2445,7 @@ void handle_add_szline(char token,char* params,serverrec* source,serverrec* repl
 	char* create_time = strtok(NULL," ");
 	char* duration = strtok(NULL," :");
 	char* reason = strtok(NULL,"\r\n");
-	add_zline(atoi(duration),who,reason,mask);
+	add_zline(atoi(duration),(const char*)who,(const char*)reason,(const char*)mask);
 	// we must update the creation time on this gline
 	// now that we've added it, or it wont expire at the right time.
 	zline_set_creation_time(mask,atoi(create_time));
@@ -2468,7 +2468,7 @@ void handle_del_szline(char token,char* params,serverrec* source,serverrec* repl
 	char* who = strtok(NULL," ");
 	if (mask)
 	{
-		if (del_zline(mask))
+		if (del_zline((const char*)mask))
 		{
 			if (who)
 			{
@@ -2759,6 +2759,10 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
 		{
 			token = '*';
 		}
+		if (!strcmp(command,"PING"))
+		{
+			token = '*';
+		}
 		if (!strcmp(command,"NOTICE"))
 		{
 			snprintf(udp_msg,MAXBUF,"V %s %s",source,data);
@@ -3060,6 +3064,8 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
 		char Link_Pass[1024];
 		char Link_SendPass[1024];
 		int LinkPort = 0;
+
+		log(DEBUG,"U-token linked server detected.");
 		
 		// search for a corresponding <link> block in the config files
 		for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
@@ -3150,14 +3156,14 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
 	}
 }
 
-long duration(char* str)
+long duration(const char* str)
 {
 	char n_field[MAXBUF];
 	long total = 0;
-	char* str_end = str + strlen(str);
+	const char* str_end = str + strlen(str);
 	n_field[0] = 0;
 	
-	for (char* i = str; i < str_end; i++)
+	for (char* i = (char*)str; i < str_end; i++)
 	{
 		// if we have digits, build up a string for the value in n_field,
 		// up to 10 digits in size.