Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
ea7bfc21
Commit
ea7bfc21
authored
3 years ago
by
Benjamin Wenger
Browse files
Options
Downloads
Patches
Plain Diff
fixed a crash due to a replay check with bad code
parent
df0f6178
No related branches found
No related tags found
1 merge request
!117
Release
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
network/message/handler.go
+7
-5
7 additions, 5 deletions
network/message/handler.go
storage/utility/meteredCmixMessageBuffer.go
+1
-1
1 addition, 1 deletion
storage/utility/meteredCmixMessageBuffer.go
with
8 additions
and
6 deletions
network/message/handler.go
+
7
−
5
View file @
ea7bfc21
...
@@ -126,17 +126,19 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
...
@@ -126,17 +126,19 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
return
return
}
}
im
:=
fmt
.
Sprintf
(
"Received message of type %s from %s in round %d,"
+
" msgDigest: %s, keyFP: %v"
,
encTy
,
sender
,
bundle
.
Round
,
msgDigest
,
msg
.
GetKeyFP
())
jww
.
INFO
.
Print
(
im
)
m
.
Internal
.
Events
.
Report
(
2
,
"MessageReception"
,
"MessagePart"
,
im
)
// Process the decrypted/unencrypted message partition, to see if
// Process the decrypted/unencrypted message partition, to see if
// we get a full message
// we get a full message
xxMsg
,
ok
:=
m
.
partitioner
.
HandlePartition
(
sender
,
encTy
,
msg
.
GetContents
(),
xxMsg
,
ok
:=
m
.
partitioner
.
HandlePartition
(
sender
,
encTy
,
msg
.
GetContents
(),
relationshipFingerprint
)
relationshipFingerprint
)
im
:=
fmt
.
Sprintf
(
"Received message of ecr type %s and msg type "
+
"%d from %s in round %d,msgDigest: %s, keyFP: %v"
,
encTy
,
xxMsg
.
MessageType
,
sender
,
bundle
.
Round
,
msgDigest
,
msg
.
GetKeyFP
())
jww
.
INFO
.
Print
(
im
)
m
.
Internal
.
Events
.
Report
(
2
,
"MessageReception"
,
"MessagePart"
,
im
)
// If the reception completed a message, hear it on the switchboard
// If the reception completed a message, hear it on the switchboard
if
ok
{
if
ok
{
//Set the identities
//Set the identities
...
...
This diff is collapsed.
Click to expand it.
storage/utility/meteredCmixMessageBuffer.go
+
1
−
1
View file @
ea7bfc21
...
@@ -56,7 +56,7 @@ func (*meteredCmixMessageHandler) LoadMessage(kv *versioned.KV, key string) (int
...
@@ -56,7 +56,7 @@ func (*meteredCmixMessageHandler) LoadMessage(kv *versioned.KV, key string) (int
// Load the versioned object
// Load the versioned object
vo
,
err
:=
kv
.
Get
(
key
,
currentMeteredCmixMessageVersion
)
vo
,
err
:=
kv
.
Get
(
key
,
currentMeteredCmixMessageVersion
)
if
err
!=
nil
{
if
err
!=
nil
{
return
format
.
Message
{}
,
err
return
nil
,
err
}
}
msg
:=
meteredCmixMessage
{}
msg
:=
meteredCmixMessage
{}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment