Jakob Borg
4316992d95
Add 'lib/protocol/' from commit 'f91191218b192ace841c878f161832d19c09145a'
...
git-subtree-dir: lib/protocol
git-subtree-mainline: 5ecb8bdd8a
git-subtree-split: f91191218b
2015-09-22 19:34:29 +02:00
Jakob Borg
5ecb8bdd8a
Correct success/error handling for multicast/broadcast sends
2015-09-22 16:04:48 +02:00
Jakob Borg
3b81d4b8a5
Update suture for data race bug
2015-09-21 15:48:37 +02:00
Jakob Borg
6e3b3dc4e7
Comment typo fix
2015-09-21 14:20:33 +02:00
Jakob Borg
8d421a62d2
Usage reporting should recognize new discovery server IP:s
2015-09-21 10:54:21 +02:00
Jakob Borg
185b0690c8
Further forgotten copyright notices
2015-09-21 10:43:36 +02:00
Jakob Borg
bd0e97023e
We don't need a separate subscription lock
...
We forgot to lock it during replace, so data rate. This is simpler.
2015-09-21 10:42:07 +02:00
Jakob Borg
34ff0706a3
Add missing copyright notice
2015-09-21 10:34:20 +02:00
Jakob Borg
acba61babb
Ping handling changes in protocol, removed from config here
2015-09-21 10:14:27 +02:00
Audrius Butkevicius
f91191218b
Merge pull request #19 from syncthing/pingfix
...
Simplify and improve the ping mechanism
2015-09-21 09:00:40 +01:00
Jakob Borg
05c79ac8c2
Simplify and improve the ping mechanism
...
This should resolve the spurious ping timeouts we've had on low powered
boxes. Those errors are the result of us requiring a timely Pong
response to our Pings. However this is unnecessarily strict - as long as
we've received *anything* recently, we know the other peer is alive. So
the new mechanism removes the Pong message entirely and separates the
ping check into two routines:
- One that makes sure to send ping periodically, if nothing else has
been sent. This guarantees a message sent every 45-90 seconds.
- One that checks how long it was since we last received a message. If
it's longer than 300 seconds, we trigger an ErrTimeout.
So we're guaranteed to detect a connection failure in 300 + 300/2
seconds (due to how often the check runs) and we may detect it much
sooner if we get an actual error on the ping write (a connection reset
or so).
This is more sluggish than before but I think that's an OK price to pay
for making it actually work out of the box.
This removes the configurability of it, as the timeout on one side is
dependent on the send interval on the other side. Do we still need it
configurable?
2015-09-21 08:51:42 +02:00
Jakob Borg
24d2a93c0d
Change default discovery server names
2015-09-20 22:30:31 +02:00
Audrius Butkevicius
de43080228
Merge pull request #2275 from calmh/tlsdisco
...
New global discovery protocol over HTTPS (fixes #628 )
2015-09-20 20:16:04 +01:00
Jakob Borg
b0cd7be39b
New global discovery protocol over HTTPS ( fixes #628 , fixes #1907 )
2015-09-20 21:10:53 +02:00
Jakob Borg
a7169a6348
Add AppVeyor for Windows builds
2015-09-20 15:18:50 +02:00
Jakob Borg
1d710bdcd9
Update lang-en.json
2015-09-18 14:11:01 +02:00
Audrius Butkevicius
5feffba1ff
Merge pull request #2285 from uok/patch-1
...
Fix translation (fixes #2284 )
2015-09-18 09:42:43 +01:00
Ben S.
6c56586a6b
Add missing translation ( fixes #2284 )
2015-09-18 10:26:32 +02:00
Audrius Butkevicius
a32b66c7c3
Merge pull request #2278 from calmh/relaydep
...
lib/relay need not depend on lib/model any more
2015-09-14 20:16:31 +01:00
Jakob Borg
7e3c06191e
lib/relay need not depend on lib/model any more
2015-09-14 20:19:39 +02:00
Audrius Butkevicius
3d09090c4e
Merge pull request #2273 from calmh/relaydeps
...
Invert initialization dependence on relay/conns
2015-09-14 10:16:06 +01:00
Jakob Borg
596a49c112
Invert initialization dependence on relay/conns
...
This makes it so we can initialize the relay management and then give
that to the connection management, instead of the other way around.
This is important to me in the discovery revamp I'm doing, as otherwise
I get a circular dependency when constructing stuff, with relaying
depending on connection, connection depending on discovery, and
discovery depending on relaying.
With this fixed, discovery will depend on relaying, and connection will
depend on both discovery and relaying.
2015-09-14 10:21:55 +02:00
Jakob Borg
95fc253d6b
Rename externalAddr to addressLister
...
It's going to have to list internal addresses too.
2015-09-13 18:09:44 +02:00
Jakob Borg
e6d5372029
Fix -no-upgrade
2015-09-13 18:04:58 +02:00
Jakob Borg
8e5c692244
Merge pull request #2269 from calmh/externaladdr
...
Add external address tracker object
2015-09-13 17:39:51 +02:00
Jakob Borg
e694c664e5
Add external address tracker object
2015-09-13 07:56:13 +02:00
Audrius Butkevicius
8779f93746
Merge pull request #2270 from calmh/diskspaceagain
...
Don't require free disk space when we might only update metadata
2015-09-12 22:11:26 +01:00
Jakob Borg
1f0f5c1e23
Don't require free disk space when we might only update metadata
...
Instead, make sure we do the check as part of CheckFolderHealth before
pulling, and individually per file to try to not run out of space at
that stage.
(The latter is far from fool proof as we may pull lots of stuff in
parallell, but it's worth a try.)
2015-09-12 23:00:43 +02:00
Audrius Butkevicius
aaf6bf3cd2
Merge pull request #2264 from calmh/customlan
...
Add custom networks that are considered local (internal routing, VPN etc)
2015-09-11 15:21:37 +01:00
Jakob Borg
fa95c82daf
Add custom networks that are considered local (internal routing, VPN etc)
...
Allows things like this in the <options> element:
<alwaysLocalNet>10.0.0.0/8</alwaysLocalNet>
2015-09-11 15:10:41 +02:00
Audrius Butkevicius
0da7142a59
Merge pull request #2231 from calmh/symtype
...
lib/symlinks need not depend on protocol
2015-09-11 12:28:38 +01:00
Jakob Borg
446a938b06
lib/symlinks need not depend on protocol
2015-09-11 12:55:25 +02:00
Audrius Butkevicius
21c3994650
Merge pull request #2260 from rumpelsepp/authors-update
...
Add my email to AUTHORS as well
2015-09-10 20:59:38 +01:00
Stefan Tatschner
f90f3a5ca6
Add my email to AUTHORS as well
...
The pull request has been merged faster than I was able to fix that
mistack. :) Sorry.
2015-09-10 21:23:38 +02:00
Audrius Butkevicius
a34d2b72c0
Merge pull request #2259 from rumpelsepp/mailmap-update
...
Add my "community email address" to NICKS
2015-09-10 20:18:51 +01:00
Stefan Tatschner
9d617dcfec
Add my "community email address" to NICKS
...
Since my amount of received emails increased over the time, I would like
to separate my private email address from my "community email address".
2015-09-10 21:14:22 +02:00
Audrius Butkevicius
55506a0fc3
Merge pull request #2257 from rumpelsepp/docs-update
...
Update etc/linux-systemd/README.md
2015-09-10 20:12:31 +01:00
Stefan Tatschner
19c03f504f
Update etc/linux-systemd/README.md
2015-09-10 21:04:52 +02:00
Jakob Borg
985a3436e2
Always show columns headers (accessibility)
2015-09-10 15:05:08 +02:00
Jakob Borg
9dae87c80c
Allow configuration of releases URL
2015-09-10 14:16:44 +02:00
Jakob Borg
46364a38c6
Allow configuration of usage reporting URL
2015-09-10 14:08:40 +02:00
Jakob Borg
148b2b9d02
Fix crash when relaying or global discovery is disabled ( fixes #2246 )
2015-09-09 12:58:57 +02:00
Jakob Borg
64354b51c9
Generate certs with SHA256 signature instead of SHA1
...
Doesn't matter at all for BEP, but the same stuff is used by the web UI
and modern browsers are starting to dislike SHA1 extra much.
2015-09-09 12:55:17 +02:00
Audrius Butkevicius
f2db1c8ab2
Merge pull request #2245 from calmh/ur
...
Relay server info, urVersion in ur
2015-09-06 20:24:00 +01:00
Jakob Borg
36b8a75ede
Relay server info, urVersion in ur
2015-09-06 21:15:46 +02:00
Audrius Butkevicius
0a42b85c06
Merge pull request #2242 from calmh/ur
...
Add interesting fields to usage report (fixes #559 )
2015-09-06 17:19:18 +01:00
Jakob Borg
baf231e3b6
Add interesting fields to usage report ( fixes #559 )
2015-09-06 18:17:30 +02:00
Jakob Borg
e26e85b6d6
Only check pull file size if check is enabled (ref #2241 )
2015-09-06 17:13:00 +02:00
Audrius Butkevicius
b2193b23e5
Merge pull request #2237 from calmh/freespace
...
Allow fractional percentages (fixes #2233 )
2015-09-05 12:29:03 +01:00
Jakob Borg
2af3a92833
Allow fractional percentages ( fixes #2233 )
2015-09-05 12:39:15 +02:00