Commit Graph
594 Commits
Author SHA1 Message Date
Bryan Boreham f56700a032 Factor out routine to check if a container is already running
Conflicts:
	weave
2014-10-29 14:20:24 +00:00
Bryan Boreham 75deacaed0 Factor out REST call
Conflicts:
	weave
2014-10-29 14:20:24 +00:00
Michael Bridgen 44cac7fb40 Build weavedns bin and container in the Makefile 2014-10-29 14:20:24 +00:00
Michael Bridgen 190e708045 Merge branch 'arrange_for_merge' of ../weavedns into integrate_weavedns
This pulls the weavedns repo commits into the weave repo, for merging
into the main code base.
2014-10-29 12:25:20 +00:00
Michael Bridgen a384e0bc16 Move more weavedns things out of the way 2014-10-29 12:23:18 +00:00
Michael Bridgen 747d48749d Ignore compiled binary 2014-10-29 11:44:07 +00:00
Michael Bridgen 822ec90606 Rename weavedns package to nameserver, and fix up 2014-10-29 11:41:58 +00:00
Michael Bridgen 8469fea215 Move files around in preparation for melding into weave code
* library code will go in weave/nameserver/
 * main.go for the server goes in weavedns/ with the containerising
2014-10-29 11:34:56 +00:00
Michael Bridgen fdcb960cdd Don't export sendResponse, and pay attention to its retval 2014-10-28 17:23:03 +00:00
Michael Bridgen 03f766bb95 test.Log;test.Fail -> test.Fatal, and use checkError
(in tests)
2014-10-28 17:15:36 +00:00
Michael Bridgen 48328dec50 Change logging config to match weave 2014-10-28 16:52:43 +00:00
Michael Bridgen b3489f6ec1 Move the handler function closer to its use 2014-10-28 15:39:50 +00:00
Michael Bridgen 96ce10a4d5 Use compact if-with-assign statements where scoping allows 2014-10-28 15:38:53 +00:00
Michael Bridgen 126c36cffb Extended makeDNSReply to PTR replies too 2014-10-28 14:46:29 +00:00
Michael Bridgen 5bb6c85565 Move DNS utils into their own file 2014-10-28 11:48:51 +00:00
Michael Bridgen a5869e2090 Use constant for TTL 2014-10-28 11:10:59 +00:00
Michael Bridgen 548039db08 No need to give defaults in docstrings for options
The usage message will include them anyway.
2014-10-28 10:59:30 +00:00
Michael Bridgen 2cc0e8aaa6 Clarify comments 2014-10-28 10:54:37 +00:00
Michael Bridgen 765bfbb49d Merge pull request #159 from rade/140_weave_connect
add `weave connect` to dynamically add peers to running router
2014-10-27 14:47:32 +00:00
Matthias Radestock 1b9dbad15f cosmetic 2014-10-27 14:34:59 +00:00
Matthias Radestock 741f4616a4 Merge branch 'master' into 140_weave_connect
Conflicts:
	weave
2014-10-27 14:33:26 +00:00
Michael Bridgen cb05e886a8 Removed duplicate check for rDNS domain
There's no need to check whether the queried address is a subdomain of
in-addr.arpa, since this handler is registered with the muxer under
that domain anyway.

(Also, remove a magic number)
2014-10-27 14:13:53 +00:00
Matthias Radestock 4b8988346f cosmetic 2014-10-27 14:08:54 +00:00
Matthias Radestock 6393e545ae introduce 'weave connect' to connect a running router to other peers
Getting this to work with 'wget' is just too cumbersome especially
when it comes to getting the error message out. So 'curl' only.
2014-10-27 09:15:14 +00:00
Matthias Radestock acbabc4f9e s/StatusPort/HttpPort
since we are adding functionality other than status
2014-10-27 08:22:22 +00:00
Matthias Radestock fad5846946 refactor: extract basic container/bridge connection establishment
Note that we do not mark the interface in the container as 'up' here
since some callers, in particular 'attach', add CIDRs to the
interface, and some programs rely on 'up' implying 'has IP address'.
2014-10-26 12:13:28 +00:00
Matthias Radestock de82adce46 Merge branch 'master' into 130_launch_without_ip
Plus a bit of a refactoring, to avoid duplicating the CIDR
regexp. Plus some minor cosmetic tweaks.

