mirror of
				https://github.com/yggdrasil-network/yggdrasil-go.git
				synced 2025-11-04 03:05:07 +03:00 
			
		
		
		
	Merge pull request #569 from Arceliar/bbr
Enable bbr for tcp sockets on linux
This commit is contained in:
		
						commit
						56ac49861e
					
				
					 4 changed files with 35 additions and 4 deletions
				
			
		
							
								
								
									
										2
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
module github.com/yggdrasil-network/yggdrasil-go
 | 
			
		||||
 | 
			
		||||
require (
 | 
			
		||||
	github.com/Arceliar/phony v0.0.0-20190907031509-af5bdbeecab6
 | 
			
		||||
	github.com/Arceliar/phony v0.0.0-20191004004458-c7ba8368bafa
 | 
			
		||||
	github.com/gologme/log v0.0.0-20181207131047-4e5d8ccb38e8
 | 
			
		||||
	github.com/hashicorp/go-syslog v1.0.0
 | 
			
		||||
	github.com/hjson/hjson-go v3.0.1-0.20190209023717-9147687966d9+incompatible
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								go.sum
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
github.com/Arceliar/phony v0.0.0-20190907031509-af5bdbeecab6 h1:zMj5Q1V0yF4WNfV/FpXG6iXfPJ965Xc5asR2vHXanXc=
 | 
			
		||||
github.com/Arceliar/phony v0.0.0-20190907031509-af5bdbeecab6/go.mod h1:6Lkn+/zJilRMsKmbmG1RPoamiArC6HS73xbwRyp3UyI=
 | 
			
		||||
github.com/Arceliar/phony v0.0.0-20191004004458-c7ba8368bafa h1:bFoWgQ17NKP4FBB2Tnt1QZ8fZqrxLYORIlHUa5ioDjc=
 | 
			
		||||
github.com/Arceliar/phony v0.0.0-20191004004458-c7ba8368bafa/go.mod h1:6Lkn+/zJilRMsKmbmG1RPoamiArC6HS73xbwRyp3UyI=
 | 
			
		||||
github.com/gologme/log v0.0.0-20181207131047-4e5d8ccb38e8 h1:WD8iJ37bRNwvETMfVTusVSAi0WdXTpfNVGY2aHycNKY=
 | 
			
		||||
github.com/gologme/log v0.0.0-20181207131047-4e5d8ccb38e8/go.mod h1:gq31gQ8wEHkR+WekdWsqDuf8pXTUZA9BnnzTuPz1Y9U=
 | 
			
		||||
github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										31
									
								
								src/yggdrasil/tcp_linux.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								src/yggdrasil/tcp_linux.go
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,31 @@
 | 
			
		|||
// +build linux
 | 
			
		||||
 | 
			
		||||
package yggdrasil
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"syscall"
 | 
			
		||||
 | 
			
		||||
	"golang.org/x/sys/unix"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// WARNING: This context is used both by net.Dialer and net.Listen in tcp.go
 | 
			
		||||
 | 
			
		||||
func (t *tcp) tcpContext(network, address string, c syscall.RawConn) error {
 | 
			
		||||
	var control error
 | 
			
		||||
	var bbr error
 | 
			
		||||
 | 
			
		||||
	control = c.Control(func(fd uintptr) {
 | 
			
		||||
		bbr = unix.SetsockoptString(int(fd), unix.IPPROTO_TCP, unix.TCP_CONGESTION, "bbr")
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	// Log any errors
 | 
			
		||||
	if bbr != nil {
 | 
			
		||||
		t.link.core.log.Debugln("Failed to set tcp_congestion_control to bbr for socket, SetsockoptString error:", bbr)
 | 
			
		||||
	}
 | 
			
		||||
	if control != nil {
 | 
			
		||||
		t.link.core.log.Debugln("Failed to set tcp_congestion_control to bbr for socket, Control error:", control)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Return nil because errors here are not considered fatal for the connection, it just means congestion control is suboptimal
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
// +build !darwin
 | 
			
		||||
// +build !darwin,!linux
 | 
			
		||||
 | 
			
		||||
package yggdrasil
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue