sundp
/
YHGW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善数据解析

This commit is contained in:
fish 2019-04-27 17:36:52 +08:00
parent 3d781d12fa
commit c867893ebb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
router.go
View File

@ -520,11 +520,11 @@ func dealDatav3(data []byte) string{
if current == 0 { if current == 0 {
//类型2 吸顶 //类型2 吸顶
if datatype==2{ if datatype==2{
if durationAsInt64 < extensionOutTime2 || extensionOutTime2<=0 { if durationAsInt64 < extensionOutTime2 && extensionOutTime2>0 {
return "" return ""
} }
}else{ }else{
if durationAsInt64 < extensionOutTime || extensionOutTime<=0 { if durationAsInt64 < extensionOutTime && extensionOutTime>0 {
return "" return ""
} }
} }
@ -532,11 +532,11 @@ func dealDatav3(data []byte) string{
}else{ }else{
//类型2 吸顶 //类型2 吸顶
if datatype==2{ if datatype==2{
if durationAsInt64 < extensionInTime2 || extensionOutTime2<=0 { if durationAsInt64 < extensionInTime2 && extensionOutTime2>0 {
return "" return ""
} }
}else{ }else{
if durationAsInt64 < extensionInTime || extensionInTime<=0 { if durationAsInt64 < extensionInTime && extensionInTime>0 {
return "" return ""
} }
} }

8
tcpserver.go
View File

@ -163,22 +163,22 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
continueCount = 3 continueCount = 3
end = 4 end = 4
if i+4>=reqLen{ if i+4>reqLen{
log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType)
continue continue
} }
//类型为1 数据量为2 //类型为1 数据量为2
values = data[i+2:i+4] values = data[i+2:i+4]
}else if dataType == 2{ }else if dataType == 2{
//类型为2 数据量位1 //类型为2 数据量位1
continueCount = 2 continueCount = 2
end = 3 end = 3
if i+3 >=reqLen{ if i+3 >reqLen{
log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType)
continue continue
} }
values = data[i+2:i+3] values = data[i+2:i+3]