0ccf19e488
Merge pull request #561 from dpw/random-mac
rade2015-04-15 15:43:57 +01:00
a1db1e11f5
Make the first byte of the generated bridge MAC more random
David Wragg2015-04-15 14:19:28 +01:00
2eb13f0020
Merge pull request #558 from awh/weave_ps_includes_exposed_addresses
rade2015-04-15 12:01:30 +01:00
cbbe3cc122
Include weave exposed addresses in ps output
Adam Harrison2015-04-14 14:22:02 +01:00
ab49eb42fb
Merge pull request #555 from rade/478_more_discriminate_connectivity
rade2015-04-15 11:48:23 +01:00
339f85cbcb
get rid of Router.NormalisePeerAddr There was only one call site left and it always gets invoked with an ip:port, so normalisation is a no-op.
Matthias Radestock2015-04-14 13:18:40 +01:00
290d5443cc
more discriminate connectivity If a peer was specified on the command line w/o a port, then do not connect to it if we have inbound connections from that IP.
Matthias Radestock2015-04-14 08:48:56 +01:00
9bd2afc6c3
Merge pull request #560 from rade/include_remote_address_in_connection_logging
rade2015-04-15 11:23:26 +01:00
5415e3a60a
drop "Peer " prefix in Peers section of status it's redundant and the output looks much better w/o it
Matthias Radestock2015-04-15 11:09:35 +01:00
f6def13ea9
change style for connections in status' reconnects section to match how they are shown in the logs
Matthias Radestock2015-04-15 10:55:14 +01:00
b1fd1334b4
always include the remote address in connection log entries in addition to the peer name
Matthias Radestock2015-04-14 22:14:29 +01:00
3db4e86564
remove established connections from ConnectionMaker state This got broken in 6409a8647c The issue is that for successful connections nothing ever sets attempting=false, so we need some other means of removing such entries.
Matthias Radestock2015-04-13 14:59:32 +01:00
8ad244e0f9
Let ConnectionMaker report the reason the connection broke
Bryan Boreham2015-04-13 14:21:59 +01:00
272e63643c
make weave port configurable via WEAVE_PORT We cannot just leave that to the -port parameter since that only controls the container internal port weave is listening on (and uses as the default destination port for outbound connections). Also, we need the port for connection tracking cleanup during stop and reset.
Matthias Radestock2015-04-12 21:58:20 +01:00
a93a09dd35
remember user-supplied peer addresses as given rather than post name resolution. This way we can forget them as given even when name resolution has changed or fails.
Matthias Radestock2015-04-12 20:44:12 +01:00
6409a8647c
simplify connection logic slightly There is no need to remove entries from cm.targets that are in ourConnectedTargets. None of these targets will be in validTargets (since addTarget filters anything in ourConnectedTargets), so they will be removed a few lines further down anyway...
Matthias Radestock2015-04-12 12:11:27 +01:00
21102d3615
refactor: extract router configuration the param list of NewRouter was getting a bit long
Matthias Radestock2015-04-12 10:46:46 +01:00
e89e3adc69
cosmetic: more consistent param/arg/var ordering re Port
Matthias Radestock2015-04-12 10:45:49 +01:00
065b632f91
significantly reduce time for test dns servers to shut down by setting the ReadTimeout to 100ms instead of the default 2s.
Matthias Radestock2015-04-11 20:52:51 +01:00
e0bba10ead
better handling of test multicast listener initialisation errors We handle that error explicitly in all cases and point out the common cause, namely the absence of a default multicast interface.
Matthias Radestock2015-04-11 20:22:41 +01:00
59ae50eb4e
don't rely on docker inspect for determining container death Docker can take a while to notice & record the death of containers, so we perform a more direct check instead.
Matthias Radestock2015-04-11 12:24:09 +01:00
551c1d2925
Merge pull request #541 from abligh/support-unix-domain-control-socket
rade2015-04-10 20:39:11 +01:00
9699b4ce1a
Support using a unix domain socket for the HTTP control interface.
Alex Bligh2015-04-10 16:02:30 +01:00
3a83570005
Merge pull request #526 from bboreham/extend-ps
rade2015-04-10 15:57:53 +01:00
f88ce6e798
don't mention defaults twice in usage go's flag package already shows the default values, so we only need to mention them when they are determined later.
Matthias Radestock2015-04-10 15:38:11 +01:00
0799d9f70b
shorten connection timeout for http interactions with containers
Matthias Radestock2015-04-10 15:33:11 +01:00
db302a0d3d
Merge pull request #539 from abligh/make-iface-mandatory
rade2015-04-10 15:22:07 +01:00
24bd7151e2
Error if neither -iface or -name is specified
Alex Bligh2015-04-10 14:59:57 +01:00
40d127d9a4
make connection heartbeating independent of periodic gossip This was a convenient but rather suspect coupling. In particular, it will break if the period gossip logic changes s.t. it no longer sends gossip on all connections every interval.
Matthias Radestock2015-04-06 10:59:07 +01:00
e639007b62
eliminate AddConnection/RemoveConnection race We were invoking AddConnection in a separate goroutine, and this could result in RemoveConnection getting invoked first, resulting in bogus entries in our connection map, which would effectively prevent connectivity to the other peer until the stale entry got removed through a lost tie break. And if, per chance, the remote end ran into exactly the same race condition, then connectivity between that peer and ourself was broken permanently.
Matthias Radestock2015-04-09 06:34:35 +01:00
56f5c749e1
optimise broadcast route calculation ...by obtaining our connection set just once. This also guards against potential locking issues, since we no longer obtain the required lock on our local peer while holding a lock on Peers.
Matthias Radestock2015-04-08 21:54:45 +01:00
rade