Denote WithNetNS* functions with unsafe
Please see https://github.com/weaveworks/weave/issues/2388#issuecomment-228365069 for more details.
This commit is contained in:
1 parent
7f5c37ef1e
commit
89221f117b
4 files changed
+26
-14
No files matched your search
+3
-3
@@ -48,7 +48,7 @@ func FindNetDevs(processID int, match func(link netlink.Link) bool) ([]NetDev, e
|
||||
}
|
||||
defer ns.Close()
|
||||
|
||||
err = weavenet.WithNetNS(ns, func() error {
|
||||
err = weavenet.WithNetNSUnsafe(ns, func() error {
|
||||
return forEachLink(func(link netlink.Link) error {
|
||||
if match(link) {
|
||||
netDev, err := linkToNetDev(link)
|
||||
@@ -97,7 +97,7 @@ func linkToNetDev(link netlink.Link) (NetDev, error) {
|
||||
func ConnectedToBridgePredicate(bridgeName string) (func(link netlink.Link) bool, error) {
|
||||
var br netlink.Link
|
||||
|
||||
err := weavenet.WithNetNSLinkByPid(1, bridgeName, func(link netlink.Link) error {
|
||||
err := weavenet.WithNetNSLinkByPidUnsafe(1, bridgeName, func(link netlink.Link) error {
|
||||
br = link
|
||||
return nil
|
||||
})
|
||||
@@ -160,7 +160,7 @@ func GetWeaveNetDevs(processID int) ([]NetDev, error) {
|
||||
func GetBridgeNetDev(bridgeName string) (NetDev, error) {
|
||||
var netdev NetDev
|
||||
|
||||
err := weavenet.WithNetNSLinkByPid(1, bridgeName, func(link netlink.Link) error {
|
||||
err := weavenet.WithNetNSLinkByPidUnsafe(1, bridgeName, func(link netlink.Link) error {
|
||||
var err error
|
||||
netdev, err = linkToNetDev(link)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user