sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-21 14:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Create conn mgr

Browse Source
This commit is contained in:
Zoltán Papp
2025-02-25 23:50:25 +01:00
parent 0457251d09
commit 8542674a83
15 changed files with 184 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/iface/configurer/kernel_unix.go
+3 -3
View File
@@ -213,8 +213,8 @@ func (c *KernelConfigurer) GetStats(peerKey string) (WGStats, error) {
}, nil
}
func (c *KernelConfigurer) Transfers() (map[wgtypes.Key]WGStats, error) {
stats := make(map[wgtypes.Key]WGStats)
func (c *KernelConfigurer) Transfers() (map[string]WGStats, error) {
stats := make(map[string]WGStats)
wg, err := wgctrl.New()
if err != nil {
return nil, fmt.Errorf("wgctl: %w", err)
@@ -231,7 +231,7 @@ func (c *KernelConfigurer) Transfers() (map[wgtypes.Key]WGStats, error) {
return nil, fmt.Errorf("get device %s: %w", c.deviceName, err)
}
for _, peer := range wgDevice.Peers {
stats[peer.PublicKey] = WGStats{
stats[peer.PublicKey.String()] = WGStats{
LastHandshake: peer.LastHandshakeTime,
TxBytes: peer.TransmitBytes,
RxBytes: peer.ReceiveBytes,
client/iface/configurer/usp.go
+5 -12
View File
@@ -263,7 +263,7 @@ func (t *WGUSPConfigurer) GetStats(peerKey string) (WGStats, error) {
}, nil
}
func (t *WGUSPConfigurer) Transfers() (map[wgtypes.Key]WGStats, error) {
func (t *WGUSPConfigurer) Transfers() (map[string]WGStats, error) {
ipc, err := t.device.IpcGet()
if err != nil {
return nil, fmt.Errorf("ipc get: %w", err)
@@ -272,10 +272,10 @@ func (t *WGUSPConfigurer) Transfers() (map[wgtypes.Key]WGStats, error) {
return parseTransfers(ipc)
}
func parseTransfers(ipc string) (map[wgtypes.Key]WGStats, error) {
stats := make(map[wgtypes.Key]WGStats)
func parseTransfers(ipc string) (map[string]WGStats, error) {
stats := make(map[string]WGStats)
var (
currentKey wgtypes.Key
currentKey string
currentStats WGStats
hasPeer bool
)
@@ -291,14 +291,7 @@ func parseTransfers(ipc string) (map[wgtypes.Key]WGStats, error) {
if err != nil {
return nil, fmt.Errorf("decode peerID: %w", err)
}
b64 := base64.StdEncoding.EncodeToString(h)
peerKeyParsed, err := wgtypes.ParseKey(b64)
if err != nil {
return nil, fmt.Errorf("parse key: %w", err)
}
currentKey = peerKeyParsed
currentKey = base64.StdEncoding.EncodeToString(h)
currentStats = WGStats{} // Reset stats for the new peer
hasPeer = true
stats[currentKey] = currentStats
client/iface/device/interface.go
+1 -1
View File
@@ -17,5 +17,5 @@ type WGConfigurer interface {
RemoveAllowedIP(peerKey string, allowedIP string) error
Close()
GetStats(peerKey string) (configurer.WGStats, error)
Transfers() (map[wgtypes.Key]configurer.WGStats, error)
Transfers() (map[string]configurer.WGStats, error)
}
client/iface/iface.go
+1 -1
View File
@@ -218,7 +218,7 @@ func (w *WGIface) GetStats(peerKey string) (configurer.WGStats, error) {
return w.configurer.GetStats(peerKey)
}
func (w *WGIface) Transfers() (map[wgtypes.Key]configurer.WGStats, error) {
func (w *WGIface) Transfers() (map[string]configurer.WGStats, error) {
return w.configurer.Transfers()
}