7x31/anylink
1
0
Fork 0
mirror of https://github.com/bjdgyc/anylink.git synced 2025-10-31 16:43:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

复用pl对象，减少copy性能损耗

Browse Source
This commit is contained in:
lanrenwo
2022-11-25 15:08:05 +08:00
parent e909ca552c
commit 9e53ec289c
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handler/link_tap.go
View File

@@ -175,7 +175,7 @@ func allTapWrite(ifce LinkDriver, cSess *sessdata.ConnSession) {
return
}
putPayload(pl)
putPayloadInBefore(cSess, pl)
}
}

2
server/handler/link_tun.go
View File

@@ -108,7 +108,7 @@ func tunWrite(ifce *water.Interface, cSess *sessdata.ConnSession) {
return
}
putPayload(pl)
putPayloadInBefore(cSess, pl)
}
}

12
server/handler/payload.go
View File

@@ -15,9 +15,6 @@ func payloadIn(cSess *sessdata.ConnSession, pl *sessdata.Payload) bool {
// 校验不通过直接丢弃
return false
}
if base.Cfg.AuditInterval >= 0 {
auditPayload.Add(cSess.Username, pl)
}
}
closed := false
@@ -30,6 +27,15 @@ func payloadIn(cSess *sessdata.ConnSession, pl *sessdata.Payload) bool {
return closed
}
func putPayloadInBefore(cSess *sessdata.ConnSession, pl *sessdata.Payload) {
// 异步审计日志
if base.Cfg.AuditInterval >= 0 {
auditPayload.Add(cSess.Username, pl)
return
}
putPayload(pl)
}
func payloadOut(cSess *sessdata.ConnSession, pl *sessdata.Payload) bool {
dSess := cSess.GetDtlsSession()
if dSess == nil {

41
server/handler/payload_access_audit.go
View File

@@ -39,10 +39,13 @@ type LogBatch struct {
// 异步写入pool
func (p *AuditPayload) Add(userName string, pl *sessdata.Payload) {
bPlData := getByteFull()
copy(*bPlData, pl.Data)
p.Pool.JobQueue <- func() {
logAudit(userName, bPlData)
select {
case p.Pool.JobQueue <- func() {
logAudit(userName, pl)
}:
default:
putPayload(pl)
base.Error("AccessAudit: AuditPayload channel is full")
}
}
@@ -66,11 +69,11 @@ func logAuditBatch() {
return
}
auditPayload = &AuditPayload{
Pool: grpool.NewPool(10, 500),
Pool: grpool.NewPool(10, 10240),
IpAuditMap: utils.NewMap("cmap", 0),
}
logBatch = &LogBatch{
LogChan: make(chan dbdata.AccessAudit, 5000),
LogChan: make(chan dbdata.AccessAudit, 10240),
}
var (
limit = 100 // 超过上限批量写入数据表
@@ -97,11 +100,13 @@ func logAuditBatch() {
}
// 解析IP包的数据
func logAudit(userName string, bPlData *[]byte) {
defer putByte(bPlData)
func logAudit(userName string, pl *sessdata.Payload) {
defer putPayload(pl)
plData := *bPlData
ipProto := waterutil.IPv4Protocol(plData)
if !(pl.LType == sessdata.LTypeIPData && pl.PType == 0x00) {
return
}
ipProto := waterutil.IPv4Protocol(pl.Data)
// 访问协议
var accessProto uint8
// 只统计 tcp和udp 的访问
@@ -114,9 +119,9 @@ func logAudit(userName string, bPlData *[]byte) {
return
}
ipSrc := waterutil.IPv4Source(plData)
ipDst := waterutil.IPv4Destination(plData)
ipPort := waterutil.IPv4DestinationPort(plData)
ipSrc := waterutil.IPv4Source(pl.Data)
ipDst := waterutil.IPv4Destination(pl.Data)
ipPort := waterutil.IPv4DestinationPort(pl.Data)
b := getByte51()
key := *b
@@ -129,7 +134,7 @@ func logAudit(userName string, bPlData *[]byte) {
info := ""
nu := utils.NowSec().Unix()
if ipProto == waterutil.TCP {
tcpPlData := waterutil.IPv4Payload(plData)
tcpPlData := waterutil.IPv4Payload(pl.Data)
// 24 (ACK PSH)
if len(tcpPlData) < 14 || tcpPlData[13] != 24 {
return
@@ -173,5 +178,11 @@ func logAudit(userName string, bPlData *[]byte) {
AccessProto: accessProto,
Info: info,
}
logBatch.LogChan <- audit
select {
case logBatch.LogChan <- audit:
default:
base.Error("AccessAudit: LogChan channel is full")
return
}
}