apps/pg
1
0
Fork 0
mirror of https://github.com/sigcn/pg.git synced 2025-11-01 16:52:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pgcli/vpn: add version meta

Browse Source
This commit is contained in:
rkonfj
2024-05-26 17:33:12 +08:00
parent 7043c85d3e
commit 5c03d24521
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pgcli/main.go
View File

@@ -13,7 +13,7 @@ import (
) )
var ( var (
Version = "unknown" Version = "dev"
Commit = "unknown" Commit = "unknown"
) )
@@ -33,6 +33,8 @@ func main() {
}, },
} }
vpn.Version = Version
vpn.Commit = Commit
cmd.AddCommand(vpn.Cmd) cmd.AddCommand(vpn.Cmd)
cmd.AddCommand(secret.Cmd) cmd.AddCommand(secret.Cmd)
cmd.AddCommand(curve25519.Cmd) cmd.AddCommand(curve25519.Cmd)

17
cmd/pgcli/vpn/vpn.go
View File

@@ -26,12 +26,16 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var Cmd = &cobra.Command{ var (
Use: "vpn", Cmd = &cobra.Command{
Short: "Run a vpn daemon which backend is PeerGuard p2p network", Use: "vpn",
Args: cobra.NoArgs, Short: "Run a vpn daemon which backend is PeerGuard p2p network",
RunE: run, Args: cobra.NoArgs,
} RunE: run,
}
Version = "dev"
Commit string
)
func init() { func init() {
Cmd.Flags().StringP("ipv4", "4", "", "ipv4 address prefix (i.e. 100.99.0.1/24)") Cmd.Flags().StringP("ipv4", "4", "", "ipv4 address prefix (i.e. 100.99.0.1/24)")
@@ -162,6 +166,7 @@ func (v *P2PVPN) listenPacketConn() (c net.PacketConn, err error) {
disco.AddIgnoredLocalCIDRs(v.Config.AllowedIPs...) disco.AddIgnoredLocalCIDRs(v.Config.AllowedIPs...)
p2pOptions := []p2p.Option{ p2pOptions := []p2p.Option{
p2p.PeerMeta("allowedIPs", v.Config.AllowedIPs), p2p.PeerMeta("allowedIPs", v.Config.AllowedIPs),
p2p.PeerMeta("version", fmt.Sprintf("%s-%s", Version, Commit)),
p2p.ListenPeerUp(v.addPeer), p2p.ListenPeerUp(v.addPeer),
} }