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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
d583dc09
Commit
d583dc09
authored
Feb 23, 2021
by
Benjamin Wenger
Browse files
Options
Downloads
Patches
Plain Diff
improved send cmix debug prints
parent
9191feb3
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
network/message/sendCmix.go
+21
-8
21 additions, 8 deletions
network/message/sendCmix.go
with
21 additions
and
8 deletions
network/message/sendCmix.go
+
21
−
8
View file @
d583dc09
...
@@ -103,13 +103,17 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -103,13 +103,17 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
uint
(
bestRound
.
AddressSpaceSize
),
uint
(
bestRound
.
AddressSpaceSize
),
int64
(
bestRound
.
Timestamps
[
states
.
QUEUED
]))
int64
(
bestRound
.
Timestamps
[
states
.
QUEUED
]))
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"Failed to generate ephemeral ID: %+v"
,
err
)
jww
.
FATAL
.
Panicf
(
"Failed to generate ephemeral ID when "
+
"sending to %s (msgDigest: %s): %+v"
,
err
,
recipient
,
msg
.
Digest
())
}
}
stream
:=
rng
.
GetStream
()
stream
:=
rng
.
GetStream
()
ephIdFilled
,
err
:=
ephID
.
Fill
(
uint
(
bestRound
.
AddressSpaceSize
),
stream
)
ephIdFilled
,
err
:=
ephID
.
Fill
(
uint
(
bestRound
.
AddressSpaceSize
),
stream
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"Failed to obfuscate the ephemeralID: %+v"
,
err
)
jww
.
FATAL
.
Panicf
(
"Failed to obfuscate the ephemeralID when "
+
"sending to %s (msgDigest: %s): %+v"
,
recipient
,
msg
.
Digest
(),
err
)
}
}
stream
.
Close
()
stream
.
Close
()
...
@@ -119,7 +123,8 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -119,7 +123,8 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
ifp
,
err
:=
fingerprint
.
IdentityFP
(
msg
.
GetContents
(),
recipient
)
ifp
,
err
:=
fingerprint
.
IdentityFP
(
msg
.
GetContents
(),
recipient
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"failed to generate the Identity "
+
jww
.
FATAL
.
Panicf
(
"failed to generate the Identity "
+
"fingerprint due to unrecoverable error: %+v"
,
err
)
"fingerprint due to unrecoverable error when sending to %s "
+
"(msgDigest: %s): %+v"
,
recipient
,
msg
.
Digest
(),
err
)
}
}
msg
.
SetIdentityFP
(
ifp
)
msg
.
SetIdentityFP
(
ifp
)
...
@@ -127,7 +132,9 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -127,7 +132,9 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
//build the topology
//build the topology
idList
,
err
:=
id
.
NewIDListFromBytes
(
bestRound
.
Topology
)
idList
,
err
:=
id
.
NewIDListFromBytes
(
bestRound
.
Topology
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"Failed to use topology for round %v: %s"
,
bestRound
.
ID
,
err
)
jww
.
ERROR
.
Printf
(
"Failed to use topology for round %d when "
+
"sending to %s (msgDigest: %s): %+v"
,
bestRound
.
ID
,
recipient
,
msg
.
Digest
(),
err
)
continue
continue
}
}
topology
:=
connect
.
NewCircuit
(
idList
)
topology
:=
connect
.
NewCircuit
(
idList
)
...
@@ -146,7 +153,9 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -146,7 +153,9 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
transmitGateway
,
ok
:=
comms
.
GetHost
(
firstGateway
)
transmitGateway
,
ok
:=
comms
.
GetHost
(
firstGateway
)
if
!
ok
{
if
!
ok
{
jww
.
ERROR
.
Printf
(
"Failed to get host for gateway %s"
,
transmitGateway
)
jww
.
ERROR
.
Printf
(
"Failed to get host for gateway %s when "
+
"sending to %s (msgDigest: %s)"
,
transmitGateway
,
recipient
,
msg
.
Digest
())
time
.
Sleep
(
param
.
RetryDelay
)
time
.
Sleep
(
param
.
RetryDelay
)
continue
continue
}
}
...
@@ -158,6 +167,8 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -158,6 +167,8 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
stream
.
Close
()
stream
.
Close
()
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"Failed to generate salt when sending to "
+
"%s (msgDigest: %s): %+v"
,
recipient
,
msg
.
Digest
(),
err
)
return
0
,
ephemeral
.
Id
{},
errors
.
WithMessage
(
err
,
return
0
,
ephemeral
.
Id
{},
errors
.
WithMessage
(
err
,
"Failed to generate salt, this should never happen"
)
"Failed to generate salt, this should never happen"
)
}
}
...
@@ -196,12 +207,14 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
...
@@ -196,12 +207,14 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
if
err
!=
nil
{
if
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
if
strings
.
Contains
(
err
.
Error
(),
"try a different round."
)
{
"try a different round."
)
{
jww
.
WARN
.
Printf
(
"could not send: %s"
,
jww
.
WARN
.
Printf
(
"Failed to send to %s (msgDigest: %s) "
+
err
)
"due to round error with rougn %d, retrying: %+v"
,
recipient
,
msg
.
Digest
(),
bestRound
.
ID
,
err
)
continue
continue
}
}
jww
.
ERROR
.
Printf
(
"Failed to send to EphID %d (%s) on "
+
jww
.
ERROR
.
Printf
(
"Failed to send to EphID %d (%s) on "
+
"round %d: %+v"
,
ephID
.
Int64
(),
recipient
,
bestRound
.
ID
,
err
)
"round %d, bailing: %+v"
,
ephID
.
Int64
(),
recipient
,
bestRound
.
ID
,
err
)
return
0
,
ephemeral
.
Id
{},
errors
.
WithMessage
(
err
,
"Failed to put cmix message"
)
return
0
,
ephemeral
.
Id
{},
errors
.
WithMessage
(
err
,
"Failed to put cmix message"
)
}
else
if
gwSlotResp
.
Accepted
{
}
else
if
gwSlotResp
.
Accepted
{
jww
.
INFO
.
Printf
(
"Sucesfully sent to EphID %v (source: %s) "
+
jww
.
INFO
.
Printf
(
"Sucesfully sent to EphID %v (source: %s) "
+
...
...
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