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

Unexport network.Message

Browse Source
This commit is contained in:
Milos Gajdos
2019-10-23 17:32:45 +01:00
parent 68789af4ea
commit 35729092e0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
network/default.go
View File

@@ -252,7 +252,7 @@ func (n *network) resolve() {
} }
// handleNetConn handles network announcement messages // handleNetConn handles network announcement messages
func (n *network) handleNetConn(s tunnel.Session, msg chan *Message) { func (n *network) handleNetConn(s tunnel.Session, msg chan *message) {
for { for {
m := new(transport.Message) m := new(transport.Message)
if err := s.Recv(m); err != nil { if err := s.Recv(m); err != nil {
@@ -264,7 +264,7 @@ func (n *network) handleNetConn(s tunnel.Session, msg chan *Message) {
} }
select { select {
case msg <- &Message{ case msg <- &message{
msg: m, msg: m,
session: s, session: s,
}: }:
@@ -275,7 +275,7 @@ func (n *network) handleNetConn(s tunnel.Session, msg chan *Message) {
} }
// acceptNetConn accepts connections from NetworkChannel // acceptNetConn accepts connections from NetworkChannel
func (n *network) acceptNetConn(l tunnel.Listener, recv chan *Message) { func (n *network) acceptNetConn(l tunnel.Listener, recv chan *message) {
var i int var i int
for { for {
// accept a connection // accept a connection
@@ -337,7 +337,7 @@ func (n *network) updatePeerLinks(peerAddr string, linkId string) error {
// processNetChan processes messages received on NetworkChannel // processNetChan processes messages received on NetworkChannel
func (n *network) processNetChan(listener tunnel.Listener) { func (n *network) processNetChan(listener tunnel.Listener) {
// receive network message queue // receive network message queue
recv := make(chan *Message, 128) recv := make(chan *message, 128)
// accept NetworkChannel connections // accept NetworkChannel connections
go n.acceptNetConn(listener, recv) go n.acceptNetConn(listener, recv)
@@ -604,7 +604,7 @@ func (n *network) prune() {
} }
// handleCtrlConn handles ControlChannel connections // handleCtrlConn handles ControlChannel connections
func (n *network) handleCtrlConn(s tunnel.Session, msg chan *Message) { func (n *network) handleCtrlConn(s tunnel.Session, msg chan *message) {
for { for {
m := new(transport.Message) m := new(transport.Message)
if err := s.Recv(m); err != nil { if err := s.Recv(m); err != nil {
@@ -616,7 +616,7 @@ func (n *network) handleCtrlConn(s tunnel.Session, msg chan *Message) {
} }
select { select {
case msg <- &Message{ case msg <- &message{
msg: m, msg: m,
session: s, session: s,
}: }:
@@ -627,7 +627,7 @@ func (n *network) handleCtrlConn(s tunnel.Session, msg chan *Message) {
} }
// acceptCtrlConn accepts connections from ControlChannel // acceptCtrlConn accepts connections from ControlChannel
func (n *network) acceptCtrlConn(l tunnel.Listener, recv chan *Message) { func (n *network) acceptCtrlConn(l tunnel.Listener, recv chan *message) {
var i int var i int
for { for {
// accept a connection // accept a connection
@@ -717,7 +717,7 @@ func (n *network) getRouteMetric(router string, gateway string) int64 {
// processCtrlChan processes messages received on ControlChannel // processCtrlChan processes messages received on ControlChannel
func (n *network) processCtrlChan(listener tunnel.Listener) { func (n *network) processCtrlChan(listener tunnel.Listener) {
// receive control message queue // receive control message queue
recv := make(chan *Message, 128) recv := make(chan *message, 128)
// accept ControlChannel cconnections // accept ControlChannel cconnections
go n.acceptCtrlConn(listener, recv) go n.acceptCtrlConn(listener, recv)

4
network/network.go
View File

@@ -56,8 +56,8 @@ type Network interface {
Server() server.Server Server() server.Server
} }
// Message is network message // message is network message
type Message struct { type message struct {
// msg is transport message // msg is transport message
msg *transport.Message msg *transport.Message
// session is tunnel session // session is tunnel session