parent
746392cfd2
commit
f1d440a437
@ -197,6 +197,8 @@ func initialize() {
|
|||||||
if len(*argIP) == 0 {
|
if len(*argIP) == 0 {
|
||||||
argIP = scanLineA("Please enter your IP and port (e.g. 127.0.0.1:30348): ")
|
argIP = scanLineA("Please enter your IP and port (e.g. 127.0.0.1:30348): ")
|
||||||
}
|
}
|
||||||
|
} else if *fileReader {
|
||||||
|
*bootstrapMode = true
|
||||||
} else {
|
} else {
|
||||||
if len(*argEnode) == 0 {
|
if len(*argEnode) == 0 {
|
||||||
argEnode = scanLineA("Please enter the peer's enode: ")
|
argEnode = scanLineA("Please enter the peer's enode: ")
|
||||||
@ -205,11 +207,22 @@ func initialize() {
|
|||||||
peers = append(peers, peer)
|
peers = append(peers, peer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if *mailServerMode {
|
||||||
|
if len(msPassword) == 0 {
|
||||||
|
msPassword, err = console.Stdin.PromptPassword("Please enter the Mail Server password: ")
|
||||||
|
if err != nil {
|
||||||
|
utils.Fatalf("Failed to read Mail Server password: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cfg := &whisper.Config{
|
cfg := &whisper.Config{
|
||||||
MaxMessageSize: uint32(*argMaxSize),
|
MaxMessageSize: uint32(*argMaxSize),
|
||||||
MinimumAcceptedPOW: *argPoW,
|
MinimumAcceptedPOW: *argPoW,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shh = whisper.New(cfg)
|
||||||
|
|
||||||
if *argPoW != whisper.DefaultMinimumPoW {
|
if *argPoW != whisper.DefaultMinimumPoW {
|
||||||
err := shh.SetMinimumPoW(*argPoW)
|
err := shh.SetMinimumPoW(*argPoW)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -257,18 +270,8 @@ func initialize() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *mailServerMode {
|
if *mailServerMode {
|
||||||
if len(msPassword) == 0 {
|
|
||||||
msPassword, err = console.Stdin.PromptPassword("Please enter the Mail Server password: ")
|
|
||||||
if err != nil {
|
|
||||||
utils.Fatalf("Failed to read Mail Server password: %s", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
shh = whisper.New(cfg)
|
|
||||||
shh.RegisterServer(&mailServer)
|
shh.RegisterServer(&mailServer)
|
||||||
mailServer.Init(shh, *argDBPath, msPassword, *argServerPoW)
|
mailServer.Init(shh, *argDBPath, msPassword, *argServerPoW)
|
||||||
} else {
|
|
||||||
shh = whisper.New(cfg)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server = &p2p.Server{
|
server = &p2p.Server{
|
||||||
@ -306,7 +309,11 @@ func startServer() error {
|
|||||||
configureNode()
|
configureNode()
|
||||||
}
|
}
|
||||||
|
|
||||||
if !*forwarderMode {
|
if *fileExMode {
|
||||||
|
fmt.Printf("Please type the file name to be send. To quit type: '%s'\n", quitCommand)
|
||||||
|
} else if *fileReader {
|
||||||
|
fmt.Printf("Please type the file name to be decrypted. To quit type: '%s'\n", quitCommand)
|
||||||
|
} else if !*forwarderMode {
|
||||||
fmt.Printf("Please type the message. To quit type: '%s'\n", quitCommand)
|
fmt.Printf("Please type the message. To quit type: '%s'\n", quitCommand)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@ -566,6 +573,7 @@ func sendMsg(payload []byte) common.Hash {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Fatalf("failed to create new message: %s", err)
|
utils.Fatalf("failed to create new message: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
envelope, err := msg.Wrap(¶ms)
|
envelope, err := msg.Wrap(¶ms)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("failed to seal message: %v \n", err)
|
fmt.Printf("failed to seal message: %v \n", err)
|
||||||
@ -601,15 +609,17 @@ func messageLoop() {
|
|||||||
m2 := af.Retrieve()
|
m2 := af.Retrieve()
|
||||||
messages := append(m1, m2...)
|
messages := append(m1, m2...)
|
||||||
for _, msg := range messages {
|
for _, msg := range messages {
|
||||||
|
reportedOnce := false
|
||||||
|
if !*fileExMode && len(msg.Payload) <= 2048 {
|
||||||
|
printMessageInfo(msg)
|
||||||
|
reportedOnce = true
|
||||||
|
}
|
||||||
|
|
||||||
// All messages are saved upon specifying argSaveDir.
|
// All messages are saved upon specifying argSaveDir.
|
||||||
// fileExMode only specifies how messages are displayed on the console after they are saved.
|
// fileExMode only specifies how messages are displayed on the console after they are saved.
|
||||||
// if fileExMode == true, only the hashes are displayed, since messages might be too big.
|
// if fileExMode == true, only the hashes are displayed, since messages might be too big.
|
||||||
if len(*argSaveDir) > 0 {
|
if len(*argSaveDir) > 0 {
|
||||||
writeMessageToFile(*argSaveDir, msg)
|
writeMessageToFile(*argSaveDir, msg, !reportedOnce)
|
||||||
}
|
|
||||||
|
|
||||||
if !*fileExMode && len(msg.Payload) <= 2048 {
|
|
||||||
printMessageInfo(msg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case <-done:
|
case <-done:
|
||||||
@ -634,7 +644,11 @@ func printMessageInfo(msg *whisper.ReceivedMessage) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeMessageToFile(dir string, msg *whisper.ReceivedMessage) {
|
func writeMessageToFile(dir string, msg *whisper.ReceivedMessage, show bool) {
|
||||||
|
if len(dir) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
timestamp := fmt.Sprintf("%d", msg.Sent)
|
timestamp := fmt.Sprintf("%d", msg.Sent)
|
||||||
name := fmt.Sprintf("%x", msg.EnvelopeHash)
|
name := fmt.Sprintf("%x", msg.EnvelopeHash)
|
||||||
|
|
||||||
@ -643,22 +657,24 @@ func writeMessageToFile(dir string, msg *whisper.ReceivedMessage) {
|
|||||||
address = crypto.PubkeyToAddress(*msg.Src)
|
address = crypto.PubkeyToAddress(*msg.Src)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
env := shh.GetEnvelope(msg.EnvelopeHash)
|
||||||
|
if env == nil {
|
||||||
|
fmt.Printf("\nUnexpected error: envelope not found: %x\n", msg.EnvelopeHash)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// this is a sample code; uncomment if you don't want to save your own messages.
|
// this is a sample code; uncomment if you don't want to save your own messages.
|
||||||
//if whisper.IsPubKeyEqual(msg.Src, &asymKey.PublicKey) {
|
//if whisper.IsPubKeyEqual(msg.Src, &asymKey.PublicKey) {
|
||||||
// fmt.Printf("\n%s <%x>: message from myself received, not saved: '%s'\n", timestamp, address, name)
|
// fmt.Printf("\n%s <%x>: message from myself received, not saved: '%s'\n", timestamp, address, name)
|
||||||
// return
|
// return
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if len(dir) > 0 {
|
|
||||||
fullpath := filepath.Join(dir, name)
|
fullpath := filepath.Join(dir, name)
|
||||||
err := ioutil.WriteFile(fullpath, msg.Raw, 0644)
|
err := ioutil.WriteFile(fullpath, env.Data, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("\n%s {%x}: message received but not saved: %s\n", timestamp, address, err)
|
fmt.Printf("\n%s {%x}: message received but not saved: %s\n", timestamp, address, err)
|
||||||
} else {
|
} else if show {
|
||||||
fmt.Printf("\n%s {%x}: message received and saved as '%s' (%d bytes)\n", timestamp, address, name, len(msg.Raw))
|
fmt.Printf("\n%s {%x}: message received and saved as '%s' (%d bytes)\n", timestamp, address, name, len(env.Data))
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fmt.Printf("\n%s {%x}: message received (%d bytes), but not saved: %s\n", timestamp, address, len(msg.Raw), name)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -682,18 +698,23 @@ func requestExpiredMessagesLoop() {
|
|||||||
for {
|
for {
|
||||||
timeLow = scanUint("Please enter the lower limit of the time range (unix timestamp): ")
|
timeLow = scanUint("Please enter the lower limit of the time range (unix timestamp): ")
|
||||||
timeUpp = scanUint("Please enter the upper limit of the time range (unix timestamp): ")
|
timeUpp = scanUint("Please enter the upper limit of the time range (unix timestamp): ")
|
||||||
t = scanLine("Please enter the topic (hexadecimal): ")
|
t = scanLine("Enter the topic (hex). Press enter to request all messages, regardless of the topic: ")
|
||||||
if len(t) >= whisper.TopicLength*2 {
|
if len(t) == whisper.TopicLength*2 {
|
||||||
x, err := hex.DecodeString(t)
|
x, err := hex.DecodeString(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Fatalf("Failed to parse the topic: %s", err)
|
fmt.Printf("Failed to parse the topic: %s \n", err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
xt = whisper.BytesToTopic(x)
|
xt = whisper.BytesToTopic(x)
|
||||||
bloom = whisper.TopicToBloom(xt)
|
bloom = whisper.TopicToBloom(xt)
|
||||||
obfuscateBloom(bloom)
|
obfuscateBloom(bloom)
|
||||||
} else {
|
} else if len(t) == 0 {
|
||||||
bloom = whisper.MakeFullNodeBloom()
|
bloom = whisper.MakeFullNodeBloom()
|
||||||
|
} else {
|
||||||
|
fmt.Println("Error: topic is invalid, request aborted")
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if timeUpp == 0 {
|
if timeUpp == 0 {
|
||||||
timeUpp = 0xFFFFFFFF
|
timeUpp = 0xFFFFFFFF
|
||||||
}
|
}
|
||||||
|
@ -269,3 +269,11 @@ func TopicToBloom(topic TopicType) []byte {
|
|||||||
}
|
}
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetEnvelope retrieves an envelope from the message queue by its hash.
|
||||||
|
// It returns nil if the envelope can not be found.
|
||||||
|
func (w *Whisper) GetEnvelope(hash common.Hash) *Envelope {
|
||||||
|
w.poolMu.RLock()
|
||||||
|
defer w.poolMu.RUnlock()
|
||||||
|
return w.envelopes[hash]
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user