6a696e03e7
* migrate to golang.zx2c4.com/wireguard/wgctrl This commit introduces the usage of wgctrl. It avoids the usage of exec calls of the wg command and parsing the output of `wg show`. Signed-off-by: leonnicolas <leonloechner@gmx.de> * vendor wgctrl Signed-off-by: leonnicolas <leonloechner@gmx.de> * apply suggestions from code review Remove wireguard.Enpoint struct and use net.UDPAddr for the resolved endpoint and addr string (dnsanme:port) if a DN was supplied. Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/*: use wireguard.Enpoint This commit introduces the wireguard.Enpoint struct. It encapsulates a DN name with port and a net.UPDAddr. The fields are private and only accessible over exported Methods to avoid accidental modification. Also iptables.GetProtocol is improved to avoid ipv4 rules being applied by `ip6tables`. Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/wireguard/conf_test.go: add tests for Endpoint Signed-off-by: leonnicolas <leonloechner@gmx.de> * cmd/kg/main.go: validate port range Signed-off-by: leonnicolas <leonloechner@gmx.de> * add suggestions from review Signed-off-by: leonnicolas <leonloechner@gmx.de> * pkg/mesh/mesh.go: use Equal func Implement an Equal func for Enpoint and use it instead of comparing strings. Signed-off-by: leonnicolas <leonloechner@gmx.de> * cmd/kgctl/main.go: check port range Signed-off-by: leonnicolas <leonloechner@gmx.de> * vendor Signed-off-by: leonnicolas <leonloechner@gmx.de>
19 lines
585 B
Go
19 lines
585 B
Go
package nlenc
|
|
|
|
import "bytes"
|
|
|
|
// Bytes returns a null-terminated byte slice with the contents of s.
|
|
func Bytes(s string) []byte {
|
|
return append([]byte(s), 0x00)
|
|
}
|
|
|
|
// String returns a string with the contents of b from a null-terminated
|
|
// byte slice.
|
|
func String(b []byte) string {
|
|
// If the string has more than one NULL terminator byte, we want to remove
|
|
// all of them before returning the string to the caller; hence the use of
|
|
// strings.TrimRight instead of strings.TrimSuffix (which previously only
|
|
// removed a single NULL).
|
|
return string(bytes.TrimRight(b, "\x00"))
|
|
}
|