apps/cunicu
1
0
Fork 0
mirror of https://codeberg.org/cunicu/cunicu.git synced 2026-04-24 08:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

device: do not delete TUN device on shutdown

Browse Source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel
2022-08-23 12:09:58 +02:00
parent 099af6d0c7
commit 5dca738b0f
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/device/device_user.go
+11 -13
View File
@@ -86,37 +86,35 @@ func NewUserDevice(name string) (*UserDevice, error) {
return dev, nil
}
func (i *UserDevice) Close() error {
i.device.Close()
func (d *UserDevice) Close() error {
d.device.Close()
if err := i.api.Close(); err != nil {
if err := d.api.Close(); err != nil {
return err
}
if err := i.Device.Close(); err != nil {
return fmt.Errorf("failed to close kernel device: %w", err)
}
// TODO: Check for stale TUN device and cleanup?
return nil
}
func (i *UserDevice) handleUserAPI() {
func (d *UserDevice) handleUserAPI() {
for {
conn, err := i.api.Accept()
conn, err := d.api.Accept()
if err != nil {
if errors.Is(err, net.ErrClosed) {
return
} else {
i.logger.Error("Failed to accept new user api connection", zap.Error(err))
d.logger.Error("Failed to accept new user api connection", zap.Error(err))
continue
}
} else if i.device == nil {
i.logger.Warn("Dropping user api connection as device is not ready yet")
} else if d.device == nil {
d.logger.Warn("Dropping user api connection as device is not ready yet")
continue
}
i.logger.Debug("Handle new IPC connection", zap.String("socket", conn.LocalAddr().String()))
go i.device.IpcHandle(conn)
d.logger.Debug("Handle new IPC connection", zap.String("socket", conn.LocalAddr().String()))
go d.device.IpcHandle(conn)
}
}