Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
briar
briar
Commits
1d546da7
Verified
Commit
1d546da7
authored
6 years ago
by
akwizgran
Browse files
Options
Downloads
Patches
Plain Diff
Store sync versions received from contacts.
parent
f2c951b7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1134
Add version negotiation to sync protocol
Pipeline
#3538
failed
6 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java
+26
-7
26 additions, 7 deletions
...n/java/org/briarproject/bramble/sync/IncomingSession.java
with
26 additions
and
7 deletions
bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java
+
26
−
7
View file @
1d546da7
...
...
@@ -21,13 +21,14 @@ import org.briarproject.bramble.api.sync.SyncSession;
import
org.briarproject.bramble.api.sync.Versions
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.concurrent.Executor
;
import
java.util.logging.Logger
;
import
javax.annotation.concurrent.ThreadSafe
;
import
static
java
.
util
.
logging
.
Level
.
INFO
;
import
static
java
.
util
.
logging
.
Level
.
WARNING
;
import
static
java
.
util
.
logging
.
Logger
.
getLogger
;
import
static
org
.
briarproject
.
bramble
.
api
.
lifecycle
.
LifecycleManager
.
LifecycleState
.
STOPPING
;
import
static
org
.
briarproject
.
bramble
.
util
.
LogUtils
.
logException
;
...
...
@@ -39,7 +40,7 @@ import static org.briarproject.bramble.util.LogUtils.logException;
class
IncomingSession
implements
SyncSession
,
EventListener
{
private
static
final
Logger
LOG
=
Logger
.
getLogger
(
IncomingSession
.
class
.
getName
());
getLogger
(
IncomingSession
.
class
.
getName
());
private
final
DatabaseComponent
db
;
private
final
Executor
dbExecutor
;
...
...
@@ -84,11 +85,7 @@ class IncomingSession implements SyncSession, EventListener {
dbExecutor
.
execute
(
new
ReceiveRequest
(
r
));
}
else
if
(
recordReader
.
hasVersions
())
{
Versions
v
=
recordReader
.
readVersions
();
// TODO: Store remote peer's supported versions
if
(
LOG
.
isLoggable
(
INFO
))
{
LOG
.
info
(
"Received supported versions: "
+
v
.
getSupportedVersions
());
}
dbExecutor
.
execute
(
new
ReceiveVersions
(
v
));
}
else
{
// unknown records are ignored in RecordReader#eof()
throw
new
FormatException
();
...
...
@@ -199,4 +196,26 @@ class IncomingSession implements SyncSession, EventListener {
}
}
}
private
class
ReceiveVersions
implements
Runnable
{
private
final
Versions
versions
;
private
ReceiveVersions
(
Versions
versions
)
{
this
.
versions
=
versions
;
}
@DatabaseExecutor
@Override
public
void
run
()
{
try
{
List
<
Byte
>
supported
=
versions
.
getSupportedVersions
();
db
.
transaction
(
false
,
txn
->
db
.
setSyncVersions
(
txn
,
contactId
,
supported
));
}
catch
(
DbException
e
)
{
logException
(
LOG
,
WARNING
,
e
);
interrupt
();
}
}
}
}
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