Skip to content

G2 Udp hole punching / NAT Traversal #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
F4FXL wants to merge 2 commits into
base: master
Choose a base branch
from
Open

G2 Udp hole punching / NAT Traversal #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7bdf33
First G2 UDP Hole Punching test
F4FXL Nov 1, 2018
9c8adb3
Removed unnecessary loop, using G2_DV_PORT constant
F4FXL Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ircDDBGateway/Common/G2ProtocolHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@ CAMBEData* CG2ProtocolHandler::readAMBE()
return data;
}

void CG2ProtocolHandler::PunchUDPHole(const wxString& address)
{
unsigned char buffer[1];
::memset(buffer, 0, 1);

in_addr addr = CUDPReaderWriter::lookup(address);

//wxLogError(wxT("Punching hole to %s"), address.mb_str());

m_socket.write(buffer, 1, addr, G2_DV_PORT);
}

void CG2ProtocolHandler::close()
{
m_socket.close();
Expand Down
2 changes: 2 additions & 0 deletions ircDDBGateway/Common/G2ProtocolHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class CG2ProtocolHandler {
CHeaderData* readHeader();
CAMBEData* readAMBE();

void PunchUDPHole(const wxString& addr);

void close();

private:
Expand Down
3 changes: 3 additions & 0 deletions ircDDBGateway/ircDDBGateway/IRCDDBGatewayThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,7 @@ void CIRCDDBGatewayThread::processIrcDDB()
if (!address.IsEmpty()) {
wxLogMessage(wxT("USER: %s %s %s %s"), user.c_str(), repeater.c_str(), gateway.c_str(), address.c_str());
m_cache.updateUser(user, repeater, gateway, address, timestamp, DP_DEXTRA, false, false);
m_g2Handler->PunchUDPHole(address);
} else {
wxLogMessage(wxT("USER: %s NOT FOUND"), user.c_str());
}
Expand All @@ -744,6 +745,7 @@ void CIRCDDBGatewayThread::processIrcDDB()
if (!address.IsEmpty()) {
wxLogMessage(wxT("REPEATER: %s %s %s"), repeater.c_str(), gateway.c_str(), address.c_str());
m_cache.updateRepeater(repeater, gateway, address, DP_DEXTRA, false, false);
m_g2Handler->PunchUDPHole(address);
} else {
wxLogMessage(wxT("REPEATER: %s NOT FOUND"), repeater.c_str());
}
Expand All @@ -761,6 +763,7 @@ void CIRCDDBGatewayThread::processIrcDDB()
if (!address.IsEmpty()) {
wxLogMessage(wxT("GATEWAY: %s %s"), gateway.c_str(), address.c_str());
m_cache.updateGateway(gateway, address, DP_DEXTRA, false, false);
m_g2Handler->PunchUDPHole(address);
} else {
wxLogMessage(wxT("GATEWAY: %s NOT FOUND"), gateway.c_str());
}
Expand Down