Skip to content

Commit

Permalink
add nettype on create CustomListenerSelector
Browse files Browse the repository at this point in the history
  • Loading branch information
xiemalin committed Aug 19, 2021
1 parent 0a81ec1 commit 51a7726
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion client.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func (c *RpcClient) startLoopReceive() {
default:
dataPackage, err := c.safeReceive()
if err != nil {
// if met error, wait some time to retry
// if met error, wait some time to retry or call client close method to close loop if met net error
time.Sleep(200 * time.Millisecond)
}

Expand Down
28 changes: 23 additions & 5 deletions nettool/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ type CustomListenerSelector struct {
}

// NewCustomListenerSelector new a CustomListenerSelector
func NewCustomListenerSelector(host string, port int, headsize uint8, matchMode int) (*CustomListenerSelector, error) {
return NewCustomListenerSelectorByAddr(host+":"+strconv.Itoa(port), headsize, matchMode)
func NewCustomListenerSelector(network, host string, port int, headsize uint8, matchMode int) (*CustomListenerSelector, error) {
return NewCustomListenerSelectorByAddr(network, host+":"+strconv.Itoa(port), headsize, matchMode)
}

// NewCustomListenerSelectorByAddr new a CustomListenerSelector by address string
func NewCustomListenerSelectorByAddr(server string, headsize uint8, matchMode int) (*CustomListenerSelector, error) {
listener, err := net.Listen("tcp", server)
func NewCustomListenerSelectorByAddr(network, server string, headsize uint8, matchMode int) (*CustomListenerSelector, error) {
listener, err := net.Listen(network, server)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -113,13 +113,18 @@ func (server *CustomListenerSelector) RegisterDefaultListener() net.Listener {
return server.defaultListener
}

// Serve do listening from net trasport
func (server *CustomListenerSelector) Serve() error {
for {
conn, err := server.listenerProxy.Accept()
if err != nil {
// if met error broadcast to all listeners
netinfo := NetInfo{conn, err}
for _, server := range server.listeners {
server.sessionChan <- netinfo
s := server
go func() {
s.sessionChan <- netinfo
}()
}
return err
}
Expand Down Expand Up @@ -160,6 +165,19 @@ func (server *CustomListenerSelector) Serve() error {

}

// Close do close all listeners
func (server *CustomListenerSelector) Close() error {
var errRet error
for _, server := range server.listeners {
err := server.Close()
if err != nil {
errRet = err
}
}

return errRet
}

// net.Conn proxy
type ConnWrapper struct {
conn net.Conn
Expand Down

0 comments on commit 51a7726

Please sign in to comment.