unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Use DialMode/ListenMode

Browse Source
This commit is contained in:
Asim Aslam
2019-10-15 16:08:38 +01:00
parent ca934951ad
commit be5093798b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
network/default.go
View File

@@ -822,7 +822,7 @@ func (n *network) Connect() error {
}
// dial into ControlChannel to send route adverts
ctrlClient, err := n.tunnel.Dial(ControlChannel, tunnel.DialMulticast())
ctrlClient, err := n.tunnel.Dial(ControlChannel, tunnel.DialMode(tunnel.Multicast))
if err != nil {
n.Unlock()
return err
@@ -831,14 +831,14 @@ func (n *network) Connect() error {
n.tunClient[ControlChannel] = ctrlClient
// listen on ControlChannel
ctrlListener, err := n.tunnel.Listen(ControlChannel, tunnel.ListenMulticast())
ctrlListener, err := n.tunnel.Listen(ControlChannel, tunnel.ListenMode(tunnel.Multicast))
if err != nil {
n.Unlock()
return err
}
// dial into NetworkChannel to send network messages
netClient, err := n.tunnel.Dial(NetworkChannel, tunnel.DialMulticast())
netClient, err := n.tunnel.Dial(NetworkChannel, tunnel.DialMode(tunnel.Multicast))
if err != nil {
n.Unlock()
return err
@@ -847,7 +847,7 @@ func (n *network) Connect() error {
n.tunClient[NetworkChannel] = netClient
// listen on NetworkChannel
netListener, err := n.tunnel.Listen(NetworkChannel, tunnel.ListenMulticast())
netListener, err := n.tunnel.Listen(NetworkChannel, tunnel.ListenMode(tunnel.Multicast))
if err != nil {
n.Unlock()
return err

4
tunnel/broker/broker.go
View File

@@ -58,7 +58,7 @@ func (t *tunBroker) Disconnect() error {
func (t *tunBroker) Publish(topic string, m *broker.Message, opts ...broker.PublishOption) error {
// TODO: this is probably inefficient, we might want to just maintain an open connection
// it may be easier to add broadcast to the tunnel
c, err := t.tunnel.Dial(topic, tunnel.DialMulticast())
c, err := t.tunnel.Dial(topic, tunnel.DialMode(tunnel.Multicast))
if err != nil {
return err
}
@@ -71,7 +71,7 @@ func (t *tunBroker) Publish(topic string, m *broker.Message, opts ...broker.Publ
}
func (t *tunBroker) Subscribe(topic string, h broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
l, err := t.tunnel.Listen(topic, tunnel.ListenMulticast())
l, err := t.tunnel.Listen(topic, tunnel.ListenMode(tunnel.Multicast))
if err != nil {
return nil, err
}

8
tunnel/options.go
View File

@@ -95,18 +95,18 @@ func DefaultOptions() Options {
}
// Listen options
func ListenMulticast() ListenOption {
func ListenMode(m Mode) ListenOption {
return func(o *ListenOptions) {
o.Mode = Multicast
o.Mode = m
}
}
// Dial options
// Dial multicast sets the multicast option to send only to those mapped
func DialMulticast() DialOption {
func DialMode(m Mode) DialOption {
return func(o *DialOptions) {
o.Mode = Multicast
o.Mode = m
}
}

2
tunnel/tunnel.go
View File

@@ -13,7 +13,7 @@ const (
Unicast Mode = iota
// send to all channel listeners
Multicast
// send to all listeners
// send to all links
Broadcast
)