aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorVlad <gluk256@gmail.com>2018-02-26 20:58:04 +0800
committerVlad <gluk256@gmail.com>2018-02-26 20:58:04 +0800
commit6e0667fa06caa15a5333bc4c902315c9d56a3739 (patch)
treec41685fad52285836218d1c82d8ae188153686d0 /cmd
parent423c8bb1d8210387944e379a5f151c5ff4b8803f (diff)
downloaddexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar.gz
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar.bz2
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar.lz
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar.xz
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.tar.zst
dexon-6e0667fa06caa15a5333bc4c902315c9d56a3739.zip
whisper: wnode updated - all messages are saved if savedir param is given
Diffstat (limited to 'cmd')
-rw-r--r--cmd/wnode/main.go24
1 files changed, 10 insertions, 14 deletions
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index 971b1c0ab..8694219c5 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -76,14 +76,14 @@ var (
// cmd arguments
var (
- bootstrapMode = flag.Bool("standalone", false, "boostrap node: don't actively connect to peers, wait for incoming connections")
- forwarderMode = flag.Bool("forwarder", false, "forwarder mode: only forward messages, neither send nor decrypt messages")
+ bootstrapMode = flag.Bool("standalone", false, "boostrap node: does not initiate connection to peers, just waits for incoming connections")
+ forwarderMode = flag.Bool("forwarder", false, "forwarder mode: only forwards messages, neither encrypts nor decrypts messages")
mailServerMode = flag.Bool("mailserver", false, "mail server mode: delivers expired messages on demand")
requestMail = flag.Bool("mailclient", false, "request expired messages from the bootstrap server")
asymmetricMode = flag.Bool("asym", false, "use asymmetric encryption")
generateKey = flag.Bool("generatekey", false, "generate and show the private key")
fileExMode = flag.Bool("fileexchange", false, "file exchange mode")
- testMode = flag.Bool("test", false, "use of predefined parameters for diagnostics")
+ testMode = flag.Bool("test", false, "use of predefined parameters for diagnostics (password, etc.)")
echoMode = flag.Bool("echo", false, "echo mode: prints some arguments for diagnostics")
argVerbosity = flag.Int("verbosity", int(log.LvlError), "log verbosity level")
@@ -99,7 +99,7 @@ var (
argIDFile = flag.String("idfile", "", "file name with node id (private key)")
argEnode = flag.String("boot", "", "bootstrap node you want to connect to (e.g. enode://e454......08d50@52.176.211.200:16428)")
argTopic = flag.String("topic", "", "topic in hexadecimal format (e.g. 70a4beef)")
- argSaveDir = flag.String("savedir", "", "directory where incoming messages will be saved as files")
+ argSaveDir = flag.String("savedir", "", "directory where all incoming messages will be saved as files")
)
func main() {
@@ -548,20 +548,16 @@ func messageLoop() {
for {
select {
case <-ticker.C:
- messages := sf.Retrieve()
+ m1 := sf.Retrieve()
+ m2 := af.Retrieve()
+ messages := append(m1, m2...)
for _, msg := range messages {
- if *fileExMode || len(msg.Payload) > 2048 {
+ // NB: it is possible that *fileExMode == false && len(*argSaveDir) > 0
+ if len(*argSaveDir) > 0 {
writeMessageToFile(*argSaveDir, msg)
- } else {
- printMessageInfo(msg)
}
- }
- messages = af.Retrieve()
- for _, msg := range messages {
- if *fileExMode || len(msg.Payload) > 2048 {
- writeMessageToFile(*argSaveDir, msg)
- } else {
+ if !*fileExMode && len(msg.Payload) <= 2048 {
printMessageInfo(msg)
}
}