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

get&set

Browse source
This commit is contained in:
j3d1 2016-01-23 09:22:46 +01:00
parent d3b89e3b11
commit 8200103514
14 changed files with 415 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -15,7 +15,7 @@ $(BUILDDIR):
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
$(CC) $^ -o $(BUILDDIR)/$@ -lboost_filesystem -lboost_system -lpthread $(CC) $^ -o $(BUILDDIR)/$@ -lboost_filesystem -lboost_system -lboost_program_options -lpthread
$(OBJECTS): $(BUILDDIR)/%.o : $(SOURCEDIR)/%.cpp $(OBJECTS): $(BUILDDIR)/%.o : $(SOURCEDIR)/%.cpp

73
src/Constant.h
View file

@ -14,38 +14,40 @@
#define USAGE "usage: %s [-bdhjrvswx] [-i interface] [-u [password:]username]\n\ #define USAGE "usage: %s [-bdhjrvswx] [-i interface] [-u [password:]username]\n\
[-p password] <command>\n\n" [-p password] <command>\n\n"
#define HELP "\ #define HELP "\
Option Summary:\n\ Option Summary:\n\
-h --help This help text\n\ -h --help This help text\n\
-v --version Display version of this tool\n\ -V --version Display version of this tool\n\
-d --debug [n] Show debugging messages\n\ -d --debug [n] Show debugging messages\n\
-r switch ports to emulate switch while sniffing\n\ -v --verbose [n] Show debugging messages\n\
-b --header Show header\n\ -r --reverse switch ports to emulate switch while sniffing\n\
-x --hex Display Packets as Hex String\n\ -b --header Show header\n\
-j --json Display Packets as JSON\n\ -x --hex Display Packets as Hex String\n\
-i --interface <iface> only use one Interface\n\ -j --json Display Packets as JSON\n\
-u --user <[password:]username>\n\ -i --interface <iface> only use one Interface\n\
-p --password <password>\n\ -u --user <[password:]username>\n\
Login with Username and Password\n\ -p --password <password>\n\
-f --file <path> choose a settings file\n\n\ Login with Username and Password\n\
-t --timeout <n> Timeout in milliseconds. Default: 180\n\ -f --file <path> choose a settings file\n\n\
-I --interactive Not yet implemented\n\ -t --timeout <n> Timeout in milliseconds. Default: 180\n\
-O --stdout Not yet implemented\n\ -I --interactive Not yet implemented\n\
-w --wait Not yet implemented: blocking until operation is completed\n\ -O --stdout Not yet implemented\n\
-s --permanent Not yet implemented: make changes immediately permanent\n\n\ -w --wait Not yet implemented: blocking until operation is completed\n\
Command Summary:\n\ -s --permanent Not yet implemented: make changes immediately permanent\n\n\
help This help text\n\ Command Summary:\n\
list list all connected switches\n\ list list all connected switches\n\
sniff [type:<type>] [<filter>]\n\ sniff [type:<type>] [<filter>]\n\
capture and display all incoming or outgoing packets\n\ capture and display all incoming or outgoing packets\n\
depending on the --reverse option\n\ depending on the --reverse option\n\
encode use encoding algorithm on hex data separated by colon\n\ encode use encoding algorithm on hex data separated by colon\n\
get Not yet implemented\n\ get <property1> [<property1> [...]]\n\
set Not yet implemented\n\ Not yet implemented\n\
get|save Not yet implemented: save config to file\n\ set <property1>=<value> [<property2>=<value> [...]]\n\
set|restore Not yet implemented: restore onfig from file\n\ Not yet implemented\n\
flash Not yet implemented: replace firmware\n\ get|save Not yet implemented: save config to file\n\
reboot Not yet implemented\n\ set|restore Not yet implemented: restore onfig from file\n\
reset Not yet implemented\n\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" ### for questions please contact <smrtlink@jdi.li> ###\n\n"
//TODO //TODO
/* /*
@ -54,13 +56,6 @@
* *
*/ */
#define FLAG_HEX 1
#define FLAG_REVERSE 2
#define FLAG_HEADER 4
#define FLAG_PERMANENT 8
#define FLAG_WAIT 16
#define FLAG_DEBUG 32
extern Options options; extern Options options;
#endif /* OPTIONS_H_ */ #endif /* OPTIONS_H_ */

