X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=4c686d94bc2e4c4c277962ff29cc97eb2d3bf555;hb=792c0789eecbad303f8b65da8513d5c01bdc648e;hp=04f1c399156110a2759794400e0feb81b28d81f4;hpb=a78e3c7b6ac2ad0fb3f89036459cf7053dbe8496;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index 04f1c39..4c686d9 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -186,11 +186,12 @@ void Server_Start(void)
 			switch( ntohl( client_addr.sin_addr.s_addr ) )
 			{
 			case 0x7F000001:	// 127.0.0.1	localhost
-		//	case 0x825E0D00:	// 130.95.13.0
-			case 0x825E0D07:	// 130.95.13.7	motsugo
-			case 0x825E0D11:	// 130.95.13.17	mermaid
-			case 0x825E0D12:	// 130.95.13.18	mussel
-			case 0x825E0D17:	// 130.95.13.23	martello
+		//	case 0x825F0D00:	// 130.95.13.0
+			case 0x825F0D07:	// 130.95.13.7	motsugo
+			case 0x825F0D11:	// 130.95.13.17	mermaid
+			case 0x825F0D12:	// 130.95.13.18	mussel
+			case 0x825F0D17:	// 130.95.13.23	martello
+			case 0x825F0D42:	// 130.95.13.66	heathred
 				bTrusted = 1;
 				break;
 			default:
@@ -296,22 +297,24 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString)
 {
 	char	*command, *args;
 	 int	i;
-	#if 0
-	char	**argList;
-	 int	numArgs = 0;
-	#endif
+	
+	if( giDebugLevel >= 2 )
+		Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString);
 	
 	if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
 	{
+		printf("command=%s, args=%s\n", command, args);
 		// Is this an error? (just ignore for now)
-		args = "";
+		//args = "";
 	}
 	
 	
 	// Find command
 	for( i = 0; i < NUM_COMMANDS; i++ )
 	{
-		if(strcmp(CommandString, gaServer_Commands[i].Name) == 0) {
+		if(strcmp(command, gaServer_Commands[i].Name) == 0) {
+			if( giDebugLevel >= 2 )
+				Debug(Client, "CMD %s - \"%s\"", command, args);
 			gaServer_Commands[i].Function(Client, args);
 			return ;
 		}
@@ -332,7 +335,11 @@ void Server_Cmd_USER(tClient *Client, char *Args)
 {
 	char	*username;
 	
-	Server_int_ParseArgs(0, Args, &username, NULL);
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 USER takes 1 argument\n");
+		return ;
+	}
 	
 	// Debug!
 	if( giDebugLevel )
@@ -371,7 +378,11 @@ void Server_Cmd_PASS(tClient *Client, char *Args)
 {
 	char	*passhash;
 	
-	Server_int_ParseArgs(0, Args, &passhash, NULL);
+	if( Server_int_ParseArgs(0, Args, &passhash, NULL) )
+	{
+		sendf(Client->Socket, "407 PASS takes 1 argument\n");
+		return ;
+	}
 	
 	// Pass on to cokebank
 	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, passhash);
@@ -394,7 +405,11 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 {
 	char	*username;
 	
-	Server_int_ParseArgs(0, Args, &username, NULL);
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 AUTOAUTH takes 1 argument\n");
+		return ;
+	}
 	
 	// Check if trusted
 	if( !Client->bIsTrusted ) {
@@ -415,6 +430,8 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 	
 	// You can't be an internal account
 	if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+		if(giDebugLevel)
+			Debug(Client, "Autoauth as '%s', not allowed", username);
 		Client->UID = -1;
 		sendf(Client->Socket, "401 Auth Failure\n");
 		return ;
@@ -435,7 +452,11 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 {
 	char	*username;
 	
-	Server_int_ParseArgs(0, Args, &username, NULL);
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 SETEUSER takes 1 argument\n");
+		return ;
+	}
 	
 	if( !strlen(Args) ) {
 		sendf(Client->Socket, "407 SETEUSER expects an argument\n");
@@ -1163,12 +1184,24 @@ int sendf(int Socket, const char *Format, ...)
 int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
 {
 	va_list args;
-	char	savedChar = *ArgStr;
+	char	savedChar;
 	char	**dest;
 	va_start(args, ArgStr);
+
+	// Check for null
+	if( !ArgStr )
+	{
+		while( (dest = va_arg(args, char **)) )
+			*dest = NULL;
+		va_end(args);
+		return 1;
+	}
+
+	savedChar = *ArgStr;
 	
 	while( (dest = va_arg(args, char **)) )
 	{
+		printf(" dest = %p\n", dest);
 		// Trim leading spaces
 		while( *ArgStr == ' ' || *ArgStr == '\t' )
 			ArgStr ++;
@@ -1180,37 +1213,42 @@ int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
 			do {
 				*dest = NULL;
 			}	while( (dest = va_arg(args, char **)) );
+		va_end(args);
 			return -1;
 		}
 		
-		// Set destination
-		*dest = ArgStr;
-		
 		if( *ArgStr == '"' )
 		{
+			ArgStr ++;
+			*dest = ArgStr;
 			// Read until quote
 			while( *ArgStr && *ArgStr != '"' )
 				ArgStr ++;
 		}
 		else
 		{
+			// Set destination
+			*dest = ArgStr;
 			// Read until a space
 			while( *ArgStr && *ArgStr != ' ' && *ArgStr != '\t' )
 				ArgStr ++;
 		}
 		savedChar = *ArgStr;	// savedChar is used to un-mangle the last string
 		*ArgStr = '\0';
+		ArgStr ++;
 	}
+	va_end(args);
 	
 	// Oops, extra arguments, and greedy not set
-	if( savedChar == ' ' && bUseLongLast )
+	if( (savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) {
 		return -1;
+	}
 	
 	// Un-mangle last
-	if(bUseLongLast)
+	if(bUseLongLast) {
+		ArgStr --;
 		*ArgStr = savedChar;
-	
-	va_end(args);
+	}
 	
 	return 0;	// Success!
 }