allow specifying --wg-iface and --wg-port #659

nazarewk · 2023-01-20T08:33:37Z

Describe your changes

I am working on setting up multiple instances of Netbird on same machine, I need a way to tell the deamon to input different interfaces/ports to those without modifying files by hand.

I got it to work at nazarewk-iac/nix-configs@aeefbf5c

Issue ticket number and link

Checklist

Is it a bug fix
Is a typo/documentation fix
Is a feature enhancement
Created tests that fail without the change (if possible)
Extended the README / documentation, if necessary

nazarewk · 2023-01-20T09:01:55Z

I guess adding entries to interfaces blacklist would be handy too

mlsmaycon · 2023-02-01T12:31:53Z

hello @nazarewk, thanks for the contribution.

The Pr is still with a Draft status. I have a few comments to add and some requests as well, but I wonder if you want to add more to it.

nazarewk · 2023-02-01T13:21:47Z

hello @nazarewk, thanks for the contribution.

The Pr is still with a Draft status. I have a few comments to add and some requests as well, but I wonder if you want to add more to it.

I have what I personally need in the PR, but I'm up for comments.

mlsmaycon

thanks @nazarewk. I left some comments regarding the input; we are moving things a bit to be configured through the up command to prevent reinstallation of the daemon.

client/cmd/root.go

client/server/server.go

client/internal/config.go

client/cmd/login.go

client/cmd/root.go

client/internal/config.go

nazarewk · 2023-02-02T12:37:22Z

what is the difference between netbird up and netbird service run/start/stop? After moving flags to up I'm not getting those reflected in my service file.

mlsmaycon · 2023-02-02T14:05:51Z

what is the difference between netbird up and netbird service run/start/stop? After moving flags to up I'm not getting those reflected in my service file.

The service start and stop only controls the OS system start and stop of a service. The run starts netbird as a daemon process, which listens for commands and updates the process execution.

I saw that you updated the flags to be added with the service run, but the problem there is that to update a configuration you need to reinstall the client for most installations, this is due because the netbird service install generates a static service configuration and not updating it will make every restart restore any update made with up

mlsmaycon · 2023-02-02T14:34:16Z

client/internal/config.go

+	if !slices.Contains(config.IFaceBlackList, config.WgIface) {
+		var newBlacklist []string
+		replaced := false
+		for _, ifc := range config.IFaceBlackList {
+			if ifc == oldIface {
+				ifc = config.WgIface
+				replaced = true
+			}
+			newBlacklist = append(newBlacklist, ifc)
+		}
+		if !replaced {
+			newBlacklist = append(newBlacklist, config.WgIface)
+		}
+		log.Infof("prepending Wireguard Interface Name to interface blacklist %#v, updated to %v (old value %v)", config.WgIface, newBlacklist, config.IFaceBlackList)
+		config.IFaceBlackList = newBlacklist
+		refresh = true
+	}


Suggested change

if !slices.Contains(config.IFaceBlackList, config.WgIface) {

var newBlacklist []string

replaced := false

for _, ifc := range config.IFaceBlackList {

if ifc == oldIface {

ifc = config.WgIface

replaced = true

}

newBlacklist = append(newBlacklist, ifc)

}

if !replaced {

newBlacklist = append(newBlacklist, config.WgIface)

}

log.Infof("prepending Wireguard Interface Name to interface blacklist %#v, updated to %v (old value %v)", config.WgIface, newBlacklist, config.IFaceBlackList)

config.IFaceBlackList = newBlacklist

refresh = true

}

if oldIface != config.WgIface {

for i, ifc := range config.IFaceBlackList {

if ifc == oldIface {

ifc = config.WgIface

config.IFaceBlackList[i] = config.WgIface

log.Infof("replaced Wireguard Interface Name in the interface blacklist. old name %s, new name", oldIface, config.WgIface)

refresh = true

break

}

}

}

mlsmaycon · 2023-02-02T14:37:08Z

client/internal/config.go

+	if input.WgPort != 0 && input.WgPort != config.WgPort {
+		log.Infof("new Wireguard Port provided, updated to %#v (old value %#v)", input.WgPort, config.WgPort)
+		config.WgPort = input.WgPort
+		refresh = true
+	}


Suggested change

if input.WgPort != 0 && input.WgPort != config.WgPort {

log.Infof("new Wireguard Port provided, updated to %#v (old value %#v)", input.WgPort, config.WgPort)

config.WgPort = input.WgPort

refresh = true

}

mlsmaycon · 2023-02-02T14:40:04Z

client/internal/config.go

+	if config.WgPort == 0 && input.WgPort == 0 {
+		log.Infof("using default Wireguard Port: %#v ", iface.DefaultWgPort)
 		config.WgPort = iface.DefaultWgPort
 		refresh = true
 	}


Suggested change

if config.WgPort == 0 && input.WgPort == 0 {

log.Infof("using default Wireguard Port: %#v ", iface.DefaultWgPort)

config.WgPort = iface.DefaultWgPort

refresh = true

}

if input.WgPort != 0 && input.WgPort != config.WgPort {

log.Infof("new Wireguard Port provided, updated to %d (old value %d)", input.WgPort, config.WgPort)

config.WgPort = input.WgPort

refresh = true

}

