octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 13:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: removed deadcode in connection/tcp_listen.go

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3084
This commit is contained in:
Lars K.W. Gohlke 2016-05-12 20:43:11 +00:00 committed by Audrius Butkevicius
parent b993b41847
commit 935c273c8f
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/connections/tcp_listen.go
View File

@ -35,9 +35,8 @@ type tcpListener struct {
natService *nat.Service natService *nat.Service
mapping *nat.Mapping mapping *nat.Mapping
address *url.URL err error
err error mut sync.RWMutex
mut sync.RWMutex
} }
func (t *tcpListener) Serve() { func (t *tcpListener) Serve() {
@ -163,40 +162,6 @@ func newTCPListener(uri *url.URL, tlsCfg *tls.Config, conns chan IntermediateCon
} }
} }
func isPublicIPv4(ip net.IP) bool {
ip = ip.To4()
if ip == nil {
// Not an IPv4 address (IPv6)
return false
}
// IsGlobalUnicast below only checks that it's not link local or
// multicast, and we want to exclude private (NAT:ed) addresses as well.
rfc1918 := []net.IPNet{
{IP: net.IP{10, 0, 0, 0}, Mask: net.IPMask{255, 0, 0, 0}},
{IP: net.IP{172, 16, 0, 0}, Mask: net.IPMask{255, 240, 0, 0}},
{IP: net.IP{192, 168, 0, 0}, Mask: net.IPMask{255, 255, 0, 0}},
}
for _, n := range rfc1918 {
if n.Contains(ip) {
return false
}
}
return ip.IsGlobalUnicast()
}
func isPublicIPv6(ip net.IP) bool {
if ip.To4() != nil {
// Not an IPv6 address (IPv4)
// (To16() returns a v6 mapped v4 address so can't be used to check
// that it's an actual v6 address)
return false
}
return ip.IsGlobalUnicast()
}
func fixupPort(uri *url.URL) *url.URL { func fixupPort(uri *url.URL) *url.URL {
copyURI := *uri copyURI := *uri