Matthias Radestock
b4c00050e0
simplify dns-args
...
it makes more sense to strip off the `--with-dns` at the call site.
`weave dns-args` now does something useful, instead of having to be
invoked as `weave dns-args --with-dns`.
2015-04-20 11:31:12 +01:00
Matthias Radestock
53e145bea7
simplify local portion of weave run
...
pull all the local `weave run` execution into one place, thus
dispensing with the need to have lots of tests for whether we are
executing in the context of "--local".
Also, we only remote exec dns-args if "--with-dns" is supplied, which
is more efficient in the common case (and also more obvious).
NB: we need to retain the docker version check for `run` since the
specific breakage it guards against does affect the code we execute
locally for `run`.
2015-04-20 11:30:56 +01:00
Matthias Radestock
0a2f341c6b
cosmetic: move DOCKERHUB_USER setting
...
for more logical grouping
2015-04-19 13:19:06 +01:00
Matthias Radestock
cefd89b7d8
only set vars that we need for remote execution
2015-04-19 13:19:06 +01:00
Matthias Radestock
fbf7612726
only check for command / print usage at remote
...
This is desirable since we want to do as little as possible locally,
and not duplicate any checks.
2015-04-19 13:19:06 +01:00
Matthias Radestock
7752d6b102
refactor: move "need to run as root" check
...
to a more obvious place
2015-04-19 13:18:22 +01:00
Matthias Radestock
74f77a71ce
cosmetic: move usage()
2015-04-19 11:53:33 +01:00
Matthias Radestock
40cd875763
don't validate CIDRs twice in weave expose
2015-04-19 11:17:42 +01:00
Matthias Radestock
5addf4e7b1
cosmetic: logical grouping of functions in weave script
2015-04-19 09:14:28 +01:00
rade
35201b8865
Merge pull request #572 from dpw/forwarder-df
...
refactor: separate Forwarder and ForwarderDF
2015-04-18 20:09:51 +01:00
David Wragg
dceef04ffa
Separate Forwarder and ForwarderDF
...
Much of the state and code associated with Forwarder only applied in the
DF case.
2015-04-18 10:38:05 +01:00
rade
3974b9282a
Merge pull request #570 from awh/fix_multi_cidr_error_messages
...
Fix multi cidr error messages
2015-04-17 15:34:36 +01:00
Adam Harrison
3943b0231b
Improved validation of trailing arguments
2015-04-17 13:54:55 +01:00
rade
ac2afdadb6
Merge pull request #571 from tomwilkie/travis
...
Run linter in travis; fix linter; make nameserver lint free.
2015-04-17 12:58:35 +01:00
Tom Wilkie
f735082d95
Fix gofmt errors in nameserver.
2015-04-17 11:42:29 +00:00
Tom Wilkie
c187c9b290
Make lint script work; $result has special meaning!
2015-04-17 11:42:19 +00:00
Tom Wilkie
eef5559a43
Lint the codebase in travis.
2015-04-17 11:11:52 +00:00
rade
5006839fb8
Merge pull request #569 from bboreham/simplify_parse
...
Simplify address parsing for populate_dns in weave script
2015-04-17 12:04:38 +01:00
Adam Harrison
be05cec1b0
Ensure at least one CIDR is supplied to multi-CIDR commands
2015-04-17 11:38:46 +01:00
Adam Harrison
f17cd6ac3b
Convert hide to use collect_cidr_args
2015-04-17 11:37:28 +01:00
Bryan Boreham
7c68525e93
Simplify address parsing for populate_dns()
2015-04-17 11:31:31 +01:00
Adam Harrison
2332bc9a94
Require minimum Vagrant version (1.7.0) in smoke tests
2015-04-17 11:07:53 +01:00
Matthias Radestock
803821ab2c
we need arping in the vagrant vm, for weave --local to work
2015-04-17 10:22:08 +01:00
Matthias Radestock
1cd31fd090
only invoke create_bridge once in expose/hide
2015-04-16 18:19:15 +01:00
Matthias Radestock
705dda9d3e
cosmetic: remove outdated comment
2015-04-16 18:19:00 +01:00
Matthias Radestock
19da213dab
refactor: more shell magic, for consistency
2015-04-16 18:00:18 +01:00
Matthias Radestock
779b69c0f6
correct usage for expose+hide
...
Hangover from #498 .
2015-04-16 17:49:17 +01:00
rade
8f4d894a77
Merge pull request #566 from awh/name_exposed_addresses_in_weavedns
...
Add optional hostname argument to weave expose
Closes #375 .
2015-04-16 17:45:47 +01:00
Adam Harrison
4d941338fd
Add optional hostname argument to weave expose
2015-04-16 15:19:01 +01:00
rade
af51aef33f
Merge pull request #551 from rade/weave_port
...
make weave port configurable via WEAVE_PORT
2015-04-16 14:44:39 +01:00
Bryan Boreham
36b13b704d
Merge pull request #565 from rade/515_crypto_glitch_stall
...
Big improvement in observed behaviour. LGTM; closes #515
2015-04-16 12:08:02 +01:00
Matthias Radestock
a5a91ebb33
do not shut down connections on PacketDecodingError
2015-04-15 21:52:56 +01:00
Matthias Radestock
f4ba0f7287
log udp packet processing errors against the connection
2015-04-15 21:10:22 +01:00
Matthias Radestock
57b7276ceb
create forwarders before AddConnection, if we can
...
This is beneficial for reasons explained in the comments. And we used
to do that previously, when initHeartbeats was called before
AddConnection.
2015-04-15 20:55:42 +01:00
Matthias Radestock
9b25815641
don't send heartbeats on new but ultimately invalid connections
...
It is wasteful and can trip up crypto at the other end. See comment
for why.
To accomplish this we move the responsibility for shutting down the
new, invalid connection from LocalPeer.AddConnection to its caller,
i.e. LocalConnection.run. So rather than always firing up all the
connection machinery and getting told asynchronously by AddConnection
to shut it all down again, we now only fire it up if AddConnection
succeeded.
2015-04-15 20:04:40 +01:00
Matthias Radestock
a9963675b6
remove dead code
2015-04-15 16:13:18 +01:00
rade
0ccf19e488
Merge pull request #561 from dpw/random-mac
...
Make the first byte of the generated bridge MAC more random
2015-04-15 15:43:57 +01:00
David Wragg
a1db1e11f5
Make the first byte of the generated bridge MAC more random
2015-04-15 14:19:28 +01:00
rade
2eb13f0020
Merge pull request #558 from awh/weave_ps_includes_exposed_addresses
...
Include weave exposed addresses in ps output
Closes #385 .
2015-04-15 12:01:30 +01:00
Adam Harrison
cbbe3cc122
Include weave exposed addresses in ps output
2015-04-15 11:54:05 +01:00
rade
ab49eb42fb
Merge pull request #555 from rade/478_more_discriminate_connectivity
...
more discriminate connectivity
Closes #478 .
2015-04-15 11:48:23 +01:00
Matthias Radestock
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.
Also remove mysterious comment.
2015-04-15 11:44:48 +01:00
Matthias Radestock
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.
This eliminates unnecessary (and ultimately failing) connection
attempts in the common scenario of several peers having been told
about each other on their command lines.
We represent a command line peer address with a TCPAddr, which avoids
back and forth conversion to string and extra fields to carry the "did
the original include a port?" information.
2015-04-15 11:42:53 +01:00
rade
9bd2afc6c3
Merge pull request #560 from rade/include_remote_address_in_connection_logging
...
always include the remote address in connection log entries
tidy up / declutter some log and status output
2015-04-15 11:23:26 +01:00
Matthias Radestock
9478696d1a
update example output in docs
2015-04-15 11:17:30 +01:00
Matthias Radestock
5415e3a60a
drop "Peer " prefix in Peers section of status
...
it's redundant and the output looks much better w/o it
2015-04-15 11:09:35 +01:00
Matthias Radestock
f0998d6196
declutter status' reconnects section
2015-04-15 10:56:29 +01:00
Matthias Radestock
f6def13ea9
change style for connections in status' reconnects section
...
to match how they are shown in the logs
2015-04-15 10:55:14 +01:00
Matthias Radestock
b1fd1334b4
always include the remote address in connection log entries
...
in addition to the peer name
This is handy for debugging, especially in situations when there are
multiple connections in flight to the same peer.
2015-04-14 22:14:29 +01:00
Matthias Radestock
74b3bf8299
pass on args in multiweave launch <args>...
2015-04-14 19:22:01 +01:00