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

修正编译警告，HttpClient移到Net目录

This commit is contained in:
大石头X2 2017-02-27 17:57:00 +08:00
parent 3f2747222c
commit 91229367f1
15 changed files with 357 additions and 695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Board/AP0103.cpp
View File

@ -101,7 +101,7 @@ void AP0103::InitLeds()
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
static void ButtonOnpress(InputPort* port, bool down, void* param)
{
// if (port->PressTime > 1000)
AP0103::OnPress(port, down);
@ -198,7 +198,7 @@ void AP0103::Register(int index, IDataPort& dp)
ds.Register(index, dp);
}
void OnInitNet(void* param)
static void OnInitNet(void* param)
{
auto& bsp = *(AP0103*)param;

4
Board/AP0104.cpp
View File

@ -101,7 +101,7 @@ void AP0104::InitLeds()
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
static void ButtonOnpress(InputPort* port, bool down, void* param)
{
// if (port->PressTime > 1000)
AP0104::OnPress(port, down);
@ -192,7 +192,7 @@ void AP0104::Register(int index, IDataPort& dp)
ds.Register(index, dp);
}
void OnInitNet(void* param)
static void OnInitNet(void* param)
{
auto& bsp = *(AP0104*)param;

4
Board/AP0801.cpp
View File

@ -103,7 +103,7 @@ void AP0801::InitLeds()
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
static void ButtonOnpress(InputPort* port, bool down, void* param)
{
if (port->PressTime > 1000)
AP0801::Current->OnLongPress(port, down);
@ -205,7 +205,7 @@ void AP0801::Register(uint offset, uint size, Handler hook)
ds.Register(offset, size, hook);
}
void OnInitNet(void* param)
static void OnInitNet(void* param)
{
auto& bsp = *(AP0801*)param;

4
Board/AP0802.cpp
View File

@ -228,7 +228,7 @@ void AP0802::Register(int index, IDataPort& dp)
ds.Register(index, dp);
}
void OnInitNet(void* param)
static void OnInitNet(void* param)
{
auto& bsp = *(AP0802*)param;
@ -246,7 +246,7 @@ void AP0802::InitNet()
/******************************** 2401 ********************************/
int Fix2401(const Buffer& bs)
static int Fix2401(const Buffer& bs)
{
//auto& bs = *(Buffer*)param;
// 微网指令特殊处理长度

2
Board/IOK0612.cpp
View File

@ -95,7 +95,7 @@ void IOK0612::InitLeds()
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
static void ButtonOnpress(InputPort* port, bool down, void* param)
{
if (port->PressTime > 1000)
IOK0612::OnLongPress(port, down);

2
Board/NH3_0317.cpp
View File

@ -95,7 +95,7 @@ void NH3_0317::InitLeds()
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
static void ButtonOnpress(InputPort* port, bool down, void* param)
{
if (port->PressTime > 1000)
NH3_0317::OnLongPress(port, down);

36
Core/String.cpp
View File

@ -21,7 +21,8 @@ extern char* itoa(int value, char* string, int radix);
extern char* ltoa(Int64 value, char* string, int radix);
extern char* utoa(uint value, char* string, int radix);
extern char* ultoa(UInt64 value, char* string, int radix);
char* dtostrf(double val, byte prec, char* sout);
char* dtostrf(double val, byte prec, char* sout, int len);
/******************************** String ********************************/
@ -373,7 +374,11 @@ bool String::Concat(byte num, int radix)
}
char buf[1 + 3 * sizeof(byte)];
#if defined(_MSC_VER)
_itoa_s(num, buf, sizeof(buf), radix);
#else
itoa(num, buf, radix);
#endif
return Concat(buf, strlen(buf));
}
@ -384,7 +389,11 @@ bool String::Concat(short num, int radix)
if (radix == 16 || radix == -16) return Concat((ushort)num, radix);
char buf[2 + 3 * sizeof(int)];
#if defined(_MSC_VER)
_itoa_s(num, buf, sizeof(buf), radix);
#else
itoa(num, buf, radix);
#endif
return Concat(buf, strlen(buf));
}
@ -412,7 +421,11 @@ bool String::Concat(int num, int radix)
if (radix == 16 || radix == -16) return Concat((uint)num, radix);
char buf[2 + 3 * sizeof(int)];
#if defined(_MSC_VER)
_itoa_s(num, buf, sizeof(buf), radix);
#else
itoa(num, buf, radix);
#endif
return Concat(buf, strlen(buf));
}
@ -464,9 +477,13 @@ bool String::Concat(UInt64 num, int radix)
return Concat(buf, strlen(buf));
}
char* ftoa(char* str, double num)
static char* ftoa(char* str, int len, double num)
{
int len = sprintf(str, "%.8f", num);
#if defined(_MSC_VER)
len = sprintf_s(str, len, "%.8f", num);
#else
len = sprintf(str, "%.8f", num);
#endif
// 干掉后面多余的0
for (int i = len; i >= 0; i--)
{
@ -479,7 +496,7 @@ char* ftoa(char* str, double num)
bool String::Concat(float num, int decimalPlaces)
{
char buf[20];
dtostrf(num, decimalPlaces, buf);
dtostrf(num, decimalPlaces, buf, sizeof(buf));
//sprintf(buf, "%f", num);
//ftoa(buf, num);
return Concat(buf, strlen(buf));
@ -488,7 +505,7 @@ bool String::Concat(float num, int decimalPlaces)
bool String::Concat(double num, int decimalPlaces)
{
char buf[20];
dtostrf(num, decimalPlaces, buf);
dtostrf(num, decimalPlaces, buf, sizeof(buf));
//sprintf(buf, "%f", num);
//ftoa(buf, num);
return Concat(buf, strlen(buf));
@ -1051,11 +1068,16 @@ extern char* ultoa(UInt64 value, char* string, int radix)
}
#endif
char *dtostrf (double val, byte prec, char* str)
static char *dtostrf(double val, byte prec, char* str, int len)
{
char fmt[20];
#if defined(_MSC_VER)
sprintf_s(fmt, sizeof(fmt), "%%.%df", prec);
len = sprintf_s(str, len, fmt, val);
#else
sprintf(fmt, "%%.%df", prec);
int len = sprintf(str, fmt, val);
len = sprintf(str, fmt, val);
#endif
// 干掉后面多余的0
for (int i = len; i >= 0; i--)

16
Net/HttpClient.cpp Normal file
View File

@ -0,0 +1,16 @@
#include "HttpClient.h"
#include "Socket.h"
HttpClient::HttpClient()
{
_Socket = nullptr;
}
String HttpClient::Get(const String& uri)
{
String str;
return str;
}

21
Net/HttpClient.h Normal file
View File

@ -0,0 +1,21 @@
#ifndef _HttpClient_H_
#define _HttpClient_H_
#include "Core\SString.h"
class Socket;
// Http客户端
class HttpClient
{
public:
HttpClient();
String Get(const String& uri);
private:
Socket* _Socket;
};
#endif

457
TinyIP/HttpClient.cpp
View File

@ -1,457 +0,0 @@
#include "HttpClient.h"
#define NET_DEBUG DEBUG
bool Callback(TinyIP* tip, void* param, Stream& ms);
TcpSocket::TcpSocket(TinyIP* tip) : Socket(tip)
{
Type = IP_TCP;
Port = 0;
RemoteIP = 0;
RemotePort = 0;
LocalIP = 0;
LocalPort = 0;
// 累加端口
static ushort g_tcp_port = 1024;
if(g_tcp_port < 1024) g_tcp_port = 1024;
BindPort = g_tcp_port++;
// 我们仅仅递增第二个字节，这将允许我们以256或者512字节来发包
static uint seqnum = 0xa;
Seq = seqnum << 8;
seqnum += 2;
Ack = 0;
Status = Closed;
OnAccepted = nullptr;
OnReceived = nullptr;
OnDisconnected = nullptr;
}
cstring TcpSocket::ToString()
{
static char name[10];
sprintf(name, "TCP_%d", Port);
return name;
}
bool TcpSocket::OnOpen()
{
if(Port != 0) BindPort = Port;
if(Port)
debug_printf("Tcp::Open %d 过滤 %d\r\n", BindPort, Port);
else
debug_printf("Tcp::Open %d 监听所有端口TCP数据包\r\n", BindPort);
Enable = true;
return Enable;
}
void TcpSocket::OnClose()
{
debug_printf("Tcp::Close %d\r\n", BindPort);
Enable = false;
}
bool TcpSocket::Process(Stream* ms)
{
TCP_HEADER* tcp = (TCP_HEADER*)ms->Current();
if(!ms->Seek(tcp->Size())) return false;
Header = tcp;
uint len = ms->Remain();
ushort port = _REV16(tcp->DestPort);
ushort remotePort = _REV16(tcp->SrcPort);
// 仅处理本连接的IP和端口
if(Port != 0 && port != Port) return false;
//if(RemotePort != 0 && remotePort != RemotePort) return false;
//if(RemoteIP != 0 && Tip->RemoteIP != RemoteIP) return false;
IP_HEADER* ip = tcp->Prev();
RemotePort = remotePort;
RemoteIP = ip->SrcIP;
LocalPort = port;
LocalIP = ip->DestIP;
OnProcess(tcp, *ms);
return true;
}
void TcpSocket::OnProcess(TCP_HEADER* tcp, Stream& ms)
{
// 计算标称的数据长度
//uint len = tcp->Size() - sizeof(TCP_HEADER);
//assert_param(len <= ms.Remain());
// TCP好像没有标识数据长度的字段，但是IP里面有，这样子的话，ms里面的长度是准确的
uint len = ms.Remain();
#if NET_DEBUG
debug_printf("Tcp::Process Flags=0x%02x From ", tcp->Flags);
TinyIP::ShowIP(RemoteIP);
debug_printf(":%d", RemotePort);
debug_printf("\r\n");
#endif
// 下次主动发数据时，用该序列号，因为对方Ack确认期望下次得到这个序列号
Seq = _REV(tcp->Ack);
Ack = _REV(tcp->Seq) + len + 1;
// 第一次同步应答
if (tcp->Flags & TCP_FLAGS_SYN) // SYN连接请求标志位，为1表示发起连接的请求数据包
{
if(!(tcp->Flags & TCP_FLAGS_ACK))
OnAccept(tcp, len);
else
Accepted2(tcp, len);
}
else if(tcp->Flags & (TCP_FLAGS_FIN | TCP_FLAGS_RST))
{
OnDisconnect(tcp, len);
}
// 第三次同步应答,三次应答后方可传输数据
else if (tcp->Flags & TCP_FLAGS_ACK) // ACK确认标志位，为1表示此数据包为应答数据包
{
if(len == 0 && tcp->Ack <= 1)
Accepted2(tcp, len);
else
OnDataReceive(tcp, len);
}
else
debug_printf("Tcp::Process 未知标识位 0x%02x \r\n", tcp->Flags);
}
void TcpSocket::OnAccept(TCP_HEADER* tcp, uint len)
{
if(OnAccepted)
OnAccepted(this, tcp, tcp->Next(), len);
else
{
#if NET_DEBUG
debug_printf("Tcp Accept "); // 打印发送方的ip
TinyIP::ShowIP(RemoteIP);
debug_printf(":%d", RemotePort);
debug_printf("\r\n");
#endif
}
//第二次同步应答
SetSeqAck(tcp, 1, false);
SetMss(tcp);
// 需要用到MSS，所以采用4个字节的可选段
//Send(tcp, 4, TCP_FLAGS_SYN | TCP_FLAGS_ACK);
// 注意tcp->Size()包括头部的扩展数据，这里不用单独填4
Send(tcp, 0, TCP_FLAGS_SYN | TCP_FLAGS_ACK);
}
void TcpSocket::Accepted2(TCP_HEADER* tcp, uint len)
{
if(OnAccepted)
OnAccepted(this, tcp, tcp->Next(), len);
else
{
#if NET_DEBUG
debug_printf("Tcp Accept3 "); // 打印发送方的ip
TinyIP::ShowIP(RemoteIP);
debug_printf(":%d", RemotePort);
debug_printf("\r\n");
#endif
}
//第二次同步应答
SetSeqAck(tcp, 1, true);
Send(tcp, 0, TCP_FLAGS_ACK);
}
void TcpSocket::OnDataReceive(TCP_HEADER* tcp, uint len)
{
// 无数据返回ACK
if (len == 0)
{
if (tcp->Flags & (TCP_FLAGS_FIN | TCP_FLAGS_RST)) //FIN结束连接请求标志位。为1表示是结束连接的请求数据包
{
SetSeqAck(tcp, 1, true);
Send(tcp, 0, TCP_FLAGS_ACK);
}
else
{
#if NET_DEBUG
debug_printf("Tcp Receive(%d) From ", len);
TinyIP::ShowIP(RemoteIP);
debug_printf("\r\n");
#endif
}
return;
}
if(OnReceived)
{
// 返回值指示是否向对方发送数据包
bool rs = OnReceived(this, tcp, tcp->Next(), len);
if(!rs)
{
// 发送ACK，通知已收到
SetSeqAck(tcp, 1, true);
Send(tcp, 0, TCP_FLAGS_ACK);
return;
}
}
else
{
#if NET_DEBUG
debug_printf("Tcp Receive(%d) From ", len);
TinyIP::ShowIP(RemoteIP);
debug_printf(" : ");
String(tcp->Next(), len).Show(true);
#endif
}
// 发送ACK，通知已收到
SetSeqAck(tcp, len, true);
//Send(buf, 0, TCP_FLAGS_ACK);
//TcpSend(buf, len);
// 响应Ack和发送数据一步到位
Send(tcp, len, TCP_FLAGS_ACK | TCP_FLAGS_PUSH);
}
void TcpSocket::OnDisconnect(TCP_HEADER* tcp, uint len)
{
if(OnDisconnected) OnDisconnected(this, tcp, tcp->Next(), len);
// RST是对方紧急关闭，这里啥都不干
if(tcp->Flags & TCP_FLAGS_FIN)
{
SetSeqAck(tcp, 1, true);
//Close(tcp, 0);
Send(tcp, 0, TCP_FLAGS_ACK | TCP_FLAGS_PUSH | TCP_FLAGS_FIN);
}
else
{
#if NET_DEBUG
debug_printf("Tcp OnDisconnect "); // 打印发送方的ip
TinyIP::ShowIP(RemoteIP);
debug_printf(":%d Flags=0x%02x", RemotePort, tcp->Flags);
debug_printf("\r\n");
#endif
}
}
void TcpSocket::Send(TCP_HEADER* tcp, uint len, byte flags)
{
tcp->SrcPort = _REV16(Port > 0 ? Port : LocalPort);
tcp->DestPort = _REV16(RemotePort);
tcp->Flags = flags;
tcp->WindowSize = _REV16(1024);
if(tcp->Length < sizeof(TCP_HEADER) / 4) tcp->Length = sizeof(TCP_HEADER) / 4;
// 必须在校验码之前设置，因为计算校验码需要地址
Tip->RemoteIP = RemoteIP;
// 网络序是大端
tcp->Checksum = 0;
tcp->Checksum = _REV16(Tip->CheckSum((byte*)tcp, tcp->Size() + len, 2));
debug_printf("SendTcp: Flags=0x%02x, len=%d(0x%x) %d => %d \r\n", flags, tcp->Length, tcp->Length, _REV16(tcp->SrcPort), _REV16(tcp->DestPort));
// 注意tcp->Size()包括头部的扩展数据
Tip->SendIP(IP_TCP, (byte*)tcp, tcp->Size() + len);
}
void TcpSocket::SetSeqAck(TCP_HEADER* tcp, uint ackNum, bool opSeq)
{
/*
第一次握手：主机A发送位码为SYN＝1，随机产生Seq=x的数据包到服务器，主机B由SYN=1知道，A要求建立联机
第二次握手：主机B收到请求后要确认联机信息，向A发送Ack=(A.Seq+1)，SYN=1，ACK=1，随机产生Seq=y的包
第三次握手：主机A收到后检查Ack是否正确，即A.Seq+1，以及位码ACK是否为1，
若正确，主机A会再发送Ack=(B.Seq+1)，ACK=1，主机B收到后确认Seq值与ACK=1则连接建立成功。
完成三次握手，主机A与主机B开始传送数据。
Seq 序列号。每一个字节都编号，本报文所发送数据的第一个字节的序号。
Ack 确认号。期望收到对方的下一个报文的数据的第一个字节的序号。
*/
//TCP_HEADER* tcp = Header;
uint ack = tcp->Ack;
tcp->Ack = _REV(_REV(tcp->Seq) + ackNum);
if (!opSeq)
{
tcp->Seq = _REV(Seq);
}
else
{
tcp->Seq = ack;
//tcp->Seq = _REV(Seq);
}
}
void TcpSocket::SetMss(TCP_HEADER* tcp)
{
tcp->Length = sizeof(TCP_HEADER) / 4;
// 头部后面可能有可选数据，Length决定头部总长度（4的倍数）
//if (mss)
{
uint* p = (uint*)tcp->Next();
// 使用可选域设置 MSS 到 1460:0x5b4
p[0] = _REV(0x020405b4);
p[1] = _REV(0x01030302);
p[2] = _REV(0x01010402);
tcp->Length += 3;
}
}
TCP_HEADER* TcpSocket::Create()
{
return (TCP_HEADER*)(Tip->Buffer + sizeof(ETH_HEADER) + sizeof(IP_HEADER));
}
void TcpSocket::SendAck(uint len)
{
TCP_HEADER* tcp = Create();
tcp->Init(true);
Send(tcp, len, TCP_FLAGS_ACK | TCP_FLAGS_PUSH);
}
void TcpSocket::Disconnect()
{
debug_printf("Tcp::Disconnect ");
Tip->ShowIP(RemoteIP);
debug_printf(":%d \r\n", RemotePort);
TCP_HEADER* tcp = Create();
tcp->Init(true);
Send(tcp, 0, TCP_FLAGS_ACK | TCP_FLAGS_PUSH | TCP_FLAGS_FIN);
}
void TcpSocket::Send(const byte* buf, uint len)
{
debug_printf("Tcp::Send ");
Tip->ShowIP(RemoteIP);
debug_printf(":%d buf=0x%08x len=%d ...... \r\n", RemotePort, buf, len);
TCP_HEADER* tcp = Create();
tcp->Init(true);
byte* end = Tip->Buffer + Tip->BufferSize;
if(buf < tcp->Next() || buf >= end)
{
// 复制数据，确保数据不会溢出
uint len2 = Tip->BufferSize - tcp->Offset() - tcp->Size();
assert_param(len <= len2);
Buffer(tcp->Next(), len) = buf;
}
// 发送的时候采用LocalPort
LocalPort = BindPort;
//SetSeqAck(tcp, len, true);
tcp->Seq = _REV(Seq);
tcp->Ack = _REV(Ack);
// 发送数据的时候，需要同时带PUSH和ACK
Send(tcp, len, TCP_FLAGS_PUSH | TCP_FLAGS_ACK);
Tip->LoopWait(Callback, this, 5000);
if(tcp->Flags & TCP_FLAGS_ACK)
debug_printf("发送成功！\r\n");
else
debug_printf("发送失败！\r\n");
}
// 连接远程服务器，记录远程服务器IP和端口，后续发送数据和关闭连接需要
bool TcpSocket::Connect(IPAddress ip, ushort port)
{
debug_printf("Tcp::Connect ");
Tip->ShowIP(ip);
debug_printf(":%d ...... \r\n", port);
RemoteIP = ip;
RemotePort = port;
TCP_HEADER* tcp = Create();
tcp->Init(true);
tcp->Seq = 0; // 仅仅是为了Ack=0，tcp->Seq还是会被Socket的顺序Seq替代
SetSeqAck(tcp, 0, false);
SetMss(tcp);
Status = SynSent;
Send(tcp, 0, TCP_FLAGS_SYN);
if(Tip->LoopWait(Callback, this, 5000))
{
//if(tcp->Flags & TCP_FLAGS_SYN)
if(Status = SynAck)
{
Status = Established;
debug_printf("连接成功！\r\n");
return true;
}
Status = Closed;
debug_printf("拒绝连接！\r\n");
return false;
}
Status = Closed;
debug_printf("连接超时！\r\n");
return false;
}
bool Callback(TinyIP* tip, void* param, Stream& ms)
{
auto eth = ms.Retrieve<ETH_HEADER>();
if(eth->Type != ETH_IP) return false;
auto _ip = ms.Retrieve<IP_HEADER>();
if(_ip->Protocol != IP_TCP) return false;
auto socket = (TcpSocket*)param;
// 这里不移动数据流，方便后面调用Process
auto tcp = (TCP_HEADER*)_ip->Next();
// 检查端口
ushort port = _REV16(tcp->DestPort);
if(port != socket->Port) return false;
socket->Header = tcp;
if(socket->Status == TcpSocket::SynSent)
{
if(tcp->Flags & TCP_FLAGS_ACK)
{
socket->Status = TcpSocket::SynAck;
// 处理。如果对方回发第二次握手包，或者终止握手
//Stream ms(tip->Buffer, tip->BufferSize);
socket->Process(&ms);
return true;
}
}
return false;
}
bool TcpSocket::OnWrite(const byte* buf, uint len)
{
Send(buf, len);
return len;
}
uint TcpSocket::OnRead(byte* buf, uint len)
{
// 暂时不支持
assert_param(false);
return 0;
}

48
TinyIP/HttpClient.h
View File

@ -1,48 +0,0 @@
#ifndef _TinyIP_HttpClient_H_
#define _TinyIP_HttpClient_H_
#include "TinyIP.h"
// Http客户端
class HttpClient : public TcpSocket
{
public:
HttpClient(TinyIP* tip);
// 处理数据包
virtual bool Process(Stream* ms);
bool Connect(IPAddress ip, ushort port); // 连接远程服务器，记录远程服务器IP和端口，后续发送数据和关闭连接需要
void Send(const byte* buf, uint len); // 向Socket发送数据，可能是外部数据包
void Disconnect(); // 关闭Socket
// 收到Tcp数据时触发，传递结构体和负载数据长度。返回值指示是否向对方发送数据包
typedef bool (*TcpHandler)(TcpSocket* socket, TCP_HEADER* tcp, byte* buf, uint len);
TcpHandler OnAccepted;
TcpHandler OnReceived;
TcpHandler OnDisconnected;
virtual cstring ToString();
protected:
void SendAck(uint len);
void SetSeqAck(TCP_HEADER* tcp, uint ackNum, bool cp_seq);
void SetMss(TCP_HEADER* tcp);
void Send(TCP_HEADER* tcp, uint len, byte flags);
virtual void OnProcess(TCP_HEADER* tcp, Stream& ms);
virtual void OnAccept(TCP_HEADER* tcp, uint len);
virtual void Accepted2(TCP_HEADER* tcp, uint len);
virtual void OnDataReceive(TCP_HEADER* tcp, uint len);
virtual void OnDisconnect(TCP_HEADER* tcp, uint len);
virtual bool OnOpen();
virtual void OnClose();
virtual bool OnWrite(const byte* buf, uint len);
virtual uint OnRead(byte* buf, uint len);
};
#endif

2
TinyNet/Tiny.cpp
View File

@ -56,7 +56,7 @@ void Setup(ushort code, cstring name, COM message, int baudRate)
Config::Current = &Config::CreateFlash();
}
int Fix2401(const Buffer& bs)
static int Fix2401(const Buffer& bs)
{
//auto& bs = *(Buffer*)param;
// 微网指令特殊处理长度

2
TokenNet/Token.cpp
View File

@ -213,7 +213,7 @@ void Token::Setup(ushort code, cstring name, COM message, int baudRate)
Config::Current = &Config::CreateFlash();
}
int Fix2401(const Buffer& bs)
static int Fix2401(const Buffer& bs)
{
//auto& bs = *(Buffer*)param;
// 微网指令特殊处理长度

28
vs/SmartOS.vcxproj
View File

@ -36,6 +36,8 @@
<ClCompile Include="..\Board\IOK0612.cpp" />
<ClCompile Include="..\Board\NH3_0317.cpp" />
<ClCompile Include="..\Board\Pandora.cpp" />
<ClCompile Include="..\BootConfig.cpp" />
<ClCompile Include="..\Config.cpp" />
<ClCompile Include="..\Core\Array.cpp" />
<ClCompile Include="..\Core\Buffer.cpp" />
<ClCompile Include="..\Core\ByteArray.cpp" />
@ -105,6 +107,7 @@
<ClCompile Include="..\Net\Blu40.cpp" />
<ClCompile Include="..\Net\Dhcp.cpp" />
<ClCompile Include="..\Net\DNS.cpp" />
<ClCompile Include="..\Net\HttpClient.cpp" />
<ClCompile Include="..\Net\IPAddress.cpp" />
<ClCompile Include="..\Net\IPEndPoint.cpp" />
<ClCompile Include="..\Net\ITransport.cpp" />
@ -121,6 +124,31 @@
<ClCompile Include="..\Security\RC6.cpp" />
<ClCompile Include="..\Security\RSA.cpp" />
<ClCompile Include="..\Storage\Storage.cpp" />
<ClCompile Include="..\Test\ADCTest.cpp" />
<ClCompile Include="..\Test\ArrayTest.cpp" />
<ClCompile Include="..\Test\AT45DBTest.cpp" />
<ClCompile Include="..\Test\BufferTest.cpp" />
<ClCompile Include="..\Test\CrcTest.cpp" />
<ClCompile Include="..\Test\DateTimeTest.cpp" />
<ClCompile Include="..\Test\DictionaryTest.cpp" />
<ClCompile Include="..\Test\EthernetTest.cpp" />
<ClCompile Include="..\Test\FlashTest.cpp" />
<ClCompile Include="..\Test\InvokeTest.cpp" />
<ClCompile Include="..\Test\IRTest.cpp" />
<ClCompile Include="..\Test\JsonTest.cpp" />
<ClCompile Include="..\Test\ListTest.cpp" />
<ClCompile Include="..\Test\MessageTest.cpp" />
<ClCompile Include="..\Test\NRF24L01Test.cpp" />
<ClCompile Include="..\Test\PulsePortTest.cpp" />
<ClCompile Include="..\Test\SerialTest.cpp" />
<ClCompile Include="..\Test\StringTest.cpp" />
<ClCompile Include="..\Test\ThreadTest.cpp" />
<ClCompile Include="..\Test\TimerTest.cpp" />
<ClCompile Include="..\TinyIP\Arp.cpp" />
<ClCompile Include="..\TinyIP\Icmp.cpp" />
<ClCompile Include="..\TinyIP\Tcp.cpp" />
<ClCompile Include="..\TinyIP\TinyIP.cpp" />
<ClCompile Include="..\TinyIP\Udp.cpp" />
<ClCompile Include="..\TinyNet\DataMessage.cpp" />
<ClCompile Include="..\TinyNet\JoinMessage.cpp" />
<ClCompile Include="..\TinyNet\PingMessage.cpp" />

80
vs/SmartOS.vcxproj.filters
View File

@ -462,5 +462,85 @@
<ClCompile Include="..\TokenNet\TokenConfig.cpp">
<Filter>TokenNet</Filter>
</ClCompile>
<ClCompile Include="..\Config.cpp" />
<ClCompile Include="..\BootConfig.cpp" />
<ClCompile Include="..\TinyIP\Icmp.cpp">
<Filter>TinyIP</Filter>
</ClCompile>
<ClCompile Include="..\TinyIP\Tcp.cpp">
<Filter>TinyIP</Filter>
</ClCompile>
<ClCompile Include="..\TinyIP\TinyIP.cpp">
<Filter>TinyIP</Filter>
</ClCompile>
<ClCompile Include="..\TinyIP\Udp.cpp">
<Filter>TinyIP</Filter>
</ClCompile>
<ClCompile Include="..\TinyIP\Arp.cpp">
<Filter>TinyIP</Filter>
</ClCompile>
<ClCompile Include="..\Test\TimerTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\ADCTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\ArrayTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\AT45DBTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\BufferTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\CrcTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\DateTimeTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\DictionaryTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\EthernetTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\FlashTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\InvokeTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\IRTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\JsonTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\ListTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\MessageTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\NRF24L01Test.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\PulsePortTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\SerialTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\StringTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Test\ThreadTest.cpp">
<Filter>Test</Filter>
</ClCompile>
<ClCompile Include="..\Net\HttpClient.cpp">
<Filter>Net</Filter>
</ClCompile>
</ItemGroup>
</Project>