From aef53ef2bd4f4d32e4f50b8859dd16224288e97b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 04 六月 2019 10:10:25 +0800
Subject: [PATCH] one client ip one conn
---
server.go | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/server.go b/server.go
index 017a8aa..d07c0f0 100644
--- a/server.go
+++ b/server.go
@@ -1,7 +1,6 @@
package main
import (
- "errors"
"flag"
"fmt"
"net"
@@ -20,7 +19,7 @@
var sec = flag.Int("sec", 10, "the second for query data. ")
var Level = flag.String("level","ErrorLevel","log level")
-
+var ipMap map[string]net.Conn
func main() {
flag.Parse()
@@ -40,11 +39,18 @@
connArr:=make([]net.Conn,0)
+ ipMap = make(map[string]net.Conn,0)
for {
conn, err := listener.Accept()//
+
+ ipStr := conn.RemoteAddr().String()
+ if oldConn,ok := ipMap[ipStr];ok {
+ oldConn.Close()
+ }
+ ipMap[ipStr] = conn
connArr = append(connArr,conn)
if err != nil {
- log.Log.Errorf("some connecion error: %s\n", err)
+ log.Log.Infoln("some connecion error: ", err)
}
go handleConnection(conn,connArr)
}
@@ -58,13 +64,10 @@
go func(conn net.Conn, ech chan error) {
buf := make([]byte, 10)
for {
- _, err := conn.Read(buf)
- log.Log.Errorln("Read completed!")
- if err != nil {
- ech <- err
- log.Log.Errorln("Read Error!conn.Close")
- break
- }
+ readMsg, err := conn.Read(buf)
+ log.Log.Infoln("Read completed,readMsg:",readMsg,",err:",err)
+ ech <- err
+ break
}
}(conn, ech)
tick := time.NewTicker(10 * time.Second)
@@ -72,36 +75,33 @@
for {
select {
case <-tick.C:
- handleMessage(conn, connArr)
+ if !handleMessage(conn, connArr){
+ conn.Close()
+ return
+ }
case err := <-ech:
- log.Log.Errorln(err, "remoteAddr ", remoteAddr, " close")
+ log.Log.Infoln(err, "remoteAddr ", remoteAddr, " close")
conn.Close()
- break
+ return
}
+
}
log.Log.Infoln("Client at " + remoteAddr + " disconnected.")
}
-func handleMessage(conn net.Conn, connArr []net.Conn) {
+func handleMessage(conn net.Conn, connArr []net.Conn) bool {
jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
if jsonstring == nil {
- log.Log.Infoln("the data is nil")
- return
+ log.Log.Infoln("the data is nil,remoteArr:",conn.RemoteAddr())
+ return true
}
jsonstring = append(jsonstring, []byte("\000")...)
log.Log.Infoln("jsonstring len: ", len(jsonstring), "\000 data: ", len("\000"))
_, err := conn.Write(jsonstring)
if err !=nil{
- log.Log.Errorln(err)
-
- //index :=0
- //for ;index < len(connArr); {
- // if connArr[index] == conn{
- // connArr = append(connArr[:index],connArr[index+1:]...)
- // continue
- // }
- // index++
- //}
+ log.Log.Infoln("conn.WriteErr:",err)
+ return false
}
+ return true
}
--
Gitblit v1.8.0