mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
change bandwidth type from int to int64 to prevent overflow
This commit is contained in:
parent
115ba6a745
commit
2c599f8827
7 changed files with 36 additions and 34 deletions
|
@ -10,35 +10,36 @@ const (
|
|||
)
|
||||
|
||||
type bytesLogger interface {
|
||||
addOutbound(int)
|
||||
addInbound(int)
|
||||
addOutbound(int64)
|
||||
addInbound(int64)
|
||||
}
|
||||
|
||||
// Default bytesLogger does nothing.
|
||||
type bytesNullLogger struct{}
|
||||
|
||||
func (b bytesNullLogger) addOutbound(amount int) {}
|
||||
func (b bytesNullLogger) addInbound(amount int) {}
|
||||
func (b bytesNullLogger) addOutbound(amount int64) {}
|
||||
func (b bytesNullLogger) addInbound(amount int64) {}
|
||||
|
||||
// bytesSyncLogger uses channels to safely log from multiple sources with output
|
||||
// occuring at reasonable intervals.
|
||||
type bytesSyncLogger struct {
|
||||
outboundChan chan int
|
||||
inboundChan chan int
|
||||
outboundChan chan int64
|
||||
inboundChan chan int64
|
||||
}
|
||||
|
||||
// newBytesSyncLogger returns a new bytesSyncLogger and starts it loggin.
|
||||
func newBytesSyncLogger() *bytesSyncLogger {
|
||||
b := &bytesSyncLogger{
|
||||
outboundChan: make(chan int, 5),
|
||||
inboundChan: make(chan int, 5),
|
||||
outboundChan: make(chan int64, 5),
|
||||
inboundChan: make(chan int64, 5),
|
||||
}
|
||||
go b.log()
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *bytesSyncLogger) log() {
|
||||
var outbound, inbound, outEvents, inEvents int
|
||||
var outbound, inbound int64
|
||||
var outEvents, inEvents int
|
||||
ticker := time.NewTicker(LogTimeInterval)
|
||||
for {
|
||||
select {
|
||||
|
@ -61,10 +62,10 @@ func (b *bytesSyncLogger) log() {
|
|||
}
|
||||
}
|
||||
|
||||
func (b *bytesSyncLogger) addOutbound(amount int) {
|
||||
func (b *bytesSyncLogger) addOutbound(amount int64) {
|
||||
b.outboundChan <- amount
|
||||
}
|
||||
|
||||
func (b *bytesSyncLogger) addInbound(amount int) {
|
||||
func (b *bytesSyncLogger) addInbound(amount int64) {
|
||||
b.inboundChan <- amount
|
||||
}
|
||||
|
|
|
@ -92,7 +92,7 @@ func (c *WebRTCPeer) Write(b []byte) (int, error) {
|
|||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
c.bytesLogger.addOutbound(len(b))
|
||||
c.bytesLogger.addOutbound(int64(len(b)))
|
||||
return len(b), nil
|
||||
}
|
||||
|
||||
|
@ -226,7 +226,7 @@ func (c *WebRTCPeer) preparePeerConnection(config *webrtc.Configuration) error {
|
|||
log.Println("0 length message---")
|
||||
}
|
||||
n, err := c.writePipe.Write(msg.Data)
|
||||
c.bytesLogger.addInbound(n)
|
||||
c.bytesLogger.addInbound(int64(n))
|
||||
if err != nil {
|
||||
// TODO: Maybe shouldn't actually close.
|
||||
log.Println("Error writing to SOCKS pipe")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue