-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tunnels refactoring and datarace fixes
Golang documentation mentioning it's unsafe to concurently send messages via same tunnel, so there is a mutex and a data copy on write
- Loading branch information
Showing
7 changed files
with
255 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package core | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "errors" | ||
| "io" | ||
| "log" | ||
| "sync" | ||
| ) | ||
|
|
||
| // TunnelIO - Duplex data tunnel, compatible with both io.ReadWriter | ||
| type TunnelIO struct { | ||
| ID uint64 | ||
| SessionID string | ||
|
|
||
| Send chan []byte | ||
| Recv chan []byte | ||
|
|
||
| isOpen bool | ||
| mutex *sync.RWMutex | ||
| } | ||
|
|
||
| // NewTunnelIO - Single entry point for creating instance of new TunnelIO | ||
| func NewTunnelIO(tunnelID uint64, sessionID string) *TunnelIO { | ||
| log.Printf("New tunnel!: %d", tunnelID) | ||
|
|
||
| return &TunnelIO{ | ||
| ID: tunnelID, | ||
| SessionID: sessionID, | ||
| Send: make(chan []byte), | ||
| Recv: make(chan []byte), | ||
| isOpen: false, | ||
| mutex: &sync.RWMutex{}, | ||
| } | ||
| } | ||
|
|
||
| // Write - Writer method for interface | ||
| func (tun *TunnelIO) Write(data []byte) (int, error) { | ||
| if !tun.IsOpen() { | ||
| log.Printf("Warning: Write on closed tunnel %d", tun.ID) | ||
| return 0, io.EOF | ||
| } | ||
|
|
||
| // This is necessary to avoid any race conditions on thay byte array | ||
| dataCopy := make([]byte, len(data)) | ||
| copy(dataCopy, data) | ||
|
|
||
| log.Printf("Write %d bytes", len(dataCopy)) | ||
|
|
||
| tun.Send <- dataCopy | ||
| n := len(dataCopy) | ||
|
|
||
| return n, nil | ||
| } | ||
|
|
||
| // Read - Reader method for interface | ||
| func (tun *TunnelIO) Read(data []byte) (int, error) { | ||
| if !tun.IsOpen() { | ||
| log.Printf("Warning: Read on closed tunnel %d", tun.ID) | ||
| return 0, io.EOF | ||
| } | ||
|
|
||
| var buff bytes.Buffer | ||
|
|
||
| recvData := <-tun.Recv | ||
| log.Printf("Read %d bytes", len(recvData)) | ||
| buff.Write(recvData) | ||
|
|
||
| n := copy(data, buff.Bytes()) | ||
| return n, nil | ||
| } | ||
|
|
||
| // Close - Close tunnel IO operations | ||
| func (tun *TunnelIO) Close() error { | ||
| tun.mutex.Lock() | ||
| defer tun.mutex.Unlock() | ||
|
|
||
| if !tun.isOpen { | ||
| log.Printf("Warning: Close on closed tunnel %d", tun.ID) | ||
|
|
||
| // I guess we can ignore it and don't return any error | ||
| return nil | ||
| } | ||
|
|
||
| log.Printf("Close tunnel %d", tun.ID) | ||
|
|
||
| tun.isOpen = false | ||
|
|
||
| close(tun.Recv) | ||
| close(tun.Send) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (tun *TunnelIO) IsOpen() bool { | ||
| tun.mutex.RLock() | ||
| defer tun.mutex.RUnlock() | ||
|
|
||
| return tun.isOpen | ||
| } | ||
|
|
||
| func (tun *TunnelIO) Open() error { | ||
| tun.mutex.Lock() | ||
| defer tun.mutex.Unlock() | ||
|
|
||
| if tun.isOpen { | ||
| return errors.New("tunnel relady in open state") | ||
| } | ||
|
|
||
| log.Printf("Open tunnel %d", tun.ID) | ||
|
|
||
| tun.isOpen = true | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.