j3d1/smrtlink
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: j3d1:master
Branches Tags
j3d1:master
j3d1:dev
j3d1:boost
j3d1:v1.0-alpha
..
compare: j3d1:dev
Branches Tags
j3d1:master
j3d1:dev
j3d1:boost
j3d1:v1.0-alpha

17 commits
master ... dev

Author SHA1 Message Date
/jedi/
1f3730ac87 reformat 2016-02-25 19:46:35 +01:00
/jedi/
f15abc71be lookup clean up 2016-02-25 01:47:14 +01:00
/jedi/
69198cd6fe 1.2 2016-02-23 21:43:35 +01:00
/jedi/
e494a7db91 trying out stuff 2016-02-23 20:51:11 +01:00
/jedi/
507cfe2140 trying out stuff 2016-02-23 15:54:56 +01:00
/jedi/
a90401ddeb trying out stuff 2016-02-23 12:24:49 +01:00
/jedi/
49ab8a307e interactive shell wip 2016-02-06 02:35:47 +01:00
/jedi/
5b7014737a interactive shell wip 2016-02-06 02:32:17 +01:00
/jedi/
59796d600b clean up 2016-01-28 00:38:40 +01:00
/jedi/
164edcdad9 implementing -I, -s and reset 2016-01-27 23:54:19 +01:00
/jedi/
a42a0aa8ce repair 2016-01-23 10:05:59 +01:00
/jedi/
2952953f5d repair 2016-01-23 09:55:37 +01:00
/jedi/
0c289aff9c clean up 2016-01-23 09:53:18 +01:00
/jedi/
8200103514 get&set 2016-01-23 09:22:46 +01:00
/jedi/
d3b89e3b11 clean up 2016-01-23 04:25:55 +01:00
/jedi/
693d8d42ff Program.cpp update 2016-01-22 23:51:17 +01:00
/jedi/
922ac9f88e updates 2016-01-21 05:20:21 +01:00
34 changed files with 1026 additions and 957 deletions
Show stats Expand all files Collapse all files

23
src/Constant.h
View file

@ -11,29 +11,46 @@
#include "Types.h"
#define VERSION "smrtlink (v1.1 Linux)\n"
#define USAGE "usage: %s [-bhrVstx] [-i interface] [-U [password:]username]\n\
#define USAGE "usage: %s [-bdhjrvVstwx] [-i interface] [-U [password:]username]\n\
[-P password] <command>\n\n"
#define HELP "\
Option Summary:\n\
-h --help This help text\n\
-V --version Display version of this tool\n\
-d --debug [n] Show debugging messages\n\
-v --verbose [n] Show debugging messages\n\
\
-r --reverse switch ports to emulate switch while sniffing\n\
-i --interface <iface> only use one Interface\n\
-t --timeout <n> Timeout in milliseconds. Default: 180\n\
-w --wait Not yet implemented: blocking until operation is completed\n\
-s --permanent make changes immediately permanent\n\
\
-b --header Show header\n\
-t --text Display Packets as readable Text (default)\n\
-x --hex Display Packets as Hex String\n\
-j --json Display Packets as JSON\n\n\
\
-U --user <[password:]username>\n\
-P --password <password>\n\
Login with Username and Password\n\n\
Login with Username and Password\n\
-f --file <path> choose a settings file\n\
-I --stdin Not yet implemented\n\
-O --stdout Not yet implemented\n\
-X --interactive gives in interactive Shell. Ignores all commands\n\n\
Command Summary:\n\
list list all connected switches\n\
sniff capture and display all incoming or outgoing packets\n\
sniff [type:<type>] [<filter>]\n\
capture and display all incoming or outgoing packets\n\
depending on the --reverse option\n\
encode use encoding algorithm on hex data separated by colon\n\
get <property1> [<property1> [...]]\n\
Not yet implemented\n\
set <property1>=<value> [<property2>=<value> [...]]\n\
Not yet implemented\n\
save Not yet implemented: save config to file\n\
restore Not yet implemented: restore onfig from file\n\
flash Not yet implemented: replace firmware\n\
reboot Not yet implemented\n\
reset Not yet implemented\n\n\
### for questions please contact <smrtlink@jdi.li> ###\n\n"

45
src/File.cpp
View file

@ -10,31 +10,32 @@
#include "Constant.h"
std::string File::read() {
if (!fs::exists(home)) {
fs::create_directory(home);
}
if (!fs::exists(home)) {
fs::create_directory(home);
}
fs::ifstream in(((options.file=="")?home / DEFAULT_FILE:options.file), std::ios::in | std::ios::binary);
if (in) {
std::string contents;
in.seekg(0, std::ios::end);
contents.resize(in.tellg());
in.seekg(0, std::ios::beg);
in.read(&contents[0], contents.size());
in.close();
return (contents);
}
return "";
fs::ifstream in(((options.file == "") ? home / DEFAULT_FILE : options.file),
std::ios::in | std::ios::binary);
if (in) {
std::string contents;
in.seekg(0, std::ios::end);
contents.resize(in.tellg());
in.seekg(0, std::ios::beg);
in.read(&contents[0], contents.size());
in.close();
return (contents);
}
return "";
}
int File::write(std::string content) {
if (!fs::exists(home)) {
fs::create_directory(home);
}
fs::path p = (options.file=="")?home / DEFAULT_FILE:options.file;
fs::ofstream file(p);
file << content<<"\n";
file.close();
return 0;
if (!fs::exists(home)) {
fs::create_directory(home);
}
fs::path p = (options.file == "") ? home / DEFAULT_FILE : options.file;
fs::ofstream file(p);
file << content << "\n";
file.close();
return 0;
}

16
src/File.h
View file

@ -17,14 +17,14 @@ namespace fs = boost::filesystem;
#define DEFAULT_FILE "config.json"
class File {
public:
File() {
home = fs::path(getenv("HOME")) / ".smrtlink";
}
std::string read();
int write(std::string);
private:
fs::path home;
public:
File() {
home = fs::path(getenv("HOME")) / ".smrtlink";
}
std::string read();
int write(std::string);
private:
fs::path home;
};
#endif /* FILE_H_ */

5
src/Filter.cpp
View file

