From 15a19e1998938425b32e3cc01fd28c52d8f986c1 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Wed, 12 May 2021 07:19:02 -0700 Subject: [PATCH] use all the config options --- src/cli/cli.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/cli/cli.go b/src/cli/cli.go index 0f1bce39..5ad6945d 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -229,6 +229,18 @@ func send(c *cli.Context) (err error) { if !c.IsSet("pass") { crocOptions.RelayPassword = rememberedOptions.RelayPassword } + if !c.IsSet("relay6") { + crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6 + } + if !c.IsSet("overwrite") { + crocOptions.Overwrite = rememberedOptions.Overwrite + } + if !c.IsSet("curve") { + crocOptions.Curve = rememberedOptions.Curve + } + if !c.IsSet("local") { + crocOptions.OnlyLocal = rememberedOptions.OnlyLocal + } } var fnames []string @@ -443,6 +455,18 @@ func receive(c *cli.Context) (err error) { if !c.IsSet("pass") { crocOptions.RelayPassword = rememberedOptions.RelayPassword } + if !c.IsSet("relay6") { + crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6 + } + if !c.IsSet("overwrite") { + crocOptions.Overwrite = rememberedOptions.Overwrite + } + if !c.IsSet("curve") { + crocOptions.Curve = rememberedOptions.Curve + } + if !c.IsSet("local") { + crocOptions.OnlyLocal = rememberedOptions.OnlyLocal + } } if crocOptions.SharedSecret == "" {