From 4e34f2001ca4c86e6d4749f7d58e4789be46d580 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 7 Nov 2015 11:14:11 +0000 Subject: [PATCH] cosmetic --- router/fastdp.go | 27 +++++++++------------------ router/sleeve.go | 40 +++++++++++++--------------------------- 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/router/fastdp.go b/router/fastdp.go index fbd09d0b..f0a76e22 100644 --- a/router/fastdp.go +++ b/router/fastdp.go @@ -259,8 +259,7 @@ func (fastdp *FastDatapath) bridge(ingress bridgePortID, key PacketKey, lock *fa // If we know about the destination MAC, deliver it to the // associated port. if sender := fastdp.sendToMAC[key.DstMAC]; sender != nil { - return NewMultiFlowOp(false, odpEthernetFlowKey(key), - sender(key, lock)) + return NewMultiFlowOp(false, odpEthernetFlowKey(key), sender(key, lock)) } // Otherwise, it might be a real broadcast, or it might @@ -344,8 +343,7 @@ func (flowStatus *FlowStatus) MarshalJSON() ([]byte, error) { actions = append(actions, fmt.Sprint(action)) } - return json.Marshal(&jsonFlowStatus{flowKeys, actions, - flowStatus.Packets, flowStatus.Bytes, flowStatus.Used}) + return json.Marshal(&jsonFlowStatus{flowKeys, actions, flowStatus.Packets, flowStatus.Bytes, flowStatus.Used}) } type VportStatus odp.Vport @@ -357,8 +355,7 @@ func (vport *VportStatus) MarshalJSON() ([]byte, error) { TypeName string } - return json.Marshal(&jsonVportStatus{vport.ID, vport.Spec.Name(), - vport.Spec.TypeName()}) + return json.Marshal(&jsonVportStatus{vport.ID, vport.Spec.Name(), vport.Spec.TypeName()}) } func (fastdp fastDatapathOverlay) Diagnostics() interface{} { @@ -411,8 +408,7 @@ func (fastdp *FastDatapath) getVxlanVportID(udpPort int) (odp.VportID, error) { } vxlanVportID, err := fastdp.dp.CreateVport( - odp.NewVxlanVportSpec(fmt.Sprintf("vxlan-%d", udpPort), - uint16(udpPort))) + odp.NewVxlanVportSpec(fmt.Sprintf("vxlan-%d", udpPort), uint16(udpPort))) if err != nil { return 0, err } @@ -458,8 +454,7 @@ func (fastdp *FastDatapath) getVxlanVportID(udpPort int) (odp.VportID, error) { tunnelFlowKey.SetIpv4Src(tunKey.Ipv4Src) tunnelFlowKey.SetIpv4Dst(tunKey.Ipv4Dst) - return NewMultiFlowOp(false, odpFlowKey(tunnelFlowKey), - consumer(key)) + return NewMultiFlowOp(false, odpFlowKey(tunnelFlowKey), consumer(key)) } return vxlanVportID, nil @@ -698,8 +693,7 @@ func (fwd *fastDatapathForwarder) handleVxlanSpecialPacket(frame []byte, sender fwd.heartbeatTimer.Reset(0) } } else if !udpAddrsEqual(fwd.remoteAddr, sender) { - log.Info(fwd.logPrefix(), - "Peer IP address changed to ", sender) + log.Info(fwd.logPrefix(), "Peer IP address changed to ", sender) fwd.remoteAddr = sender } @@ -724,8 +718,7 @@ func (fwd *fastDatapathForwarder) ControlMessage(tag byte, msg []byte) { fwd.handleHeartbeatAck() default: - log.Info(fwd.logPrefix(), - "Ignoring unknown control message: ", tag) + log.Info(fwd.logPrefix(), "Ignoring unknown control message: ", tag) } } @@ -950,8 +943,7 @@ func (fastdp *FastDatapath) Miss(packet []byte, fks odp.FlowKeys) error { // delivery to a local netdev based on the dest MAC), // including the ingress in every flow makes things simpler // in touchFlow. - mfop := NewMultiFlowOp(false, handler(fks, &lock), - odpFlowKey(odp.NewInPortFlowKey(ingress))) + mfop := NewMultiFlowOp(false, handler(fks, &lock), odpFlowKey(odp.NewInPortFlowKey(ingress))) fastdp.send(mfop, packet, &lock) return nil } @@ -1019,8 +1011,7 @@ func (fastdp *FastDatapath) makeBridgeVport(vport odp.Vport) { // Packets coming from the netdev are processed by the bridge fastdp.missHandlers[vportID] = func(flowKeys odp.FlowKeys, lock *fastDatapathLock) FlowOp { - return fastdp.bridge(bridgePortID{vport: vportID}, - flowKeysToPacketKey(flowKeys), lock) + return fastdp.bridge(bridgePortID{vport: vportID}, flowKeysToPacketKey(flowKeys), lock) } } diff --git a/router/sleeve.go b/router/sleeve.go index bc46fb7a..4dd22340 100644 --- a/router/sleeve.go +++ b/router/sleeve.go @@ -75,8 +75,7 @@ func NewSleeveOverlay(localPort int) Overlay { } func (sleeve *SleeveOverlay) StartConsumingPackets(localPeer *Peer, peers *Peers, consumer OverlayConsumer) error { - localAddr, err := net.ResolveUDPAddr("udp4", - fmt.Sprint(":", sleeve.localPort)) + localAddr, err := net.ResolveUDPAddr("udp4", fmt.Sprint(":", sleeve.localPort)) if err != nil { return err } @@ -96,8 +95,7 @@ func (sleeve *SleeveOverlay) StartConsumingPackets(localPeer *Peer, peers *Peers // This makes sure all packets we send out do not have DF set // on them. - err = syscall.SetsockoptInt(fd, syscall.IPPROTO_IP, - syscall.IP_MTU_DISCOVER, syscall.IP_PMTUDISC_DONT) + err = syscall.SetsockoptInt(fd, syscall.IPPROTO_IP, syscall.IP_MTU_DISCOVER, syscall.IP_PMTUDISC_DONT) if err != nil { return err } @@ -184,8 +182,7 @@ func (sleeve *SleeveOverlay) readUDP() { err = fwd.crypto.Dec.IterateFrames(packet, func(src []byte, dst []byte, frame []byte) { - sleeve.handleFrame(sender, fwd, - src, dst, frame, dec) + sleeve.handleFrame(sender, fwd, src, dst, frame, dec) }) if err != nil { // Errors during UDP packet decoding / @@ -393,8 +390,7 @@ func (sleeve *SleeveOverlay) MakeForwarder(params ForwarderParams) (OverlayForwa senderDF: newUDPSenderDF(params.LocalAddr.IP, sleeve.localPort), } - go fwd.run(aggChan, aggDFChan, specialChan, controlMsgChan, - confirmedChan, finishedChan) + go fwd.run(aggChan, aggDFChan, specialChan, controlMsgChan, confirmedChan, finishedChan) return fwd, nil } @@ -445,8 +441,7 @@ func (f curriedForward) Process(frame []byte, dec *EthernetDecoder, broadcast bo fwd.lock.RUnlock() if !haveContact { - log.Print(fwd.logPrefix(), - "Cannot forward frame yet - awaiting contact") + log.Print(fwd.logPrefix(), "Cannot forward frame yet - awaiting contact") return } @@ -465,8 +460,7 @@ func (f curriedForward) Process(frame []byte, dec *EthernetDecoder, broadcast bo // of our pipeline. if dec.DF() { if !frameTooBig(frame, mtu) { - fwd.aggregate(fwd.aggregatorDFChan, srcName, dstName, - frame) + fwd.aggregate(fwd.aggregatorDFChan, srcName, dstName, frame) return } @@ -491,8 +485,7 @@ func (f curriedForward) Process(frame []byte, dec *EthernetDecoder, broadcast bo // The frag-needed packet does not have DF set, so the // potential recursion here is bounded. - fwd.sleeve.sendToConsumer(f.key.DstPeer, f.key.SrcPeer, - fragNeededPacket, dec) + fwd.sleeve.sendToConsumer(f.key.DstPeer, f.key.SrcPeer, fragNeededPacket, dec) return } @@ -513,8 +506,7 @@ func (f curriedForward) Process(frame []byte, dec *EthernetDecoder, broadcast bo // fragment it ourself. checkWarn(fragment(dec.Eth, dec.IP, mtu, func(segFrame []byte) { - fwd.aggregate(fwd.aggregatorDFChan, srcName, dstName, - segFrame) + fwd.aggregate(fwd.aggregatorDFChan, srcName, dstName, segFrame) })) } @@ -567,8 +559,7 @@ func fragment(eth layers.Ethernet, ip layers.IPv4, mtu int, forward func([]byte) ip.FragOffset = uint16((offset + offsetBase) >> 3) buf := gopacket.NewSerializeBuffer() segPayload := gopacket.Payload(segmentPayload) - err := gopacket.SerializeLayers(buf, opts, ð, &ip, - &segPayload) + err := gopacket.SerializeLayers(buf, opts, ð, &ip, &segPayload) if err != nil { return err } @@ -620,13 +611,10 @@ loop: for err == nil { select { case frame := <-aggChan: - err = fwd.aggregateAndSend(frame, aggChan, - fwd.crypto.Enc, fwd.sleeve, - MaxUDPPacketSize-UDPOverhead) + err = fwd.aggregateAndSend(frame, aggChan, fwd.crypto.Enc, fwd.sleeve, MaxUDPPacketSize-UDPOverhead) case frame := <-aggDFChan: - err = fwd.aggregateAndSend(frame, aggDFChan, - fwd.crypto.EncDF, fwd.senderDF, fwd.maxPayload) + err = fwd.aggregateAndSend(frame, aggDFChan, fwd.crypto.EncDF, fwd.senderDF, fwd.maxPayload) case sf := <-specialChan: err = fwd.handleSpecialFrame(sf) @@ -770,8 +758,7 @@ func (fwd *sleeveForwarder) handleControlMessage(cm controlMessage) error { return fwd.handleMTUTestAck(cm.msg) default: - log.Print(fwd.logPrefix(), - "Ignoring unknown control message tag: ", cm.tag) + log.Print(fwd.logPrefix(), "Ignoring unknown control message tag: ", cm.tag) return nil } } @@ -830,8 +817,7 @@ func (fwd *sleeveForwarder) handleHeartbeat(special specialFrame) error { } } } else if !udpAddrsEqual(fwd.remoteAddr, special.sender) { - log.Print(fwd.logPrefix(), - "Peer UDP address changed to ", special.sender) + log.Print(fwd.logPrefix(), "Peer UDP address changed to ", special.sender) fwd.setRemoteAddr(special.sender) }