Browse Source

command bus fix

Adam Ierymenko 11 years ago
parent
commit
1c555e4b96
2 changed files with 5 additions and 5 deletions
  1. 2 2
      main.cpp
  2. 3 3
      node/NodeConfig.cpp

+ 2 - 2
main.cpp

@@ -116,9 +116,9 @@ static void printHelp(FILE *out,const char *cn)
 
 
 static void _CBresultHandler(void *arg,const char *line)
 static void _CBresultHandler(void *arg,const char *line)
 {
 {
-	if ((line)&&(line[0]))
+	if ((line)&&(line[0])) {
 		fprintf(stdout,"%s"ZT_EOL_S,line);
 		fprintf(stdout,"%s"ZT_EOL_S,line);
-	else *((bool *)arg) = true;
+	} else *((bool *)arg) = true;
 }
 }
 
 
 #ifdef __WINDOWS__
 #ifdef __WINDOWS__

+ 3 - 3
node/NodeConfig.cpp

@@ -184,7 +184,7 @@ void NodeConfig::_doCommand(IpcConnection *ipcc,const char *commandLine)
 
 
 	if ((cmd.empty())||(cmd[0] == "help")) {
 	if ((cmd.empty())||(cmd[0] == "help")) {
 		ipcc->printf("200 help help"ZT_EOL_S);
 		ipcc->printf("200 help help"ZT_EOL_S);
-		ipcc->printf("200 auth token"ZT_EOL_S);
+		ipcc->printf("200 help auth <token>"ZT_EOL_S);
 		ipcc->printf("200 help info"ZT_EOL_S);
 		ipcc->printf("200 help info"ZT_EOL_S);
 		ipcc->printf("200 help listpeers"ZT_EOL_S);
 		ipcc->printf("200 help listpeers"ZT_EOL_S);
 		ipcc->printf("200 help listnetworks"ZT_EOL_S);
 		ipcc->printf("200 help listnetworks"ZT_EOL_S);
@@ -196,8 +196,8 @@ void NodeConfig::_doCommand(IpcConnection *ipcc,const char *commandLine)
 		if ((cmd.size() > 1)&&(_authToken == cmd[1])) {
 		if ((cmd.size() > 1)&&(_authToken == cmd[1])) {
 			Mutex::Lock _l(_connections_m);
 			Mutex::Lock _l(_connections_m);
 			_connections[ipcc] = true;
 			_connections[ipcc] = true;
-			ipcc->printf("200 OK"ZT_EOL_S);
-		} else ipcc->printf("403 auth failed"ZT_EOL_S);
+			ipcc->printf("200 auth OK"ZT_EOL_S);
+		} else ipcc->printf("403 auth FAILED"ZT_EOL_S);
 	} else {
 	} else {
 		{
 		{
 			Mutex::Lock _l(_connections_m);
 			Mutex::Lock _l(_connections_m);