dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Testnet work... getting there!

Browse source
This commit is contained in:
Adam Ierymenko 2014-10-23 16:46:09 -07:00
parent 0a195e7bc0
commit 4fbb098daa
11 changed files with 398 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

18
control/NodeControlService.cpp
View file

@ -120,7 +120,6 @@ void NodeControlService::_doCommand(IpcConnection *ipcc,const char *commandLine)
ipcc->printf("200 help leave <network ID>"ZT_EOL_S);
ipcc->printf("200 help terminate [<reason>]"ZT_EOL_S);
ipcc->printf("200 help updatecheck"ZT_EOL_S);
//ipcc->printf("200 help inject <network ID> <from MAC> <to MAC> <ethertype(hex)> <string>");
} else if (cmd[0] == "auth") {
if ((cmd.size() > 1)&&(_authToken.length() > 0)&&(_authToken == cmd[1])) {
Mutex::Lock _l(_connections_m);
@ -240,23 +239,6 @@ void NodeControlService::_doCommand(IpcConnection *ipcc,const char *commandLine)
} else {
ipcc->printf("200 OK"ZT_EOL_S);
}
} else if (cmd[0] == "inject") {
if (cmd.size() >= 6) {
MAC from,to;
unsigned char from2[6];
unsigned char to2[6];
from.fromString(cmd[2].c_str());
to.fromString(cmd[3].c_str());
from.copyTo(from2,6);
to.copyTo(to2,6);
if (_node->injectPacketFromHost(Utils::hexStrToU64(cmd[1].c_str()),from2,to2,Utils::hexStrToUInt(cmd[4].c_str()),cmd[5].c_str(),(unsigned int)cmd[5].length()+1)) {
ipcc->printf("200 OK"ZT_EOL_S);
} else {
ipcc->printf("500 inject failed or not supported by this tap device"ZT_EOL_S);
}
} else {
ipcc->printf("400 missing required arguments"ZT_EOL_S);
}
} else {
ipcc->printf("404 %s No such command. Use 'help' for help."ZT_EOL_S,cmd[0].c_str());
}