mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
webRTCConn has better seam with BytesLogger interface
This commit is contained in:
parent
6b8568cc6c
commit
b2c9fcac5e
4 changed files with 39 additions and 20 deletions
|
@ -66,6 +66,7 @@ type SnowflakeChannel interface {
|
|||
// updated once multiplexed transport on a single circuit is available.
|
||||
type Peers struct {
|
||||
Tongue
|
||||
BytesLogger
|
||||
|
||||
snowflakeChan chan *webRTCConn
|
||||
current *webRTCConn
|
||||
|
@ -88,6 +89,7 @@ func (p *Peers) FindSnowflake() (*webRTCConn, error) {
|
|||
return nil, errors.New(s)
|
||||
}
|
||||
connection, err := p.Catch()
|
||||
connection.BytesLogger = p.BytesLogger
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -96,7 +98,11 @@ func (p *Peers) FindSnowflake() (*webRTCConn, error) {
|
|||
|
||||
// TODO: Needs fixing.
|
||||
func (p *Peers) Count() int {
|
||||
return len(p.snowflakeChan)
|
||||
count := 0
|
||||
if p.current != nil {
|
||||
count = 1
|
||||
}
|
||||
return count + len(p.snowflakeChan)
|
||||
}
|
||||
|
||||
// Close all remote peers.
|
||||
|
@ -257,6 +263,12 @@ func main() {
|
|||
remotes := NewPeers(SnowflakeCapacity)
|
||||
broker := NewBrokerChannel(brokerURL, frontDomain, CreateBrokerTransport())
|
||||
|
||||
remotes.BytesLogger = &BytesSyncLogger{
|
||||
inboundChan: make(chan int, 5), outboundChan: make(chan int, 5),
|
||||
inbound: 0, outbound: 0, inEvents: 0, outEvents: 0,
|
||||
}
|
||||
go remotes.BytesLogger.Log()
|
||||
|
||||
remotes.Tongue = WebRTCDialer{broker}
|
||||
go ConnectLoop(remotes)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue