ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lan-broadcast' into lan-broadcast

Browse Source
This commit is contained in:
hiker 2018-04-24 09:18:41 +10:00
commit 2a89e7e0d1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/network.cpp
View File

@ -349,12 +349,16 @@ const std::vector<TransportAddress>& Network::getBroadcastAddresses()
if (p->ifa_addr->sa_family == AF_INET) if (p->ifa_addr->sa_family == AF_INET)
{ {
struct sockaddr_in *sa = (struct sockaddr_in *) p->ifa_addr; struct sockaddr_in *sa = (struct sockaddr_in *) p->ifa_addr;
TransportAddress ta(sa->sin_addr, get); TransportAddress ta(htonl(sa->sin_addr.s_addr), 0);
char *addr = inet_ntoa(sa->sin_addr); uint32_t u = ((sockaddr_in*)(p->ifa_netmask))->sin_addr.s_addr;
int ip = ((sockaddr_in*)(p->ifa_netmask))->sin_addr.s_addr; // Convert mask to #bits: SWAT algorithm
ip = ~ip; u = u - ((u >> 1) & 0x55555555);
printf("Interface: %s\tAddress: %s\tmask: %x -> %x\n", p->ifa_name, u = (u & 0x33333333) + ((u >> 2) & 0x33333333);
addr, p->ifa_netmask, htonl(ip)); u = (((u + (u >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
printf("Interface: %s\tAddress: %s\tmask: %x\n", p->ifa_name,
ta.toString().c_str(), u);
addAllBroadcastAddresses(ta, u);
} }
} }