zishuo/netlink
1
0
Fork 0
mirror of https://github.com/vishvananda/netlink.git synced 2025-09-26 20:01:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change behavior of Subscribe to non-blocking. Fix test."

Browse Source 
This reverts commit 916f9685fa.
This commit is contained in:
Quan Tian
2024-05-23 17:10:54 +08:00
committed by Alessandro Boch
parent 856e190dd7
commit 1e68b2710d
8 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addr_linux.go
View File

@@ -367,9 +367,6 @@ func addrSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- AddrUpdate, done <-c
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
if cberr != nil { if cberr != nil {
cberr(fmt.Errorf("Receive failed: %v", cberr(fmt.Errorf("Receive failed: %v",
err)) err))

3
link_linux.go
View File

@@ -2434,9 +2434,6 @@ func linkSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- LinkUpdate, done <-c
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
if cberr != nil { if cberr != nil {
cberr(fmt.Errorf("Receive failed: %v", cberr(fmt.Errorf("Receive failed: %v",
err)) err))

3
neigh_linux.go
View File

@@ -416,9 +416,6 @@ func neighSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- NeighUpdate, done <
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
if cberr != nil { if cberr != nil {
cberr(err) cberr(err)
} }

10
nl/nl_linux.go
View File

@@ -727,16 +727,6 @@ func Subscribe(protocol int, groups ...uint) (*NetlinkSocket, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Sometimes (socket_linux.go:SocketGet), Subscribe is used to create a socket
// that subscirbed to no groups. So we don't need to set nonblock there.
if len(groups) > 0 {
if err := unix.SetNonblock(fd, true); err != nil {
unix.Close(fd)
return nil, err
}
}
s := &NetlinkSocket{ s := &NetlinkSocket{
fd: int32(fd), fd: int32(fd),
} }

3
proc_event_linux.go
View File

@@ -148,9 +148,6 @@ func ProcEventMonitor(ch chan<- ProcEvent, done <-chan struct{}, errorChan chan<
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
errorChan <- err errorChan <- err
return return
} }

3
route_linux.go
View File

@@ -1657,9 +1657,6 @@ func routeSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- RouteUpdate, done <
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
if cberr != nil { if cberr != nil {
cberr(fmt.Errorf("Receive failed: %v", cberr(fmt.Errorf("Receive failed: %v",
err)) err))

3
socket_linux.go
View File

@@ -499,9 +499,6 @@ loop:
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
return err return err
} }
if from.Pid != nl.PidKernel { if from.Pid != nl.PidKernel {

4
xfrm_monitor_linux.go
View File

@@ -2,7 +2,6 @@ package netlink
import ( import (
"fmt" "fmt"
"syscall"
"github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns" "github.com/vishvananda/netns"
@@ -57,9 +56,6 @@ func XfrmMonitor(ch chan<- XfrmMsg, done <-chan struct{}, errorChan chan<- error
for { for {
msgs, from, err := s.Receive() msgs, from, err := s.Receive()
if err != nil { if err != nil {
if err == syscall.EAGAIN {
continue
}
errorChan <- err errorChan <- err
return return
} }