Skip to content

Commit 8c6a1f2

Browse files
committed
Fix bpg var setter
Signed-off-by: Zhonghu Xu <xuzhonghu@huawei.com>
1 parent a669a5f commit 8c6a1f2

File tree

1 file changed

+22
-32
lines changed

1 file changed

+22
-32
lines changed

pkg/bpf/bpf.go

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -375,28 +375,28 @@ func (l *BpfLoader) GetKmeshConfigMap() factory.GlobalBpfConfig {
375375
}
376376
}
377377

378-
func (l *BpfLoader) UpdateBpfLogLevel(BpfLogLevel uint32) error {
378+
func (l *BpfLoader) UpdateBpfLogLevel(bpfLogLevel uint32) error {
379379
if l.workloadObj != nil {
380-
if err := l.workloadObj.SockConn.BpfLogLevel.Set(BpfLogLevel); err != nil {
380+
if err := l.workloadObj.SockConn.BpfLogLevel.Set(bpfLogLevel); err != nil {
381381
return fmt.Errorf("set sockcon BpfLogLevel failed %w", err)
382382
}
383-
if err := l.workloadObj.SockOps.BpfLogLevel.Set(BpfLogLevel); err != nil {
383+
if err := l.workloadObj.SockOps.BpfLogLevel.Set(bpfLogLevel); err != nil {
384384
return fmt.Errorf("set sockops BpfLogLevel failed %w", err)
385385
}
386-
if err := l.workloadObj.XdpAuth.BpfLogLevel.Set(BpfLogLevel); err != nil {
386+
if err := l.workloadObj.XdpAuth.BpfLogLevel.Set(bpfLogLevel); err != nil {
387387
return fmt.Errorf("set xdp BpfLogLevel failed %w", err)
388388
}
389-
if err := l.workloadObj.SendMsg.BpfLogLevel.Set(BpfLogLevel); err != nil {
389+
if err := l.workloadObj.SendMsg.BpfLogLevel.Set(bpfLogLevel); err != nil {
390390
return fmt.Errorf("set sendmsg BpfLogLevel failed %w", err)
391391
}
392-
if err := l.workloadObj.CgroupSkb.BpfLogLevel.Set(BpfLogLevel); err != nil {
392+
if err := l.workloadObj.CgroupSkb.BpfLogLevel.Set(bpfLogLevel); err != nil {
393393
return fmt.Errorf("set sendmsg BpfLogLevel failed %w", err)
394394
}
395395
} else if l.obj != nil {
396-
if err := l.obj.SockConn.BpfLogLevel.Set(BpfLogLevel); err != nil {
396+
if err := l.obj.SockConn.BpfLogLevel.Set(bpfLogLevel); err != nil {
397397
return fmt.Errorf("set sockcon BpfLogLevel failed %w", err)
398398
}
399-
if err := l.obj.SockOps.BpfLogLevel.Set(BpfLogLevel); err != nil {
399+
if err := l.obj.SockOps.BpfLogLevel.Set(bpfLogLevel); err != nil {
400400
return fmt.Errorf("set sockops BpfLogLevel failed %w", err)
401401
}
402402
}
@@ -405,25 +405,23 @@ func (l *BpfLoader) UpdateBpfLogLevel(BpfLogLevel uint32) error {
405405
}
406406

407407
func (l *BpfLoader) GetBpfLogLevel() uint32 {
408-
var BpfLogLevel uint32
408+
var bpfLogLevel uint32
409409
if l.workloadObj != nil {
410-
if err := l.workloadObj.SockConn.BpfLogLevel.Get(&BpfLogLevel); err != nil {
410+
if err := l.workloadObj.SockConn.BpfLogLevel.Get(&bpfLogLevel); err != nil {
411411
log.Errorf("get BpfLogLevel failed %v", err)
412-
return 0
413412
}
414413
} else if l.obj != nil {
415-
if err := l.obj.SockConn.BpfLogLevel.Get(&BpfLogLevel); err != nil {
414+
if err := l.obj.SockConn.BpfLogLevel.Get(&bpfLogLevel); err != nil {
416415
log.Errorf("get BpfLogLevel failed %v", err)
417-
return 0
418416
}
419417
}
420418

421-
return 0
419+
return bpfLogLevel
422420
}
423421

424-
func (l *BpfLoader) UpdateNodeIP(NodeIP [16]byte) error {
422+
func (l *BpfLoader) UpdateNodeIP(nodeIP [16]byte) error {
425423
if l.workloadObj != nil {
426-
if err := l.workloadObj.SockOps.NodeIp.Set(NodeIP); err != nil {
424+
if err := l.workloadObj.SockOps.NodeIp.Set(nodeIP); err != nil {
427425
return fmt.Errorf("set NodeIP failed %w", err)
428426
}
429427
} else if l.obj != nil {
@@ -434,15 +432,13 @@ func (l *BpfLoader) UpdateNodeIP(NodeIP [16]byte) error {
434432
}
435433

436434
func (l *BpfLoader) GetNodeIP() [16]byte {
435+
var nodeIP [16]byte
437436
if l.workloadObj != nil {
438-
var nodeIP [16]byte
439437
if err := l.workloadObj.SockOps.NodeIp.Get(&nodeIP); err != nil {
440438
log.Errorf("get NodeIP failed %v", err)
441-
return [16]byte{}
442439
}
443-
return nodeIP
444440
}
445-
return [16]byte{}
441+
return nodeIP
446442
}
447443

448444
func (l *BpfLoader) UpdatePodGateway(podGateway [16]byte) error {
@@ -458,15 +454,13 @@ func (l *BpfLoader) UpdatePodGateway(podGateway [16]byte) error {
458454
}
459455

460456
func (l *BpfLoader) GetPodGateway() [16]byte {
457+
var podGateway [16]byte
461458
if l.workloadObj != nil {
462-
var podGateway [16]byte
463459
if err := l.workloadObj.SockOps.PodGateway.Get(&podGateway); err != nil {
464460
log.Errorf("get PodGateway failed %v", err)
465-
return [16]byte{}
466461
}
467-
return podGateway
468462
}
469-
return [16]byte{}
463+
return podGateway
470464
}
471465

472466
func (l *BpfLoader) UpdateAuthzOffload(authzOffload uint32) error {
@@ -480,15 +474,13 @@ func (l *BpfLoader) UpdateAuthzOffload(authzOffload uint32) error {
480474
}
481475

482476
func (l *BpfLoader) GetAuthzOffload() uint32 {
477+
var authzOffload uint32
483478
if l.workloadObj != nil {
484-
var authzOffload uint32
485479
if err := l.workloadObj.XdpAuth.AuthzOffload.Get(&authzOffload); err != nil {
486480
log.Errorf("get AuthzOffload failed %v", err)
487-
return 0
488481
}
489-
return authzOffload
490482
}
491-
return 0
483+
return authzOffload
492484
}
493485

494486
func (l *BpfLoader) UpdateEnableMonitoring(enableMonitoring uint32) error {
@@ -505,15 +497,13 @@ func (l *BpfLoader) UpdateEnableMonitoring(enableMonitoring uint32) error {
505497
}
506498

507499
func (l *BpfLoader) GetEnableMonitoring() uint32 {
500+
var enableMonitoring uint32
508501
if l.workloadObj != nil {
509-
var enableMonitoring uint32
510502
if err := l.workloadObj.CgroupSkb.EnableMonitoring.Get(&enableMonitoring); err != nil {
511503
log.Errorf("get EnableMonitoring failed %v", err)
512-
return 0
513504
}
514-
return enableMonitoring
515505
}
516-
return 0
506+
return enableMonitoring
517507
}
518508

519509
func closeMap(m *ebpf.Map) {

0 commit comments

Comments
 (0)