Merge pull request #11890 from Luap99/ports

libpod: deduplicate ports in db

2 files changed, 48 insertions, 185 deletions

diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go
index f309390c3..0e582ae52 100644
--- a/cmd/podman/containers/port.go
+++ b/cmd/podman/containers/port.go
@@ -8,7 +8,6 @@ import (
 	"github.com/containers/podman/v3/cmd/podman/common"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/validate"
-	"github.com/containers/podman/v3/libpod/network/types"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -73,7 +72,8 @@ func port(_ *cobra.Command, args []string) error {
 	var (
 		container string
 		err       error
-		userPort  types.OCICNIPortMapping
+		userPort  uint16
+		userProto string
 	)
 
 	if len(args) == 0 && !portOpts.Latest && !portOpts.All {
@@ -101,16 +101,12 @@ func port(_ *cobra.Command, args []string) error {
 			fields = append(fields, "tcp")
 		}
 
-		portNum, err := strconv.Atoi(fields[0])
+		portNum, err := strconv.ParseUint(fields[0], 10, 16)
 		if err != nil {
 			return err
 		}
-		userPort = types.OCICNIPortMapping{
-			HostPort:      0,
-			ContainerPort: int32(portNum),
-			Protocol:      fields[1],
-			HostIP:        "",
-		}
+		userPort = uint16(portNum)
+		userProto = fields[1]
 	}
 
 	reports, err := registry.ContainerEngine().ContainerPort(registry.GetContext(), container, portOpts)
@@ -120,24 +116,36 @@ func port(_ *cobra.Command, args []string) error {
 	var found bool
 	// Iterate mappings
 	for _, report := range reports {
+		allPrefix := ""
+		if portOpts.All {
+			allPrefix = report.Id[:12] + "\t"
+		}
 		for _, v := range report.Ports {
 			hostIP := v.HostIP
 			// Set host IP to 0.0.0.0 if blank
 			if hostIP == "" {
 				hostIP = "0.0.0.0"
 			}
-			if portOpts.All {
-				fmt.Printf("%s\t", report.Id[:12])
-			}
-			// If not searching by port or port/proto, then dump what we see
-			if port == "" {
-				fmt.Printf("%d/%s -> %s:%d\n", v.ContainerPort, v.Protocol, hostIP, v.HostPort)
-				continue
-			}
-			if v.ContainerPort == userPort.ContainerPort {
-				fmt.Printf("%s:%d\n", hostIP, v.HostPort)
-				found = true
-				break
+			protocols := strings.Split(v.Protocol, ",")
+			for _, protocol := range protocols {
+				// If not searching by port or port/proto, then dump what we see
+				if port == "" {
+					for i := uint16(0); i < v.Range; i++ {
+						fmt.Printf("%s%d/%s -> %s:%d\n", allPrefix, v.ContainerPort+i, protocol, hostIP, v.HostPort+i)
+					}
+					continue
+				}
+				// check if the proto matches and if the port is in the range
+				// this is faster than looping over the range for no reason
+				if v.Protocol == userProto &&
+					v.ContainerPort <= userPort &&
+					v.ContainerPort+v.Range > userPort {
+					// we have to add the current range to the host port
+					hostPort := v.HostPort + userPort - v.ContainerPort
+					fmt.Printf("%s%s:%d\n", allPrefix, hostIP, hostPort)
+					found = true
+					break
+				}
 			}
 		}
 		if !found && port != "" {
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 9687cd5bd..712de327c 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -3,8 +3,6 @@ package containers
 import (
 	"fmt"
 	"os"
-	"sort"
-	"strconv"
 	"strings"
 	"time"
 
@@ -477,174 +475,31 @@ func (l psReporter) UTS() string {
 
 // portsToString converts the ports used to a string of the from "port1, port2"
 // and also groups a continuous list of ports into a readable format.
-func portsToString(ports []types.OCICNIPortMapping) string {
+// The format is IP:HostPort(-Range)->ContainerPort(-Range)/Proto
+func portsToString(ports []types.PortMapping) string {
 	if len(ports) == 0 {
 		return ""
 	}
-	// Sort the ports, so grouping continuous ports become easy.
-	sort.Slice(ports, func(i, j int) bool {
-		return comparePorts(ports[i], ports[j])
-	})
-
-	portGroups := [][]types.OCICNIPortMapping{}
-	currentGroup := []types.OCICNIPortMapping{}
-	for i, v := range ports {
-		var prevPort, nextPort *int32
-		if i > 0 {
-			prevPort = &ports[i-1].ContainerPort
-		}
-		if i+1 < len(ports) {
-			nextPort = &ports[i+1].ContainerPort
-		}
-
-		port := v.ContainerPort
-
-		// Helper functions
-		addToCurrentGroup := func(x types.OCICNIPortMapping) {
-			currentGroup = append(currentGroup, x)
-		}
-
-		addToPortGroup := func(x types.OCICNIPortMapping) {
-			portGroups = append(portGroups, []types.OCICNIPortMapping{x})
-		}
-
-		finishCurrentGroup := func() {
-			portGroups = append(portGroups, currentGroup)
-			currentGroup = []types.OCICNIPortMapping{}
-		}
-
-		// Single entry slice
-		if prevPort == nil && nextPort == nil {
-			addToPortGroup(v)
-		}
-
-		// Start of the slice with len > 0
-		if prevPort == nil && nextPort != nil {
-			isGroup := *nextPort-1 == port
-
-			if isGroup {
-				// Start with a group
-				addToCurrentGroup(v)
-			} else {
-				// Start with single item
-				addToPortGroup(v)
-			}
-
-			continue
-		}
-
-		// Middle of the slice with len > 0
-		if prevPort != nil && nextPort != nil {
-			currentIsGroup := *prevPort+1 == port
-			nextIsGroup := *nextPort-1 == port
-
-			if currentIsGroup {
-				// Maybe in the middle of a group
-				addToCurrentGroup(v)
-
-				if !nextIsGroup {
-					// End of a group
-					finishCurrentGroup()
-				}
-			} else if nextIsGroup {
-				// Start of a new group
-				addToCurrentGroup(v)
-			} else {
-				// No group at all
-				addToPortGroup(v)
-			}
-
-			continue
-		}
-
-		// End of the slice with len > 0
-		if prevPort != nil && nextPort == nil {
-			isGroup := *prevPort+1 == port
-
-			if isGroup {
-				// End group
-				addToCurrentGroup(v)
-				finishCurrentGroup()
-			} else {
-				// End single item
-				addToPortGroup(v)
-			}
-		}
-	}
-
-	portDisplay := []string{}
-	for _, group := range portGroups {
-		if len(group) == 0 {
-			// Usually should not happen, but better do not crash.
-			continue
-		}
-
-		first := group[0]
-
-		hostIP := first.HostIP
+	sb := &strings.Builder{}
+	for _, port := range ports {
+		hostIP := port.HostIP
 		if hostIP == "" {
 			hostIP = "0.0.0.0"
 		}
-
-		// Single mappings
-		if len(group) == 1 {
-			portDisplay = append(portDisplay,
-				fmt.Sprintf(
-					"%s:%d->%d/%s",
-					hostIP, first.HostPort, first.ContainerPort, first.Protocol,
-				),
-			)
-			continue
-		}
-
-		// Group mappings
-		last := group[len(group)-1]
-		portDisplay = append(portDisplay, formatGroup(
-			fmt.Sprintf("%s/%s", hostIP, first.Protocol),
-			first.HostPort, last.HostPort,
-			first.ContainerPort, last.ContainerPort,
-		))
-	}
-	return strings.Join(portDisplay, ", ")
-}
-
-func comparePorts(i, j types.OCICNIPortMapping) bool {
-	if i.ContainerPort != j.ContainerPort {
-		return i.ContainerPort < j.ContainerPort
-	}
-
-	if i.HostIP != j.HostIP {
-		return i.HostIP < j.HostIP
-	}
-
-	if i.HostPort != j.HostPort {
-		return i.HostPort < j.HostPort
-	}
-
-	return i.Protocol < j.Protocol
-}
-
-// formatGroup returns the group in the format:
-// <IP:firstHost:lastHost->firstCtr:lastCtr/Proto>
-// e.g 0.0.0.0:1000-1006->2000-2006/tcp.
-func formatGroup(key string, firstHost, lastHost, firstCtr, lastCtr int32) string {
-	parts := strings.Split(key, "/")
-	groupType := parts[0]
-	var ip string
-	if len(parts) > 1 {
-		ip = parts[0]
-		groupType = parts[1]
-	}
-
-	group := func(first, last int32) string {
-		group := strconv.Itoa(int(first))
-		if first != last {
-			group = fmt.Sprintf("%s-%d", group, last)
+		protocols := strings.Split(port.Protocol, ",")
+		for _, protocol := range protocols {
+			if port.Range > 1 {
+				fmt.Fprintf(sb, "%s:%d-%d->%d-%d/%s, ",
+					hostIP, port.HostPort, port.HostPort+port.Range-1,
+					port.ContainerPort, port.ContainerPort+port.Range-1, protocol)
+			} else {
+				fmt.Fprintf(sb, "%s:%d->%d/%s, ",
+					hostIP, port.HostPort,
+					port.ContainerPort, protocol)
+			}
 		}
-		return group
 	}
-	hostGroup := group(firstHost, lastHost)
-	ctrGroup := group(firstCtr, lastCtr)
-
-	return fmt.Sprintf("%s:%s->%s/%s", ip, hostGroup, ctrGroup, groupType)
+	display := sb.String()
+	// make sure to trim the last ", " of the string
+	return display[:len(display)-2]
 }