|
|
@ -136,6 +136,13 @@ namespace client |
|
|
|
return boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(m_Addr), m_Port); |
|
|
|
return boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(m_Addr), m_Port); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
i2p::datagram::DatagramDestination * GetDatagramDest() const |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
auto dgram = m_Dest->GetDatagramDestination(); |
|
|
|
|
|
|
|
if(!dgram) dgram = m_Dest->CreateDatagramDestination(); |
|
|
|
|
|
|
|
return dgram; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
WebSocks * Parent; |
|
|
|
WebSocks * Parent; |
|
|
|
|
|
|
|
|
|
|
|
private: |
|
|
|
private: |
|
|
@ -156,6 +163,7 @@ namespace client |
|
|
|
eWSCTryConnect, |
|
|
|
eWSCTryConnect, |
|
|
|
eWSCFailConnect, |
|
|
|
eWSCFailConnect, |
|
|
|
eWSCOkayConnect, |
|
|
|
eWSCOkayConnect, |
|
|
|
|
|
|
|
eWSCDatagram, |
|
|
|
eWSCClose, |
|
|
|
eWSCClose, |
|
|
|
eWSCEnd |
|
|
|
eWSCEnd |
|
|
|
}; |
|
|
|
}; |
|
|
@ -174,13 +182,17 @@ namespace client |
|
|
|
std::string m_RemoteAddr; |
|
|
|
std::string m_RemoteAddr; |
|
|
|
int m_RemotePort; |
|
|
|
int m_RemotePort; |
|
|
|
uint8_t m_RecvBuf[2048]; |
|
|
|
uint8_t m_RecvBuf[2048]; |
|
|
|
|
|
|
|
bool m_IsDatagram; |
|
|
|
|
|
|
|
i2p::datagram::DatagramDestination * m_Datagram; |
|
|
|
|
|
|
|
|
|
|
|
WebSocksConn(const ServerConn & conn, WebSocksImpl * parent) : |
|
|
|
WebSocksConn(const ServerConn & conn, WebSocksImpl * parent) : |
|
|
|
IWebSocksConn(parent->Parent), |
|
|
|
IWebSocksConn(parent->Parent), |
|
|
|
m_Conn(conn), |
|
|
|
m_Conn(conn), |
|
|
|
m_Stream(nullptr), |
|
|
|
m_Stream(nullptr), |
|
|
|
m_State(eWSCInitial), |
|
|
|
m_State(eWSCInitial), |
|
|
|
m_Parent(parent) |
|
|
|
m_Parent(parent), |
|
|
|
|
|
|
|
m_IsDatagram(false), |
|
|
|
|
|
|
|
m_Datagram(nullptr) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -190,6 +202,35 @@ namespace client |
|
|
|
Close(); |
|
|
|
Close(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void HandleDatagram(const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
auto conn = m_Parent->GetConn(m_Conn); |
|
|
|
|
|
|
|
if(conn) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
std::stringstream ss; |
|
|
|
|
|
|
|
ss << from.GetIdentHash().ToBase32(); |
|
|
|
|
|
|
|
ss << ".b32.i2p:"; |
|
|
|
|
|
|
|
ss << std::to_string(fromPort); |
|
|
|
|
|
|
|
ss << "\n"; |
|
|
|
|
|
|
|
ss << std::string((char *)buf, len); |
|
|
|
|
|
|
|
conn->send(ss.str()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void BeginDatagram() |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
m_Datagram = m_Parent->GetDatagramDest(); |
|
|
|
|
|
|
|
m_Datagram->SetReceiver( |
|
|
|
|
|
|
|
std::bind( |
|
|
|
|
|
|
|
&WebSocksConn::HandleDatagram, |
|
|
|
|
|
|
|
this, |
|
|
|
|
|
|
|
std::placeholders::_1, |
|
|
|
|
|
|
|
std::placeholders::_2, |
|
|
|
|
|
|
|
std::placeholders::_3, |
|
|
|
|
|
|
|
std::placeholders::_4, |
|
|
|
|
|
|
|
std::placeholders::_5), m_RemotePort); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void EnterState(ConnState state) |
|
|
|
void EnterState(ConnState state) |
|
|
|
{ |
|
|
|
{ |
|
|
|
LogPrint(eLogDebug, "websocks: state ", m_State, " -> ", state); |
|
|
|
LogPrint(eLogDebug, "websocks: state ", m_State, " -> ", state); |
|
|
@ -206,6 +247,11 @@ namespace client |
|
|
|
// we will try to connect
|
|
|
|
// we will try to connect
|
|
|
|
m_State = eWSCTryConnect; |
|
|
|
m_State = eWSCTryConnect; |
|
|
|
m_Parent->CreateStreamTo(m_RemoteAddr, m_RemotePort, std::bind(&WebSocksConn::ConnectResult, this, std::placeholders::_1)); |
|
|
|
m_Parent->CreateStreamTo(m_RemoteAddr, m_RemotePort, std::bind(&WebSocksConn::ConnectResult, this, std::placeholders::_1)); |
|
|
|
|
|
|
|
} else if (state == eWSCDatagram) { |
|
|
|
|
|
|
|
LogPrint(eLogDebug, "websocks: datagram mode initiated"); |
|
|
|
|
|
|
|
m_State = eWSCDatagram; |
|
|
|
|
|
|
|
BeginDatagram(); |
|
|
|
|
|
|
|
SendResponse(""); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
} |
|
|
|
} |
|
|
@ -245,6 +291,13 @@ namespace client |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
} |
|
|
|
} |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
case eWSCDatagram: |
|
|
|
|
|
|
|
if(state != eWSCClose) { |
|
|
|
|
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
m_State = eWSCClose; |
|
|
|
|
|
|
|
Close(); |
|
|
|
|
|
|
|
return; |
|
|
|
case eWSCOkayConnect: |
|
|
|
case eWSCOkayConnect: |
|
|
|
if(state == eWSCClose) { |
|
|
|
if(state == eWSCClose) { |
|
|
|
// graceful close
|
|
|
|
// graceful close
|
|
|
@ -253,6 +306,7 @@ namespace client |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
LogPrint(eLogWarning, "websocks: invalid state change ", m_State, " -> ", state); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return; |
|
|
|
case eWSCClose: |
|
|
|
case eWSCClose: |
|
|
|
if(state == eWSCEnd) { |
|
|
|
if(state == eWSCEnd) { |
|
|
|
LogPrint(eLogDebug, "websocks: socket ended"); |
|
|
|
LogPrint(eLogDebug, "websocks: socket ended"); |
|
|
@ -361,7 +415,36 @@ namespace client |
|
|
|
m_RemotePort = std::stoi(payload.substr(itr+1)); |
|
|
|
m_RemotePort = std::stoi(payload.substr(itr+1)); |
|
|
|
m_RemoteAddr = payload.substr(0, itr); |
|
|
|
m_RemoteAddr = payload.substr(0, itr); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
m_IsDatagram = m_RemoteAddr == "DATAGRAM"; |
|
|
|
|
|
|
|
if(m_IsDatagram) |
|
|
|
|
|
|
|
EnterState(eWSCDatagram); |
|
|
|
|
|
|
|
else |
|
|
|
EnterState(eWSCTryConnect); |
|
|
|
EnterState(eWSCTryConnect); |
|
|
|
|
|
|
|
} else if (m_State == eWSCDatagram) { |
|
|
|
|
|
|
|
// send datagram
|
|
|
|
|
|
|
|
// format is "host:port\npayload"
|
|
|
|
|
|
|
|
auto idx = payload.find("\n"); |
|
|
|
|
|
|
|
std::string line = payload.substr(0, idx); |
|
|
|
|
|
|
|
auto itr = line.find(":"); |
|
|
|
|
|
|
|
auto & addressbook = i2p::client::context.GetAddressBook(); |
|
|
|
|
|
|
|
std::string addr; |
|
|
|
|
|
|
|
int port = 0; |
|
|
|
|
|
|
|
if (itr == std::string::npos) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
addr = line; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
addr = line.substr(0, itr); |
|
|
|
|
|
|
|
port = std::atoi(line.substr(itr+1).c_str()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
i2p::data::IdentHash ident; |
|
|
|
|
|
|
|
if(addressbook.GetIdentHash(addr, ident)) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
const char * data = payload.c_str() + idx + 1; |
|
|
|
|
|
|
|
size_t len = payload.size() - (1 + line.size()); |
|
|
|
|
|
|
|
m_Datagram->SendDatagramTo((const uint8_t*)data, len, ident, m_RemotePort, port); |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// wtf?
|
|
|
|
// wtf?
|
|
|
|
LogPrint(eLogWarning, "websocks: got message in invalid state ", m_State); |
|
|
|
LogPrint(eLogWarning, "websocks: got message in invalid state ", m_State); |
|
|
@ -373,6 +456,7 @@ namespace client |
|
|
|
if(m_State == eWSCClose) { |
|
|
|
if(m_State == eWSCClose) { |
|
|
|
LogPrint(eLogDebug, "websocks: closing connection"); |
|
|
|
LogPrint(eLogDebug, "websocks: closing connection"); |
|
|
|
if(m_Stream) m_Stream->Close(); |
|
|
|
if(m_Stream) m_Stream->Close(); |
|
|
|
|
|
|
|
if(m_Datagram) m_Datagram->ResetReceiver(m_RemotePort); |
|
|
|
m_Parent->CloseConn(m_Conn); |
|
|
|
m_Parent->CloseConn(m_Conn); |
|
|
|
EnterState(eWSCEnd); |
|
|
|
EnterState(eWSCEnd); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|