Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-24 09:56:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed getting MTU on windows, add address to log messages with MTU

Browse source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2022-07-27 13:24:07 +03:00
parent 4b1f5c9c9b
commit fdeb884fe5
No known key found for this signature in database
GPG key ID: 66F6C87B98EBCFE2
2 changed files with 58 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libi2pd/RouterContext.cpp
View file

@ -902,7 +902,7 @@ namespace i2p
if (mtu) if (mtu)
{ {
addr->ssu->mtu = mtu; addr->ssu->mtu = mtu;
LogPrint (eLogDebug, "Router: MTU for ", v4 ? "ipv4" : "ipv6", " address is set to ", mtu); LogPrint (eLogDebug, "Router: MTU for ", v4 ? "ipv4" : "ipv6", " address ", addr->host.to_string(), " is set to ", mtu);
} }
} }
} }

38
libi2pd/util.cpp
View file

@ -173,7 +173,7 @@ namespace net
if(dwRetVal != NO_ERROR) if(dwRetVal != NO_ERROR)
{ {
LogPrint(eLogError, "NetIface: GetMTU(): Enclosed GetAdaptersAddresses() call has failed"); LogPrint(eLogError, "NetIface: GetMTU: Enclosed GetAdaptersAddresses() call has failed");
FREE(pAddresses); FREE(pAddresses);
return fallback; return fallback;
} }
@ -185,7 +185,7 @@ namespace net
pUnicast = pCurrAddresses->FirstUnicastAddress; pUnicast = pCurrAddresses->FirstUnicastAddress;
if(pUnicast == nullptr) if(pUnicast == nullptr)
LogPrint(eLogError, "NetIface: GetMTU(): Not a unicast IPv4 address, this is not supported"); LogPrint(eLogError, "NetIface: GetMTU: Not a unicast IPv4 address, this is not supported");
for(int i = 0; pUnicast != nullptr; ++i) for(int i = 0; pUnicast != nullptr; ++i)
{ {
@ -193,10 +193,13 @@ namespace net
sockaddr_in* localInterfaceAddress = (sockaddr_in*) lpAddr; sockaddr_in* localInterfaceAddress = (sockaddr_in*) lpAddr;
if(localInterfaceAddress->sin_addr.S_un.S_addr == inputAddress.sin_addr.S_un.S_addr) if(localInterfaceAddress->sin_addr.S_un.S_addr == inputAddress.sin_addr.S_un.S_addr)
{ {
auto result = pAddresses->Mtu; char addr[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &(((struct sockaddr_in *)localInterfaceAddress)->sin_addr), addr, INET_ADDRSTRLEN);
auto result = pCurrAddresses->Mtu;
FREE(pAddresses); FREE(pAddresses);
pAddresses = nullptr; pAddresses = nullptr;
LogPrint(eLogInfo, "NetIface: GetMTU(): Using ", result, " bytes for IPv4"); LogPrint(eLogInfo, "NetIface: GetMTU: Using ", result, " bytes for IPv4 address ", addr);
return result; return result;
} }
pUnicast = pUnicast->Next; pUnicast = pUnicast->Next;
@ -204,7 +207,7 @@ namespace net
pCurrAddresses = pCurrAddresses->Next; pCurrAddresses = pCurrAddresses->Next;
} }
LogPrint(eLogError, "NetIface: GetMTU(): No usable unicast IPv4 addresses found"); LogPrint(eLogError, "NetIface: GetMTU: No usable unicast IPv4 addresses found");
FREE(pAddresses); FREE(pAddresses);
return fallback; return fallback;
} }
@ -216,7 +219,7 @@ namespace net
PIP_ADAPTER_ADDRESSES pCurrAddresses = nullptr; PIP_ADAPTER_ADDRESSES pCurrAddresses = nullptr;
PIP_ADAPTER_UNICAST_ADDRESS pUnicast = nullptr; PIP_ADAPTER_UNICAST_ADDRESS pUnicast = nullptr;
if(GetAdaptersAddresses(AF_INET6, GAA_FLAG_INCLUDE_PREFIX, nullptr, pAddresses, &outBufLen) if (GetAdaptersAddresses(AF_INET6, GAA_FLAG_INCLUDE_PREFIX, nullptr, pAddresses, &outBufLen)
== ERROR_BUFFER_OVERFLOW) == ERROR_BUFFER_OVERFLOW)
{ {
FREE(pAddresses); FREE(pAddresses);
@ -227,23 +230,23 @@ namespace net
AF_INET6, GAA_FLAG_INCLUDE_PREFIX, nullptr, pAddresses, &outBufLen AF_INET6, GAA_FLAG_INCLUDE_PREFIX, nullptr, pAddresses, &outBufLen
); );
if(dwRetVal != NO_ERROR) if (dwRetVal != NO_ERROR)
{ {
LogPrint(eLogError, "NetIface: GetMTU(): Enclosed GetAdaptersAddresses() call has failed"); LogPrint(eLogError, "NetIface: GetMTU: Enclosed GetAdaptersAddresses() call has failed");
FREE(pAddresses); FREE(pAddresses);
return fallback; return fallback;
} }
bool found_address = false; bool found_address = false;
pCurrAddresses = pAddresses; pCurrAddresses = pAddresses;
while(pCurrAddresses) while (pCurrAddresses)
{ {
PIP_ADAPTER_UNICAST_ADDRESS firstUnicastAddress = pCurrAddresses->FirstUnicastAddress; PIP_ADAPTER_UNICAST_ADDRESS firstUnicastAddress = pCurrAddresses->FirstUnicastAddress;
pUnicast = pCurrAddresses->FirstUnicastAddress; pUnicast = pCurrAddresses->FirstUnicastAddress;
if(pUnicast == nullptr) if (pUnicast == nullptr)
LogPrint(eLogError, "NetIface: GetMTU(): Not a unicast IPv6 address, this is not supported"); LogPrint(eLogError, "NetIface: GetMTU: Not a unicast IPv6 address, this is not supported");
for(int i = 0; pUnicast != nullptr; ++i) for (int i = 0; pUnicast != nullptr; ++i)
{ {
LPSOCKADDR lpAddr = pUnicast->Address.lpSockaddr; LPSOCKADDR lpAddr = pUnicast->Address.lpSockaddr;
sockaddr_in6 *localInterfaceAddress = (sockaddr_in6*) lpAddr; sockaddr_in6 *localInterfaceAddress = (sockaddr_in6*) lpAddr;
@ -258,10 +261,13 @@ namespace net
if (found_address) if (found_address)
{ {
auto result = pAddresses->Mtu; char addr[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)localInterfaceAddress)->sin6_addr), addr, INET6_ADDRSTRLEN);
auto result = pCurrAddresses->Mtu;
FREE(pAddresses); FREE(pAddresses);
pAddresses = nullptr; pAddresses = nullptr;
LogPrint(eLogInfo, "NetIface: GetMTU(): Using ", result, " bytes for IPv6"); LogPrint(eLogInfo, "NetIface: GetMTU: Using ", result, " bytes for IPv6 address ", addr);
return result; return result;
} }
pUnicast = pUnicast->Next; pUnicast = pUnicast->Next;
@ -270,7 +276,7 @@ namespace net
pCurrAddresses = pCurrAddresses->Next; pCurrAddresses = pCurrAddresses->Next;
} }
LogPrint(eLogError, "NetIface: GetMTU(): No usable unicast IPv6 addresses found"); LogPrint(eLogError, "NetIface: GetMTU: No usable unicast IPv6 addresses found");
FREE(pAddresses); FREE(pAddresses);
return fallback; return fallback;
} }
@ -302,7 +308,7 @@ namespace net
} }
else else
{ {
LogPrint(eLogError, "NetIface: GetMTU(): Address family is not supported"); LogPrint(eLogError, "NetIface: GetMTU: Address family is not supported");
return fallback; return fallback;
} }
} }