use all the config options

This commit is contained in:
Zack Scholl 2021-05-12 07:19:02 -07:00
parent d0ebb7ad38
commit 15a19e1998
1 changed files with 24 additions and 0 deletions

View File

@ -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 == "" {