summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/icmp
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/icmp
parentbd46185e24e03b93ac551a5ddfffb06975f157c8 (diff)
Remove unused commit() function argument to Bind.
PiperOrigin-RevId: 236926132 Change-Id: I5cf103f22766e6e65a581de780c7bb9ca0fa3181
Diffstat (limited to 'pkg/tcpip/transport/icmp')
-rw-r--r--pkg/tcpip/transport/icmp/endpoint.go17
1 files changed, 5 insertions, 12 deletions
diff --git a/pkg/tcpip/transport/icmp/endpoint.go b/pkg/tcpip/transport/icmp/endpoint.go
index b3b7a1d0e..05c4b532a 100644
--- a/pkg/tcpip/transport/icmp/endpoint.go
+++ b/pkg/tcpip/transport/icmp/endpoint.go
@@ -100,7 +100,7 @@ func newEndpoint(stack *stack.Stack, netProto tcpip.NetworkProtocolNumber, trans
// Raw endpoints must be immediately bound because they receive all
// ICMP traffic starting from when they're created via socket().
if raw {
- if err := e.bindLocked(tcpip.FullAddress{}, nil); err != nil {
+ if err := e.bindLocked(tcpip.FullAddress{}); err != nil {
return nil, err
}
}
@@ -202,7 +202,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
}
@@ -576,7 +576,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 {
@@ -608,13 +608,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(addr.NIC, netProtos, e.transProto, id, e)
- return err
- }
- }
e.id = id
e.regNICID = addr.NIC
@@ -631,11 +624,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
}