Skip to content

Commit

Permalink
socketpair_windows: remove implementation for now
Browse files Browse the repository at this point in the history
Current implementation has the same issues that
socketpair_unix.go had, namely double closes and
leaking FDs. The initial author prefers to remove
the code for now as the whole feature (NRI) doesn't
work on windows for now.

This allows us to rename socketpair_unix.go -> socketpair.go
as everything in it is generic.

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
  • Loading branch information
champtar committed Feb 3, 2024
1 parent 4298b41 commit e47f09b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 199 deletions.
2 changes: 0 additions & 2 deletions pkg/net/socketpair_unix.go → pkg/net/socketpair.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build !windows

/*
Copyright The containerd Authors.
Expand Down
30 changes: 30 additions & 0 deletions pkg/net/socketpair_cloexec_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//go:build windows

/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package net

import (
"errors"

sys "golang.org/x/sys/windows"
)

func newSocketPairCLOEXEC() ([2]sys.Handle, error) {
// when implementing do use WSA_FLAG_NO_HANDLE_INHERIT to avoid leaking FDs
return [2]sys.Handle{sys.InvalidHandle, sys.InvalidHandle}, errors.New("newSocketPairCLOEXEC unimplemented for windows")
}
197 changes: 0 additions & 197 deletions pkg/net/socketpair_windows.go

This file was deleted.

0 comments on commit e47f09b

Please sign in to comment.