mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-06 05:17:49 +00:00
e7dc2f9190
clearAddresses write locks the struct and then calls notify. notify in turn tries to obtain a read lock on the same mutex. The result was a deadlock. This change unlocks the struct before calling notify.
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
// Copyright (C) 2016 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package nat
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
)
|
|
|
|
func TestMappingValidGateway(t *testing.T) {
|
|
a := net.ParseIP("10.0.0.1")
|
|
b := net.ParseIP("192.168.0.1")
|
|
tests := []struct {
|
|
mappingLocalIP net.IP
|
|
gatewayLocalIP net.IP
|
|
expected bool
|
|
}{
|
|
// Any of the IPs is nil or unspecified implies correct
|
|
{nil, nil, true},
|
|
{net.IPv4zero, net.IPv4zero, true},
|
|
{nil, net.IPv4zero, true},
|
|
{net.IPv4zero, nil, true},
|
|
{a, nil, true},
|
|
{b, nil, true},
|
|
{a, net.IPv4zero, true},
|
|
{b, net.IPv4zero, true},
|
|
{nil, a, true},
|
|
{nil, b, true},
|
|
{net.IPv4zero, a, true},
|
|
{net.IPv4zero, b, true},
|
|
// IPs are the same implies correct
|
|
{a, a, true},
|
|
{b, b, true},
|
|
// IPs are specified and different, implies incorrect
|
|
{a, b, false},
|
|
{b, a, false},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
m := Mapping{
|
|
address: Address{
|
|
IP: test.mappingLocalIP,
|
|
},
|
|
}
|
|
result := m.validGateway(test.gatewayLocalIP)
|
|
if result != test.expected {
|
|
t.Errorf("Incorrect: local %s gateway %s result %t expected %t", test.mappingLocalIP, test.gatewayLocalIP, result, test.expected)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestMappingClearAddresses(t *testing.T) {
|
|
natSvc := NewService(protocol.EmptyDeviceID, nil)
|
|
// Mock a mapped port; avoids the need to actually map a port
|
|
ip := net.ParseIP("192.168.0.1")
|
|
m := natSvc.NewMapping(TCP, ip, 1024)
|
|
m.extAddresses["test"] = Address{
|
|
IP: ip,
|
|
Port: 1024,
|
|
}
|
|
// Now try and remove the mapped port; prior to #4829 this deadlocked
|
|
natSvc.RemoveMapping(m)
|
|
}
|