From f0d88176549f097fadd3d547827aed3b951ddc92 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 31 Aug 2018 15:47:49 -0700 Subject: Automated rollback of changelist 211103930 PiperOrigin-RevId: 211156845 Change-Id: Ie28011d7eb5f45f3a0158dbee2a68c5edf22f6e0 --- pkg/tcpip/transport/ping/protocol.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'pkg/tcpip/transport/ping/protocol.go') diff --git a/pkg/tcpip/transport/ping/protocol.go b/pkg/tcpip/transport/ping/protocol.go index b885f3627..8a8192064 100644 --- a/pkg/tcpip/transport/ping/protocol.go +++ b/pkg/tcpip/transport/ping/protocol.go @@ -71,7 +71,7 @@ func (p *protocol) NewEndpoint(stack *stack.Stack, netProto tcpip.NetworkProtoco if netProto != p.netProto() { return nil, tcpip.ErrUnknownProtocol } - return newEndpoint(stack, netProto, p.number, waiterQueue), nil + return newEndpoint(stack, netProto, waiterQueue), nil } // MinimumPacketSize returns the minimum valid ping packet size. @@ -87,14 +87,8 @@ func (p *protocol) MinimumPacketSize() int { // ParsePorts returns the source and destination ports stored in the given ping // packet. -func (p *protocol) ParsePorts(v buffer.View) (src, dst uint16, err *tcpip.Error) { - switch p.number { - case ProtocolNumber4: - return 0, binary.BigEndian.Uint16(v[header.ICMPv4MinimumSize:]), nil - case ProtocolNumber6: - return 0, binary.BigEndian.Uint16(v[header.ICMPv6MinimumSize:]), nil - } - panic(fmt.Sprint("unknown protocol number: ", p.number)) +func (*protocol) ParsePorts(v buffer.View) (src, dst uint16, err *tcpip.Error) { + return 0, binary.BigEndian.Uint16(v[header.ICMPv4MinimumSize:]), nil } // HandleUnknownDestinationPacket handles packets targeted at this protocol but @@ -118,7 +112,5 @@ func init() { return &protocol{ProtocolNumber4} }) - stack.RegisterTransportProtocolFactory(ProtocolName6, func() stack.TransportProtocol { - return &protocol{ProtocolNumber6} - }) + // TODO: Support IPv6. } -- cgit v1.2.3