Skip to content
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

Ipv6 #113

Merged
merged 19 commits into from
Oct 10, 2016
Merged

Ipv6 #113

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5770f61
Applied ipv6 patch.
rakshasa Aug 14, 2014
e14dd06
Removed ifdef for ipv6.
rakshasa Aug 19, 2014
ac6dc62
Merge branch 'master' into ipv6
rakshasa Sep 6, 2014
e3b6ff4
Fixed clang warnings.
rakshasa Sep 6, 2014
06e8a5b
Updated authors and readme.
rakshasa Sep 15, 2014
62a72bc
Update to inet6 sock address class.
rakshasa Sep 18, 2014
4a4e971
Added socket_address_key that does not depend on rak socket_adddress.
rakshasa Sep 18, 2014
abf37da
Updated peer_list to use new socket address key.
rakshasa Sep 18, 2014
c02721d
Added test classes for socket_address_key.
rakshasa Sep 18, 2014
099d220
Added tests for basic inet4 address lookup tests.
rakshasa Sep 19, 2014
0500ef7
Added conversion of inet6 to socket address key.
rakshasa Sep 19, 2014
54fa023
Added direct conversion from sin_addr and sin6_addr to socket_address…
rakshasa Sep 20, 2014
1711b35
Removed socket_address_key from rak headers.
rakshasa Sep 20, 2014
a6b6733
Moved network related headers to torrent/net.
rakshasa Sep 23, 2014
ad95b31
Use inet6 if bind is not set.
rakshasa Sep 23, 2014
11b6b4f
Fixed missing header files.
rakshasa Sep 24, 2014
b80b558
Fixed link local addresses.
rakshasa Oct 28, 2014
4f7f45a
Merge branch 'master' into ipv6
rakshasa Aug 29, 2016
6f51b39
Merge branch 'master' into ipv6
rakshasa Oct 10, 2016
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
Prev Previous commit
Next Next commit
Fixed link local addresses.
  • Loading branch information
@rakshasa
rakshasa committed Oct 28, 2014
commit b80b5580cd77aaf5399a12588402c25b806b5f27
8 changes: 4 additions & 4 deletions src/net/local_addr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace {
// IPv4 priority, from highest to lowest:
//
// 1. Everything else (global address)
// 2. Private address space (10.0.0.0/8, 172.16.0.0/16, 192.168.0.0/24)
// 2. Private address space (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16)
// 3. Empty/INADDR_ANY (0.0.0.0)
// 4. Link-local address (169.254.0.0/16)
// 5. Localhost (127.0.0.0/8)
Expand All @@ -69,14 +69,14 @@ get_priority_ipv4(const in_addr& addr) {
if ((addr.s_addr & htonl(0xff000000U)) == htonl(0x7f000000U)) {
return 5;
}
if (addr.s_addr == htonl(0)) {
if ((addr.s_addr & htonl(0xffff0000U)) == htonl(0xa9fe0000U)) {
return 4;
}
if ((addr.s_addr & htonl(0xffff0000U)) == htonl(0xa9fe0000U)) {
if (addr.s_addr == htonl(0)) {
return 3;
}
if ((addr.s_addr & htonl(0xff000000U)) == htonl(0x0a000000U) ||
(addr.s_addr & htonl(0xffff0000U)) == htonl(0xac100000U) ||
(addr.s_addr & htonl(0xfff00000U)) == htonl(0xac100000U) ||
(addr.s_addr & htonl(0xffff0000U)) == htonl(0xc0a80000U)) {
return 2;
}
Expand Down