|
@@ -20,7 +20,7 @@ import (
|
|
|
|
|
|
//TODO: make it support reload as best you can!
|
|
//TODO: make it support reload as best you can!
|
|
|
|
|
|
-type Conn struct {
|
|
|
|
|
|
+type StdConn struct {
|
|
sysFd int
|
|
sysFd int
|
|
l *logrus.Logger
|
|
l *logrus.Logger
|
|
batch int
|
|
batch int
|
|
@@ -45,7 +45,7 @@ const (
|
|
|
|
|
|
type _SK_MEMINFO [_SK_MEMINFO_VARS]uint32
|
|
type _SK_MEMINFO [_SK_MEMINFO_VARS]uint32
|
|
|
|
|
|
-func NewListener(l *logrus.Logger, ip net.IP, port int, multi bool, batch int) (*Conn, error) {
|
|
|
|
|
|
+func NewListener(l *logrus.Logger, ip net.IP, port int, multi bool, batch int) (Conn, error) {
|
|
syscall.ForkLock.RLock()
|
|
syscall.ForkLock.RLock()
|
|
fd, err := unix.Socket(unix.AF_INET6, unix.SOCK_DGRAM, unix.IPPROTO_UDP)
|
|
fd, err := unix.Socket(unix.AF_INET6, unix.SOCK_DGRAM, unix.IPPROTO_UDP)
|
|
if err == nil {
|
|
if err == nil {
|
|
@@ -77,30 +77,30 @@ func NewListener(l *logrus.Logger, ip net.IP, port int, multi bool, batch int) (
|
|
//v, err := unix.GetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_INCOMING_CPU)
|
|
//v, err := unix.GetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_INCOMING_CPU)
|
|
//l.Println(v, err)
|
|
//l.Println(v, err)
|
|
|
|
|
|
- return &Conn{sysFd: fd, l: l, batch: batch}, err
|
|
|
|
|
|
+ return &StdConn{sysFd: fd, l: l, batch: batch}, err
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) Rebind() error {
|
|
|
|
|
|
+func (u *StdConn) Rebind() error {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) SetRecvBuffer(n int) error {
|
|
|
|
|
|
+func (u *StdConn) SetRecvBuffer(n int) error {
|
|
return unix.SetsockoptInt(u.sysFd, unix.SOL_SOCKET, unix.SO_RCVBUFFORCE, n)
|
|
return unix.SetsockoptInt(u.sysFd, unix.SOL_SOCKET, unix.SO_RCVBUFFORCE, n)
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) SetSendBuffer(n int) error {
|
|
|
|
|
|
+func (u *StdConn) SetSendBuffer(n int) error {
|
|
return unix.SetsockoptInt(u.sysFd, unix.SOL_SOCKET, unix.SO_SNDBUFFORCE, n)
|
|
return unix.SetsockoptInt(u.sysFd, unix.SOL_SOCKET, unix.SO_SNDBUFFORCE, n)
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) GetRecvBuffer() (int, error) {
|
|
|
|
|
|
+func (u *StdConn) GetRecvBuffer() (int, error) {
|
|
return unix.GetsockoptInt(int(u.sysFd), unix.SOL_SOCKET, unix.SO_RCVBUF)
|
|
return unix.GetsockoptInt(int(u.sysFd), unix.SOL_SOCKET, unix.SO_RCVBUF)
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) GetSendBuffer() (int, error) {
|
|
|
|
|
|
+func (u *StdConn) GetSendBuffer() (int, error) {
|
|
return unix.GetsockoptInt(int(u.sysFd), unix.SOL_SOCKET, unix.SO_SNDBUF)
|
|
return unix.GetsockoptInt(int(u.sysFd), unix.SOL_SOCKET, unix.SO_SNDBUF)
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) LocalAddr() (*Addr, error) {
|
|
|
|
|
|
+func (u *StdConn) LocalAddr() (*Addr, error) {
|
|
sa, err := unix.Getsockname(u.sysFd)
|
|
sa, err := unix.Getsockname(u.sysFd)
|
|
if err != nil {
|
|
if err != nil {
|
|
return nil, err
|
|
return nil, err
|
|
@@ -119,7 +119,7 @@ func (u *Conn) LocalAddr() (*Addr, error) {
|
|
return addr, nil
|
|
return addr, nil
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) ListenOut(r EncReader, lhf LightHouseHandlerFunc, cache *firewall.ConntrackCacheTicker, q int) {
|
|
|
|
|
|
+func (u *StdConn) ListenOut(r EncReader, lhf LightHouseHandlerFunc, cache *firewall.ConntrackCacheTicker, q int) {
|
|
plaintext := make([]byte, MTU)
|
|
plaintext := make([]byte, MTU)
|
|
h := &header.H{}
|
|
h := &header.H{}
|
|
fwPacket := &firewall.Packet{}
|
|
fwPacket := &firewall.Packet{}
|
|
@@ -150,7 +150,7 @@ func (u *Conn) ListenOut(r EncReader, lhf LightHouseHandlerFunc, cache *firewall
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) ReadSingle(msgs []rawMessage) (int, error) {
|
|
|
|
|
|
+func (u *StdConn) ReadSingle(msgs []rawMessage) (int, error) {
|
|
for {
|
|
for {
|
|
n, _, err := unix.Syscall6(
|
|
n, _, err := unix.Syscall6(
|
|
unix.SYS_RECVMSG,
|
|
unix.SYS_RECVMSG,
|
|
@@ -171,7 +171,7 @@ func (u *Conn) ReadSingle(msgs []rawMessage) (int, error) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) ReadMulti(msgs []rawMessage) (int, error) {
|
|
|
|
|
|
+func (u *StdConn) ReadMulti(msgs []rawMessage) (int, error) {
|
|
for {
|
|
for {
|
|
n, _, err := unix.Syscall6(
|
|
n, _, err := unix.Syscall6(
|
|
unix.SYS_RECVMMSG,
|
|
unix.SYS_RECVMMSG,
|
|
@@ -191,7 +191,7 @@ func (u *Conn) ReadMulti(msgs []rawMessage) (int, error) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) WriteTo(b []byte, addr *Addr) error {
|
|
|
|
|
|
+func (u *StdConn) WriteTo(b []byte, addr *Addr) error {
|
|
|
|
|
|
var rsa unix.RawSockaddrInet6
|
|
var rsa unix.RawSockaddrInet6
|
|
rsa.Family = unix.AF_INET6
|
|
rsa.Family = unix.AF_INET6
|
|
@@ -221,7 +221,7 @@ func (u *Conn) WriteTo(b []byte, addr *Addr) error {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) ReloadConfig(c *config.C) {
|
|
|
|
|
|
+func (u *StdConn) ReloadConfig(c *config.C) {
|
|
b := c.GetInt("listen.read_buffer", 0)
|
|
b := c.GetInt("listen.read_buffer", 0)
|
|
if b > 0 {
|
|
if b > 0 {
|
|
err := u.SetRecvBuffer(b)
|
|
err := u.SetRecvBuffer(b)
|
|
@@ -253,7 +253,7 @@ func (u *Conn) ReloadConfig(c *config.C) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (u *Conn) getMemInfo(meminfo *_SK_MEMINFO) error {
|
|
|
|
|
|
+func (u *StdConn) getMemInfo(meminfo *_SK_MEMINFO) error {
|
|
var vallen uint32 = 4 * _SK_MEMINFO_VARS
|
|
var vallen uint32 = 4 * _SK_MEMINFO_VARS
|
|
_, _, err := unix.Syscall6(unix.SYS_GETSOCKOPT, uintptr(u.sysFd), uintptr(unix.SOL_SOCKET), uintptr(unix.SO_MEMINFO), uintptr(unsafe.Pointer(meminfo)), uintptr(unsafe.Pointer(&vallen)), 0)
|
|
_, _, err := unix.Syscall6(unix.SYS_GETSOCKOPT, uintptr(u.sysFd), uintptr(unix.SOL_SOCKET), uintptr(unix.SO_MEMINFO), uintptr(unsafe.Pointer(meminfo)), uintptr(unsafe.Pointer(&vallen)), 0)
|
|
if err != 0 {
|
|
if err != 0 {
|
|
@@ -262,11 +262,11 @@ func (u *Conn) getMemInfo(meminfo *_SK_MEMINFO) error {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-func NewUDPStatsEmitter(udpConns []*Conn) func() {
|
|
|
|
|
|
+func NewUDPStatsEmitter(udpConns []Conn) func() {
|
|
// Check if our kernel supports SO_MEMINFO before registering the gauges
|
|
// Check if our kernel supports SO_MEMINFO before registering the gauges
|
|
var udpGauges [][_SK_MEMINFO_VARS]metrics.Gauge
|
|
var udpGauges [][_SK_MEMINFO_VARS]metrics.Gauge
|
|
var meminfo _SK_MEMINFO
|
|
var meminfo _SK_MEMINFO
|
|
- if err := udpConns[0].getMemInfo(&meminfo); err == nil {
|
|
|
|
|
|
+ if err := udpConns[0].(*StdConn).getMemInfo(&meminfo); err == nil {
|
|
udpGauges = make([][_SK_MEMINFO_VARS]metrics.Gauge, len(udpConns))
|
|
udpGauges = make([][_SK_MEMINFO_VARS]metrics.Gauge, len(udpConns))
|
|
for i := range udpConns {
|
|
for i := range udpConns {
|
|
udpGauges[i] = [_SK_MEMINFO_VARS]metrics.Gauge{
|
|
udpGauges[i] = [_SK_MEMINFO_VARS]metrics.Gauge{
|
|
@@ -285,7 +285,7 @@ func NewUDPStatsEmitter(udpConns []*Conn) func() {
|
|
|
|
|
|
return func() {
|
|
return func() {
|
|
for i, gauges := range udpGauges {
|
|
for i, gauges := range udpGauges {
|
|
- if err := udpConns[i].getMemInfo(&meminfo); err == nil {
|
|
|
|
|
|
+ if err := udpConns[i].(*StdConn).getMemInfo(&meminfo); err == nil {
|
|
for j := 0; j < _SK_MEMINFO_VARS; j++ {
|
|
for j := 0; j < _SK_MEMINFO_VARS; j++ {
|
|
gauges[j].Update(int64(meminfo[j]))
|
|
gauges[j].Update(int64(meminfo[j]))
|
|
}
|
|
}
|