Merge pull request #1551 from blinklabs-io/feat/use-lsof-freebsd-connections

shirou · web-flow · commit fad5e6864773 · 2023-11-12T10:37:03.000+09:00
feat: use lsof for net_connections on FreeBSD
diff --git a/README.md b/README.md
@@ -190,7 +190,7 @@ Some code is ported from Ohai. Many thanks.
 |users                 |x      |x        |x        |x       |x        |         |         |
 |pids                  |x      |x        |x        |x       |x        |         |         |
 |pid\_exists           |x      |x        |x        |x       |x        |         |         |
-|net\_connections      |x      |         |x        |x       |         |         |         |
+|net\_connections      |x      |x        |x        |x       |         |         |         |
 |net\_protocols        |x      |         |         |        |         |         |         |
 |net\_if\_addrs        |       |         |         |        |         |         |         |
 |net\_if\_stats        |       |         |         |        |         |         |         |
diff --git a/process/process_freebsd.go b/process/process_freebsd.go
@@ -286,11 +286,11 @@ func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
 }
 
 func (p *Process) ConnectionsWithContext(ctx context.Context) ([]net.ConnectionStat, error) {
-	return nil, common.ErrNotImplementedError
+	return net.ConnectionsPidWithContext(ctx, "all", p.Pid)
 }
 
 func (p *Process) ConnectionsMaxWithContext(ctx context.Context, max int) ([]net.ConnectionStat, error) {
-	return nil, common.ErrNotImplementedError
+	return net.ConnectionsPidMaxWithContext(ctx, "all", p.Pid, max)
 }
 
 func ProcessesWithContext(ctx context.Context) ([]*Process, error) {

Original file line number	Diff line number	Diff line change
`@@ -286,11 +286,11 @@ func (p Process) ChildrenWithContext(ctx context.Context) ([]Process, error) {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`func (p *Process) ConnectionsWithContext(ctx context.Context) ([]net.ConnectionStat, error) {`
`289`		`- return nil, common.ErrNotImplementedError`
	`289`	`+ return net.ConnectionsPidWithContext(ctx, "all", p.Pid)`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`func (p *Process) ConnectionsMaxWithContext(ctx context.Context, max int) ([]net.ConnectionStat, error) {`
`293`		`- return nil, common.ErrNotImplementedError`
	`293`	`+ return net.ConnectionsPidMaxWithContext(ctx, "all", p.Pid, max)`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`func ProcessesWithContext(ctx context.Context) ([]*Process, error) {`