NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

简化令牌配置

This commit is contained in:
大石头 2017-09-04 00:31:38 +08:00
parent bd3cfb95b1
commit afa1d03243
12 changed files with 35 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Board/AP0103.cpp
View File

@ -158,13 +158,8 @@ void AP0103::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
tc->UseLocal();
Client = tc;

7
Board/AP0104.cpp
View File

@ -152,13 +152,8 @@ void AP0104::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
tc->UseLocal();
Client = tc;

7
Board/IOK026X.cpp
View File

@ -112,13 +112,8 @@ void IOK026X::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
tc->UseLocal();
Client = tc;

7
Board/NH3_0317.cpp
View File

@ -124,13 +124,8 @@ void NH3_0317::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
tc->UseLocal();
Client = tc;

7
Board/Pandora.cpp
View File

@ -145,13 +145,8 @@ void PA0903::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
tc->UseLocal();
Client = tc;

7
Board/TokenBoard.cpp
View File

@ -52,13 +52,8 @@ void TokenBoard::InitClient(bool useLocal)
// 初始化配置区
InitConfig();
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
auto tc = TokenClient::Create("udp://smart.wslink.cn:33333", Buffer(Data, Size));
if (useLocal) tc->UseLocal();
Client = tc;

354
TokenNet/Token.cpp
View File