@ -30,7 +30,8 @@ Filter Filter::tokenid(short i) {
}
bool Filter::pass(const Packet p) const {
macAddr none { 0, 0, 0, 0, 0, 0 };
macAddr none {
0, 0, 0, 0, 0, 0 };
if (this->oc != Packet::NONE && this->oc != p.getOpCode())
return false;
if (this->switchMac != none && this->switchMac != p.getSwitchMac())
@ -44,7 +45,7 @@ bool Filter::pass(const Packet p) const {
bool Filter::operator<(const Filter f) const {
if (this->oc != f.oc)
return this->oc > f.oc;
return this->oc > f.oc;
if (this->switchMac != f.switchMac)
return this->switchMac > f.switchMac;
if (this->tokenId != f.tokenId)

29
src/Filter.h
View file

@ -11,20 +11,21 @@
#include "Packet.h"
class Filter {
public:
Filter();
Filter(Packet::OpCode);
Filter(macAddr);
Filter opcode(Packet::OpCode);
Filter mac(macAddr);
Filter tokenid(short);
bool pass(const Packet) const;
bool operator<(const Filter) const;
private:
Packet::OpCode oc = Packet::NONE;
macAddr switchMac = { 0, 0, 0, 0, 0, 0 };
short tokenId = -1;
short fragmentOffset = -1;
public:
Filter();
Filter(Packet::OpCode);
Filter(macAddr);
Filter opcode(Packet::OpCode);
Filter mac(macAddr);
Filter tokenid(short);
bool pass(const Packet) const;
bool operator<(const Filter) const;
private:
Packet::OpCode oc = Packet::NONE;
macAddr switchMac = {
0, 0, 0, 0, 0, 0 };
short tokenId = -1;
short fragmentOffset = -1;
};
#endif /* FILTER_H_ */

136
src/Host.cpp
View file

@ -26,77 +26,79 @@
#include "Types.h"
macAddr Host::getMac() {
int s;
struct ifreq buffer;
macAddr data { 0, 0, 0, 0, 0, 0 };
if (options.interface != "") {
s = socket(PF_INET, SOCK_DGRAM, 0);
memset(&buffer, 0x00, sizeof(buffer));
strcpy(buffer.ifr_name, options.interface.c_str());
ioctl(s, SIOCGIFHWADDR, &buffer);
close(s);
memcpy(&data[0], &buffer.ifr_hwaddr.sa_data[0], 6);
}
return data;
int s;
struct ifreq buffer;
macAddr data {
0, 0, 0, 0, 0, 0 };
if (options.interface != "") {
s = socket(PF_INET, SOCK_DGRAM, 0);
memset(&buffer, 0x00, sizeof(buffer));
strcpy(buffer.ifr_name, options.interface.c_str());
ioctl(s, SIOCGIFHWADDR, &buffer);
close(s);
memcpy(&data[0], &buffer.ifr_hwaddr.sa_data[0], 6);
}
return data;
}
ipAddr Host::getIp() {
struct ifaddrs *ifaddr, *ifa;
int n;
ipAddr data { 0, 0, 0, 0 };
if (getifaddrs(&ifaddr) == -1) {
perror("getifaddrs");
exit(EXIT_FAILURE);
}
for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
if (ifa->ifa_addr == NULL)
continue;
if (ifa->ifa_addr->sa_family == AF_INET)
if (options.interface.compare(ifa->ifa_name) == 0) {
memcpy(&data[0], &ifa->ifa_addr->sa_data[2], 4);
return data;
}
}
/*
for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
if (ifa->ifa_addr == NULL)
continue;
if (ifa->ifa_addr->sa_family == AF_INET)
if (getIface().compare(ifa->ifa_name) == 0) {
memcpy(&data[0], &ifa->ifa_addr->sa_data[2], 4);
return data;
}
}
*/
freeifaddrs(ifaddr);
return data;
struct ifaddrs *ifaddr, *ifa;
int n;
ipAddr data {
0, 0, 0, 0 };
if (getifaddrs(&ifaddr) == -1) {
perror("getifaddrs");
exit(EXIT_FAILURE);
}
for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
if (ifa->ifa_addr == NULL)
continue;
if (ifa->ifa_addr->sa_family == AF_INET)
if (options.interface.compare(ifa->ifa_name) == 0) {
memcpy(&data[0], &ifa->ifa_addr->sa_data[2], 4);
return data;
}
}
/*
for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
if (ifa->ifa_addr == NULL)
continue;
if (ifa->ifa_addr->sa_family == AF_INET)
if (getIface().compare(ifa->ifa_name) == 0) {
memcpy(&data[0], &ifa->ifa_addr->sa_data[2], 4);
return data;
}
}
*/
freeifaddrs(ifaddr);
return data;
}
std::string Host::getIface() {
std::string defaultInterface;
std::ifstream routeFile("/proc/net/route", std::ios_base::in);
if (!routeFile.good())
return "";
std::string line;
std::vector<std::string> tokens;
if (std::getline(routeFile, line))
while (std::getline(routeFile, line)) {
std::istringstream stream(line);
std::string delimiter = "\t";
size_t pos = 0;
std::string token;
while ((pos = line.find(delimiter)) != std::string::npos) {
token = line.substr(0, pos);
tokens.push_back(token);
line.erase(0, pos + delimiter.length());
}
if ((tokens.size() >= 2)
&& (tokens[1] == std::string("00000000"))) {
defaultInterface = tokens[0];
break;
}
tokens.clear();
}
routeFile.close();
return defaultInterface;
std::string defaultInterface;
std::ifstream routeFile("/proc/net/route", std::ios_base::in);
if (!routeFile.good())
return "";
std::string line;
std::vector<std::string> tokens;
if (std::getline(routeFile, line))
while (std::getline(routeFile, line)) {
std::istringstream stream(line);
std::string delimiter = "\t";
size_t pos = 0;
std::string token;
while ((pos = line.find(delimiter)) != std::string::npos) {
token = line.substr(0, pos);
tokens.push_back(token);
line.erase(0, pos + delimiter.length());
}
if ((tokens.size() >= 2)
&& (tokens[1] == std::string("00000000"))) {
defaultInterface = tokens[0];
break;
}
tokens.clear();
}
routeFile.close();
return defaultInterface;
}

11
src/Host.h
View file

@ -11,11 +11,12 @@
#include "Types.h"
class Host {
public:
Host(){};
macAddr getMac();
ipAddr getIp();
std::string getIface();
public:
Host() {
}
macAddr getMac();
ipAddr getIp();
std::string getIface();
};
#endif /* HOST_H_ */

14
src/Interactive.h
View file

@ -9,13 +9,13 @@
#define INTERACTIVE_H_
class Interactive {
public:
Interactive() {
}
virtual ~Interactive() {
}
int loop();
int single(std::vector<std::string> v);
public:
Interactive() {
}
virtual ~Interactive() {
}
int loop();
int single(std::vector<std::string> v);
};
#endif /* INTERACTIVE_H_ */

64
src/Packet.cpp
View file

@ -150,42 +150,43 @@ void Packet::setTokenId(short tokenId) {
std::string Packet::opCodeToString() {
switch (opCode) {
case DISCOVERY:
return "DISCOVERY";
case GET:
return "GET";
case SET:
return "SET";
case CONFIRM:
return "CONFIRM";
case REPLY:
return "REPLY";
default:
return "NONE";
case DISCOVERY:
return "DISCOVERY";
case GET:
return "GET";
case SET:
return "SET";
case CONFIRM:
return "CONFIRM";
case REPLY:
return "REPLY";
default:
return "NONE";
}
return "NONE";
}
void Packet::encode(bytes &data) {
int len = data.size();
bytes key = { 191, 155, 227, 202, 99, 162, 79, 104, 49, 18, 190, 164, 30,
76, 189, 131, 23, 52, 86, 106, 207, 125, 126, 169, 196, 28, 172, 58,
188, 132, 160, 3, 36, 120, 144, 168, 12, 231, 116, 44, 41, 97, 108,
213, 42, 198, 32, 148, 218, 107, 247, 112, 204, 14, 66, 68, 91, 224,
206, 235, 33, 130, 203, 178, 1, 134, 199, 78, 249, 123, 7, 145, 73,
208, 209, 100, 74, 115, 72, 118, 8, 22, 243, 147, 64, 96, 5, 87, 60,
113, 233, 152, 31, 219, 143, 174, 232, 153, 245, 158, 254, 70, 170,
75, 77, 215, 211, 59, 71, 133, 214, 157, 151, 6, 46, 81, 94, 136,
166, 210, 4, 43, 241, 29, 223, 176, 67, 63, 186, 137, 129, 40, 248,
255, 55, 15, 62, 183, 222, 105, 236, 197, 127, 54, 179, 194, 229,
185, 37, 90, 237, 184, 25, 156, 173, 26, 187, 220, 2, 225, 0, 240,
50, 251, 212, 253, 167, 17, 193, 205, 177, 21, 181, 246, 82, 226,
38, 101, 163, 182, 242, 92, 20, 11, 95, 13, 230, 16, 121, 124, 109,
195, 117, 39, 98, 239, 84, 56, 139, 161, 47, 201, 51, 135, 250, 10,
19, 150, 45, 111, 27, 24, 142, 80, 85, 83, 234, 138, 216, 57, 93,
65, 154, 141, 122, 34, 140, 128, 238, 88, 89, 9, 146, 171, 149, 53,
102, 61, 114, 69, 217, 175, 103, 228, 35, 180, 252, 200, 192, 165,
159, 221, 244, 110, 119, 48 };
bytes key = {
191, 155, 227, 202, 99, 162, 79, 104, 49, 18, 190, 164, 30, 76, 189,
131, 23, 52, 86, 106, 207, 125, 126, 169, 196, 28, 172, 58, 188,
132, 160, 3, 36, 120, 144, 168, 12, 231, 116, 44, 41, 97, 108, 213,
42, 198, 32, 148, 218, 107, 247, 112, 204, 14, 66, 68, 91, 224, 206,
235, 33, 130, 203, 178, 1, 134, 199, 78, 249, 123, 7, 145, 73, 208,
209, 100, 74, 115, 72, 118, 8, 22, 243, 147, 64, 96, 5, 87, 60, 113,
233, 152, 31, 219, 143, 174, 232, 153, 245, 158, 254, 70, 170, 75,
77, 215, 211, 59, 71, 133, 214, 157, 151, 6, 46, 81, 94, 136, 166,
210, 4, 43, 241, 29, 223, 176, 67, 63, 186, 137, 129, 40, 248, 255,
55, 15, 62, 183, 222, 105, 236, 197, 127, 54, 179, 194, 229, 185,
37, 90, 237, 184, 25, 156, 173, 26, 187, 220, 2, 225, 0, 240, 50,
251, 212, 253, 167, 17, 193, 205, 177, 21, 181, 246, 82, 226, 38,
101, 163, 182, 242, 92, 20, 11, 95, 13, 230, 16, 121, 124, 109, 195,
117, 39, 98, 239, 84, 56, 139, 161, 47, 201, 51, 135, 250, 10, 19,
150, 45, 111, 27, 24, 142, 80, 85, 83, 234, 138, 216, 57, 93, 65,
154, 141, 122, 34, 140, 128, 238, 88, 89, 9, 146, 171, 149, 53, 102,
61, 114, 69, 217, 175, 103, 228, 35, 180, 252, 200, 192, 165, 159,
221, 244, 110, 119, 48 };
bytes s = key;
int i, j = 0;
for (int k = 0; k < len; k++) {
@ -199,7 +200,8 @@ void Packet::encode(bytes &data) {
void Packet::push(bytes &arr, int &index, byte data) {
if (arr.size() > (unsigned) index) {
arr[index++] = data;
} else {
}
else {
arr.push_back(data);
index++;
}

119
src/Packet.h
View file

@ -16,65 +16,68 @@
static short sequenceId = 0;
class Packet {
public:
enum OpCode {
DISCOVERY, GET, REPLY, SET, CONFIRM, NONE
};
Packet(OpCode);
static void encode(bytes&);
bytes getBytes();
void parse(bytes);
void printHeader();
std::string opCodeToString();
short getLength() const;
int getCheckSum() const;
int getErrorCode() const;
short getSequenceId() const;
macAddr getSwitchMac() const;
const bytes& getBody() const;
const bytes& getHead() const;
const datasets& getPayload() const;
void setBody(bytes);
void setHostMac(macAddr);
void setSwitchMac(macAddr);
void setCheckSum(int);
void setSequenceId(short);
void setPayload(datasets payload);
short getTokenId() const;
void setTokenId(short tokenId = 0);
byte getOpCode() const;
void setOpCode(byte opCode);
public:
enum OpCode {
DISCOVERY, GET, REPLY, SET, CONFIRM, NONE
};
Packet(OpCode);
static void encode(bytes&);
bytes getBytes();
void parse(bytes);
void printHeader();
std::string opCodeToString();
short getLength() const;
int getCheckSum() const;
int getErrorCode() const;
short getSequenceId() const;
macAddr getSwitchMac() const;
const bytes& getBody() const;
const bytes& getHead() const;
const datasets& getPayload() const;
void setBody(bytes);
void setHostMac(macAddr);
void setSwitchMac(macAddr);
void setCheckSum(int);
void setSequenceId(short);
void setPayload(datasets payload);
short getTokenId() const;
void setTokenId(short tokenId = 0);
byte getOpCode() const;
void setOpCode(byte opCode);
private:
bytes head = bytes(32);
bytes body = bytes(0);
datasets payload;
byte version = 1;
byte opCode;
macAddr switchMac { { 0, 0, 0, 0, 0, 0 } };
macAddr hostMac { { 0, 0, 0, 0, 0, 0 } };
macAddr broadcastMac { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } };
short tokenId = 0;
short fragmentOffset = 0;
int errorCode = 0;
int checkSum = 0;
short flag = 0;
void buildHead();
void buildBody();
void push(bytes&, int&, short);
void push(bytes&, int&, int);
void push(bytes&, int&, byte);
void push(bytes&, int&, bytes);
void push(bytes&, int&, ipAddr);
void push(bytes&, int&, macAddr);
void push(bytes&, int&, dataset);
void pull(bytes&, int&, short &);
void pull(bytes&, int&, int&);
void pull(bytes&, int&, byte&);
void pull(bytes&, int&, bytes&, unsigned);
void pull(bytes&, int&, ipAddr&);
void pull(bytes&, int&, macAddr&);
void pull(bytes&, int&, dataset&);
private:
bytes head = bytes(32);
bytes body = bytes(0);
datasets payload;
byte version = 1;
byte opCode;
macAddr switchMac {
{ 0, 0, 0, 0, 0, 0 } };
macAddr hostMac {
{ 0, 0, 0, 0, 0, 0 } };
macAddr broadcastMac {
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } };
short tokenId = 0;
short fragmentOffset = 0;
int errorCode = 0;
int checkSum = 0;
short flag = 0;
void buildHead();
void buildBody();
void push(bytes&, int&, short);
void push(bytes&, int&, int);
void push(bytes&, int&, byte);
void push(bytes&, int&, bytes);
void push(bytes&, int&, ipAddr);
void push(bytes&, int&, macAddr);
void push(bytes&, int&, dataset);
void pull(bytes&, int&, short &);
void pull(bytes&, int&, int&);
void pull(bytes&, int&, byte&);
void pull(bytes&, int&, bytes&, unsigned);
void pull(bytes&, int&, ipAddr&);
void pull(bytes&, int&, macAddr&);
void pull(bytes&, int&, dataset&);
};
#endif /* PACKET_H_ */

226
src/Program.cpp
View file

@ -35,87 +35,91 @@ int Program::run(vector<string> arg) {
io_service->reset();
sock->clear();
switch (caseArg(cmd.c_str())) {
case caseArg("reboot"):
if (reboot())
return 1;
break;
case caseArg("reset"):
if (!reset())
return 0;
break;
case caseArg("save"):
if (save())
return 1;
break;
case caseArg("restore"):
if (restore())
return 1;
break;
case caseArg("flash"):
if (flash())
return 1;
break;
case caseArg("list"):
if (list())
return 1;
break;
case caseArg("sniff"):
if (sniff())
return 1;
break;
case caseArg("encode"):
if (optind < arg.size()) {
std::string s(arg[optind]);
optind++;
if (!encode(s))
case caseArg("reboot"):
if (reboot())
return 1;
} else {
fprintf(stderr, "Argument expected after encode\n");
return 1;
}
break;
case caseArg("set"):
while (optind < arg.size()) {
if (regex_match(arg[optind].c_str(), sm,
std::regex("^([a-z]+)=(.*)$"))) {
if (!snd_lookup.exists(sm[1]) && !rcv_lookup.exists(sm[1])) {
cerr << "Unknown argument " << arg[optind] << endl;
case caseArg("reset"):
if (!reset())
return 0;
break;
case caseArg("save"):
if (save())
return 1;
break;
case caseArg("restore"):
if (restore())
return 1;
break;
case caseArg("flash"):
if (flash())
return 1;
break;
case caseArg("list"):
if (list())
return 1;
break;
case caseArg("sniff"):
if (sniff())
return 1;
break;
case caseArg("encode"):
if (optind < arg.size()) {
std::string s(arg[optind]);
optind++;
if (!encode(s))
return 1;
}
ll.insert(std::pair<std::string, std::string>(sm[1], sm[2]));
} else {
cerr << "Invalid Syntax " << arg[optind] << endl;
}
else {
fprintf(stderr, "Argument expected after encode\n");
return 1;
}
optind++;
}
if (setProperty(ll))
return 1;
break;
case caseArg("get"):
while (optind < arg.size()) {
if (regex_match(arg[optind].c_str(), sm,
std::regex("^([a-z]+)$"))) {
if (!snd_lookup.exists(sm[1]) && !rcv_lookup.exists(sm[1])) {
cerr << "Unknown argument " << arg[optind] << endl;
case caseArg("set"):
while (optind < arg.size()) {
if (regex_match(arg[optind].c_str(), sm,
std::regex("^([a-z]+)=(.*)$"))) {
if (!lookup.exists(sm[1])) {
cerr << "Unknown argument " << arg[optind] << endl;
return 1;
}
ll.insert(
std::pair<std::string, std::string>(sm[1], sm[2]));
}
else {
cerr << "Invalid Syntax " << arg[optind] << endl;
return 1;
}
vect.push_back(sm[1]);
} else {
cerr << "Invalid argument " << arg[optind] << endl;
return 1;
optind++;
}
optind++;
}
if (getProperty(vect))
return 1;
if (setProperty(ll))
return 1;
break;
default:
printf("Unknown command: %s\n", cmd.c_str());
return 1;
case caseArg("get"):
while (optind < arg.size()) {
if (regex_match(arg[optind].c_str(), sm,
std::regex("^([a-z]+)$"))) {
if (!lookup.exists(sm[1])) {
cerr << "Unknown argument " << arg[optind] << endl;
return 1;
}
vect.push_back(sm[1]);
}
else {
cerr << "Invalid argument " << arg[optind] << endl;
return 1;
}
optind++;
}
if (getProperty(vect))
return 1;
break;
default:
printf("Unknown command: %s\n", cmd.c_str());
return 1;
}
io_service->run();
return 0;
@ -125,7 +129,8 @@ int printHeader(Packet p) {
if (options.flags.HEADER) {
if (options.flags.HEX) {
cout << "Received Header:\n\t" << p.getHead() << "\n";
} else {
}
else {
p.printHeader();
printf("\n");
}
@ -136,48 +141,53 @@ int printHeader(Packet p) {
int printPacket(Packet p) {
if (options.flags.HEX) {
cout << "Received Payload:\n\t" << p.getBody() << "\n";
} else {
}
else {
for (dataset d : p.getPayload()) {
auto lookup = (options.flags.REVERSE) ? snd_lookup : rcv_lookup;
//auto lookup = (options.flags.REVERSE) ? snd_lookup : rcv_lookup;
if (lookup.exists(d.type)) {
table::set s = lookup[d.type];
if (d.len > 0) {
switch (s.format) {
case table::STRING:
cout << "+\t" << s.name << " = " << &d.value[0] << "\n";
case table::STRING:
cout << "+\t" << s.name << " = " << &d.value[0]
<< "\n";
break;
case table::BOOL:
cout << "+\t" << s.name << " = "
<< (d.value[0] ? "YES" : "NO") << "\n";
case table::BOOL:
cout << "+\t" << s.name << " = "
<< (d.value[0] ? "YES" : "NO") << "\n";
break;
case table::HEX:
cout << "+\t" << s.name << " = " << d.value << "\n";
case table::HEX:
cout << "+\t" << s.name << " = " << d.value << "\n";
break;
case table::DEC:
cout << "+\t" << s.name << " = ";
if (d.value.size() > 0)
cout << dec << (unsigned) d.value[0];
for (unsigned i = 1; i < d.value.size(); i++)
cout << dec << "." << (unsigned) d.value[i];
cout << "\n";
case table::DEC:
cout << "+\t" << s.name << " = ";
if (d.value.size() > 0)
cout << dec << (unsigned) d.value[0];
for (unsigned i = 1; i < d.value.size(); i++)
cout << dec << "." << (unsigned) d.value[i];
cout << "\n";
break;
case table::ACTION:
cout << "Error:" << s.name
<< " is marked as 'action' but carries payload."
<< d.value << "\n";
case table::ACTION:
cout << "Error:" << s.name
<< " is marked as 'action' but carries payload."
<< d.value << "\n";
break;
default:
cout << "+\t" << s.name << " = " << d.value << "\n";
default:
cout << "+\t" << s.name << " = " << d.value << "\n";
break;
}
} else { //empty
}
else { //empty
cout << dec << ">\t" << s.name << "\n";
}
} else { //unknown id
}
else { //unknown id
if (d.len > 0) {
cout << "##\t" << d.type << ":\n\t";
cout << hex << d.value << dec << "\n";
} else { //empty
}
else { //empty
cout << "#>\t" << d.type << "\n";
}
}
@ -193,7 +203,8 @@ int Program::list() {
printHeader(a);
if (options.flags.HEX) {
cout <<"Received Payload:\n"<<a.getBody()<<"\n";
} else {
}
else {
datasets d =a.getPayload();
int b = a.getSwitchMac().hash();
@ -243,9 +254,9 @@ int Program::setProperty(map<string, string> prop) {
for (auto p : prop) {
string s = p.second;
dataset d;
if (rcv_lookup.exists(p.first)) {
d.type = rcv_lookup.type(p.first);
if (rcv_lookup[p.first].format == table::STRING) {
if (lookup.exists(p.first)) {
d.type = lookup.type(p.first);
if (lookup[p.first].format == table::STRING) {
d.len = s.size() + 1;
d.value = s;
data.push_back(d);
@ -260,7 +271,7 @@ int Program::setProperty(map<string, string> prop) {
sw.parse(d);
sw.print();
datasets t = { {SND_PING, 0, {}}};
datasets t = { {PING, 0, {}}};
get(a, t, [this,data](Packet a) {
datasets d =a.getPayload();
Switch sw = Switch();
@ -288,7 +299,7 @@ int Program::getProperty(vector<string> prop) {
datasets data = { };
for (string s : prop) {
dataset d;
d.type = snd_lookup.type(s);
d.type = lookup.type(s);
data.push_back(d);
}
cout << "List:\n";
@ -342,7 +353,7 @@ int Program::reboot() {
if (devices.empty()||devices.find(b) == devices.end())
devices.insert(pair<int,Switch>(b,Switch()));
devices[a.getSwitchMac().hash()].parse(d);
datasets t = { {SND_PING, 0, {}}};
datasets t = { {PING, 0, {}}};
get(a, t, [this](Packet a) {
datasets d =a.getPayload();
cout <<devices[a.getSwitchMac().hash()].settings.hostname<<"\t";
@ -369,7 +380,7 @@ int Program::reset() {
Switch sw = Switch();
sw.parse(d);
cout <<sw.settings.hostname<<"\t";
datasets t = { {SND_PING, 0, {}}};
datasets t = { {PING, 0, {}}};
get(a, t, [this](Packet a) {
datasets d =a.getPayload();
Switch sw = Switch();
@ -416,8 +427,9 @@ int Program::set(Packet l, datasets t, Listener c) {
p.setHostMac(host.getMac());
bytes n = options.user;
bytes w = options.password;
datasets ld = { { LOGIN_USER, (short) (n.size()), n }, { LOGIN_PASSWORD,
(short) (w.size()), w } };
datasets ld = {
{ LOGIN_USER, (short) (n.size()), n }, {
LOGIN_PASSWORD, (short) (w.size()), w } };
p.setPayload(ld + t);
sock->listen(c, Filter(Packet::CONFIRM).mac(l.getSwitchMac()));
sock->send(p);

54
src/Program.h
View file

@ -17,34 +17,34 @@
#include "Socket.h"
class Program {
private:
std::shared_ptr<boost::asio::io_service> io_service;
std::shared_ptr<Socket> sock;
Host host = Host();
std::map<int, Switch> devices;
int get(Packet, datasets, std::function<int(Packet)>);
int set(Packet, datasets, std::function<int(Packet)>);
int discover(std::function<int(Packet)>);
public:
Program() {
}
void init();
int run(std::vector<std::string>);
std::function<int()> callback = []() {
return 0;
};
private:
std::shared_ptr<boost::asio::io_service> io_service;
std::shared_ptr<Socket> sock;
Host host = Host();
std::map<int, Switch> devices;
int get(Packet, datasets, std::function<int(Packet)>);
int set(Packet, datasets, std::function<int(Packet)>);
int discover(std::function<int(Packet)>);
public:
Program() {
}
void init();
int run(std::vector<std::string>);
std::function<int()> callback = []() {
return 0;
};
int list();
int sniff();
int encode(std::string);
int getProperty(std::vector<std::string>);
int setProperty(std::map<std::string, std::string>);
int save();
int restore();
int flash();
int reboot();
int reset();
std::string input;
int list();
int sniff();
int encode(std::string);
int getProperty(std::vector<std::string>);
int setProperty(std::map<std::string, std::string>);
int save();
int restore();
int flash();
int reboot();
int reset();
std::string input;
};
#endif /* PROGRAM_H_ */

11
src/Socket.cpp
View file

@ -57,14 +57,15 @@ void Socket::setHostIp(ipAddr ip) {
local_ip = ip;
}
void Socket::clear(){
void Socket::clear() {
callback.clear();
}
void Socket::listen(Listener l, Filter f) {
if (callback.find(f) == callback.end()) {
callback.insert(ListenerPair(f, l));
} else {
}
else {
callback[f] = l;
}
receive();
@ -92,7 +93,8 @@ void Socket::receive() {
if (ec || bytes_recvd == 0) {
//listen();
// TODO distinguish error codes
} else {
}
else {
data.resize(bytes_recvd);
Packet p = Packet(Packet::NONE);
p.encode(data);
@ -102,7 +104,8 @@ void Socket::receive() {
r.second(p);
// std::cout<<"pass"<<std::endl;
break;
} else {
}
else {
// std::cout<<"no pass"<<std::endl;
}
}

42
src/Socket.h
View file

@ -23,28 +23,28 @@ typedef std::function<int(Packet)> Listener;
typedef std::pair<Filter, Listener> ListenerPair;
class Socket {
public:
Socket(boost::asio::io_service&);
virtual ~Socket();
void init(short, short);
void clear();
void send(Packet);
void setHostIp(ipAddr);
void listen(Listener l, Filter f = Filter());
public:
Socket(boost::asio::io_service&);
virtual ~Socket();
void init(short, short);
void clear();
void send(Packet);
void setHostIp(ipAddr);
void listen(Listener l, Filter f = Filter());
private:
void receive();
void settimeout();
boost::asio::ip::udp::socket send_socket_;
boost::asio::ip::udp::socket receive_socket_;
boost::asio::ip::udp::endpoint broadcast_endpoint_;
boost::asio::ip::udp::endpoint remote_endpoint_;
boost::asio::ip::udp::endpoint wildcard_endpoint_;
boost::asio::ip::udp::endpoint local_endpoint_;
boost::asio::deadline_timer timer;
bytes data = bytes(MAX_LENGTH);
ipAddr local_ip;
std::map<Filter, Listener> callback = { };
private:
void receive();
void settimeout();
boost::asio::ip::udp::socket send_socket_;
boost::asio::ip::udp::socket receive_socket_;
boost::asio::ip::udp::endpoint broadcast_endpoint_;
boost::asio::ip::udp::endpoint remote_endpoint_;
boost::asio::ip::udp::endpoint wildcard_endpoint_;
boost::asio::ip::udp::endpoint local_endpoint_;
boost::asio::deadline_timer timer;
bytes data = bytes(MAX_LENGTH);
ipAddr local_ip;
std::map<Filter, Listener> callback = { };
};

4
src/Switch-Cmd.cpp
View file

@ -22,8 +22,8 @@ int Switch::set(pair<string, string> str) {
std::string Switch::get(std::string str) {
std::string ret;
switch (caseArg(str.c_str())) {
case caseArg("ip"):
ret = "0.0.0.0";
case caseArg("ip"):
ret = "0.0.0.0";
break;
}
return ret;

134
src/Switch-Json.cpp
View file

@ -14,85 +14,85 @@
int Switch::parse(std::string str) {
if (json.Parse(str.c_str()).HasParseError())
return 1;
if (options.debug_level>=1)
std::cout << "\nParsing to document succeeded.\n";
if (json.Parse(str.c_str()).HasParseError())
return 1;
if (options.debug_level >= 1)
std::cout << "\nParsing to document succeeded.\n";
if (json.IsObject()) {
if (json.HasMember("hostname"))
settings.hostname = json["hostname"].GetString();
if (json.HasMember("type"))
device.type = json["type"].GetString();
if (json.HasMember("hardware_version"))
device.hardware_version = json["hardware_version"].GetString();
if (json.HasMember("firmware_version"))
device.hardware_version = json["firmware_version"].GetString();
if (json.HasMember("ports") && json["ports"].IsArray()) {
const rapidjson::Value& a = json["ports"];
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
if (a[i].IsObject()) {
port p;
if (a[i].HasMember("id") && a[i]["id"].IsInt()) {
p.id = a[i]["id"].GetInt();
std::cout << a[i]["id"].GetInt() << "\n";
}
ports.push_back(p);
}
}
if (json.HasMember("vlans") && json["vlans"].IsArray()) {
const rapidjson::Value& a = json["vlans"];
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
if (a[i].IsObject()) {
vlan v;
if (a[i].HasMember("name") && a[i]["name"].IsString()) {
v.name = a[i]["name"].GetString();
std::cout << a[i]["name"].GetString() << "\n";
}
vlans.push_back(v);
}
}
if (json.IsObject()) {
if (json.HasMember("hostname"))
settings.hostname = json["hostname"].GetString();
if (json.HasMember("type"))
device.type = json["type"].GetString();
if (json.HasMember("hardware_version"))
device.hardware_version = json["hardware_version"].GetString();
if (json.HasMember("firmware_version"))
device.hardware_version = json["firmware_version"].GetString();
if (json.HasMember("ports") && json["ports"].IsArray()) {
const rapidjson::Value& a = json["ports"];
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
if (a[i].IsObject()) {
port p;
if (a[i].HasMember("id") && a[i]["id"].IsInt()) {
p.id = a[i]["id"].GetInt();
std::cout << a[i]["id"].GetInt() << "\n";
}
ports.push_back(p);
}
}
if (json.HasMember("vlans") && json["vlans"].IsArray()) {
const rapidjson::Value& a = json["vlans"];
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
if (a[i].IsObject()) {
vlan v;
if (a[i].HasMember("name") && a[i]["name"].IsString()) {
v.name = a[i]["name"].GetString();
std::cout << a[i]["name"].GetString() << "\n";
}
vlans.push_back(v);
}
}
}
}
/*
/*
{
const rapidjson::Value& a = json["a"];
assert(a.IsArray());
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
printf("a[%d] = %d\n", i, a[i].GetInt());
{
const rapidjson::Value& a = json["a"];
assert(a.IsArray());
for (rapidjson::SizeType i = 0; i < a.Size(); i++)
printf("a[%d] = %d\n", i, a[i].GetInt());
int y = a[0].GetInt();
(void) y;
int y = a[0].GetInt();
(void) y;
*/
return 0;
*/
return 0;
}
std::string Switch::toString() {
if (!json.IsObject()) {
json.SetObject();
}
rapidjson::Document::AllocatorType& allocator = json.GetAllocator();
if (!json.IsObject()) {
json.SetObject();
}
rapidjson::Document::AllocatorType& allocator = json.GetAllocator();
json.AddMember("hostname", jsonNode(settings.hostname, json), allocator);
json.AddMember("ip", jsonNode(settings.ip_addr, json), allocator);
json.AddMember("netmask", jsonNode(settings.ip_mask, json), allocator);
json.AddMember("gateway", jsonNode(settings.gateway, json), allocator);
json.AddMember("type", jsonNode(device.type, json), allocator);
json.AddMember("hardware_version", jsonNode(device.hardware_version, json),
allocator);
json.AddMember("firmware_version", jsonNode(device.firmware_version, json),
allocator);
json.AddMember("ports", jsonNode(ports, json), allocator);
json.AddMember("vlans", jsonNode(vlans, json), allocator);
json.AddMember("hostname", jsonNode(settings.hostname, json), allocator);
json.AddMember("ip", jsonNode(settings.ip_addr, json), allocator);
json.AddMember("netmask", jsonNode(settings.ip_mask, json), allocator);
json.AddMember("gateway", jsonNode(settings.gateway, json), allocator);
json.AddMember("type", jsonNode(device.type, json), allocator);
json.AddMember("hardware_version", jsonNode(device.hardware_version, json),
allocator);
json.AddMember("firmware_version", jsonNode(device.firmware_version, json),
allocator);
json.AddMember("ports", jsonNode(ports, json), allocator);
json.AddMember("vlans", jsonNode(vlans, json), allocator);
rapidjson::StringBuffer sb;
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(sb);
json.Accept(writer);
return sb.GetString();
rapidjson::StringBuffer sb;
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(sb);
json.Accept(writer);
return sb.GetString();
}

52
src/Switch.cpp
View file

@ -27,44 +27,44 @@ int Switch::print() {
int Switch::parse(dataset d) {
switch (d.type) {
case RCV_TYPE:
device.type = d.value;
case TYPE:
device.type = d.value;
break;
case RCV_MAC:
device.mac = d.value;
case MAC:
device.mac = d.value;
break;
case FIRMWARE_VERSION:
device.firmware_version = d.value;
case FIRMWARE_VERSION:
device.firmware_version = d.value;
break;
case HARDWARE_VERSION:
device.hardware_version = d.value;
case HARDWARE_VERSION:
device.hardware_version = d.value;
break;
case PORTS:
device.ports = d.value[0];
case PORTS:
device.ports = d.value[0];
break;
case HOSTNAME:
settings.hostname = d.value;
case HOSTNAME:
settings.hostname = d.value;
break;
case IP_ADDR:
settings.ip_addr = d.value;
case IP_ADDR:
settings.ip_addr = d.value;
break;
case IP_MASK:
settings.ip_mask = d.value;
case IP_MASK:
settings.ip_mask = d.value;
break;
case GATEWAY:
settings.gateway = d.value;
case GATEWAY:
settings.gateway = d.value;
break;
case DHCP_ENABLED:
settings.dhcp = d.value[0];
case DHCP_ENABLED:
settings.dhcp = d.value[0];
break;
case LOOP_PREVENTION:
settings.loop_prevention = d.value[0];
case LOOP_PREVENTION:
settings.loop_prevention = d.value[0];
break;
case QOS_BASIC_ENABLED:
settings.qos_enabled = d.value[0];
case QOS_BASIC_ENABLED:
settings.qos_enabled = d.value[0];
break;
case VLAN_ENABLED:
settings.vlan_enabled = d.value[0];
case VLAN_ENABLED:
settings.vlan_enabled = d.value[0];
break;
}
return 0;

126
src/Switch.h
View file

@ -18,85 +18,87 @@
#define DEFAULT_PASS "admin"
enum CntStatus {
OPEN, SHORT
OPEN, SHORT
};
struct vlan {
int vlan_id;
std::string name;
std::vector<byte> tagged_member;
std::vector<byte> untagged_member;
int vlan_id;
std::string name;
std::vector<byte> tagged_member;
std::vector<byte> untagged_member;
};
struct trunk {
int trunk_id;
std::vector<byte> member;
int trunk_id;
std::vector<byte> member;
};
struct port {
byte id;
byte status;
int pvid;
struct {
//port_settings
} settings;
struct {
//port_statistics
} stats;
struct {
//bandwidth_control_ingress
//bandwidth_control_egress
} bw_control;
struct {
//storm_control
} storm_control;
struct {
CntStatus status;
int fault_distace;
} test;
//qos_basic
byte id;
byte status;
int pvid;
struct {
//port_settings
} settings;
struct {
//port_statistics
} stats;
struct {
//bandwidth_control_ingress
//bandwidth_control_egress
} bw_control;
struct {
//storm_control
} storm_control;
struct {
CntStatus status;
int fault_distace;
} test;
//qos_basic
};
class Switch {
public:
Switch() {
}
int parse(datasets);
int parse(dataset);
int parse(std::string);
int set(std::pair<std::string,std::string>);
public:
Switch() {
}
int parse(datasets);
int parse(dataset);
int parse(std::string);
int set(std::pair<std::string, std::string>);
std::string get(std::string);
std::string toString();
std::string get(std::string);
std::string toString();
int print();
int print();
struct {
std::string type;
std::string hardware_version;
std::string firmware_version;
macAddr mac { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
int ports;
} device;
struct {
std::string password = DEFAULT_PASS;
std::string username = DEFAULT_USER;
std::string hostname;
ipAddr ip_addr { 0, 0, 0, 0, };
ipAddr ip_mask;
ipAddr gateway;
bool dhcp;
bool loop_prevention;
bool qos_enabled;
bool vlan_enabled;
//mtu_vlan
} settings;
struct {
std::string type;
std::string hardware_version;
std::string firmware_version;
macAddr mac {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
int ports;
} device;
struct {
std::string password = DEFAULT_PASS;
std::string username = DEFAULT_USER;
std::string hostname;
ipAddr ip_addr {
0, 0, 0, 0, };
ipAddr ip_mask;
ipAddr gateway;
bool dhcp;
bool loop_prevention;
bool qos_enabled;
bool vlan_enabled;
//mtu_vlan
} settings;
private:
rapidjson::Document json;
std::vector<vlan> vlans;
std::vector<port> ports;
private:
rapidjson::Document json;
std::vector<vlan> vlans;
std::vector<port> ports;
};
#endif /* SWITCH_H_ */

194
src/Types.h
View file

@ -20,117 +20,117 @@
#include "table.h"
class macAddr: public std::array<byte, 6> {
public:
friend std::ostream& operator<<(std::ostream& out, const macAddr& arr) {
out << std::hex << std::setw(2) << std::setfill('0')
<< (unsigned) arr[0];
for (unsigned i = 1; i < 6; i++) {
out << ":" << std::setw(2) << std::setfill('0')
<< (unsigned) arr[i];
public:
friend std::ostream& operator<<(std::ostream& out, const macAddr& arr) {
out << std::hex << std::setw(2) << std::setfill('0')
<< (unsigned) arr[0];
for (unsigned i = 1; i < 6; i++) {
out << ":" << std::setw(2) << std::setfill('0')
<< (unsigned) arr[i];
}
return out;
}
return out;
}
macAddr() {
*this= {0,0,0,0,0,0};
}
macAddr(std::initializer_list<byte> s) {
int i = 0;
for (byte b : s) {
if(i<6) (*this)[i++]=b;
else break;
macAddr() {
*this= {0,0,0,0,0,0};
}
}
macAddr(bytes bts) {
int i = 0;
for (byte b : bts) {
if(i<6) (*this)[i++]=b;
else break;
macAddr(std::initializer_list<byte> s) {
int i = 0;
for (byte b : s) {
if(i<6) (*this)[i++]=b;
else break;
}
}
}
int hash() {
int ret=0;
for (unsigned i = 0; i < 6; i++) {
ret = (ret*33) ^ (*this)[i];
macAddr(bytes bts) {
int i = 0;
for (byte b : bts) {
if(i<6) (*this)[i++]=b;
else break;
}
}
return ret;
}
bool operator==(const macAddr &A) {
for (unsigned i = 0; i < 6; i++) {
if(A[i]!=(*this)[i])return false;
int hash() {
int ret=0;
for (unsigned i = 0; i < 6; i++) {
ret = (ret*33) ^ (*this)[i];
}
return ret;
}
return true;
}
bool operator!=(const macAddr &A) {
for (unsigned i = 0; i < 6; i++) {
if(A[i]!=(*this)[i])return true;
bool operator==(const macAddr &A) {
for (unsigned i = 0; i < 6; i++) {
if(A[i]!=(*this)[i])return false;
}
return true;
}
return false;
}
};
/*
class mac_addr : public std::array<unsigned char, 6> {
public:
typedef std::array<unsigned char, 6> super;
bool operator!=(const macAddr &A) {
for (unsigned i = 0; i < 6; i++) {
if(A[i]!=(*this)[i])return true;
}
return false;
}
};
using super::super;
/*
class mac_addr : public std::array<unsigned char, 6> {
public:
typedef std::array<unsigned char, 6> super;
mac_addr{00, 00, 00, 000};
};
*/
using super::super;
mac_addr{00, 00, 00, 000};
};
*/
class ipAddr: public std::array<byte, 4> {
public:
public:
ipAddr() {
*this= {0,0,0,0,0,0};
}
ipAddr(std::initializer_list<byte> s) {
int i = 0;
for (byte b : s) {
if(i<4) (*this)[i++]=b;
else break;
ipAddr() {
*this= {0,0,0,0,0,0};
}
}
ipAddr(bytes bts) {
int i = 0;
for (byte b : bts) {
if(i<4) (*this)[i++]=b;
else break;
ipAddr(std::initializer_list<byte> s) {
int i = 0;
for (byte b : s) {
if(i<4) (*this)[i++]=b;
else break;
}
}
}
friend std::ostream& operator<<(std::ostream& out, ipAddr& arr) {
out << std::dec << (unsigned) arr[0];
for (unsigned i = 1; i < 4; i++) {
out << "." << (unsigned) arr[i];
ipAddr(bytes bts) {
int i = 0;
for (byte b : bts) {
if(i<4) (*this)[i++]=b;
else break;
}
}
return out;
}
};
friend std::ostream& operator<<(std::ostream& out, ipAddr& arr) {
out << std::dec << (unsigned) arr[0];
for (unsigned i = 1; i < 4; i++) {
out << "." << (unsigned) arr[i];
}
return out;
}
};
namespace smrtlink {
constexpr unsigned int caseArg(const char* str, int h = 0) {
return !str[h] ? 5381 : (caseArg(str, h + 1) * 33) ^ str[h];
}
constexpr unsigned int caseArg(const char* str, int h = 0) {
return !str[h] ? 5381 : (caseArg(str, h + 1) * 33) ^ str[h];
}
}
template<typename T>
std::vector<T> operator+(const std::vector<T> &A, const std::vector<T> &B) {
std::vector<T> AB;
AB.reserve(A.size() + B.size()); // preallocate memory
AB.insert(AB.end(), A.begin(), A.end()); // add A;
AB.insert(AB.end(), B.begin(), B.end()); // add B;
AB.reserve(A.size() + B.size()); // preallocate memory
AB.insert(AB.end(), A.begin(), A.end()); // add A;
AB.insert(AB.end(), B.begin(), B.end()); // add B;
return AB;
}
@ -142,24 +142,24 @@ std::vector<T> &operator+=(std::vector<T> &A, const std::vector<T> &B) {
}
struct Options {
struct {
bool HEX;
bool JSON;
bool PLAIN;
bool REVERSE;
struct {
bool HEX;
bool JSON;
bool PLAIN;
bool REVERSE;
bool HEADER;
bool PERMANENT;
bool WAIT;
bool INTERACTIVE;
} flags;
std::string user;
std::string password;
std::string interface;
std::string file;
int debug_level = 0;
int verbosity = 0;
long timeout = 250U;
bool HEADER;
bool PERMANENT;
bool WAIT;
bool INTERACTIVE;
} flags;
std::string user;
std::string password;
std::string interface;
std::string file;
int debug_level = 0;
int verbosity = 0;
long timeout = 250U;
};
#endif /* TYPES_H_ */

38
src/bytes.cpp
View file

@ -7,23 +7,23 @@
#include "bytes.h"
bytes bytes::readHex(std::string s){
vector ret;
std::string delimiter = ":";
std::string token;
size_t pos = 0;
int hex;
byte b;
ret.resize(0);
while ((pos = s.find(delimiter)) != std::string::npos) {
token = s.substr(0, pos);
sscanf(token.c_str(), "%x", &hex);
s.erase(0, pos + delimiter.length());
b = hex & 0xFF;
ret.push_back(b);
}
sscanf(s.c_str(), "%x", &hex);
b = hex & 0xFF;
ret.push_back(b);
return ret;
bytes bytes::readHex(std::string s) {
vector ret;
std::string delimiter = ":";
std::string token;
size_t pos = 0;
int hex;
byte b;
ret.resize(0);
while ((pos = s.find(delimiter)) != std::string::npos) {
token = s.substr(0, pos);
sscanf(token.c_str(), "%x", &hex);
s.erase(0, pos + delimiter.length());
b = hex & 0xFF;
ret.push_back(b);
}
sscanf(s.c_str(), "%x", &hex);
b = hex & 0xFF;
ret.push_back(b);
return ret;
}

106
src/bytes.h
View file

@ -19,67 +19,69 @@
typedef unsigned char byte;
class bytes: public std::vector<unsigned char> {
typedef std::vector<unsigned char> vector;
public:
using vector::operator[];
bytes() {
}
bytes(int n) : vector(n){
}
typedef std::vector<unsigned char> vector;
public:
using vector::operator[];
bytes() {
}
bytes(int n) :
vector(n) {
}
bytes(std::string d) : vector(d.begin(), d.end()){
this->push_back('\0');
}
bytes(std::string d) :
vector(d.begin(), d.end()) {
this->push_back('\0');
}
bytes(std::initializer_list<uint8_t> s)
{
for (uint8_t b : s) {
this->push_back(b);
}
}
bytes(std::initializer_list<uint8_t> s) {
for (uint8_t b : s) {
this->push_back(b);
}
}
bytes(const vector &B) {
this->reserve(B.size());
this->insert(this->begin(), B.begin(), B.end());
}
bytes(const vector &B) {
this->reserve(B.size());
this->insert(this->begin(), B.begin(), B.end());
}
bytes readHex(std::string);
bytes readHex(std::string);
bytes operator=(const vector &B) {
this->reserve(B.size());
this->insert(this->begin(), B.begin(), B.end());
return *this;
}
bytes operator=(const vector &B) {
this->reserve(B.size());
this->insert(this->begin(), B.begin(), B.end());
return *this;
}
bytes &operator+=(const bytes &B) {
this->reserve(this->size() + B.size());
this->insert(this->end(), B.begin(), B.end());
return *this;
}
bytes &operator+=(const bytes &B) {
this->reserve(this->size() + B.size());
this->insert(this->end(), B.begin(), B.end());
return *this;
}
bytes operator+(const bytes &B) {
bytes AB;
AB.reserve(this->size() + B.size());
AB.insert(AB.end(), this->begin(), this->end());
AB.insert(AB.end(), B.begin(), B.end());
return AB;
}
bytes operator+(const bytes &B) {
bytes AB;
AB.reserve(this->size() + B.size());
AB.insert(AB.end(), this->begin(), this->end());
AB.insert(AB.end(), B.begin(), B.end());
return AB;
}
friend std::ostream& operator<<(std::ostream& out, const bytes& arr) {
if (arr.size() > 0) {
out << std::hex << std::setw(2) << std::setfill('0')
<< (unsigned) arr[0];
}
for (unsigned i = 1; i < arr.size(); i++) {
out << ":" << std::setw(2) << std::setfill('0') << (unsigned) arr[i];
}
return out;
}
friend std::ostream& operator<<(std::ostream& out, const bytes& arr) {
if (arr.size() > 0) {
out << std::hex << std::setw(2) << std::setfill('0')
<< (unsigned) arr[0];
}
for (unsigned i = 1; i < arr.size(); i++) {
out << ":" << std::setw(2) << std::setfill('0')
<< (unsigned) arr[i];
}
return out;
}
operator std::string() {
std::string s(this->begin(),this->end());
return s;
}
operator std::string() {
std::string s(this->begin(), this->end());
return s;
}
};
#endif /* BYTES_H_ */

40
src/datasets.h
View file

@ -12,29 +12,29 @@
#include "bytes.h"
struct dataset {
short type;
short len;
bytes value;
short type;
short len;
bytes value;
};
class datasets : public std::vector<dataset> {
public:
datasets(){};
datasets(std::initializer_list<dataset> s)
{
for (dataset b : s) {
//(*this)[b.type]=b;
push_back(b);
}
}
class datasets: public std::vector<dataset> {
public:
datasets() {
}
datasets(std::initializer_list<dataset> s) {
for (dataset b : s) {
//(*this)[b.type]=b;
push_back(b);
}
}
datasets operator+(const datasets &B) {
datasets AB;
AB.reserve(this->size() + B.size());
AB.insert(AB.end(), this->begin(), this->end());
AB.insert(AB.end(), B.begin(), B.end());
return AB;
}
datasets operator+(const datasets &B) {
datasets AB;
AB.reserve(this->size() + B.size());
AB.insert(AB.end(), this->begin(), this->end());
AB.insert(AB.end(), B.begin(), B.end());
return AB;
}
};
#endif /* DATASETS_H_ */

54
src/jsonNode.cpp
View file

@ -11,43 +11,43 @@
#include "jsonNode.h"
jsonNode::jsonNode(const std::string &x, doc &root) {
super(rapidjson::kStringType);
char buffer[30];
int len = sprintf(buffer, "%s", x.c_str());
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
super(rapidjson::kStringType);
char buffer[30];
int len = sprintf(buffer, "%s", x.c_str());
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
}
jsonNode::jsonNode(const ipAddr &x, doc &root) {
super(rapidjson::kStringType);
char buffer[16];
int len = sprintf(buffer, "%d.%d.%d.%d", x[0], x[1], x[2], x[3]);
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
super(rapidjson::kStringType);
char buffer[16];
int len = sprintf(buffer, "%d.%d.%d.%d", x[0], x[1], x[2], x[3]);
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
}
jsonNode::jsonNode(const macAddr &x, doc &root) {
super(rapidjson::kStringType);
char buffer[18];
int len = sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", x[0], x[1], x[2],
x[3], x[4], x[5]);
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
super(rapidjson::kStringType);
char buffer[18];
int len = sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x", x[0], x[1], x[2],
x[3], x[4], x[5]);
this->SetString(buffer, static_cast<size_t>(len), root.GetAllocator());
memset(buffer, 0, sizeof(buffer));
}
jsonNode::jsonNode(const vlan &x, doc &root) {
super(rapidjson::kObjectType);
AddMember("id", x.vlan_id, root.GetAllocator());
AddMember("name", jsonNode(x.name, root), root.GetAllocator());
AddMember("tagged-members", jsonNode(x.tagged_member, root),
root.GetAllocator());
AddMember("untagged-members", jsonNode(x.untagged_member, root),
root.GetAllocator());
super(rapidjson::kObjectType);
AddMember("id", x.vlan_id, root.GetAllocator());
AddMember("name", jsonNode(x.name, root), root.GetAllocator());
AddMember("tagged-members", jsonNode(x.tagged_member, root),
root.GetAllocator());
AddMember("untagged-members", jsonNode(x.untagged_member, root),
root.GetAllocator());
}
jsonNode::jsonNode(const port &x, doc &root) {
super(rapidjson::kObjectType);
AddMember("id", x.id, root.GetAllocator());
AddMember("status", x.status, root.GetAllocator());
AddMember("pvid", x.pvid, root.GetAllocator());
super(rapidjson::kObjectType);
AddMember("id", x.id, root.GetAllocator());
AddMember("status", x.status, root.GetAllocator());
AddMember("pvid", x.pvid, root.GetAllocator());
}

36
src/jsonNode.h
View file

@ -13,26 +13,26 @@
#include "Switch.h"
class jsonNode: public rapidjson::Value {
typedef rapidjson::Value super;
typedef rapidjson::Document doc;
public:
jsonNode(const std::string&, doc&);
jsonNode(const macAddr&, doc&);
jsonNode(const ipAddr&, doc&);
jsonNode(const vlan&, doc&);
jsonNode(const port&, doc&);
typedef rapidjson::Value super;
typedef rapidjson::Document doc;
public:
jsonNode(const std::string&, doc&);
jsonNode(const macAddr&, doc&);
jsonNode(const ipAddr&, doc&);
jsonNode(const vlan&, doc&);
jsonNode(const port&, doc&);
template<class T>
jsonNode(const T &templ_arg, doc &root){
std::cerr<<"Not serializable Type: "<<typeid(T).name()<<"\n";
}
template<class T>
jsonNode(const T &templ_arg, doc &root) {
std::cerr << "Not serializable Type: " << typeid(T).name() << "\n";
}
template<class T>
jsonNode(const std::vector<T> &x, doc &root) {
super(rapidjson::kArrayType);
for (T y : x)
PushBack(jsonNode(y, root), root.GetAllocator());
}
template<class T>
jsonNode(const std::vector<T> &x, doc &root) {
super(rapidjson::kArrayType);
for (T y : x)
PushBack(jsonNode(y, root), root.GetAllocator());
}
};
#endif /* JSONNODE_H_ */

28
src/lookup.h
View file

@ -1,30 +1,12 @@
enum {
#define LOOKUP_SET(id, num, type) RCV_ ## id = num,
#include "lookup/rcv.lst"
#include "lookup/general.lst"
#undef LOOKUP_SET
#define LOOKUP_SET(id, num, type) SND_ ## id = num,
#include "lookup/snd.lst"
#include "lookup/general.lst"
#undef LOOKUP_SET
#define LOOKUP_SET(id, num, type) id = num,
#include "lookup/rcv.lst"
#include "lookup/snd.lst"
#include "lookup/general.lst"
#define LOOKUP_SET(id, name, num, type, write) id = num,
#include "lookup/map.lst"
#undef LOOKUP_SET
};
static table rcv_lookup {
#define LOOKUP_SET(id, num, type) { RCV_ ## id, table::type,#id, #id },
#include "lookup/rcv.lst"
#include "lookup/general.lst"
#undef LOOKUP_SET
};
static table snd_lookup {
#define LOOKUP_SET(id, num, type) { SND_ ## id, table::type,#id, #id },
#include "lookup/snd.lst"
#include "lookup/general.lst"
static table lookup {
#define LOOKUP_SET(id, name, num, type, write) { id, table::type, table::write, #name, #id},
#include "lookup/map.lst"
#undef LOOKUP_SET
};

44
src/lookup/general.lst
View file

@ -1,25 +1,27 @@
LOOKUP_SET(PORTS, 10, DEC) //+byte, maybe number of ports
LOOKUP_SET(IGMP_SNOOPING, 4352, HEX) //???
LOOKUP_SET(PORTS_SETTINGS, 4096, HEX) //+per port
LOOKUP_SET(PORT_TRUNK, 4608, HEX) //byte[5] last byte bitmask??
LOOKUP_SET(MTU_VLAN, 8192, HEX) //byte[2] first byte bool,second byte port id
LOOKUP_SET(PORT_VLAN_ENABLED, 8448, BOOL) //open page
LOOKUP_SET(PORT_VLAN, 8449, HEX)
LOOKUP_SET(PORT_VLAN_MAX, 8450, DEC)
LOOKUP_SET(VLAN_ENABLED, 8704, BOOL) //+bool byte
LOOKUP_SET(VLAN, 8705, HEX) //+one set per vlan
LOOKUP_SET(VLAN_PVID, 8706, HEX) //+per port
LOOKUP_SET(VLAN_FOOOO, 8707, DEC) //????
LOOKUP_SET(PORTS, ports, 10, DEC) //+byte, maybe number of ports
LOOKUP_SET(QOS_BASIC_ENABLED, 12288, BOOL) //+bool = QoS Mod
LOOKUP_SET(QOS_BASIC, 12289, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_INGRESS, 12544, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_EGRESS, 12545, HEX) //+per port ???
LOOKUP_SET(STORM_CONTROL, 12800, HEX) //+per port ???
LOOKUP_SET(PORT_MIRROR, 16640, HEX) //byte[10] second byte port id???
LOOKUP_SET(PORT_STATISTICS, 16384, HEX) //+per port ???
LOOKUP_SET(CABLE_TEST, 16896, HEX) //+per port ???
LOOKUP_SET(LOOP_PREVENTION, 17152, BOOL) //+bool byte
LOOKUP_SET(IGMP_SNOOPING, igmp, 4352, HEX) //???
LOOKUP_SET(PORTS_SETTINGS, psetings, 4096, HEX) //+per port
LOOKUP_SET(PORT_TRUNK, trunk, 4608, HEX) //byte[5] last byte bitmask??
LOOKUP_SET(MTU_VLAN, 8192,8192, HEX) //byte[2] first byte bool,second byte port id
LOOKUP_SET(PORT_VLAN_ENABLED, 8448,8448, BOOL) //open page
LOOKUP_SET(PORT_VLAN, 8449,8449, HEX)
LOOKUP_SET(PORT_VLAN_MAX, 8450,8450, DEC)
LOOKUP_SET(VLAN_ENABLED, 8704, 8704, BOOL) //+bool byte
LOOKUP_SET(VLAN, 8705,8705, HEX) //+one set per vlan
LOOKUP_SET(VLAN_PVID, 8706,8706, HEX) //+per port
LOOKUP_SET(VLAN_FOOOO, 8707,8707, DEC) //????
LOOKUP_SET(QOS_BASIC_ENABLED, 12288,12288, BOOL) //+bool = QoS Mod
LOOKUP_SET(QOS_BASIC, 12289,12289, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_INGRESS, 12544,12544, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_EGRESS, 12545,12545, HEX) //+per port ???
LOOKUP_SET(STORM_CONTROL, 12800,12800, HEX) //+per port ???
LOOKUP_SET(PORT_MIRROR, 16640,16640, HEX) //byte[10] second byte port id???
LOOKUP_SET(PORT_STATISTICS, 16384,16384, HEX) //+per port ???
LOOKUP_SET(CABLE_TEST, 16896,16896, HEX) //+per port ???
LOOKUP_SET(LOOP_PREVENTION, 17152,17152, BOOL) //+bool byte

38
src/lookup/input.lst
View file

@ -1,38 +0,0 @@
LOOKUP_SET(type, TYPE, STRING) //+string
LOOKUP_SET(mac, MAC, HEX) //+byte[6]
LOOKUP_SET(firmware,FIRMWARE_VERSION, STRING)
LOOKUP_SET(hardware,HARDWARE_VERSION, STRING)
LOOKUP_SET(HOSTNAME,host, 2, STRING) //+string
LOOKUP_SET(IP_ADDR,ip, 4, DEC) //+byte[4]
LOOKUP_SET(IP_MASK,mask, 5, DEC) //+byte[4]
LOOKUP_SET(GATEWAY,gateway, 6, DEC) //+byte[4]
LOOKUP_SET(DHCP_ENABLED,dhcp, 9, BOOL) //+bool byte
LOOKUP_SET(PORT_VLAN_FOOOOO, 2101,2101, HEX)
LOOKUP_SET(PORTS, ports, 10, DEC) //+byte, maybe number of ports
LOOKUP_SET(IGMP_SNOOPING, igmp, 4352, HEX) //???
LOOKUP_SET(PORTS_SETTINGS, psetings, 4096, HEX) //+per port
LOOKUP_SET(PORT_TRUNK, trunk, 4608, HEX) //byte[5] last byte bitmask??
LOOKUP_SET(MTU_VLAN, 8192,8192, HEX) //byte[2] first byte bool,second byte port id
LOOKUP_SET(PORT_VLAN_ENABLED, 8448,8448, BOOL) //open page
LOOKUP_SET(PORT_VLAN, 8449,8449, HEX)
LOOKUP_SET(PORT_VLAN_MAX, 8450,8450, DEC)
LOOKUP_SET(VLAN_ENABLED, 8704, 8704, BOOL) //+bool byte
LOOKUP_SET(VLAN, 8705,8705, HEX) //+one set per vlan
LOOKUP_SET(VLAN_PVID, 8706,8706, HEX) //+per port
LOOKUP_SET(VLAN_FOOOO, 8707,8707, DEC) //????
LOOKUP_SET(QOS_BASIC_ENABLED, 12288,12288, BOOL) //+bool = QoS Mod
LOOKUP_SET(QOS_BASIC, 12289,12289, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_INGRESS, 12544,12544, HEX) //+per port ???
LOOKUP_SET(BW_CONTROL_EGRESS, 12545,12545, HEX) //+per port ???
LOOKUP_SET(STORM_CONTROL, 12800,12800, HEX) //+per port ???
LOOKUP_SET(PORT_MIRROR, 16640,16640, HEX) //byte[10] second byte port id???
LOOKUP_SET(PORT_STATISTICS, 16384,16384, HEX) //+per port ???
LOOKUP_SET(CABLE_TEST, 16896,16896, HEX) //+per port ???
LOOKUP_SET(LOOP_PREVENTION, 17152,17152, BOOL) //+bool byte

49
src/lookup/map.lst Normal file
View file

@ -0,0 +1,49 @@
LOOKUP_SET(TYPE, type, 1, STRING, RO) //+string
LOOKUP_SET(HOSTNAME, host, 2, STRING, RW) //+string //SYSTEM_INFO,SYSTEM_INFO, 2, HEX) //page sysinfo
LOOKUP_SET(MAC, mac, 3, HEX, RO) //+byte[6]
LOOKUP_SET(IP_ADDR, ip, 4, DEC, RW) //+byte[4]
LOOKUP_SET(IP_MASK, mask, 5, DEC, RW) //+byte[4]
LOOKUP_SET(GATEWAY, gateway, 6, DEC, RW) //+byte[4]
LOOKUP_SET(FIRMWARE_VERSION,firmware, 7, STRING, RO)
LOOKUP_SET(HARDWARE_VERSION,hardware, 8, STRING, RO)
LOOKUP_SET(DHCP_ENABLED, dhcp, 9, BOOL, RW) //+bool byte //IP_CONFIG,IP_CONFIG, 9, HEX) //page sysinfo
LOOKUP_SET(PORTS, ports, 10, DEC, RO) //+byte, maybe number of ports
LOOKUP_SET(LOGIN_USER, luser, 512, STRING, NONE) //string
LOOKUP_SET(NEW_USER, user, 513, STRING, WO) //string
LOOKUP_SET(LOGIN_PASSWORD, lpw, 514, STRING, NONE) //string
LOOKUP_SET(NEW_PASSWORD, password, 515, STRING, WO) //string
LOOKUP_SET(REBOOT, reboot, 773, BOOL, NONE) //bool byte = save config
LOOKUP_SET(RESET, reset, 1280, ACTION, NONE) //
LOOKUP_SET(FLASH, flash, 1536, ACTION, NONE) //update firmware
LOOKUP_SET(PORT_VLAN_FOOOOO,vlan21, 2101, HEX, RO)
LOOKUP_SET(VLAN_FOOOOOO, vlan22, 2200, HEX, RO) //vlan
LOOKUP_SET(SAVE, save, 2304, ACTION, NONE) //save
LOOKUP_SET(PING, ping, 2305, ACTION, NONE) //sent before SET ???
LOOKUP_SET(IGMP_SNOOPING, igmp, 4352, HEX, RW) //???
LOOKUP_SET(PORTS_SETTINGS, psetings, 4096, HEX, RW) //+per port
LOOKUP_SET(PORT_TRUNK, trunk, 4608, HEX, RW) //byte[5] last byte bitmask??
LOOKUP_SET(MTU_VLAN, 8192, 8192, HEX, UNKNOWN) //byte[2] first byte bool,second byte port id
LOOKUP_SET(PORT_VLAN_ENABLED,8448, 8448, BOOL, UNKNOWN) //open page
LOOKUP_SET(PORT_VLAN, 8449, 8449, HEX, UNKNOWN)
LOOKUP_SET(PORT_VLAN_MAX, 8450, 8450, DEC, UNKNOWN)
LOOKUP_SET(VLAN_ENABLED, 8704, 8704, BOOL, UNKNOWN) //+bool byte
LOOKUP_SET(VLAN, 8705, 8705, HEX, UNKNOWN) //+one set per vlan
LOOKUP_SET(VLAN_PVID, 8706, 8706, HEX, UNKNOWN) //+per port
LOOKUP_SET(VLAN_FOOOO, 8707, 8707, DEC, UNKNOWN) //????
LOOKUP_SET(QOS_BASIC_ENABLED,12288, 12288, BOOL, UNKNOWN) //+bool = QoS Mod
LOOKUP_SET(QOS_BASIC, 12289, 12289, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(BW_CONTROL_INGRESS,12544, 12544, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(BW_CONTROL_EGRESS,12545, 12545, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(STORM_CONTROL, 12800, 12800, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(PORT_MIRROR, 16640, 16640, HEX, UNKNOWN) //byte[10] second byte port id???
LOOKUP_SET(PORT_STATISTICS, 16384, 16384, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(CABLE_TEST, 16896, 16896, HEX, UNKNOWN) //+per port ???
LOOKUP_SET(LOOP_PREVENTION, 17152, 17152, BOOL, UNKNOWN) //+bool byte

20
src/lookup/rcv.lst
View file

@ -1,13 +1,13 @@
LOOKUP_SET(TYPE, 1, STRING) //+string
LOOKUP_SET(HOSTNAME, 2, STRING) //+string
LOOKUP_SET(MAC, 3, HEX) //+byte[6]
LOOKUP_SET(IP_ADDR, 4, DEC) //+byte[4]
LOOKUP_SET(IP_MASK, 5, DEC) //+byte[4]
LOOKUP_SET(GATEWAY, 6, DEC) //+byte[4]
LOOKUP_SET(FIRMWARE_VERSION, 7, STRING)
LOOKUP_SET(HARDWARE_VERSION, 8, STRING)
LOOKUP_SET(DHCP_ENABLED, 9, BOOL) //+bool byte
LOOKUP_SET(TYPE,type, 1, STRING) //+string
LOOKUP_SET(HOSTNAME,host, 2, STRING) //+string
LOOKUP_SET(MAC,MAC, 3, HEX) //+byte[6]
LOOKUP_SET(IP_ADDR,ip, 4, DEC) //+byte[4]
LOOKUP_SET(IP_MASK,mask, 5, DEC) //+byte[4]
LOOKUP_SET(GATEWAY,gateway, 6, DEC) //+byte[4]
LOOKUP_SET(FIRMWARE_VERSION,FIRMWARE_VERSION, 7, STRING)
LOOKUP_SET(HARDWARE_VERSION,HARDWARE_VERSION, 8, STRING)
LOOKUP_SET(DHCP_ENABLED,dhcp, 9, BOOL) //+bool byte
LOOKUP_SET(PORT_VLAN_FOOOOO, 2101, HEX)
LOOKUP_SET(PORT_VLAN_FOOOOO, 2101,2101, HEX)

24
src/lookup/snd.lst
View file

@ -1,17 +1,17 @@
LOOKUP_SET(SYSTEM_INFO, 2, HEX) //page sysinfo
LOOKUP_SET(IP_CONFIG, 9, HEX) //page sysinfo
LOOKUP_SET(SYSTEM_INFO,SYSTEM_INFO, 2, HEX) //page sysinfo
LOOKUP_SET(IP_CONFIG,IP_CONFIG, 9, HEX) //page sysinfo
LOOKUP_SET(LOGIN_USER, 512, STRING) //string
LOOKUP_SET(NEW_USER, 513, STRING) //string
LOOKUP_SET(LOGIN_PASSWORD, 514, STRING) //string
LOOKUP_SET(NEW_PASSWORD, 515, STRING) //string
LOOKUP_SET(REBOOT, 773, BOOL) //bool byte = save config
LOOKUP_SET(LOGIN_USER,LOGIN_USER, 512, STRING) //string
LOOKUP_SET(NEW_USER,NEW_USER, 513, STRING) //string
LOOKUP_SET(LOGIN_PASSWORD,LOGIN_PASSWORD, 514, STRING) //string
LOOKUP_SET(NEW_PASSWORD,NEW_PASSWORD, 515, STRING) //string
LOOKUP_SET(REBOOT,REBOOT, 773, BOOL) //bool byte = save config
LOOKUP_SET(RESET, 1280, ACTION) //
LOOKUP_SET(FLASH, 1536, ACTION) //update firmware
LOOKUP_SET(VLAN_FOOOOOO, 2200, HEX) //vlan
LOOKUP_SET(SAVE, 2304, ACTION) //save
LOOKUP_SET(PING, 2305, ACTION) //sent before SET ???
LOOKUP_SET(RESET,RESET, 1280, ACTION) //
LOOKUP_SET(FLASH,FLASH, 1536, ACTION) //update firmware
LOOKUP_SET(VLAN_FOOOOOO, 2200,2200, HEX) //vlan
LOOKUP_SET(SAVE,SAVE, 2304, ACTION) //save
LOOKUP_SET(PING,PING, 2305, ACTION) //sent before SET ???

122
src/smrtlink.cpp
View file

@ -38,98 +38,101 @@ int main(int argc, char *argv[]) {
options.user = DEFAULT_USER;
options.password = DEFAULT_PASS;
const struct option longopts[] = { { "version", no_argument, 0, 'V' }, {
"verbose", no_argument, 0, 'v' }, { "help", no_argument, 0, 'h' }, {
"reverse", no_argument, 0, 'r' },
{ "permanent", no_argument, 0, 's' }, { "debug", optional_argument,
0, 'd' }, { "password", required_argument, 0, 'P' }, {
"user", required_argument, 0, 'U' }, { "interface",
required_argument, 0, 'i' }, { "header", required_argument,
0, 'b' }, { "hex", required_argument, 0, 'x' }, { "file",
required_argument, 0, 'f' }, { "timeout", required_argument,
0, 't' }, { "wait", required_argument, 0, 'w' }, { 0, 0, 0,
0 }, };
const struct option longopts[] = {
{ "version", no_argument, 0, 'V' }, {
"verbose", no_argument, 0, 'v' },
{ "help", no_argument, 0, 'h' }, {
"reverse", no_argument, 0, 'r' },
{ "permanent", no_argument, 0, 's' }, {
"debug", optional_argument, 0, 'd' },
{ "password", required_argument, 0, 'P' }, {
"user", required_argument, 0, 'U' },
{ "interface", required_argument, 0, 'i' }, {
"header", required_argument, 0, 'b' },
{ "hex", required_argument, 0, 'x' }, {
"file", required_argument, 0, 'f' },
{ "timeout", required_argument, 0, 't' }, {
"wait", required_argument, 0, 'w' },
{ 0, 0, 0, 0 }, };
while ((opt = getopt_long(argc, argv, "bhrVXsxP:U:i:t::", longopts,
while ((opt = getopt_long(argc, argv, "bhrvVXIswxP:U:i:f:t:d::", longopts,
&index)) != -1) {
switch (opt) {
case 'h':
fprintf(stderr, VERSION);
fprintf(stderr, USAGE, argv[0]);
fprintf(stderr, HELP);
exit(EXIT_SUCCESS);
case 'h':
fprintf(stderr, VERSION);
fprintf(stderr, USAGE, argv[0]);
fprintf(stderr, HELP);
exit(EXIT_SUCCESS);
break;
case 'V':
fprintf(stderr, VERSION);
exit(EXIT_SUCCESS);
case 'V':
fprintf(stderr, VERSION);
exit(EXIT_SUCCESS);
break;
case 'r':
options.flags.REVERSE = true;
case 'r':
options.flags.REVERSE = true;
break;
case 'b':
options.flags.HEADER = true;
case 'b':
options.flags.HEADER = true;
break;
case 'x':
options.flags.HEX = true;
case 'x':
options.flags.HEX = true;
break;
case 's':
options.flags.PERMANENT = true;
case 's':
options.flags.PERMANENT = true;
break;
case 'w':
options.flags.WAIT = true;
case 'w':
options.flags.WAIT = true;
break;
case 'X':
options.flags.INTERACTIVE = true;
case 'X':
options.flags.INTERACTIVE = true;
break;
case 'v':
if (optarg != NULL)
options.verbosity = atoi(optarg);
else
options.verbosity++;
case 'v':
if (optarg != NULL)
options.verbosity = atoi(optarg);
else
options.verbosity++;
break;
case 'd':
if (optarg != NULL)
options.debug_level = atoi(optarg);
else
options.debug_level++;
case 'd':
if (optarg != NULL)
options.debug_level = atoi(optarg);
else
options.debug_level++;
break;
case 't':
options.timeout = atol(optarg);
case 't':
options.timeout = atol(optarg);
break;
case 'f':
options.file = std::string(optarg);
case 'f':
options.file = std::string(optarg);
break;
case 'P':
options.password = std::string(optarg);
case 'P':
options.password = std::string(optarg);
break;
case 'U':
options.user = std::string(optarg);
case 'U':
options.user = std::string(optarg);
break;
case 'i':
options.interface = std::string(optarg);
case 'i':
options.interface = std::string(optarg);
break;
default: /* '?' */
fprintf(stderr, "Unknown option\n");
fprintf(stderr, USAGE, argv[0]);
exit(EXIT_FAILURE);
default: /* '?' */
fprintf(stderr, "Unknown option\n");
fprintf(stderr, USAGE, argv[0]);
exit(EXIT_FAILURE);
}
}
@ -154,7 +157,8 @@ int main(int argc, char *argv[]) {
exit(EXIT_SUCCESS);
fprintf(stderr, "Not yet implemented.\n");
exit(EXIT_FAILURE);
} else if (optind < argc) {
}
else if (optind < argc) {
vector<string> v;
while (optind < argc)
v.push_back(argv[optind++]);

15
src/table.cpp
View file

@ -8,7 +8,6 @@
#include <string>
#include "table.h"
table::table(std::initializer_list<set> l) {
int i = 0;
this->data.resize(l.size());
@ -19,24 +18,24 @@ table::table(std::initializer_list<set> l) {
i++;
}
}
const table::set table::operator[](std::string s){
const table::set table::operator[](std::string s) {
return *this->right[s];
}
const table::set table::operator[](short n){
const table::set table::operator[](short n) {
return *this->left[n];
}
bool table::exists(std::string s){
bool table::exists(std::string s) {
return !(right.find(s) == right.end());
}
bool table::exists(short n){
bool table::exists(short n) {
return !(left.find(n) == left.end());
}
short table::type(std::string s){
short table::type(std::string s) {
return this->right[s]->type;
}
std::string table::id(short n){
std::string table::id(short n) {
return this->left[n]->id;
}
std::string table::name(short n){
std::string table::name(short n) {
return this->left[n]->name;
}

46
src/table.h
View file

@ -12,26 +12,32 @@
#include <vector>
class table {
public:
enum F {STRING,HEX,DEC,ACTION,BOOL,EMPTY};
struct set {
short type;
F format;
std::string name;
std::string id;
};
table(std::initializer_list<set> l);
const table::set operator[](std::string);
const table::set operator[](short);
bool exists(std::string);
bool exists(short);
short type(std::string);
std::string id(short);
std::string name(short);
private:
std::vector<set> data;
std::map<short, set*> left;
std::map<std::string, set*> right;
public:
enum A {
RW, RO, WO, NONE, UNKNOWN
};
enum F {
STRING, HEX, DEC, ACTION, BOOL, EMPTY
};
struct set {
short type;
F format;
A action;
std::string name;
std::string id;
};
table(std::initializer_list<set> l);
const table::set operator[](std::string);
const table::set operator[](short);
bool exists(std::string);
bool exists(short);
short type(std::string);
std::string id(short);
std::string name(short);
private:
std::vector<set> data;
std::map<short, set*> left;
std::map<std::string, set*> right;
};
#endif /* LOOKUPTABLE_H_ */

18
test.sh Executable file
View file

@ -0,0 +1,18 @@
#!/bin/sh
clear
echo SmrtLink Test
echo bin/smrtlink encode 00:11:22:33:44:55:66:77:88:99
bin/smrtlink encode 00:11:22:33:44:55:66:77:88:9
echo bin/smrtlink -i eth0 list
bin/smrtlink -i eth0 list
echo bin/smrtlink -i eth6 list
bin/smrtlink -i eth6 list
echo bin/smrtlink list
bin/smrtlink list
echo bin/smrtlink -i wlan0 list
bin/smrtlink -i wlan0 list