Conflicts:
	README.md
	weave
2014-10-25 22:26:31 +01:00
Matthias Radestock d8bea832d3 validate CIDR
This isn't meant to be precise but supposed to guard against silly
mistakes.

Closes #116.
2014-10-25 22:04:36 +01:00
Matthias Radestock 007b68c206 explain that peer can be specified as fqdn and contain optional port
Closes #137.
2014-10-25 19:51:06 +01:00
Matthias Radestock e9c5b2c3ea refactor: extract weave ports and container name into constants 2014-10-25 19:42:52 +01:00
Matthias Radestock e265f04182 cosmetic: remove trailing whitespace 2014-10-25 17:13:44 +01:00
Matthias Radestock ce631e7f28 stricter param count checking 2014-10-24 16:56:58 +01:00
Matthias Radestock 76a974f88b refactor: maintain abstraction 2014-10-24 16:07:06 +01:00
Matthias Radestock d3ba6746a5 backward compatibility 2014-10-24 15:36:54 +01:00
Matthias Radestock 9ec7422221 Merge branch 'master' into 130_launch_without_ip
Conflicts:
	weave
2014-10-24 15:08:21 +01:00
Bryan Boreham 510204587b Add simple rDNS lookup 2014-10-24 14:48:13 +01:00
Bryan Boreham d868d27263 Look up by IP 2014-10-24 14:47:49 +01:00
rade a1c4038ac7 Merge pull request #153 from rade/91_simplify_multicast_detection
remove explicit multicast detection

Closes #91
2014-10-24 14:34:49 +01:00
Matthias Radestock 83464a38eb remove explicit multicast detection
We don't need. Multicast addresses never appear as sources and hence
never end up in the peer_cache. And the router always broadcasts
frames with destination addresses that aren't in the peer cache.
2014-10-24 14:30:58 +01:00
David Wragg ded7d3a991 Merge pull request #152 from rade/weave_script_tidy
various simplifications and tidying up in weave script
2014-10-24 14:26:35 +01:00
Matthias Radestock dba8760187 update README 2014-10-24 13:43:15 +01:00
Bryan Boreham 5ee60a0003 Extend tests slightly 2014-10-24 13:37:32 +01:00
Matthias Radestock 00a4a5e056 refactor: simplify multicast route addition in 'attach' 2014-10-24 13:15:15 +01:00
Matthias Radestock 560cbabb54 refactor: simplify 'attach'
Move the interface into the container network NS asap, which
simplifies error handling.
2014-10-24 13:13:34 +01:00
Matthias Radestock de96742935 refactor: remove add_nat_rule
it did too little to be worthwhile
2014-10-24 13:03:28 +01:00
Bryan Boreham fa0331cb6d Ensure we only attempt to handle TypeA queries 2014-10-24 13:03:26 +01:00
Matthias Radestock 093b23fa83 refactor: it's not an IPADDR but a CIDR 2014-10-24 12:59:47 +01:00
Matthias Radestock 5b6a892c38 refactor: don't extract param to var and shift unless we have to 2014-10-24 12:57:35 +01:00
Matthias Radestock 6501934a15 make with_container_netns take the container as the first arg
and invoke the subsequent command.
This is closer to typical 'with' semantics.
2014-10-24 12:50:29 +01:00
Matthias Radestock 34e240c4a5 remove misleading comment...
attach() and detach() are never invoked directly,
plus it's really not that hard to figure out what they do.
2014-10-24 12:49:04 +01:00