@ -1,354 +0,0 @@
#include "Token.h"
#include "Kernel\Task.h"
#include "Device\SerialPort.h"
#include "Device\WatchDog.h"
#include "Config.h"
#include "Drivers\NRF24L01.h"
#include "Drivers\W5500.h"
#include "Drivers\ShunCom.h"
#include "Drivers\Enc28j60.h"
#include "TinyIP\TinyIP.h"
#include "Net\Dhcp.h"
#include "Net\DNS.h"
#include "TokenNet\TokenController.h"
#include "TokenNet\Gateway.h"
#include "TokenNet\Token.h"
#include "Security\RC4.h"
#include "App\FlushPort.h"
#include "BootConfig.h"
#define ShunCom_Master 0
static void StartGateway(void* param);
static void OnDhcpStop(Dhcp& dhcp)
{
// DHCP成功，或者失败且超过最大错误次数，都要启动网关，让它以上一次配置工作
if(dhcp.Result || dhcp.Times >= dhcp.MaxTimes)
{
auto gw = Gateway::Current;
if(!gw || !gw->Running) Sys.AddTask(StartGateway, &dhcp.Host, 0, -1, "启动网关");
}
}
NetworkInterface* Token::CreateW5500(SPI spi_, Pin irq, Pin rst, Pin power, IDataPort* led)
{
debug_printf("\r\nW5500::Create \r\n");
auto spi = new Spi(spi_, 36000000);
debug_printf("\tPower: ");
auto pwr = new OutputPort(power, true);
*pwr = true;
auto net = new W5500();
net->LoadConfig();
net->Init(spi, irq, rst);
net->Led = led;
return net;
}
NetworkInterface* Token::Create2860(SPI spi_, Pin irq, Pin rst)
{
debug_printf("\r\nENC2860::Create \r\n");
auto spi = new Spi(spi_, 9000000);
auto _enc = new Enc28j60();
_enc->Init(spi, irq, rst);
auto _tip = new TinyIP();
_tip->Init(_enc);
_enc->Mac = _tip->Mac;
if(!_tip->Open()) return nullptr;
Sys.Sleep(500);
if(!_enc->Linked()) debug_printf("未连接网线！\r\n");
// 通过DHCP获取IP期间，关闭Arp响应
//_tip.Arp->Enable = false;
return _tip;
}
TokenClient* Token::CreateClient(NetworkInterface* host)
{
debug_printf("\r\nCreateClient \r\n");
// 打开DHCP
static Dhcp dhcp(*host);
dhcp.OnStop = OnDhcpStop;
dhcp.Start();
auto tk = TokenConfig::Current;
// 创建连接服务器的Socket
auto socket = host->CreateSocket(tk->Protocol);
socket->Remote.Port = tk->ServerPort;
socket->Remote.Address = IPAddress(tk->ServerIP);
// 创建连接服务器的控制器
static TokenController ctrl;
ctrl.Port = dynamic_cast<ITransport*>(socket);
// 创建客户端
static TokenClient client;
//client.Control = &ctrl;
//client->Local = ctrl;
client.Cfg = tk;
client.Controls.Add(&ctrl);
// 如果是TCP，需要再建立一个本地UDP
//if(tk->Protocol == NetType::Tcp)
{
// 建立一个监听内网的UDP Socket
socket = host->CreateSocket(NetType::Udp);
socket->Remote.Port = 3355; // 广播端口。其实用哪一个都不重要，因为不会主动广播
socket->Remote.Address = IPAddress::Broadcast();
socket->Local.Port = tk->Port;
// 建立内网控制器
auto ctrl2 = new TokenController();
ctrl2->Port = dynamic_cast<ITransport*>(socket);
//client.Local = ctrl2;
client.Controls.Add(ctrl2);
}
return &client;
}
TinyServer* Token::CreateServer(ITransport* port)
{
debug_printf("\r\n CreateServer \r\n");
static TinyController ctrl;
ctrl.Port = port;
ctrl.QueueLength = 64;
ctrl.ApplyConfig();
// 新配置需要保存一下
auto tc = TinyConfig::Current;
if(tc && tc->New) tc->Save();
static TinyServer server(&ctrl);
server.Cfg = tc;
return &server;
}
#if DEBUG
static uint OnSerial(ITransport* transport, Buffer& bs, void* param, void* param2)
{
debug_printf("OnSerial len=%d \t", bs.Length());
bs.Show(true);
//TokenClient* client = TokenClient::Current;
//if(client) client->Store.Write(1, bs);
return 0;
}
#endif
void Token::Setup(ushort code, cstring name, COM message, int baudRate)
{
auto& sys = (TSys&)Sys;
sys.Code = code;
sys.Name = (char*)name;
// 初始化系统
//Sys.Clock = 48000000;
sys.Init();
#if DEBUG
sys.MessagePort = message; // 指定printf输出的串口
Sys.ShowInfo();
#endif
#if DEBUG
// 设置一定量初始任务，减少堆分配
static Task ts[0x10];
Task::Scheduler()->Set(ts, ArrayLength(ts));
#endif
#if DEBUG
// 打开串口输入便于调试数据操作，但是会影响性能
if(baudRate > 0)
{
auto sp = SerialPort::GetMessagePort();
if(baudRate != 1024000)
{
sp->Close();
sp->SetBaudRate(baudRate);
}
sp->Register(OnSerial);
}
//WatchDog::Start(20000);
#else
WatchDog::Start();
#endif
#if defined(APP)
// 把引脚放进 Boot区 的 PinConfig 内
Flash flash;
const uint bootCfgAddr = 0x800fc00; // 63K位置
Config Cfg(flash,bootCfgAddr,1 << 10);
Config::Current = &Cfg;
static BootConfig bootCfg;
bootCfg.Load();
BootConfig::Current = &bootCfg;
#endif
// Flash最后一块作为配置区
Config::Current = &Config::CreateFlash();
}
static int Fix2401(const Buffer& bs)
{
//auto& bs = *(Buffer*)param;
// 微网指令特殊处理长度
uint rs = bs.Length();
if(rs >= 8)
{
rs = bs[5] + 8;
//if(rs < bs.Length()) bs.SetLength(rs);
}
return rs;
}
ITransport* Token::Create2401(SPI spi_, Pin ce, Pin irq, Pin power, bool powerInvert, IDataPort* led)
{
debug_printf("\r\n Create2401 \r\n");
static Spi spi(spi_, 10000000, true);
static NRF24L01 nrf;
nrf.Init(&spi, ce, irq, power);
auto tc = TinyConfig::Create();
if(tc->Channel == 0)
{
tc->Channel = 120;
tc->Speed = 250;
}
if(tc->Interval == 0)
{
tc->Interval= 40;
tc->Timeout = 1000;
}
nrf.AutoAnswer = false;
nrf.DynPayload = false;
nrf.Channel = tc->Channel;
//nrf.Channel = 120;
nrf.Speed = tc->Speed;
nrf.FixData = Fix2401;
nrf.Led = led;
nrf.Master = true;
return &nrf;
}
ITransport* Token::CreateShunCom(COM index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led)
{
debug_printf("\r\n CreateShunCom \r\n");
auto tc = TinyConfig::Create();
if(tc->Channel == 0)
{
tc->Channel = 0x0F;
tc->Speed = 250;
}
if(tc->Interval == 0)
{
tc->Interval= 800;
tc->Timeout = 1600;
}
static SerialPort sp(index, baudRate);
static ShunCom zb;
zb.Power.Set(power);
zb.Sleep.Init(slp, true);
zb.Config.Init(cfg, true);
zb.Init(&sp, rst);
zb.Led = led;
#if ShunCom_Master
zb.AddrLength = 2;
if(tc->Channel != 0x0F)
{
if(zb.EnterConfig())
{
zb.ShowConfig();
zb.SetDevice(0x00);
//zb.SetPanID(0x4444);
//zb.EraConfig();
tc->Channel = 0x0F;
tc->Save();
zb.SetSend(0x01);
zb.PrintSrc(true);
zb.ExitConfig();
}
}
#endif
return &zb;
}
void StartGateway(void* param)
{
//Socket* socket = nullptr;
auto gw = Gateway::Current;
//if(gw) socket = dynamic_cast<Socket*>(gw->Client->Control->Port);
/*auto tk = TokenConfig::Current;
if(tk && tk->Server.Length() > 0)
{
// 根据DNS获取云端IP地址
auto ip = DNS::Query(*(NetworkInterface*)param, tk->Server);
if(ip == IPAddress::Any())
{
debug_printf("DNS::Query %s 失败！\r\n", tk->Server.GetBuffer());
return;
}
debug_printf("服务器地址 %s %s:%d \r\n", tk->Server.GetBuffer(), ip.ToString().GetBuffer(), tk->ServerPort);
if(socket) socket->Remote.Address = ip;
tk->ServerIP = ip.Value;
tk->Save();
}*/
// 此时启动网关服务
if(gw)
{
//auto& ep = gw->Client->Hello.EndPoint;
//if(socket) ep.Address = socket->Host->IP;
if(!gw->Running)
{
gw->Start();
debug_printf("\r\n");
// 启动时首先进入学习模式
//gw->SetMode(30);
}
}
}
void Token::SetPower(ITransport* port)
{
auto pwr = dynamic_cast<Power*>(port);
if(pwr) pwr->SetPower();
}

