Disable IPv4 defragmentation and support IPv6 (#487)

* Remove the extra negation on `nodefrag` flag's value

* Support IPv4 fragmentation and IPv6 at the same time

* Re-enable `nodefrag` flag

shared/kubernetes/provider.go

@@ -6,12 +6,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net/url"
+	"path/filepath"
+	"regexp"
+
 	"github.com/op/go-logging"
 	"github.com/up9inc/mizu/shared"
 	"github.com/up9inc/mizu/shared/logger"
 	"github.com/up9inc/mizu/shared/semver"
 	"github.com/up9inc/mizu/tap/api"
-	"io"
 	v1 "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
@@ -32,9 +36,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
 	watchtools "k8s.io/client-go/tools/watch"
-	"net/url"
-	"path/filepath"
-	"regexp"
 )
 
 type Provider struct {

tap/source/tcp_packet_source.go

@@ -121,29 +121,27 @@ func (source *tcpPacketSource) readPackets(ipdefrag bool, packets chan<- TcpPack
 		}
 
 		// defrag the IPv4 packet if required
-		if !ipdefrag {
+		if ipdefrag {
-			ip4Layer := packet.Layer(layers.LayerTypeIPv4)
+			if ip4Layer := packet.Layer(layers.LayerTypeIPv4); ip4Layer != nil {
-			if ip4Layer == nil {
+				ip4 := ip4Layer.(*layers.IPv4)
-				continue
+				l := ip4.Length
-			}
+				newip4, err := source.defragger.DefragIPv4(ip4)
-			ip4 := ip4Layer.(*layers.IPv4)
+				if err != nil {
-			l := ip4.Length
+					logger.Log.Fatal("Error while de-fragmenting", err)
-			newip4, err := source.defragger.DefragIPv4(ip4)
+				} else if newip4 == nil {
-			if err != nil {
+					logger.Log.Debugf("Fragment...")
-				logger.Log.Fatal("Error while de-fragmenting", err)
+					continue // packet fragment, we don't have whole packet yet.
-			} else if newip4 == nil {
+				}
-				logger.Log.Debugf("Fragment...")
+				if newip4.Length != l {
-				continue // packet fragment, we don't have whole packet yet.
+					diagnose.InternalStats.Ipdefrag++
-			}
+					logger.Log.Debugf("Decoding re-assembled packet: %s", newip4.NextLayerType())
-			if newip4.Length != l {
+					pb, ok := packet.(gopacket.PacketBuilder)
-				diagnose.InternalStats.Ipdefrag++
+					if !ok {
-				logger.Log.Debugf("Decoding re-assembled packet: %s", newip4.NextLayerType())
+						logger.Log.Panic("Not a PacketBuilder")
-				pb, ok := packet.(gopacket.PacketBuilder)
+					}
-				if !ok {
+					nextDecoder := newip4.NextLayerType()
-					logger.Log.Panic("Not a PacketBuilder")
+					_ = nextDecoder.Decode(newip4.Payload, pb)
 				}
-				nextDecoder := newip4.NextLayerType()
-				_ = nextDecoder.Decode(newip4.Payload, pb)
 			}
 		}