diff --git a/router.go b/router.go index 5608e20..a1a34f7 100644 --- a/router.go +++ b/router.go @@ -520,11 +520,11 @@ func dealDatav3(data []byte) string{ if current == 0 { //类型2 吸顶 if datatype==2{ - if durationAsInt64 < extensionOutTime2 || extensionOutTime2<=0 { + if durationAsInt64 < extensionOutTime2 && extensionOutTime2>0 { return "" } }else{ - if durationAsInt64 < extensionOutTime || extensionOutTime<=0 { + if durationAsInt64 < extensionOutTime && extensionOutTime>0 { return "" } } @@ -532,11 +532,11 @@ func dealDatav3(data []byte) string{ }else{ //类型2 吸顶 if datatype==2{ - if durationAsInt64 < extensionInTime2 || extensionOutTime2<=0 { + if durationAsInt64 < extensionInTime2 && extensionOutTime2>0 { return "" } }else{ - if durationAsInt64 < extensionInTime || extensionInTime<=0 { + if durationAsInt64 < extensionInTime && extensionInTime>0 { return "" } } diff --git a/tcpserver.go b/tcpserver.go index 6446643..dbb110f 100644 --- a/tcpserver.go +++ b/tcpserver.go @@ -163,22 +163,22 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) { continueCount = 3 end = 4 - if i+4>=reqLen{ + if i+4>reqLen{ + log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType) continue } //类型为1 数据量为2 values = data[i+2:i+4] - - }else if dataType == 2{ //类型为2 数据量位1 continueCount = 2 end = 3 - if i+3 >=reqLen{ + if i+3 >reqLen{ + log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType) continue } values = data[i+2:i+3]