Commit Graph
614 Commits
Author SHA1 Message Date
Michael Bridgen 27beebf5d5 Factor out the wait-for-interface code 2014-11-03 17:47:16 +00:00
Michael Bridgen 8ce6c4aba3 Rewrite weaveDNS README to account for weave integration 2014-11-03 17:34:56 +00:00
Michael Bridgen 55c8b80075 Reform rest_call
First, it's not ReST, so rename to http_call; second, separate the
port into its own argument and put the values in variables; third,
replace the container names with the appropriate variables.
2014-10-31 13:29:32 +00:00
Michael Bridgen 67dfc4211c No need for this Makefile now 2014-10-30 11:38:17 +00:00
Michael Bridgen 08a0cf3442 Merge branch 'master' into integrate_weavedns
Conflicts:
	weave
2014-10-29 16:28:54 +00:00
Michael Bridgen 7729f6d742 Realign usage message 2014-10-29 15:19:48 +00:00
Michael Bridgen b47e819485 Don't include routing_prefix in calls from script
I took subnets out of the DNS code.
2014-10-29 14:52:03 +00:00
Bryan Boreham 05921833a3 Launch weavedns and update it on run, start, attach and detach
Conflicts:
	weave
2014-10-29 14:20:24 +00:00
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
rade a88bb68447 Merge pull request #147 from bboreham/138_weave_ps
Add command `weave ps`
2014-10-29 13:45:07 +00:00
Bryan Boreham 8ab9bad31d cosmetic 2014-10-29 12:34:28 +00:00
Bryan Boreham 72b62b4ffc Add weave ps to usage 2014-10-29 12:34:09 +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
Bryan Boreham c749427de5 cosmetic 2014-10-29 11:48:23 +00:00
Bryan Boreham d56ac73732 Inline weave ps function 2014-10-29 11:47:23 +00:00
Bryan Boreham fe2d1a3699 CONTAINER_IFNAME rather than ethwe 2014-10-29 11:44:20 +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
Bryan Boreham 52a4fe545e Add mac address to weave ps output 2014-10-29 11:39:12 +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
Bryan Boreham aed3fec3e4 Merge branch 'master' into 138_weave_ps
Conflicts:
	weave
2014-10-29 11:19:03 +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