mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 00:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1879 from wekoq/no_reversed_ports

Browse Source 
Don't use reversed port for choise random port. (by whothefuckami)
This commit is contained in:
orignal 2023-02-14 13:06:31 -05:00 committed by GitHub
commit 4156900fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libi2pd/RouterContext.cpp
View File

@ -202,8 +202,13 @@ namespace i2p
uint16_t RouterContext::SelectRandomPort () const uint16_t RouterContext::SelectRandomPort () const
{ {
uint16_t port = rand () % (30777 - 9111) + 9111; // I2P network ports range uint16_t port;
if (port == 9150) port = 9151; // Tor browser do
{
port = rand () % (30777 - 9111) + 9111; // I2P network ports range
}
while(i2p::util::net::IsPortInReservedRange(port));
return port; return port;
} }

17
libi2pd/util.cpp
View File

@ -8,6 +8,7 @@
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <unordered_set>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include "util.h" #include "util.h"
@ -487,6 +488,22 @@ namespace net
return IsYggdrasilAddress (addr.to_v6 ().to_bytes ().data ()); return IsYggdrasilAddress (addr.to_v6 ().to_bytes ().data ());
} }
bool IsPortInReservedRange (const uint16_t port) noexcept
{
// https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers (Feb. 3, 2023) + Tor browser (9150)
static const std::unordered_set<uint16_t> reservedPorts{
9119,9150,9306,9312,9389,9418,9535,9536,9695,
9800,9899,10000,10050,10051,10110,10212,
10933,11001,11112,11235,11371,12222,12223,
13075,13400,13720,13721,13724,13782,13783,
13785,13786,15345,17224,17225,17500,18104,
19788,19812,19813,19814,19999,20000,24465,
24554,26000,27000,27001,27002,27003,27004,
27005,27006,27007,27008,27009,28000};
return (reservedPorts.find(port) != reservedPorts.end());
}
boost::asio::ip::address_v6 GetYggdrasilAddress () boost::asio::ip::address_v6 GetYggdrasilAddress ()
{ {
#if defined(_WIN32) #if defined(_WIN32)

1
libi2pd/util.h
View File

@ -224,6 +224,7 @@ namespace util
bool IsLocalAddress (const boost::asio::ip::address& addr); bool IsLocalAddress (const boost::asio::ip::address& addr);
bool IsInReservedRange (const boost::asio::ip::address& host); bool IsInReservedRange (const boost::asio::ip::address& host);
bool IsYggdrasilAddress (const boost::asio::ip::address& addr); bool IsYggdrasilAddress (const boost::asio::ip::address& addr);
bool IsPortInReservedRange (const uint16_t port) noexcept;
} }
} }
} }