Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c385a6b1ea | |||
| ef798c1ac7 |
@@ -10,6 +10,11 @@ type Connection struct {
|
|||||||
TX chan<- *DataFrame
|
TX chan<- *DataFrame
|
||||||
ID ID
|
ID ID
|
||||||
closed bool
|
closed bool
|
||||||
|
logger Logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Connection) SetLogger(logger Logger) {
|
||||||
|
c.logger = logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Connection) Read(p []byte) (int, error) {
|
func (c *Connection) Read(p []byte) (int, error) {
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package tunnel
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
type WrongDataFrameTypeError struct {
|
||||||
|
ShouldBe Type
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w WrongDataFrameTypeError) Error() string {
|
||||||
|
return fmt.Sprintf("wrong dataframe type, should be %s(%d)", w.ShouldBe, w.ShouldBe)
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package tunnel
|
||||||
|
|
||||||
|
type Logger interface {
|
||||||
|
Trace(args ...interface{})
|
||||||
|
Tracef(format string, args ...interface{})
|
||||||
|
|
||||||
|
Debug(args ...interface{})
|
||||||
|
Debugf(format string, args ...interface{})
|
||||||
|
|
||||||
|
Info(args ...interface{})
|
||||||
|
Infof(format string, args ...interface{})
|
||||||
|
|
||||||
|
Error(args ...interface{})
|
||||||
|
Errorf(format string, args ...interface{})
|
||||||
|
|
||||||
|
Fatal(args ...interface{})
|
||||||
|
Fatalf(format string, args ...interface{})
|
||||||
|
|
||||||
|
Panic(args ...interface{})
|
||||||
|
Panicf(format string, args ...interface{})
|
||||||
|
}
|
||||||
|
|
||||||
|
type logger struct{}
|
||||||
|
|
||||||
|
func (l *logger) Trace(args ...interface{})
|
||||||
|
func (l *logger) Tracef(format string, args ...interface{})
|
||||||
|
|
||||||
|
func (l *logger) Debug(args ...interface{})
|
||||||
|
func (l *logger) Debugf(format string, args ...interface{})
|
||||||
|
|
||||||
|
func (l *logger) Info(args ...interface{})
|
||||||
|
func (l *logger) Infof(format string, args ...interface{})
|
||||||
|
|
||||||
|
func (l *logger) Error(args ...interface{})
|
||||||
|
func (l *logger) Errorf(format string, args ...interface{})
|
||||||
|
|
||||||
|
func (l *logger) Fatal(args ...interface{})
|
||||||
|
func (l *logger) Fatalf(format string, args ...interface{})
|
||||||
|
|
||||||
|
func (l *logger) Panic(args ...interface{})
|
||||||
|
func (l *logger) Panicf(format string, args ...interface{})
|
||||||
|
|
||||||
|
var DefaultLogger = &logger{}
|
||||||
+10
-4
@@ -1,7 +1,6 @@
|
|||||||
package tunnel
|
package tunnel
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"io"
|
"io"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,6 +13,7 @@ type Manager struct {
|
|||||||
closed chan bool
|
closed chan bool
|
||||||
newConnection chan *Connection
|
newConnection chan *Connection
|
||||||
delConnection chan *Connection
|
delConnection chan *Connection
|
||||||
|
logger Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewManager(tun io.ReadWriter) *Manager {
|
func NewManager(tun io.ReadWriter) *Manager {
|
||||||
@@ -25,9 +25,14 @@ func NewManager(tun io.ReadWriter) *Manager {
|
|||||||
accept: make(chan *DataFrame, 1024),
|
accept: make(chan *DataFrame, 1024),
|
||||||
newConnection: make(chan *Connection),
|
newConnection: make(chan *Connection),
|
||||||
delConnection: make(chan *Connection),
|
delConnection: make(chan *Connection),
|
||||||
|
logger: DefaultLogger,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Manager) SetLogger(logger Logger) {
|
||||||
|
m.logger = logger
|
||||||
|
}
|
||||||
|
|
||||||
func (m *Manager) Run() {
|
func (m *Manager) Run() {
|
||||||
onReceiveQueue := make(chan bool)
|
onReceiveQueue := make(chan bool)
|
||||||
for {
|
for {
|
||||||
@@ -78,14 +83,14 @@ func (m *Manager) Connect() (*Connection, error) {
|
|||||||
connection := &Connection{
|
connection := &Connection{
|
||||||
ID: df.ID,
|
ID: df.ID,
|
||||||
TX: m.incoming,
|
TX: m.incoming,
|
||||||
|
logger: DefaultLogger,
|
||||||
}
|
}
|
||||||
m.newConnection <- connection
|
m.newConnection <- connection
|
||||||
m.incoming <- df
|
m.incoming <- df
|
||||||
|
|
||||||
df = <-connection.RX
|
df = <-connection.RX
|
||||||
if df.Type != TypeConnected {
|
if df.Type != TypeConnected {
|
||||||
|
return nil, WrongDataFrameTypeError{ShouldBe: TypeConnected}
|
||||||
return nil, errors.New("failed to connect")
|
|
||||||
}
|
}
|
||||||
return connection, nil
|
return connection, nil
|
||||||
}
|
}
|
||||||
@@ -93,11 +98,12 @@ func (m *Manager) Connect() (*Connection, error) {
|
|||||||
func (m *Manager) Accept() (*Connection, error) {
|
func (m *Manager) Accept() (*Connection, error) {
|
||||||
df := <-m.accept
|
df := <-m.accept
|
||||||
if df.Type != TypeRequest {
|
if df.Type != TypeRequest {
|
||||||
return nil, errors.New("failed to accept")
|
return nil, WrongDataFrameTypeError{ShouldBe: TypeRequest}
|
||||||
}
|
}
|
||||||
connection := &Connection{
|
connection := &Connection{
|
||||||
ID: df.ID,
|
ID: df.ID,
|
||||||
TX: m.incoming,
|
TX: m.incoming,
|
||||||
|
logger: DefaultLogger,
|
||||||
}
|
}
|
||||||
m.newConnection <- connection
|
m.newConnection <- connection
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user