// previous version config upgrade check because WgPort didn't exist

if config.WgPort == 0 {

log.Infof("using default Wireguard Port: %d", iface.DefaultWgPort)

config.WgPort = iface.DefaultWgPort

refresh = true

}

client/internal/config.go

mlsmaycon · 2023-02-02T15:02:43Z

@nazarewk, my apologies, I forgot about the protocol update required to pass the new flags from the client to the daemon.

You need to update the protocol file here /client/proto/daemon.proto#L31 and then you can run the generate.sh

Once that is done, you need to retrieve them in the https://github.com/netbirdio/netbird/blob/main/client/server/server.go#L158 and pass to the configuration calls

With that updating the port will look like this:

netbird down
netbird up --wg-port 5000

mlsmaycon · 2023-02-08T11:58:48Z

@nazarewk let us know if the requests were too much. I would be happy to join the effort and help you in your branch

nazarewk · 2023-02-08T15:36:36Z

@mlsmaycon I can't continue this right now (maybe next week) and I'm not planning to become Netbird architecture expert so feel free to help and fix the things you mentioned :)

mlsmaycon · 2024-01-15T13:49:20Z

@nazarewk, thanks for the contribution. We have decided to move forward with the flag support in the following PR: #1467

For now, I will close this one, and we can discuss further improvements on a separate ticket/issue.

nazarewk marked this pull request as ready for review February 1, 2023 13:21

mlsmaycon requested changes Feb 1, 2023

View reviewed changes

client/cmd/root.go Outdated Show resolved Hide resolved

client/server/server.go Outdated Show resolved Hide resolved

client/internal/config.go Show resolved Hide resolved

client/cmd/login.go Outdated Show resolved Hide resolved

client/cmd/root.go Outdated Show resolved Hide resolved

nazarewk changed the title ~~allow specifying --wg-iface and --wg-port on start~~ allow specifying --wg-iface and --wg-port Feb 1, 2023

nazarewk force-pushed the feature/custom-iface-port branch 2 times, most recently from ccb33b5 to 3bdbc96 Compare February 1, 2023 15:20

nazarewk requested a review from mlsmaycon February 1, 2023 15:22

nazarewk force-pushed the feature/custom-iface-port branch from 3bdbc96 to 5c19e23 Compare February 1, 2023 15:26

mlsmaycon reviewed Feb 1, 2023

View reviewed changes

client/internal/config.go Show resolved Hide resolved

client/internal/config.go Show resolved Hide resolved

nazarewk requested a review from mlsmaycon February 2, 2023 12:28

mlsmaycon reviewed Feb 2, 2023

View reviewed changes

nazarewk force-pushed the feature/custom-iface-port branch from ad6fc03 to 65d74d3 Compare March 2, 2023 12:11

nazarewk mentioned this pull request Apr 24, 2023

Multiple networks? #446

Open

nazarewk force-pushed the feature/custom-iface-port branch from 65d74d3 to 0439530 Compare April 27, 2023 07:59

allow specifying --wg-iface and --wg-port

54ccf5f

nazarewk force-pushed the feature/custom-iface-port branch from 0439530 to 54ccf5f Compare June 7, 2023 18:03

reimarstier mentioned this pull request Aug 23, 2023

Custom MTU value for wireguard interface #1101

Closed

3 tasks

mlsmaycon closed this Jan 15, 2024

nazarewk deleted the feature/custom-iface-port branch January 15, 2024 14:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

allow specifying --wg-iface and --wg-port #659

allow specifying --wg-iface and --wg-port #659

nazarewk commented Jan 20, 2023 •

edited

nazarewk commented Jan 20, 2023

mlsmaycon commented Feb 1, 2023

nazarewk commented Feb 1, 2023

mlsmaycon left a comment

nazarewk commented Feb 2, 2023

mlsmaycon commented Feb 2, 2023 •

edited

mlsmaycon Feb 2, 2023

mlsmaycon Feb 2, 2023

mlsmaycon Feb 2, 2023

mlsmaycon commented Feb 2, 2023

mlsmaycon commented Feb 8, 2023

nazarewk commented Feb 8, 2023

mlsmaycon commented Jan 15, 2024

allow specifying --wg-iface and --wg-port #659

allow specifying --wg-iface and --wg-port #659

Conversation

nazarewk commented Jan 20, 2023 • edited

Describe your changes

Issue ticket number and link

Checklist

nazarewk commented Jan 20, 2023

mlsmaycon commented Feb 1, 2023

nazarewk commented Feb 1, 2023

mlsmaycon left a comment

Choose a reason for hiding this comment

nazarewk commented Feb 2, 2023

mlsmaycon commented Feb 2, 2023 • edited

mlsmaycon Feb 2, 2023

Choose a reason for hiding this comment

mlsmaycon Feb 2, 2023

Choose a reason for hiding this comment

mlsmaycon Feb 2, 2023

Choose a reason for hiding this comment

mlsmaycon commented Feb 2, 2023

mlsmaycon commented Feb 8, 2023

nazarewk commented Feb 8, 2023

mlsmaycon commented Jan 15, 2024

nazarewk commented Jan 20, 2023 •

edited

mlsmaycon commented Feb 2, 2023 •

edited