JakeHillion/dissertation-2-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge develop into master #21

Merged
JakeHillion merged 149 commits from develop into master 2021-05-12 00:22:59 +01:00
Conversation 0 Commits 149 Files Changed 37 +15 -4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1cf9cc880d - Show all commits

8
config/builder.go
View File

@ -75,8 +75,12 @@ func buildTcp(ctx context.Context, p *proxy.Proxy, peer Peer, g func() proxy.Mac
return err return err
} }
if !peer.DisableConsumer {
p.AddConsumer(ctx, f, g()) p.AddConsumer(ctx, f, g())
}
if !peer.DisableProducer {
p.AddProducer(ctx, f, v()) p.AddProducer(ctx, f, v())
}
return nil return nil
} }
@ -121,8 +125,12 @@ func buildUdp(ctx context.Context, p *proxy.Proxy, peer Peer, g func() proxy.Mac
return err return err
} }
if !peer.DisableConsumer {
p.AddConsumer(ctx, f, g()) p.AddConsumer(ctx, f, g())
}
if !peer.DisableProducer {
p.AddProducer(ctx, f, v()) p.AddProducer(ctx, f, v())
}
return nil return nil
} }

3
config/config.go
View File

@ -57,6 +57,9 @@ type Peer struct {
KeepAlive uint KeepAlive uint
Timeout uint Timeout uint
RetryWait uint RetryWait uint
DisableConsumer bool `validate:"omitempty,nefield=DisableProducer"`
DisableProducer bool `validate:"omitempty,nefield=DisableConsumer"`
} }
func (p Peer) GetLocalHost() string { func (p Peer) GetLocalHost() string {