35
TokenNet/Token.h
View File

@ -1,35 +0,0 @@
#ifndef _Token_H_
#define _Token_H_
#include "Kernel\Sys.h"
#include "Net\ITransport.h"
#include "Net\Socket.h"
#include "Message\DataStore.h"
#include "TokenNet\TokenClient.h"
#include "TinyNet\TinyServer.h"
#include "TokenNet\Gateway.h"
#include "App\FlushPort.h"
// 令牌网
class Token
{
public:
static void Setup(ushort code, cstring name, COM message = COM1, int baudRate = 0);
static NetworkInterface* CreateW5500(SPI spi, Pin irq, Pin rst = P0, Pin power = P0, IDataPort* led = nullptr);
static NetworkInterface* Create2860(SPI spi, Pin irq, Pin rst);
static ITransport* Create2401(SPI spi, Pin ce, Pin irq, Pin power = P0, bool powerInvert = false, IDataPort* led = nullptr);
static ITransport* CreateShunCom(COM index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led = nullptr);
static TokenClient* CreateClient(NetworkInterface* host);
static TokenClient* CreateClient2860(NetworkInterface* host);
static TinyServer* CreateServer(ITransport* port);
void SetPower(ITransport* port);
};
#endif

28
TokenNet/TokenClient.cpp
View File

