-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #342 from cnlh/dev
fix version v0.25.4
- Loading branch information
Showing
5 changed files
with
125 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // +build !windows | ||
|
|
||
| package mux | ||
|
|
||
| import ( | ||
| "errors" | ||
| "github.com/xtaci/kcp-go" | ||
| "net" | ||
| "os" | ||
| "syscall" | ||
| ) | ||
|
|
||
| func sysGetSock(fd *os.File) (bufferSize int, err error) { | ||
| if fd != nil { | ||
| return syscall.GetsockoptInt(int(fd.Fd()), syscall.SOL_SOCKET, syscall.SO_RCVBUF) | ||
| } else { | ||
| return 1400 * 320, nil | ||
| } | ||
| } | ||
|
|
||
| func getConnFd(c net.Conn) (fd *os.File, err error) { | ||
| switch c.(type) { | ||
| case *net.TCPConn: | ||
| fd, err = c.(*net.TCPConn).File() | ||
| if err != nil { | ||
| return | ||
| } | ||
| return | ||
| case *net.UDPConn: | ||
| fd, err = c.(*net.UDPConn).File() | ||
| if err != nil { | ||
| return | ||
| } | ||
| return | ||
| case *kcp.UDPSession: | ||
| //fd, err = (*net.UDPConn)(unsafe.Pointer(c.(*kcp.UDPSession))).File() | ||
| //if err != nil { | ||
| // return | ||
| //} | ||
| // Todo | ||
| return | ||
| default: | ||
| err = errors.New("mux:unknown conn type, only tcp or kcp") | ||
| return | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // +build windows | ||
|
|
||
| package mux | ||
|
|
||
| import ( | ||
| "errors" | ||
| "github.com/xtaci/kcp-go" | ||
| "net" | ||
| "os" | ||
| ) | ||
|
|
||
| func sysGetSock(fd *os.File) (bufferSize int, err error) { | ||
| // https://github.com/golang/sys/blob/master/windows/syscall_windows.go#L1184 | ||
| // not support, WTF??? | ||
| // Todo | ||
| // return syscall.GetsockoptInt((syscall.Handle)(unsafe.Pointer(fd.Fd())), syscall.SOL_SOCKET, syscall.SO_RCVBUF) | ||
| bufferSize = 10 * 1024 * 1024 | ||
| return | ||
| } | ||
|
|
||
| func getConnFd(c net.Conn) (fd *os.File, err error) { | ||
| switch c.(type) { | ||
| case *net.TCPConn: | ||
| //fd, err = c.(*net.TCPConn).File() | ||
| //if err != nil { | ||
| // return | ||
| //} | ||
| return | ||
| case *net.UDPConn: | ||
| //fd, err = c.(*net.UDPConn).File() | ||
| //if err != nil { | ||
| // return | ||
| //} | ||
| return | ||
| case *kcp.UDPSession: | ||
| //fd, err = (*net.UDPConn)(unsafe.Pointer(c.(*kcp.UDPSession))).File() | ||
| //if err != nil { | ||
| // return | ||
| //} | ||
| // Todo | ||
| return | ||
| default: | ||
| err = errors.New("mux:unknown conn type, only tcp or kcp") | ||
| return | ||
| } | ||
| } |