Update BytesReceived/Sent field names

This commit is contained in:
Daniel
2023-07-21 16:05:13 +02:00
parent e70fd9abd7
commit f0ebc6e72f
6 changed files with 29 additions and 24 deletions

View File

@@ -133,10 +133,10 @@ func reportBandwidth(ctx context.Context, objs bpfObjects, bandwidthUpdates chan
false,
)
update := &packet.BandwidthUpdate{
ConnID: connID,
RecvBytes: skInfo.Rx,
SentBytes: skInfo.Tx,
Method: packet.Absolute,
ConnID: connID,
BytesReceived: skInfo.Rx,
BytesSent: skInfo.Tx,
Method: packet.Absolute,
}
select {
case bandwidthUpdates <- update:

View File

@@ -63,10 +63,10 @@ func reportBandwidth(ctx context.Context, bandwidthUpdates chan *packet.Bandwidt
false,
)
update := &packet.BandwidthUpdate{
ConnID: connID,
RecvBytes: stat.receivedBytes,
SentBytes: stat.transmittedBytes,
Method: packet.Additive,
ConnID: connID,
BytesReceived: stat.receivedBytes,
BytesSent: stat.transmittedBytes,
Method: packet.Additive,
}
select {
case bandwidthUpdates <- update:

View File

@@ -629,7 +629,7 @@ func bandwidthUpdateHandler(ctx context.Context) error {
func updateBandwidth(ctx context.Context, bwUpdate *packet.BandwidthUpdate) {
// Check if update makes sense.
if bwUpdate.RecvBytes == 0 && bwUpdate.SentBytes == 0 {
if bwUpdate.BytesReceived == 0 && bwUpdate.BytesSent == 0 {
return
}
@@ -649,11 +649,11 @@ func updateBandwidth(ctx context.Context, bwUpdate *packet.BandwidthUpdate) {
// Update stats according to method.
switch bwUpdate.Method {
case packet.Absolute:
conn.RecvBytes = bwUpdate.RecvBytes
conn.SentBytes = bwUpdate.SentBytes
conn.BytesReceived = bwUpdate.BytesReceived
conn.BytesSent = bwUpdate.BytesSent
case packet.Additive:
conn.RecvBytes += bwUpdate.RecvBytes
conn.SentBytes += bwUpdate.SentBytes
conn.BytesReceived += bwUpdate.BytesReceived
conn.BytesSent += bwUpdate.BytesSent
default:
log.Warningf("filter: unsupported bandwidth update method: %d", bwUpdate.Method)
}
@@ -664,8 +664,8 @@ func updateBandwidth(ctx context.Context, bwUpdate *packet.BandwidthUpdate) {
conn.HistoryEnabled,
conn.Process().GetID(),
conn.ID,
&conn.RecvBytes,
&conn.SentBytes,
conn.BytesReceived,
conn.BytesSent,
); err != nil {
log.Errorf("firewall: failed to persist bandwidth data: %s", err)
}