Skip to content

Revert "guestagent/procnettcp: remove unused, unexport funcs" #3849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
Merged

Revert "guestagent/procnettcp: remove unused, unexport funcs" #3849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/guestagent/procnettcp/fuzz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ func FuzzParse(f *testing.F) {
if tcp6 {
kind = TCP6
}
_, _ = parse(bytes.NewReader(data), kind)
_, _ = Parse(bytes.NewReader(data), kind)
})
}
16 changes: 10 additions & 6 deletions pkg/guestagent/procnettcp/procnettcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ type Entry struct {
State State `json:"state"`
}

func parse(r io.Reader, kind Kind) ([]Entry, error) {
return parseWithEndian(r, kind, cpu.IsBigEndian)
func Parse(r io.Reader, kind Kind) ([]Entry, error) {
return ParseWithEndian(r, kind, cpu.IsBigEndian)
}

func parseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
func ParseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
switch kind {
case TCP, TCP6, UDP, UDP6:
default:
Expand Down Expand Up @@ -78,7 +78,7 @@ func parseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
default:
// localAddress is like "0100007F:053A"
localAddress := fields[fieldNames["local_address"]]
ip, port, err := parseAddressWithEndian(localAddress, isBE)
ip, port, err := ParseAddressWithEndian(localAddress, isBE)
if err != nil {
return entries, err
}
Expand All @@ -105,7 +105,7 @@ func parseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
return entries, nil
}

// parseAddressWithEndian parses a string.
// ParseAddress parses a string.
//
// Little endian hosts:
// "0100007F:0050" (127.0.0.1:80)
Expand All @@ -118,7 +118,11 @@ func parseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
// "00000000000000000000000000000000:0050" (0.0.0.0:80)
//
// See https://serverfault.com/questions/592574/why-does-proc-net-tcp6-represents-1-as-1000
func parseAddressWithEndian(s string, isBE bool) (net.IP, uint16, error) {
func ParseAddress(s string) (net.IP, uint16, error) {
return ParseAddressWithEndian(s, cpu.IsBigEndian)
}

func ParseAddressWithEndian(s string, isBE bool) (net.IP, uint16, error) {
split := strings.SplitN(s, ":", 2)
if len(split) != 2 {
return nil, 0, fmt.Errorf("unparsable address %q", s)
Expand Down
2 changes: 1 addition & 1 deletion pkg/guestagent/procnettcp/procnettcp_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func ParseFiles() ([]Entry, error) {
}
return res, err
}
parsed, err := parse(r, kind)
parsed, err := Parse(r, kind)
if err != nil {
_ = r.Close()
return res, err
Expand Down
10 changes: 5 additions & 5 deletions pkg/guestagent/procnettcp/procnettcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestParseTCP(t *testing.T) {
4: 0100007F:053A 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 31430 1 0000000000000000 100 0 0 10 0
5: 0B3CA8C0:0016 690AA8C0:F705 01 00000000:00000000 02:00028D8B 00000000 0 0 32989 4 0000000000000000 20 4 31 10 19
`
entries, err := parseWithEndian(strings.NewReader(procNetTCP), TCP, isBE)
entries, err := ParseWithEndian(strings.NewReader(procNetTCP), TCP, isBE)
assert.NilError(t, err)
t.Log(entries)

Expand All @@ -38,7 +38,7 @@ func TestParseTCP6(t *testing.T) {
const isBE = false
procNetTCP := ` sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode
0: 000080FE00000000FF57A6705DC771FE:0050 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 850222 1 0000000000000000 100 0 0 10 0`
entries, err := parseWithEndian(strings.NewReader(procNetTCP), TCP6, isBE)
entries, err := ParseWithEndian(strings.NewReader(procNetTCP), TCP6, isBE)
assert.NilError(t, err)
t.Log(entries)

Expand All @@ -54,7 +54,7 @@ func TestParseTCP6Zero(t *testing.T) {
1: 00000000000000000000000000000000:006F 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 26772 1 0000000000000000 100 0 0 10 0
2: 00000000000000000000000000000000:0050 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 1210901 1 0000000000000000 100 0 0 10 0
`
entries, err := parseWithEndian(strings.NewReader(procNetTCP), TCP6, isBE)
entries, err := ParseWithEndian(strings.NewReader(procNetTCP), TCP6, isBE)
assert.NilError(t, err)
t.Log(entries)

Expand All @@ -71,7 +71,7 @@ func TestParseUDP(t *testing.T) {
731: 0369A8C0:0044 00000000:0000 07 00000000:00000000 00:00000000 00000000 998 0 29132 2 0000000000000000 0
731: 0F05A8C0:0044 00000000:0000 07 00000000:00000000 00:00000000 00000000 998 0 4049 2 0000000000000000 0
1768: 00000000:1451 00000000:0000 07 00000000:00000000 00:00000000 00000000 502 0 28364 2 0000000000000000 0 `
entries, err := parseWithEndian(strings.NewReader(procNetTCP), UDP, isBE)
entries, err := ParseWithEndian(strings.NewReader(procNetTCP), UDP, isBE)
assert.NilError(t, err)
t.Log(entries)

Expand Down Expand Up @@ -149,7 +149,7 @@ func TestParseAddress(t *testing.T) {

for _, test := range tests {
t.Run(test.input, func(t *testing.T) {
ip, port, err := parseAddressWithEndian(test.input, test.bigEndian)
ip, port, err := ParseAddressWithEndian(test.input, test.bigEndian)
if test.expectedErrSubstr != "" {
assert.ErrorContains(t, err, test.expectedErrSubstr)
} else {
Expand Down
Loading