mirror of
https://github.com/g4klx/ircDDBGateway.git
synced 2026-04-04 22:07:43 +00:00
Merge branch 'master' into UDPHolePunching
This commit is contained in:
commit
1abb52601f
14 changed files with 51 additions and 178 deletions
|
|
@ -48,9 +48,9 @@ public:
|
|||
bool writeHeader(const CHeaderData& header);
|
||||
bool writeAMBE(const CAMBEData& data);
|
||||
|
||||
G2_TYPE read(in_addr& incomingAddress, unsigned int& incomingPort);
|
||||
CHeaderData* readHeader(in_addr incomingAddress, unsigned int incomingPort);
|
||||
CAMBEData* readAMBE(in_addr incomingAddress, unsigned int incomingPort);
|
||||
G2_TYPE read();
|
||||
CHeaderData* readHeader();
|
||||
CAMBEData* readAMBE();
|
||||
|
||||
#if defined(ENABLE_NAT_TRAVERSAL)
|
||||
void traverseNat(const wxString& addr);
|
||||
|
|
@ -63,8 +63,10 @@ private:
|
|||
G2_TYPE m_type;
|
||||
unsigned char* m_buffer;
|
||||
unsigned int m_length;
|
||||
in_addr m_address;
|
||||
unsigned int m_port;
|
||||
|
||||
bool readPackets(in_addr& incomingAddress, unsigned int& incomingPort);
|
||||
bool readPackets();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue