JackDoan il y a 1 semaine
Parent
commit
e5c11e1cc2
3 fichiers modifiés avec 3 ajouts et 20 suppressions
  1. 0 1
      interface.go
  2. 3 8
      packet/outpacket.go
  3. 0 11
      packet/virtio.go

+ 0 - 1
interface.go

@@ -297,7 +297,6 @@ func (f *Interface) listenOut(q int) {
 	li.ListenOut(func(pkts []*packet.Packet) {
 		toSend = toSend[:0]
 		for i := range outPackets {
-			outPackets[i].Valid = false
 			outPackets[i].SegCounter = 0
 		}
 

+ 3 - 8
packet/outpacket.go

@@ -10,11 +10,9 @@ type OutPacket struct {
 	SegmentPayloads [][]byte
 	SegmentHeaders  [][]byte
 	SegmentIDs      []uint16
-	//todo virtio header?
-	SegSize      int
-	SegCounter   int
-	Valid        bool
-	wasSegmented bool
+
+	SegSize    int
+	SegCounter int
 
 	Scratch []byte
 }
@@ -35,12 +33,9 @@ func (pkt *OutPacket) Reset() {
 	pkt.SegmentHeaders = pkt.SegmentHeaders[:0]
 	pkt.SegmentIDs = pkt.SegmentIDs[:0]
 	pkt.SegSize = 0
-	pkt.Valid = false
-	pkt.wasSegmented = false
 }
 
 func (pkt *OutPacket) UseSegment(segID uint16, seg []byte, isV6 bool) int {
-	pkt.Valid = true
 	pkt.SegmentIDs = append(pkt.SegmentIDs, segID)
 	pkt.Segments = append(pkt.Segments, seg) //todo do we need this?
 

+ 0 - 11
packet/virtio.go

@@ -9,7 +9,6 @@ type VirtIOPacket struct {
 	Header    virtio.NetHdr
 	Chains    []uint16
 	ChainRefs [][]byte
-	// OfferDescriptorChains(chains []uint16, kick bool) error
 }
 
 func NewVIO() *VirtIOPacket {
@@ -25,13 +24,3 @@ func (v *VirtIOPacket) Reset() {
 	v.ChainRefs = v.ChainRefs[:0]
 	v.Chains = v.Chains[:0]
 }
-
-type VirtIOTXPacket struct {
-	VirtIOPacket
-}
-
-func NewVIOTX(isV4 bool) *VirtIOTXPacket {
-	out := new(VirtIOTXPacket)
-	out.VirtIOPacket = *NewVIO()
-	return out
-}