修复linux下dialtcp地址错误

luyu6056 · Jan 6, 2022 · 7b758ac · 7b758ac
1 parent c1c6294
commit 7b758ac
Show file tree

Hide file tree

Showing 16 changed files with 887 additions and 881 deletions.
diff --git a/client_unix.go b/client_unix.go
@@ -1,114 +1,114 @@
-// +build linux darwin netbsd freebsd openbsd dragonfly
-
-package gnet
-
-import (
-	"errors"
-	"log"
-	"net"
-	"syscall"
-	"time"
-
-	"github.com/luyu6056/gnet/internal/netpoll"
-	"golang.org/x/sys/unix"
-)
-
-type ClientManage struct {
-	*server
-}
-
-func (svr *ClientManage) Dial(network, addr string) (Conn, error) {
-
-	if network == "tcp4" {
-		tcpaddr, err := net.ResolveTCPAddr(network, addr)
-		if err != nil {
-			return nil, err
-		}
-		nfd, err := unixDailTcp(tcpaddr)
-		if err != nil {
-			return nil, err
-		}
-		lp := svr.server.subLoopGroup.next()
-		c := newTCPConn(nfd, lp, nil)
-		if err := unix.SetsockoptInt(nfd, unix.IPPROTO_TCP, unix.TCP_NODELAY, 1); err != nil {
-			return nil, err
-		}
-		sa, _ := syscall.Getsockname(nfd)
-		c.localAddr = &net.TCPAddr{IP: sa.(*syscall.SockaddrInet4).Addr[0:], Port: sa.(*syscall.SockaddrInet4).Port}
-		c.remoteAddr = tcpaddr
-		_ = lp.poller.Trigger(func() (err error) {
-			if err = lp.poller.AddRead(nfd); err != nil {
-				return
-			}
-			index := c.fd / lp.svr.subLoopGroup.len()
-			if index >= len(lp.connections) {
-				lp.connections = append(lp.connections, make([]*conn, len(lp.connections))...)
-			}
-			lp.connections[index] = c
-			return lp.loopOpenClient(c)
-		})
-		return c, nil
-	} else {
-
-	}
-	return nil, nil
-}
-func unixDailTcp(tcpAddr *net.TCPAddr) (int, error) {
-	sockfd, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
-	if err != nil {
-		return 0, errors.New("创建socket失败 " + err.Error())
-	}
-
-	rsa := &syscall.SockaddrInet4{Addr: [4]byte{tcpAddr.IP[0], tcpAddr.IP[1], tcpAddr.IP[2], tcpAddr.IP[3]}, Port: tcpAddr.Port}
-	err = syscall.Connect(sockfd, rsa)
-	return sockfd, err
-}
-
-func (lp *eventloop) loopOpenClient(c *conn) error {
-	c.state = connStateOk
-
-	out, action := lp.eventHandler.OnOpened(c)
-	if lp.svr.opts.TCPKeepAlive > 0 {
-		if _, ok := lp.svr.ln.ln.(*net.TCPListener); ok {
-			_ = netpoll.SetKeepAlive(c.fd, int(lp.svr.opts.TCPKeepAlive/time.Second))
-		}
-	}
-	if out != nil {
-		c.write(out)
-	}
-	return lp.handleAction(c, action)
-}
-func client(eventHandler EventHandler, options *Options) *ClientManage {
-	svr := &server{}
-	svr.msgOut(1)
-	svr.subLoopGroup = new(eventLoopGroup)
-	svr.eventHandler = eventHandler
-	svr.opts = options
-	svr.ln = &listener{fd: -1}
-	svr.codec = func() ICodec {
-		if options.Codec == nil {
-			return new(BuiltInFrameCodec)
-		}
-		return options.Codec
-	}()
-	if p, err := netpoll.OpenPoller(); err == nil {
-		lp := &eventloop{
-			idx:          0,
-			svr:          svr,
-			codec:        svr.codec,
-			poller:       p,
-			packet:       make([]byte, 0xFFFF),
-			connections:  make([]*conn, 256),
-			eventHandler: svr.eventHandler,
-		}
-
-		lp.outChan = svr.outChan
-		lp.lazyChan = svr.lazyChan
-		lp.outbufchan = svr.outbufchan
-		svr.subLoopGroup.register(lp)
-		svr.startLoops()
-	} else {
-		log.Fatalln("无法启动client")
-	}
-	return &ClientManage{svr}
-}
+// +build linux darwin netbsd freebsd openbsd dragonfly
+
+package gnet
+
+import (
+	"errors"
+	"log"
+	"net"
+	"syscall"
+	"time"
+
+	"github.com/luyu6056/gnet/internal/netpoll"
+	"golang.org/x/sys/unix"
+)
+
+type ClientManage struct {
+	*server
+}
+
+func (svr *ClientManage) Dial(network, addr string) (Conn, error) {
+
+	if network == "tcp4" {
+		tcpaddr, err := net.ResolveTCPAddr(network, addr)
+		if err != nil {
+			return nil, err
+		}
+		nfd, err := unixDialTcp(tcpaddr)
+		if err != nil {
+			return nil, err
+		}
+		lp := svr.server.subLoopGroup.next()
+		c := newTCPConn(nfd, lp, nil)
+		if err := unix.SetsockoptInt(nfd, unix.IPPROTO_TCP, unix.TCP_NODELAY, 1); err != nil {
+			return nil, err
+		}
+		sa, _ := syscall.Getsockname(nfd)
+		c.localAddr = &net.TCPAddr{IP: sa.(*syscall.SockaddrInet4).Addr[0:], Port: sa.(*syscall.SockaddrInet4).Port}
+		c.remoteAddr = tcpaddr
+		_ = lp.poller.Trigger(func() (err error) {
+			if err = lp.poller.AddRead(nfd); err != nil {
+				return
+			}
+			index := c.fd / lp.svr.subLoopGroup.len()
+			if index >= len(lp.connections) {
+				lp.connections = append(lp.connections, make([]*conn, len(lp.connections))...)
+			}
+			lp.connections[index] = c
+			return lp.loopOpenClient(c)
+		})
+		return c, nil
+	} else {
+
+	}
+	return nil, nil
+}
+func unixDialTcp(tcpAddr *net.TCPAddr) (int, error) {
+	sockfd, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
+	if err != nil {
+		return 0, errors.New("创建socket失败 " + err.Error())
+	}
+
+	rsa := &syscall.SockaddrInet4{Addr: [4]byte{tcpAddr.IP[12], tcpAddr.IP[13], tcpAddr.IP[14], tcpAddr.IP[15]}, Port: tcpAddr.Port}
+	err = syscall.Connect(sockfd, rsa)
+	return sockfd, err
+}
+
+func (lp *eventloop) loopOpenClient(c *conn) error {
+	c.state = connStateOk
+
+	out, action := lp.eventHandler.OnOpened(c)
+	if lp.svr.opts.TCPKeepAlive > 0 {
+		if _, ok := lp.svr.ln.ln.(*net.TCPListener); ok {
+			_ = netpoll.SetKeepAlive(c.fd, int(lp.svr.opts.TCPKeepAlive/time.Second))
+		}
+	}
+	if out != nil {
+		c.write(out)
+	}
+	return lp.handleAction(c, action)
+}
+func client(eventHandler EventHandler, options *Options) *ClientManage {
+	svr := &server{}
+	svr.msgOut(1)
+	svr.subLoopGroup = new(eventLoopGroup)
+	svr.eventHandler = eventHandler
+	svr.opts = options
+	svr.ln = &listener{fd: -1}
+	svr.codec = func() ICodec {
+		if options.Codec == nil {
+			return new(BuiltInFrameCodec)
+		}
+		return options.Codec
+	}()
+	if p, err := netpoll.OpenPoller(); err == nil {
+		lp := &eventloop{
+			idx:          0,
+			svr:          svr,
+			codec:        svr.codec,
+			poller:       p,
+			packet:       make([]byte, 0xFFFF),
+			connections:  make([]*conn, 256),
+			eventHandler: svr.eventHandler,
+		}
+
+		lp.outChan = svr.outChan
+		lp.lazyChan = svr.lazyChan
+		lp.outbufchan = svr.outbufchan
+		svr.subLoopGroup.register(lp)
+		svr.startLoops()
+	} else {
+		log.Fatalln("无法启动client")
+	}
+	return &ClientManage{svr}
+}
diff --git a/connection_windows.go b/connection_windows.go
@@ -241,6 +241,7 @@ func (c *stdConn) FlushWrite(data []byte, noCodec ...bool) {
 	} else {
 		c.AsyncWrite(data)
 	}
