summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/udp
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2019-03-05 14:52:35 -0800
committerShentubot <shentubot@google.com>2019-03-05 14:53:34 -0800
commit23e66ee96d159a774ecac9f89fab8cff463174a4 (patch)
treebba2633c3fbf9ee15da6655311fe83242b250036 /pkg/tcpip/transport/udp
parentbd46185e24e03b93ac551a5ddfffb06975f157c8 (diff)
Remove unused commit() function argument to Bind.
PiperOrigin-RevId: 236926132 Change-Id: I5cf103f22766e6e65a581de780c7bb9ca0fa3181
Diffstat (limited to 'pkg/tcpip/transport/udp')
-rw-r--r--pkg/tcpip/transport/udp/endpoint.go16
-rw-r--r--pkg/tcpip/transport/udp/udp_test.go28
2 files changed, 18 insertions, 26 deletions
diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go
index 44b9cdf6a..4108cb09c 100644
--- a/pkg/tcpip/transport/udp/endpoint.go
+++ b/pkg/tcpip/transport/udp/endpoint.go
@@ -247,7 +247,7 @@ func (e *endpoint) prepareForWrite(to *tcpip.FullAddress) (retry bool, err *tcpi
}
// The state is still 'initial', so try to bind the endpoint.
- if err := e.bindLocked(tcpip.FullAddress{}, nil); err != nil {
+ if err := e.bindLocked(tcpip.FullAddress{}); err != nil {
return false, err
}
@@ -806,7 +806,7 @@ func (e *endpoint) registerWithStack(nicid tcpip.NICID, netProtos []tcpip.Networ
return id, err
}
-func (e *endpoint) bindLocked(addr tcpip.FullAddress, commit func() *tcpip.Error) *tcpip.Error {
+func (e *endpoint) bindLocked(addr tcpip.FullAddress) *tcpip.Error {
// Don't allow binding once endpoint is not in the initial state
// anymore.
if e.state != stateInitial {
@@ -846,14 +846,6 @@ func (e *endpoint) bindLocked(addr tcpip.FullAddress, commit func() *tcpip.Error
if err != nil {
return err
}
- if commit != nil {
- if err := commit(); err != nil {
- // Unregister, the commit failed.
- e.stack.UnregisterTransportEndpoint(nicid, netProtos, ProtocolNumber, id, e)
- e.stack.ReleasePort(netProtos, ProtocolNumber, id.LocalAddress, id.LocalPort)
- return err
- }
- }
e.id = id
e.regNICID = nicid
@@ -871,11 +863,11 @@ func (e *endpoint) bindLocked(addr tcpip.FullAddress, commit func() *tcpip.Error
// Bind binds the endpoint to a specific local address and port.
// Specifying a NIC is optional.
-func (e *endpoint) Bind(addr tcpip.FullAddress, commit func() *tcpip.Error) *tcpip.Error {
+func (e *endpoint) Bind(addr tcpip.FullAddress) *tcpip.Error {
e.mu.Lock()
defer e.mu.Unlock()
- err := e.bindLocked(addr, commit)
+ err := e.bindLocked(addr)
if err != nil {
return err
}
diff --git a/pkg/tcpip/transport/udp/udp_test.go b/pkg/tcpip/transport/udp/udp_test.go
index 2a9cf4b57..884a76b04 100644
--- a/pkg/tcpip/transport/udp/udp_test.go
+++ b/pkg/tcpip/transport/udp/udp_test.go
@@ -289,7 +289,7 @@ func TestBindPortReuse(t *testing.T) {
if err := eps[i].SetSockOpt(reusePortOpt); err != nil {
c.t.Fatalf("SetSockOpt failed failed: %v", err)
}
- if err := eps[i].Bind(tcpip.FullAddress{Addr: stackV6Addr, Port: stackPort}, nil); err != nil {
+ if err := eps[i].Bind(tcpip.FullAddress{Addr: stackV6Addr, Port: stackPort}); err != nil {
t.Fatalf("ep.Bind(...) failed: %v", err)
}
}
@@ -385,7 +385,7 @@ func TestBindEphemeralPort(t *testing.T) {
c.createV6Endpoint(false)
- if err := c.ep.Bind(tcpip.FullAddress{}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{}); err != nil {
t.Fatalf("ep.Bind(...) failed: %v", err)
}
}
@@ -412,7 +412,7 @@ func TestBindReservedPort(t *testing.T) {
t.Fatalf("NewEndpoint failed: %v", err)
}
defer ep.Close()
- if got, want := ep.Bind(addr, nil), tcpip.ErrPortInUse; got != want {
+ if got, want := ep.Bind(addr), tcpip.ErrPortInUse; got != want {
t.Fatalf("got ep.Bind(...) = %v, want = %v", got, want)
}
}
@@ -425,11 +425,11 @@ func TestBindReservedPort(t *testing.T) {
defer ep.Close()
// We can't bind ipv4-any on the port reserved by the connected endpoint
// above, since the endpoint is dual-stack.
- if got, want := ep.Bind(tcpip.FullAddress{Port: addr.Port}, nil), tcpip.ErrPortInUse; got != want {
+ if got, want := ep.Bind(tcpip.FullAddress{Port: addr.Port}), tcpip.ErrPortInUse; got != want {
t.Fatalf("got ep.Bind(...) = %v, want = %v", got, want)
}
// We can bind an ipv4 address on this port, though.
- if err := ep.Bind(tcpip.FullAddress{Addr: stackAddr, Port: addr.Port}, nil); err != nil {
+ if err := ep.Bind(tcpip.FullAddress{Addr: stackAddr, Port: addr.Port}); err != nil {
t.Fatalf("ep.Bind(...) failed: %v", err)
}
}()
@@ -443,7 +443,7 @@ func TestBindReservedPort(t *testing.T) {
t.Fatalf("NewEndpoint failed: %v", err)
}
defer ep.Close()
- if err := ep.Bind(tcpip.FullAddress{Port: addr.Port}, nil); err != nil {
+ if err := ep.Bind(tcpip.FullAddress{Port: addr.Port}); err != nil {
t.Fatalf("ep.Bind(...) failed: %v", err)
}
}()
@@ -456,7 +456,7 @@ func TestV4ReadOnV6(t *testing.T) {
c.createV6Endpoint(false)
// Bind to wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -471,7 +471,7 @@ func TestV4ReadOnBoundToV4MappedWildcard(t *testing.T) {
c.createV6Endpoint(false)
// Bind to v4 mapped wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Addr: V4MappedWildcardAddr, Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Addr: V4MappedWildcardAddr, Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -486,7 +486,7 @@ func TestV4ReadOnBoundToV4Mapped(t *testing.T) {
c.createV6Endpoint(false)
// Bind to local address.
- if err := c.ep.Bind(tcpip.FullAddress{Addr: stackV4MappedAddr, Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Addr: stackV4MappedAddr, Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -501,7 +501,7 @@ func TestV6ReadOnV6(t *testing.T) {
c.createV6Endpoint(false)
// Bind to wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -556,7 +556,7 @@ func TestV4ReadOnV4(t *testing.T) {
}
// Bind to wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -650,7 +650,7 @@ func TestDualWriteBoundToWildcard(t *testing.T) {
c.createV6Endpoint(false)
// Bind to wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -729,7 +729,7 @@ func TestV6WriteOnBoundToV4Mapped(t *testing.T) {
c.createV6Endpoint(false)
// Bind to v4 mapped address.
- if err := c.ep.Bind(tcpip.FullAddress{Addr: stackV4MappedAddr, Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Addr: stackV4MappedAddr, Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}
@@ -827,7 +827,7 @@ func TestReadIncrementsPacketsReceived(t *testing.T) {
}
// Bind to wildcard.
- if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}, nil); err != nil {
+ if err := c.ep.Bind(tcpip.FullAddress{Port: stackPort}); err != nil {
c.t.Fatalf("Bind failed: %v", err)
}