@ -173,7 +173,7 @@ void TokenClient::CheckNet()
mst->Received = dlg;
mst->Open();
Cfg->ServerIP = mst->_Socket->Remote.Address.Value;
//Cfg->ServerIP = mst->_Socket->Remote.Address.Value;
}
// 为其它网卡创建本地会话
@ -565,9 +565,7 @@ bool TokenClient::OnRedirect(HelloMessage& msg)
auto cfg = Cfg;
cfg->Show();
cfg->Protocol = msg.Uri.Type;
cfg->Server() = msg.Uri.Host;
cfg->ServerPort = msg.Uri.Port;
cfg->Server() = msg.Uri.ToString();
cfg->Token() = msg.Cookie;
cfg->Save();
@ -1177,9 +1175,17 @@ void TokenClient::Register(cstring action, InvokeHandler handler, void* param)
}
// 快速建立令牌客户端，注册默认Api
TokenClient* TokenClient::CreateFast(const Buffer& store)
TokenClient* TokenClient::Create(cstring server, const Buffer& store)
{
// Flash最后一块作为配置区
if (Config::Current == nullptr) Config::Current = &Config::CreateFlash();
// 初始化令牌网
auto tk = TokenConfig::Create(server, 3377);
auto tc = new TokenClient();
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
// 重启
tc->Register("Gateway/Restart", &TokenClient::InvokeRestart, tc);
@ -1254,9 +1260,7 @@ bool TokenClient::InvokeSetRemote(void * param, const Pair& args, Stream& result
auto cfg = client->Cfg;
cfg->Show();
cfg->Protocol = uri.Type;
cfg->Server() = uri.Host;
cfg->ServerPort = uri.Port;
cfg->Server() = uri.ToString();
cfg->Save();
cfg->Show();
@ -1278,12 +1282,10 @@ bool TokenClient::InvokeGetRemote(void * param, const Pair& args, Stream& result
auto cfg = client->Cfg;
cfg->Show();
String type = cfg->Protocol == NetType::Tcp ? "Tcp://" : "Udp://";
auto host = cfg->Server();
auto port = cfg->ServerPort;
auto svr = cfg->Server();
result.Write(svr);
remote = type + host + ":" + port;
result.Write(remote);
return true;
}

2
TokenNet/TokenClient.h
View File

@ -96,7 +96,7 @@ public:
static TokenClient* Current;
// 快速建立令牌客户端，注册默认Api
static TokenClient* CreateFast(const Buffer& store);
static TokenClient* Create(cstring server, const Buffer& store);
// 重启，重置
static bool InvokeRestart(void * param, const Pair& args, Stream& result);

50
TokenNet/TokenConfig.cpp
View File

@ -17,22 +17,9 @@ void TokenConfig::Init()
ConfigBase::Init();
Length = Size();
ServerIP = 0;
SoftVer = Sys.Ver;
PingTime = 10;
//User[16] = '\0';
//Key[15] = '\0';
Protocol = NetType::Udp;
}
NetUri TokenConfig::Uri() const
{
NetUri uri(Protocol, IPAddress(ServerIP), ServerPort);
uri.Host = _Server;
return uri;
}
void TokenConfig::Show() const
@ -40,53 +27,38 @@ void TokenConfig::Show() const
#if DEBUG
debug_printf("TokenConfig::令牌配置：\r\n");
//debug_printf("\t协议: %s ,%d\r\n", Protocol == NetType::Udp ? "UDP" : Protocol == NetType::Tcp ? "TCP" : "", Protocol);
debug_printf("\t端口: %d \r\n", Port);
debug_printf("\t远程: ");
NetUri uri(Protocol, IPAddress(ServerIP), ServerPort);
uri.ToString().Show(true);
debug_printf("\t服务: %s \r\n", _Server);
debug_printf("\t厂商: %s \r\n", _Vendor);
debug_printf("\t登录: %s \r\n", _User);
debug_printf("\t密码: %s \r\n", _Pass);
debug_printf("\t令牌: %s \r\n", _Token);
#endif
}
TokenConfig* TokenConfig::Create(cstring vendor, NetType protocol, ushort sport, ushort port)
TokenConfig* TokenConfig::Create(cstring server, ushort port)
{
static TokenConfig tc;
if(!Current)
{
TokenConfig::Current = &tc;
tc.Init();
tc.Protocol = protocol;
tc.Load();
auto uri = tc.Uri();
// 默认 UDP 不允许 unknown
if(tc.Protocol == NetType::Unknown) tc.Protocol = NetType::Udp;
if(uri.Type == NetType::Unknown) uri.Type = NetType::Udp;
bool rs = tc.New;
auto vnd = tc.Vendor();
if(!vnd)
// 如果服务器配置为空，则使用外部地址
auto svr = tc.Server();
if (!svr)
{
vnd = vendor;
svr = server;
tc.Port = port;
rs = false;
tc.Save();
}
auto svr = tc.Server();
if(!svr)
{
svr = vnd;
tc.ServerPort = sport;
tc.Port = port;
rs = false;
}
if(!rs) tc.Save();
tc.Show();
}

16
TokenNet/TokenConfig.h
View File

@ -4,11 +4,6 @@
#include "..\Config.h"
#include "Net\NetUri.h"
// 必须设定为1字节对齐，否则offsetof会得到错误的位置
//#pragma pack(push) // 保存对齐状态
// 强制结构体紧凑分配空间
//#pragma pack(1)
// 配置信息
class TokenConfig : public ConfigBase
{
@ -21,13 +16,9 @@ public:
ushort SoftVer; // 软件版本
byte PingTime; // 心跳时间。秒
NetType Protocol; // 协议，TCP=6/UDP=17
ushort Port; // 本地端口
uint ServerIP; // 服务器IP地址。服务器域名解析成功后覆盖
ushort ServerPort; // 服务器端口
char _Token[32]; // 访问服务器令牌
char _Server[32]; // 服务器域名。出厂为空，从厂商服务器覆盖，恢复出厂设置时清空
char _Vendor[32]; // 厂商服务器域名。原始厂商服务器地址
byte TagEnd; // 数据区结束标识符
@ -39,15 +30,12 @@ public:
String Pass() { return String(_Pass, sizeof(_Pass), false); }
String Token() { return String(_Token, sizeof(_Token), false); }
String Server() { return String(_Server, sizeof(_Server), false); }
String Vendor() { return String(_Vendor, sizeof(_Vendor), false); }
NetUri Uri() const;
NetUri Uri() { return NetUri(Server()); }
static TokenConfig* Current;
static TokenConfig* Create(cstring vendor, NetType protocol, ushort sport, ushort port);
static TokenConfig* Create(cstring server, ushort port);
private:
};
//#pragma pack(pop) // 恢复对齐状态
#endif