+
 out:
 	for c.state == connStateOk {
 		select {

diff --git a/internal/math.go b/internal/math.go
@@ -1,49 +1,49 @@
-package internal
-
-const (
-	bitsize = 32 << (^uint(0) >> 63)
-	//maxint        = int(1<<(bitsize-1) - 1)
-	maxintHeadBit = 1 << (bitsize - 2)
-)
-
-// IsPowerOfTwo reports whether given integer is a power of two.
-func IsPowerOfTwo(n int) bool {
-	return n&(n-1) == 0
-}
-
-// CeilToPowerOfTwo returns the least power of two integer value greater than
-// or equal to n.
-func CeilToPowerOfTwo(n int) int {
-	if n&maxintHeadBit != 0 && n > maxintHeadBit {
-		panic("argument is too large")
-	}
-	if n <= 2 {
-		return 2
-	}
-	n--
-	n = fillBits(n)
-	n++
-	return n
-}
-
-// FloorToPowerOfTwo returns the greatest power of two integer value less than
-// or equal to n.
-func FloorToPowerOfTwo(n int) int {
-	if n <= 2 {
-		return 2
-	}
-	n = fillBits(n)
-	n >>= 1
-	n++
-	return n
-}
-
-func fillBits(n int) int {
-	n |= n >> 1
-	n |= n >> 2
-	n |= n >> 4
-	n |= n >> 8
-	n |= n >> 16
-	n |= n >> 32
-	return n
-}
+package internal
+
+const (
+	bitsize = 32 << (^uint(0) >> 63)
+	//maxint        = int(1<<(bitsize-1) - 1)
+	maxintHeadBit = 1 << (bitsize - 2)
+)
+
+// IsPowerOfTwo reports whether given integer is a power of two.
+func IsPowerOfTwo(n int) bool {
+	return n&(n-1) == 0
+}
+
+// CeilToPowerOfTwo returns the least power of two integer value greater than
+// or equal to n.
+func CeilToPowerOfTwo(n int) int {
+	if n&maxintHeadBit != 0 && n > maxintHeadBit {
+		panic("argument is too large")
+	}
+	if n <= 2 {
+		return 2
+	}
+	n--
+	n = fillBits(n)
+	n++
+	return n
+}
+
+// FloorToPowerOfTwo returns the greatest power of two integer value less than
+// or equal to n.
+func FloorToPowerOfTwo(n int) int {
+	if n <= 2 {
+		return 2
+	}
+	n = fillBits(n)
+	n >>= 1
+	n++
+	return n
+}
+
+func fillBits(n int) int {
+	n |= n >> 1
+	n |= n >> 2
+	n |= n >> 4
+	n |= n >> 8
+	n |= n >> 16
+	n |= n >> 32
+	return n
+}