Skip to content
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

Jump to bottom

Update net_openbsd.go to correctly parse netstat output on obsd #1621

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Update net_openbsd.go to correctly parse netstat output on obsd #1621

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 29 additions & 13 deletions net/net_openbsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ func ParseNetstat(output string, mode string,

exists := make([]string, 0, len(lines)-1)

columns := 6
if mode == "ind" {
columns = 10
columns := 9
if mode == "inb" {
columns = 6
}
for _, line := range lines {
values := strings.Fields(line)
Expand All @@ -48,18 +48,23 @@ func ParseNetstat(output string, mode string,

parsed := make([]uint64, 0, 8)
var vv []string
if mode == "inb" {
switch mode {
case "inb":
vv = []string{
values[base+3], // BytesRecv
values[base+4], // BytesSent
}
} else {
case "ind":
vv = []string{
values[base+3], // Ipkts
values[base+4], // Ierrs
values[base+4], // Idrop
values[base+5], // Opkts
values[base+6], // Odrops
}
case "ine":
vv = []string{
values[base+4], // Ierrs
values[base+6], // Oerrs
values[base+8], // Drops
}
}
for _, target := range vv {
Expand All @@ -80,16 +85,19 @@ func ParseNetstat(output string, mode string,
if !present {
n = IOCountersStat{Name: values[0]}
}
if mode == "inb" {

switch mode {
case "inb":
n.BytesRecv = parsed[0]
n.BytesSent = parsed[1]
} else {
case "ind":
n.PacketsRecv = parsed[0]
n.Errin = parsed[1]
n.Dropin = parsed[1]
n.PacketsSent = parsed[2]
n.Errout = parsed[3]
n.Dropin = parsed[4]
n.Dropout = parsed[4]
n.Dropout = parsed[3]
case "ine":
n.Errin = parsed[0]
n.Errout = parsed[1]
}

iocs[n.Name] = n
Expand All @@ -114,6 +122,10 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
if err != nil {
return nil, err
}
out3, err := invoke.CommandWithContext(ctx, netstat, "-ine")
if err != nil {
return nil, err
}
iocs := make(map[string]IOCountersStat)

lines := strings.Split(string(out), "\n")
Expand All @@ -127,6 +139,10 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
if err != nil {
return nil, err
}
err = ParseNetstat(string(out3), "ine", iocs)
if err != nil {
return nil, err
}

for _, ioc := range iocs {
ret = append(ret, ioc)
Expand Down