37
src/Program.cpp
View file

@ -18,8 +18,8 @@
#include "table.h" #include "table.h"
int printHeader(Packet p) { int printHeader(Packet p) {
if (options.flags & FLAG_HEADER) { if (options.flags.HEADER) {
if (options.flags & FLAG_HEX) { if (options.flags.HEX) {
std::cout << "Received Header:\n\t" << p.getHead() << "\n"; std::cout << "Received Header:\n\t" << p.getHead() << "\n";
} else { } else {
p.printHeader(); p.printHeader();
@ -30,12 +30,12 @@ int printHeader(Packet p) {
} }
int printPacket(Packet p) { int printPacket(Packet p) {
if (options.flags & FLAG_HEX) { if (options.flags.HEX) {
std::cout << "Received Payload:\n\t" << p.getBody() << "\n"; std::cout << "Received Payload:\n\t" << p.getBody() << "\n";
} else { } else {
for (dataset d : p.getPayload()) { for (dataset d : p.getPayload()) {
auto lookup = auto lookup =
(options.flags & FLAG_REVERSE) ? snd_lookup : rcv_lookup; (options.flags.REVERSE) ? snd_lookup : rcv_lookup;
if (lookup.exists(d.type)) { if (lookup.exists(d.type)) {
table::set s = lookup[d.type]; table::set s = lookup[d.type];
if (d.len > 0) { if (d.len > 0) {
@ -92,7 +92,7 @@ int Program::list() {
std::cout << "List:\n"; std::cout << "List:\n";
discover([this](Packet a) { discover([this](Packet a) {
printHeader(a); printHeader(a);
if (options.flags & FLAG_HEX) { if (options.flags.HEX) {
std::cout <<"Received Payload:\n"<<a.getBody()<<"\n"; std::cout <<"Received Payload:\n"<<a.getBody()<<"\n";
} else { } else {
datasets d =a.getPayload(); datasets d =a.getPayload();
@ -102,13 +102,13 @@ int Program::list() {
f.write(sw.toString()); f.write(sw.toString());
sw.print(); sw.print();
} }
return 1; return 0;
}); });
io_service->run(); io_service->run();
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "Exception: " << e.what() << "\n"; std::cerr << "Exception: " << e.what() << "\n";
} }
return 1; return 0;
} }
int Program::sniff() { int Program::sniff() {
@ -130,7 +130,7 @@ int Program::sniff() {
std::cerr << "Exception: " << e.what() << "\n"; std::cerr << "Exception: " << e.what() << "\n";
} }
return 1; return 0;
} }
int Program::encode(std::string s) { int Program::encode(std::string s) {
@ -141,7 +141,7 @@ int Program::encode(std::string s) {
return 0; return 0;
} }
int Program::setProperty() { int Program::setProperty(std::map<std::string,std::string> prop) {
try { try {
std::cout << "List:\n"; std::cout << "List:\n";
@ -158,7 +158,7 @@ int Program::setProperty() {
Switch sw = Switch(); Switch sw = Switch();
sw.parse(d); sw.parse(d);
datasets t = { {REBOOT, 1, {0}}}; datasets t = { {LOOP_PREVENTION, 1, {0}}};
set(a,t, set(a,t,
[this](Packet a) { [this](Packet a) {
@ -176,12 +176,11 @@ int Program::setProperty() {
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "Exception: " << e.what() << "\n"; std::cerr << "Exception: " << e.what() << "\n";
} }
return 1; return 0;
} }
int Program::getProperty() { int Program::getProperty(std::vector<std::string> prop) {
try { try {
std::cout << "List:\n"; std::cout << "List:\n";
discover([this](Packet a) { discover([this](Packet a) {
@ -204,7 +203,7 @@ int Program::getProperty() {
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "Exception: " << e.what() << "\n"; std::cerr << "Exception: " << e.what() << "\n";
} }
return 1; return 0;
} }
int Program::save() { int Program::save() {
@ -212,7 +211,7 @@ int Program::save() {
sw.settings.hostname = "testname.lan"; sw.settings.hostname = "testname.lan";
File f; File f;
f.write(sw.toString()); f.write(sw.toString());
return 1; return 0;
} }
int Program::restore() { int Program::restore() {
@ -220,12 +219,12 @@ int Program::restore() {
Switch sw; Switch sw;
sw.parse(f.read()); sw.parse(f.read());
sw.print(); sw.print();
return 1; return 0;
} }
int Program::flash() { int Program::flash() {
return 0; return 1;
} }
int Program::reboot() { int Program::reboot() {
@ -254,12 +253,12 @@ int Program::reboot() {
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "Exception: " << e.what() << "\n"; std::cerr << "Exception: " << e.what() << "\n";
} }
return 1; return 0;
} }
int Program::reset() { int Program::reset() {
return 0; return 1;
} }
int Program::discover(std::function<int(Packet)> c) { int Program::discover(std::function<int(Packet)> c) {

5
src/Program.h
View file

@ -14,6 +14,7 @@
#include "Host.h" #include "Host.h"
#include "Socket.h" #include "Socket.h"
class Program { class Program {
private: private:
std::shared_ptr<boost::asio::io_service> io_service; std::shared_ptr<boost::asio::io_service> io_service;
@ -31,8 +32,8 @@ public:
int list(); int list();
int sniff(); int sniff();
int encode(std::string); int encode(std::string);
int setProperty(); int getProperty(std::vector<std::string>);
int getProperty(); int setProperty(std::map<std::string,std::string>);
int save(); int save();
int restore(); int restore();
int flash(); int flash();

4
src/Socket.cpp
View file

@ -21,13 +21,13 @@ void Socket::init(short dst_port, short src_port) {
if (initialized) if (initialized)
return; return;
if (options.flags & FLAG_REVERSE) { if (options.flags.REVERSE) {
short p = dst_port; short p = dst_port;
dst_port = src_port; dst_port = src_port;
src_port = p; src_port = p;
} }
if (options.flags & FLAG_DEBUG) if (options.debug_level>=1)
std::cout << "Local IP:\t" << local_ip << "\n"; std::cout << "Local IP:\t" << local_ip << "\n";
wildcard_endpoint_ = boost::asio::ip::udp::endpoint( wildcard_endpoint_ = boost::asio::ip::udp::endpoint(

2
src/Switch-Json.cpp
View file

@ -16,7 +16,7 @@ int Switch::parse(std::string str) {
if (json.Parse(str.c_str()).HasParseError()) if (json.Parse(str.c_str()).HasParseError())
return 1; return 1;
if (options.flags & FLAG_DEBUG) if (options.debug_level>=1)
std::cout << "\nParsing to document succeeded.\n"; std::cout << "\nParsing to document succeeded.\n";
if (json.IsObject()) { if (json.IsObject()) {

140
src/Types.h
View file

@ -21,105 +21,113 @@
class macAddr: public std::array<byte, 6> { class macAddr: public std::array<byte, 6> {
public: public:
friend std::ostream& operator<<(std::ostream& out, const macAddr& arr) { friend std::ostream& operator<<(std::ostream& out, const macAddr& arr) {
out << std::hex << std::setw(2) << std::setfill('0') out << std::hex << std::setw(2) << std::setfill('0')
<< (unsigned) arr[0]; << (unsigned) arr[0];
for (unsigned i = 1; i < 6; i++) { for (unsigned i = 1; i < 6; i++) {
out << ":" << std::setw(2) << std::setfill('0') out << ":" << std::setw(2) << std::setfill('0')
<< (unsigned) arr[i]; << (unsigned) arr[i];
} }
return out; return out;
} }
macAddr() { macAddr() {
*this= {0,0,0,0,0,0}; *this= {0,0,0,0,0,0};
} }
macAddr(std::initializer_list<byte> s) { macAddr(std::initializer_list<byte> s) {
int i = 0; int i = 0;
for (byte b : s) { for (byte b : s) {
if(i<6) (*this)[i++]=b; if(i<6) (*this)[i++]=b;
else break; else break;
} }
} }
macAddr(bytes bts) { macAddr(bytes bts) {
int i = 0; int i = 0;
for (byte b : bts) { for (byte b : bts) {
if(i<6) (*this)[i++]=b; if(i<6) (*this)[i++]=b;
else break; else break;
} }
} }
}; };
/* /*
class mac_addr : public std::array<unsigned char, 6> { class mac_addr : public std::array<unsigned char, 6> {
public: public:
typedef std::array<unsigned char, 6> super; typedef std::array<unsigned char, 6> super;
using super::super; using super::super;
mac_addr{00, 00, 00, 000};
};
*/
mac_addr{00, 00, 00, 000};
};
*/
class ipAddr: public std::array<byte, 4> { class ipAddr: public std::array<byte, 4> {
public: public:
ipAddr() { ipAddr() {
*this= {0,0,0,0,0,0}; *this= {0,0,0,0,0,0};
} }
ipAddr(std::initializer_list<byte> s) { ipAddr(std::initializer_list<byte> s) {
int i = 0; int i = 0;
for (byte b : s) { for (byte b : s) {
if(i<4) (*this)[i++]=b; if(i<4) (*this)[i++]=b;
else break; else break;
} }
} }
ipAddr(bytes bts) { ipAddr(bytes bts) {
int i = 0; int i = 0;
for (byte b : bts) { for (byte b : bts) {
if(i<4) (*this)[i++]=b; if(i<4) (*this)[i++]=b;
else break; else break;
} }
} }
friend std::ostream& operator<<(std::ostream& out, ipAddr& arr) { friend std::ostream& operator<<(std::ostream& out, ipAddr& arr) {
out << std::dec << (unsigned) arr[0]; out << std::dec << (unsigned) arr[0];
for (unsigned i = 1; i < 4; i++) { for (unsigned i = 1; i < 4; i++) {
out << "." << (unsigned) arr[i]; out << "." << (unsigned) arr[i];
} }
return out; return out;
} }
}; };
template<typename T> template<typename T>
std::vector<T> operator+(const std::vector<T> &A, const std::vector<T> &B) { std::vector<T> operator+(const std::vector<T> &A, const std::vector<T> &B) {
std::vector<T> AB; std::vector<T> AB;
AB.reserve(A.size() + B.size()); // preallocate memory AB.reserve(A.size() + B.size()); // preallocate memory
AB.insert(AB.end(), A.begin(), A.end()); // add A; AB.insert(AB.end(), A.begin(), A.end()); // add A;
AB.insert(AB.end(), B.begin(), B.end()); // add B; AB.insert(AB.end(), B.begin(), B.end()); // add B;
return AB; return AB;
} }
template<typename T> template<typename T>
std::vector<T> &operator+=(std::vector<T> &A, const std::vector<T> &B) { std::vector<T> &operator+=(std::vector<T> &A, const std::vector<T> &B) {
A.reserve(A.size() + B.size()); A.reserve(A.size() + B.size());
A.insert(A.end(), B.begin(), B.end()); A.insert(A.end(), B.begin(), B.end());
return A; return A;
} }
struct Options { struct Options {
unsigned flags = 0x00; struct {
std::string user; bool HEX;
std::string password; bool JSON;
std::string interface; bool PLAIN;
std::string file; bool REVERSE;
int debug_level=0; bool HEADER;
long timeout = 180U; bool PERMANENT;
bool WAIT;
} flags;
std::string user;
std::string password;
std::string interface;
std::string file;
int debug_level = 0;
int verbosity = 0;
long timeout = 180U;
}; };
#endif /* TYPES_H_ */ #endif /* TYPES_H_ */

10
src/lookup.h
View file

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

42
src/lookup/general.lst
View file

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

20
src/lookup/rcv.lst
View file

@ -1,13 +1,13 @@
LOOKUP_SET(TYPE, 1, STRING) //+string LOOKUP_SET(TYPE,type, 1, STRING) //+string
LOOKUP_SET(HOSTNAME, 2, STRING) //+string LOOKUP_SET(HOSTNAME,host, 2, STRING) //+string
LOOKUP_SET(MAC, 3, HEX) //+byte[6] LOOKUP_SET(MAC,MAC, 3, HEX) //+byte[6]
LOOKUP_SET(IP_ADDR, 4, DEC) //+byte[4] LOOKUP_SET(IP_ADDR,ip, 4, DEC) //+byte[4]
LOOKUP_SET(IP_MASK, 5, DEC) //+byte[4] LOOKUP_SET(IP_MASK,mask, 5, DEC) //+byte[4]
LOOKUP_SET(GATEWAY, 6, DEC) //+byte[4] LOOKUP_SET(GATEWAY,gateway, 6, DEC) //+byte[4]
LOOKUP_SET(FIRMWARE_VERSION, 7, STRING) LOOKUP_SET(FIRMWARE_VERSION,FIRMWARE_VERSION, 7, STRING)
LOOKUP_SET(HARDWARE_VERSION, 8, STRING) LOOKUP_SET(HARDWARE_VERSION,HARDWARE_VERSION, 8, STRING)
LOOKUP_SET(DHCP_ENABLED, 9, BOOL) //+bool byte 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(SYSTEM_INFO,SYSTEM_INFO, 2, HEX) //page sysinfo
LOOKUP_SET(IP_CONFIG, 9, HEX) //page sysinfo LOOKUP_SET(IP_CONFIG,IP_CONFIG, 9, HEX) //page sysinfo
LOOKUP_SET(LOGIN_USER, 512, STRING) //string LOOKUP_SET(LOGIN_USER,LOGIN_USER, 512, STRING) //string
LOOKUP_SET(NEW_USER, 513, STRING) //string LOOKUP_SET(NEW_USER,NEW_USER, 513, STRING) //string
LOOKUP_SET(LOGIN_PASSWORD, 514, STRING) //string LOOKUP_SET(LOGIN_PASSWORD,LOGIN_PASSWORD, 514, STRING) //string
LOOKUP_SET(NEW_PASSWORD, 515, STRING) //string LOOKUP_SET(NEW_PASSWORD,NEW_PASSWORD, 515, STRING) //string
LOOKUP_SET(REBOOT, 773, BOOL) //bool byte = save config LOOKUP_SET(REBOOT,REBOOT, 773, BOOL) //bool byte = save config
LOOKUP_SET(RESET, 1280, ACTION) // LOOKUP_SET(RESET,RESET, 1280, ACTION) //
LOOKUP_SET(FLASH, 1536, ACTION) //update firmware LOOKUP_SET(FLASH,FLASH, 1536, ACTION) //update firmware
LOOKUP_SET(VLAN_FOOOOOO, 2200, HEX) //vlan LOOKUP_SET(VLAN_FOOOOOO, 2200,2200, HEX) //vlan
LOOKUP_SET(SAVE, 2304, ACTION) //save LOOKUP_SET(SAVE,SAVE, 2304, ACTION) //save
LOOKUP_SET(PING, 2305, ACTION) //sent before SET ??? LOOKUP_SET(PING,PING, 2305, ACTION) //sent before SET ???

360
src/smrtlink.cpp
View file

@ -1,15 +1,17 @@
//============================================================================ //============================================================================
// Name : smrtlink.cpp // Name : smrtlink.cpp
// Author : jdi // Author : jdi
// Version : // Version : 1.1
// Copyright : GPL v2 // Copyright : GPL v2
// Description : SmrtLink in C++, Ansi-style // Description : SmrtLink in C++, Ansi-style
//============================================================================ //============================================================================
#include <cstring>
#include <iostream> #include <iostream>
#include <sstream>
#include <string> #include <string>
#include <regex>
#include <cstring>
#include <sstream>
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
@ -20,202 +22,232 @@
#include "Host.h" #include "Host.h"
#include "Program.h" #include "Program.h"
#include "Switch.h" #include "Switch.h"
#include "lookup.h"
#define no_argument 0 #define no_argument 0
#define required_argument 1 #define required_argument 1
#define optional_argument 2 #define optional_argument 2
Options options; using namespace std;
//Options options;
constexpr unsigned int caseArg(const char* str, int h = 0) { constexpr unsigned int caseArg(const char* str, int h = 0) {
return !str[h] ? 5381 : (caseArg(str, h + 1) * 33) ^ str[h]; return !str[h] ? 5381 : (caseArg(str, h + 1) * 33) ^ str[h];
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int opt, index; int opt, index;
options.user = DEFAULT_USER; options.user = DEFAULT_USER;
options.password = DEFAULT_PASS; options.password = DEFAULT_PASS;
const struct option longopts[] = { { "version", no_argument, 0, 'v' }, { const struct option longopts[] = { { "version", no_argument, 0, 'V' }, {
"help", no_argument, 0, 'h' }, { "reverse", no_argument, 0, 'r' }, { "verbose", no_argument, 0, 'v' }, { "help", no_argument, 0, 'h' }, {
"permanent", no_argument, 0, 's' }, { "debug", optional_argument, 0, "reverse", no_argument, 0, 'r' },
'd' }, { "password", required_argument, 0, 'p' }, { "user", { "permanent", no_argument, 0, 's' }, { "debug", optional_argument,
required_argument, 0, 'u' }, { "interface", required_argument, 0, 'i' }, { 0, 'd' }, { "password", required_argument, 0, 'p' }, {
"header", required_argument, 0, 'b' }, { "hex", required_argument, "user", required_argument, 0, 'u' }, { "interface",
0, 'x' }, { "file", required_argument, 0, 'f' }, { "timeout", required_argument, 0, 'i' }, { "header", required_argument,
required_argument, 0, 't' }, { "wait", 0, 'b' }, { "hex", required_argument, 0, 'x' }, { "file",
required_argument, 0, 'w' }, { 0, 0, 0, 0 }, }; required_argument, 0, 'f' }, { "timeout", required_argument,
0, 't' }, { "wait", required_argument, 0, 'w' }, { 0, 0, 0,
0 }, };
Program p = Program(); Program p = Program();
while ((opt = getopt_long(argc, argv, "bhrvswxp:u:i:f:t:d::", longopts, while ((opt = getopt_long(argc, argv, "bhrvVswxp:u:i:f:t:d::", longopts,
&index)) != -1) { &index)) != -1) {
switch (opt) { switch (opt) {
case 'h': case 'h':
fprintf(stderr, VERSION); fprintf(stderr, VERSION);
fprintf(stderr, USAGE, argv[0]); fprintf(stderr, USAGE, argv[0]);
fprintf(stderr, HELP); fprintf(stderr, HELP);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'v': case 'V':
fprintf(stderr, VERSION); fprintf(stderr, VERSION);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'r': case 'r':
options.flags |= FLAG_REVERSE; options.flags.REVERSE = true;
break; break;
case 'b': case 'b':
options.flags |= FLAG_HEADER; options.flags.HEADER = true;
break; break;
case 'x': case 'x':
options.flags |= FLAG_HEX; options.flags.HEX = true;
break; break;
case 's': case 's':
options.flags |= FLAG_PERMANENT; options.flags.PERMANENT = true;
break; break;
case 'w': case 'w':
options.flags |= FLAG_WAIT; options.flags.WAIT = true;
break; break;
case 'd': case 'v':
options.flags |= FLAG_DEBUG; if (optarg != NULL)
if (optarg != NULL) options.verbosity = atoi(optarg);
options.debug_level = atoi(optarg); else
break; options.verbosity++;
break;
case 't': case 'd':
options.timeout = atol(optarg); if (optarg != NULL)
break; options.debug_level = atoi(optarg);
else
options.debug_level++;
break;
case 'f': case 't':
options.file = std::string(optarg); options.timeout = atol(optarg);
break; break;
case 'p': case 'f':
options.password = std::string(optarg); options.file = std::string(optarg);
break; break;
case 'u': case 'p':
options.user = std::string(optarg); options.password = std::string(optarg);
break; break;
case 'i': case 'u':
options.interface = std::string(optarg); options.user = std::string(optarg);
break; break;
default: /* '?' */ case 'i':
fprintf(stderr, "Unknown option\n"); options.interface = std::string(optarg);
fprintf(stderr, USAGE, argv[0]); break;
exit(EXIT_FAILURE);
}
}
/*//TODO stdin default: /* '?' */
std::ostringstream bucket; fprintf(stderr, "Unknown option\n");
bucket << std::cin.rdbuf(); fprintf(stderr, USAGE, argv[0]);
p.input = bucket.str(); exit(EXIT_FAILURE);
*/ }
}
if (optind >= argc) { /*//TODO stdin
fprintf(stderr, "Command expected\n"); std::ostringstream bucket;
fprintf(stderr, USAGE, argv[0]); bucket << std::cin.rdbuf();
exit(EXIT_FAILURE); p.input = bucket.str();
} */
p.init(); if (optind >= argc) {
fprintf(stderr, "Command expected\n");
fprintf(stderr, USAGE, argv[0]);
exit(EXIT_FAILURE);
}
if (optind < argc) { p.init();
std::string cmd = std::string(argv[optind++]); std::vector<std::string> vect;
std::map<std::string, std::string> list;
std::cmatch sm;
switch (caseArg(cmd.c_str())) { if (optind < argc) {
case caseArg("set"): std::string cmd = std::string(argv[optind++]);
if (p.setProperty()) switch (caseArg(cmd.c_str())) {
exit(EXIT_SUCCESS); case caseArg("reboot"):
fprintf(stderr, "Not yet implemented.\n"); if (!p.reboot())
exit(EXIT_FAILURE); exit(EXIT_SUCCESS);
break; fprintf(stderr, "Not yet implemented.\n");
case caseArg("reboot"): exit(EXIT_FAILURE);
if (p.reboot()) break;
exit(EXIT_SUCCESS); case caseArg("reset"):
fprintf(stderr, "Not yet implemented.\n"); if (!p.reset())
exit(EXIT_FAILURE); exit(EXIT_SUCCESS);
break; fprintf(stderr, "Not yet implemented.\n");
case caseArg("reset"): exit(EXIT_FAILURE);
if (p.reset()) break;
exit(EXIT_SUCCESS); case caseArg("save"):
fprintf(stderr, "Not yet implemented.\n"); if (!p.save())
exit(EXIT_FAILURE); exit(EXIT_SUCCESS);
break; fprintf(stderr, "Not yet implemented.\n");
case caseArg("save"): exit(EXIT_FAILURE);
if (p.save()) break;
exit(EXIT_SUCCESS); case caseArg("restore"):
fprintf(stderr, "Not yet implemented.\n"); if (!p.restore())
exit(EXIT_FAILURE); exit(EXIT_SUCCESS);
break; fprintf(stderr, "Not yet implemented.\n");
case caseArg("restore"): exit(EXIT_FAILURE);
if (p.restore()) break;
exit(EXIT_SUCCESS); case caseArg("flash"):
fprintf(stderr, "Not yet implemented.\n"); if (!p.flash())
exit(EXIT_FAILURE); exit(EXIT_SUCCESS);
break; fprintf(stderr, "Not yet implemented.\n");
case caseArg("flash"): exit(EXIT_FAILURE);
if (p.flash()) break;
exit(EXIT_SUCCESS);
fprintf(stderr, "Not yet implemented.\n");
exit(EXIT_FAILURE);
break;
case caseArg("get"): case caseArg("list"):
if (p.getProperty()) if (!p.list())
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case caseArg("list"): case caseArg("sniff"):
if (p.list()) if (!p.sniff())
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case caseArg("sniff"): case caseArg("encode"):
if (p.sniff()) if (optind < argc) {
exit(EXIT_SUCCESS); std::string s(argv[optind]);
break; optind++;
if (p.encode(s))
case caseArg("encode"): exit(EXIT_SUCCESS);
if (optind < argc) { } else {
std::string s(argv[optind]); fprintf(stderr, "Argument expected after encode\n");
optind++; exit(EXIT_FAILURE);
if (p.encode(s)) }
exit(EXIT_SUCCESS); break;
} else { case caseArg("set"):
fprintf(stderr, "Argument expected after encode\n"); while (optind < argc) {
exit(EXIT_FAILURE); if (regex_match(argv[optind], sm,
} std::regex("^([a-z]+)=(.*)$"))) {
break; if (!snd_lookup.exists(sm[1])) {
cerr << "Unknown argument " << argv[optind] << endl;
case caseArg("help"): exit(EXIT_FAILURE);
fprintf(stderr, VERSION); }
fprintf(stderr, USAGE, argv[0]); list.insert(
fprintf(stderr, HELP); std::pair<std::string, std::string>(sm[1], sm[2]));
exit(EXIT_SUCCESS); } else {
break; cerr << "Invalid Syntax " << argv[optind] << endl;
exit(EXIT_FAILURE);
default: }
printf("Unknown command: %s\n", cmd.c_str()); optind++;
while (optind < argc) { }
printf("->%s\n", argv[optind]); if (!p.setProperty(list))
optind++; exit(EXIT_SUCCESS);
} fprintf(stderr, "Not yet implemented.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} break;
} case caseArg("get"):
exit(EXIT_FAILURE); while (optind < argc) {
if (regex_match(argv[optind], sm, std::regex("^([a-z]+)$"))) {
if (!snd_lookup.exists(sm[1])) {
cerr << "Unknown argument " << argv[optind] << endl;
exit(EXIT_FAILURE);
}
vect.push_back(sm[1]);
} else {
cerr << "Invalid argument " << argv[optind] << endl;
exit(EXIT_FAILURE);
}
optind++;
}
if (!p.getProperty(vect))
exit(EXIT_SUCCESS);
break;
default:
printf("Unknown command: %s\n", cmd.c_str());
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
} }

33
src/table.cpp
View file

@ -8,18 +8,35 @@
#include <string> #include <string>
#include "table.h" #include "table.h"
table::table(std::initializer_list<set> l) { table::table(std::initializer_list<set> l) {
int i = 0; int i = 0;
for (set s : l) { this->data.resize(l.size());
this->left[s.type] = s; for (set s : l) {
} this->data[i] = s;
this->left[s.type] = &this->data[i];
this->right[s.name] = &this->data[i];
i++;
}
} }
table::set table::operator[](short n){ const table::set table::operator[](std::string s){
return this->left[n]; return *this->right[s];
}
const table::set table::operator[](short n){
return *this->left[n];
}
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()); return !(left.find(n) == left.end());
}
short table::type(std::string s){
return this->right[s]->type;
}
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; return this->left[n]->name;
} }

19
src/table.h
View file

@ -17,14 +17,21 @@ public:
struct set { struct set {
short type; short type;
F format; F format;
std::string name; std::string name;
std::string id;
}; };
table(std::initializer_list<set> l); table(std::initializer_list<set> l);
set operator[](short); const table::set operator[](std::string);
bool exists(short); const table::set operator[](short);
std::string name(short); bool exists(std::string);
bool exists(short);
short type(std::string);
std::string id(short);
std::string name(short);
private: private:
std::map<short, set> left; std::vector<set> data;
std::map<short, set*> left;
std::map<std::string, set*> right;
}; };
#endif /* LOOKUPTABLE_H_ */ #endif /* LOOKUPTABLE_H_ */