From 2ba2ca741560d5729196f3f6bdee84cc3f5d41ea Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 29 Jun 2023 02:26:22 +0900 Subject: [PATCH] pkg/port: ChildContext: remove unused PID field Signed-off-by: Akihiro Suda --- pkg/parent/parent.go | 3 +-- pkg/port/port.go | 2 -- pkg/port/testsuite/testsuite.go | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/parent/parent.go b/pkg/parent/parent.go index 4c6b2e37..29eb7d70 100644 --- a/pkg/parent/parent.go +++ b/pkg/parent/parent.go @@ -257,8 +257,7 @@ func Parent(opt Opt) error { if opt.PortDriver != nil { msgParentInitPortDriverCompleted.U.ParentInitPortDriverCompleted.PortDriverOpaque = opt.PortDriver.OpaqueForChild() cctx := &port.ChildContext{ - PID: cmd.Process.Pid, - IP: net.ParseIP(msgParentInitNetworkDriverCompleted.U.ParentInitNetworkDriverCompleted.IP).To4(), + IP: net.ParseIP(msgParentInitNetworkDriverCompleted.U.ParentInitNetworkDriverCompleted.IP).To4(), } go func() { portDriverErr <- opt.PortDriver.RunParentDriver(portDriverInitComplete, diff --git a/pkg/port/port.go b/pkg/port/port.go index c95bfc7c..367a9788 100644 --- a/pkg/port/port.go +++ b/pkg/port/port.go @@ -35,8 +35,6 @@ type Manager interface { // ChildContext is used for RunParentDriver type ChildContext struct { - // PID of the child, can be used for ns-entering to the child namespaces. - PID int // IP of the tap device IP net.IP } diff --git a/pkg/port/testsuite/testsuite.go b/pkg/port/testsuite/testsuite.go index 20410fab..18218bf9 100644 --- a/pkg/port/testsuite/testsuite.go +++ b/pkg/port/testsuite/testsuite.go @@ -161,8 +161,7 @@ func testProtoWithPID(t *testing.T, proto string, d port.ParentDriver, childPID driverErr := make(chan error) go func() { cctx := &port.ChildContext{ - PID: childPID, - IP: nil, // we don't have tap device in this test suite + IP: nil, // we don't have tap device in this test suite } driverErr <- d.RunParentDriver(initComplete, quit, cctx) }()