remove duplicated vethpair

.gitattributes

@@ -0,0 +1 @@
+asset/* filter=lfs diff=lfs merge=lfs -text

cmd/iftree/main.go

@@ -50,11 +50,12 @@ Example:
   generate table output
     # sudo iftree --table
 
-  -d, --debug   print debug message
-  -t, --table   output in table
-  -g, --graph   output in graphviz dot language(https://graphviz.org/doc/info/lang.html
-    -O, --output string   graph output name/path (default "output")
-    -T, --gtype string    graph output type, "jpg", "png", "svg", "dot" (graphviz dot language) default "png"
+  -d, --debug		print debug message
+  -t, --table		output in table
+  -g, --graph		output in graphviz dot language(https://graphviz.org/doc/info/lang.html
+    -O, --output	string   graph output name/path (default "output")
+    -T, --gtype		string    graph output type, "jpg", "png", "svg", "dot" (graphviz dot language) default "png"
+  -a, --all	 	show all veths, including unused.
 Help Options:
   -h, --help       Show this help message
 
@@ -205,6 +206,9 @@ func main() {
 		case "dot":
 			_, err = io.Copy(os.Stdout, &buf)
 		case "jpg", "png", "svg":
+			if !pflag.CommandLine.Changed("output") && !pflag.CommandLine.Changed("gtype") {
+				log.Warn(`default output dst file: "output.png"`)
+			}
 			graph, errG := graphviz.ParseBytes(buf.Bytes())
 			if errG != nil {
 				log.Fatal(errG)
@@ -237,14 +241,11 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		if err := formatter.TableParis(os.Stdout, vpairs); err != nil {
-			log.Fatal(err)
+		if *oUnusedVeths {
+			formatter.TableParis(os.Stdout, vpairs)
 		}
 		return
 	}
 
-	if err := formatter.Print(os.Stdout, vm, netNsMap, vpairs, *oUnusedVeths); err != nil {
-		log.Fatal(err)
-	}
-
+	formatter.Print(os.Stdout, vm, netNsMap, vpairs, *oUnusedVeths)
 }

pkg/formatter/color.go

@@ -6,22 +6,39 @@ import (
 )
 
 var (
+	defaultStyle = lipgloss.NewStyle()
 	// styles
-
+	text    = lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}
 	special = lipgloss.AdaptiveColor{Light: "#43BF6D", Dark: "#73F59F"}
 
-	mainStype = lipgloss.NewStyle().
-			BorderStyle(lipgloss.NormalBorder()).
-			BorderForeground(lipgloss.Color("63"))
-	tableStype = lipgloss.NewStyle()
+	basicTextStyle      = lipgloss.NewStyle().Foreground(text).Padding(0, 1)
+	boldItalicTextStyle = lipgloss.NewStyle().
+				Bold(true).
+				Padding(0, 1).
+				Italic(true).
+				Foreground(lipgloss.Color("#FFFFFF"))
+	TitleHighlight = lipgloss.NewStyle().
+			Background(lipgloss.Color("#F25D94")).
+			MarginTop(1).
+			MarginLeft(10).
+			MarginRight(10).
+			Padding(0, 1).
+			Italic(true).
+			Foreground(lipgloss.Color("#FFF7DB"))
+
+	textHighlight = lipgloss.NewStyle().
+			MarginRight(1).
+			MarginLeft(1).
+			Padding(0, 1).
+			Foreground(special)
+
+	mainStype = defaultStyle.Copy()
+
+	tableStype = defaultStyle.Copy()
 
-	vethPairStyle = lipgloss.NewStyle().
-			BorderStyle(lipgloss.NormalBorder()).
-			BorderForeground(lipgloss.Color("63"))
+	vethPairStyle = defaultStyle.Copy()
 
 	bridgeStyle = lipgloss.NewStyle().
-			MarginRight(5).
-			Padding(0, 1).
 			Bold(true).
 			Italic(true).
 			Foreground(lipgloss.AdaptiveColor{Light: "#43BF6D", Dark: "#73F59F"})
@@ -37,6 +54,14 @@ var (
 			Padding(0, 1).
 			Italic(false).
 			Foreground(lipgloss.Color("#FFFFFF"))
+
+	unusedVethStyle = lipgloss.NewStyle().
+			Background(lipgloss.Color("#F25D94")).
+			MarginLeft(5).
+			MarginRight(5).
+			Padding(0, 1).
+			Italic(true).
+			Foreground(lipgloss.Color("#FFF7DB"))
 )
 
 func colorGrid(xSteps, ySteps int) [][]string {

pkg/formatter/table.go

@@ -3,6 +3,8 @@ package formatter
 import (
 	"fmt"
 	"io"
+
+	"sort"
 	"strings"
 
 	"github.com/charmbracelet/lipgloss"
@@ -17,16 +19,13 @@ var (
 )
 
 func Table(w io.Writer, m map[string][]pkg.Node) error {
+
 	tbStr := strings.Builder{}
 	t := table.NewWriter()
 	t.SetOutputMirror(&tbStr)
-	t.SetTitle(lipgloss.NewStyle().
-		Bold(true).
-		Padding(0, 1).
-		Italic(true).
-		Foreground(lipgloss.Color("#FFFFFF")).
-		SetString("bridge <---> veth <---> veth-in container, GROUP BY NetNS").String())
-	t.AppendHeader(table.Row{"bridge", "netns", "veth", "ifname(container)"})
+
+	t.SetTitle(boldItalicTextStyle.SetString("bridge <---> veth <---> veth in container, GROUP BY NetNS").String())
+	t.AppendHeader(table.Row{"bridge", "netns", "veth", "ifname"})
 
 	for bridge, v := range m {
 		for _, vp := range v {
@@ -36,14 +35,10 @@ func Table(w io.Writer, m map[string][]pkg.Node) error {
 			}
 			c := lipgloss.Color(tableNsColors[id%len(tableNsColors)][0])
 			t.AppendRow(table.Row{
-				lipgloss.NewStyle().
-					Bold(true).
-					Padding(0, 1).
-					Italic(true).
-					Foreground(lipgloss.Color("#FFFFFF")).SetString(bridge),
-				lipgloss.NewStyle().Bold(true).Foreground(c).SetString(vp.NetNsName),
-				vp.Veth,
-				vp.PeerNameInNetns})
+				bridgeStyle.SetString(bridge),
+				netNsStyle.Copy().Foreground(c).SetString(vp.NetNsName),
+				basicTextStyle.SetString(vp.Veth),
+				basicTextStyle.SetString(vp.PeerNameInNetns)})
 			t.AppendSeparator()
 		}
 	}
@@ -59,19 +54,37 @@ func Table(w io.Writer, m map[string][]pkg.Node) error {
 	return nil
 }
 
-func TableParis(w io.WriteCloser, vpairs []pkg.Node) error {
+func TableParis(w io.WriteCloser, vpairs []pkg.Node) {
 	tbStr := strings.Builder{}
 	t := table.NewWriter()
 	t.SetOutputMirror(&tbStr)
-	t.SetTitle("unused veth pairs (experimental)")
+
+	//  (experimental)
+	t.SetTitle("unused veth pairs")
 	t.AppendHeader(table.Row{"veth", "pair"})
+	visited := make(map[string]struct{})
 	for _, v := range vpairs {
-		t.AppendRow(table.Row{v.Veth, v.Peer})
+		h := hashVethpair(v.Veth, v.Peer)
+		if _, ok := visited[h]; ok {
+			continue
+		}
+		t.AppendRow(table.Row{
+			basicTextStyle.SetString(v.Veth),
+			basicTextStyle.SetString(v.Peer)})
 		t.AppendSeparator()
+		visited[h] = struct{}{}
 	}
 	t.SetAutoIndex(true)
 	t.SetStyle(table.StyleRounded)
 	t.Render()
 	fmt.Fprintln(w, tbStr.String())
-	return nil
+}
+
+func hashVethpair(a, b string) string {
+	// FIXME, replace with a better hash function
+	res := []rune(a + b)
+	sort.Slice(res, func(i, j int) bool {
+		return res[i] < res[j]
+	})
+	return string(res)
 }

pkg/formatter/text.go

@@ -13,24 +13,14 @@ import (
 	"github.com/t1anz0ng/iftree/pkg"
 )
 
-func Print(w io.Writer, vm map[string][]pkg.Node,
-	netNsMap map[int]string,
-	vpairs []pkg.Node,
-	all bool) error {
+func Print(w io.Writer, vm map[string][]pkg.Node, netNsMap map[int]string, vpairs []pkg.Node, all bool) {
 
 	var content strings.Builder
-	var vpair strings.Builder
+	var contents []string
 
 	lw := list.NewWriter()
 	lw.SetOutputMirror(&content)
-	fmt.Fprintln(&content, lipgloss.NewStyle().
-		Background(lipgloss.Color("#F25D94")).
-		MarginLeft(10).
-		MarginRight(10).
-		Padding(0, 1).
-		Italic(true).
-		Foreground(lipgloss.Color("#FFF7DB")).
-		SetString("Bridge <---->veth pair"))
+	fmt.Fprintln(&content, TitleHighlight.SetString("Bridge <----> veth pair"))
 	for k, v := range vm {
 		master, err := netlink.LinkByName(k)
 		if err != nil {
@@ -51,7 +41,9 @@ func Print(w io.Writer, vm map[string][]pkg.Node,
 					}
 					lw.AppendItem(
 						vethStyle.SetString(
-							fmt.Sprintf("%s\t%s", p.Veth, p.PeerNameInNetns)).String())
+							fmt.Sprintf("%s\t%s",
+								basicTextStyle.SetString(p.Veth),
+								basicTextStyle.SetString(p.PeerNameInNetns))).String())
 				}
 			}
 			if f {
@@ -64,33 +56,29 @@ func Print(w io.Writer, vm map[string][]pkg.Node,
 	lw.SetStyle(list.StyleConnectedRounded)
 	lw.Render()
 
-	var contents []string
 	contents = append(contents, mainStype.Render(content.String()))
+
 	if all {
-		lw.Reset()
-		lw.SetOutputMirror(&vpair)
+		var vpair strings.Builder
+
+		fmt.Fprintln(&vpair, unusedVethStyle.SetString("unused veth pairs"))
+
+		visited := make(map[string]struct{})
 
-		fmt.Fprintln(&vpair, lipgloss.NewStyle().
-			Background(lipgloss.Color("#F25D94")).
-			MarginLeft(5).
-			MarginRight(5).
-			Padding(0, 1).
-			Italic(true).
-			Foreground(lipgloss.Color("#FFF7DB")).
-			SetString("unused veth pairs"))
-		lw.SetStyle(list.StyleConnectedRounded)
 		for _, veth := range vpairs {
-			lw.AppendItem(fmt.Sprintf("%s%s%s", veth.Veth,
-				lipgloss.NewStyle().
-					MarginRight(1).
-					MarginLeft(1).
-					Padding(0, 1).
-					Foreground(special).SetString("<----->"),
-				veth.Peer))
+			h := hashVethpair(veth.Veth, veth.Peer)
+			if _, ok := visited[h]; ok {
+				continue
+			}
+
+			fmt.Fprintf(&vpair, "%s%s%s",
+				basicTextStyle.SetString(veth.Veth),
+				textHighlight.SetString("<----->"),
+				basicTextStyle.SetString(veth.Peer))
+			visited[h] = struct{}{}
 		}
-		lw.Render()
+
 		contents = append(contents, vethPairStyle.Render(vpair.String()))
 	}
 	fmt.Fprintln(w, lipgloss.JoinVertical(lipgloss.Top, contents...))
-	return nil
 }

pkg/netutil/netutil.go → pkg/netutil/netutil_linux.go

@@ -69,18 +69,18 @@ func listNetNsPath() ([]string, error) {
 // GetPeerInNs enter target netns to get veth peer's name
 // root needed
 func GetPeerInNs(ns string, origin netns.NsHandle, peerIdx int) (netlink.Link, error) {
-	return NetnsGetName(ns, origin, func() (netlink.Link, error) {
+	return netnsGetName(ns, origin, func() (netlink.Link, error) {
 		return netlink.LinkByIndex(peerIdx)
 	})
 }
 
 func GetLoInNs(ns string, origin netns.NsHandle) (netlink.Link, error) {
-	return NetnsGetName(ns, origin, func() (netlink.Link, error) {
+	return netnsGetName(ns, origin, func() (netlink.Link, error) {
 		return netlink.LinkByName("lo")
 	})
 }
 
-func NetnsGetName(ns string, origin netns.NsHandle, fn func() (netlink.Link, error)) (link netlink.Link, err error) {
+func netnsGetName(ns string, origin netns.NsHandle, fn func() (netlink.Link, error)) (link netlink.Link, err error) {
 	hd, err := netns.GetFromPath(ns)
 	if err != nil {
 		return nil, err