Commit Graph
294 Commits
Author SHA1 Message Date
Matthias Radestock eecaa567fc eliminate periodic 'tick' in connection_maker
checkStateAndAttemptConnections already performs a full scan of all
potential targets, from which we can easily determine the nearest
future time (or, rather, its duration from now) on which an attempt is
due.

We also need to kick the ConnectionMaker into action when we receive a
topology update containing new connections.
2014-09-22 23:15:54 +01:00
Matthias Radestock d5e797f695 refactor: use better 'switch' 2014-09-22 22:34:46 +01:00
Matthias Radestock f11f84fe17 refactor: we don't care about the tick time 2014-09-22 19:38:21 +01:00
Matthias Radestock aa1e1b1d6c cosmetic - remove comment for which we have an issue filed 2014-09-22 18:34:50 +01:00
Matthias Radestock 9e8260dc63 cosmetic 2014-09-22 18:14:37 +01:00
rade e6041e082f Merge pull request #76 from bboreham/tag_fix
Only push latest and git commit tag to DockerHub
2014-09-22 18:04:40 +01:00
Bryan Boreham 451d7d8778 Merge remote-tracking branch 'upstream/master' into HEAD 2014-09-22 17:57:32 +01:00
Bryan Boreham 1b524c4f27 Updated to reflect version-tagging process 2014-09-22 17:56:42 +01:00
Bryan Boreham 6ed2ab10a1 Only push two tags - latest and git-commit - to DockerHub 2014-09-22 17:44:13 +01:00
rade 33e60b75bc Merge pull request #74 from bboreham/28_retry_faster
Attempt re-connection immediately when notified of a broken connection

Fixes #28
2014-09-22 16:23:23 +01:00
Matthias Radestock a2f725c627 Merge branch 'bboreham-61_cleanup_script'
Fixes #61
2014-09-18 12:32:01 +01:00
Matthias Radestock 331c8553db cosmetic 2014-09-18 12:30:43 +01:00
Matthias Radestock b99e49a84f Merge branch '61_cleanup_script' of https://github.com/bboreham/weave into bboreham-61_cleanup_script 2014-09-18 12:14:11 +01:00
Bryan Boreham 0ed57bad67 rm tempfile before we use it, to avoid attack via symlink 2014-09-18 11:56:15 +01:00
Bryan Boreham 86644f7615 cosmetic 2014-09-18 11:55:47 +01:00
Bryan Boreham c48ae19c55 Tidy up messages; ensure errors to to stderr 2014-09-18 11:47:47 +01:00
Bryan Boreham a75a0d8709 If and only if network setup because the container died, say so.
This involves capturing stderr output from all the 'ip' commands so we
can hide that output if we see the process died, or show it to the user
if the process didn't die, in which case we don't know why we failed.
2014-09-18 11:24:08 +01:00
Bryan Boreham bfd5007339 Don't test if symlink exists before 'rm -f'
When the symlink's target doesn't exist, '[ -f' is false, so the symlink doesn't get removed.
Since we do always want it to be removed, just call 'rm -f' anyway, which won't complain
if the file doesn't exist.
2014-09-18 11:03:06 +01:00
Matthias Radestock 8eecbfca1f Merge branch 'dpw-65_prevent_recapture'
Closes #65
2014-09-18 09:26:59 +01:00
Bryan Boreham f0191639de Start the tick again, in case we need it 2014-09-18 06:51:12 +01:00
Bryan Boreham 2720d24183 Attempt re-connection immediately when notified of a broken connection 2014-09-18 06:48:56 +01:00
David Wragg 12b969004e Filter outbound packets in the kernel
It turns out that under Linux, libpcap implements the SetDirection
filtering in userspace, causing some spurious wake ups of the packet
capture thread.  So set a BPF filter to discard outbound packets inside
the kernel.
2014-09-17 23:42:48 +01:00
Matthias Radestock ce1d40afb8 cosmetic 2014-09-17 19:25:24 +01:00
Matthias Radestock f5d9feac95 note that local traffic isn't captured 2014-09-17 19:24:32 +01:00
Matthias Radestock f2c8d61abe Merge branch '61_cleanup_script' of https://github.com/bboreham/weave into bboreham-61_cleanup_script 2014-09-17 16:50:44 +01:00
Bryan Boreham 2f5a9733b8 Take out debugging -x mode 2014-09-17 16:32:21 +01:00
Bryan Boreham 0a403dd081 untabify 2014-09-17 16:31:52 +01:00
Bryan Boreham 09aed84638 return not exit from function 2014-09-17 16:30:50 +01:00
Bryan Boreham eabcc55f73 fix subshell syntax and make del/delete consistent 2014-09-17 16:25:46 +01:00
Bryan Boreham fd7b034713 untabify 2014-09-17 16:11:30 +01:00
Bryan Boreham 7c979d6725 Remove veth and/or netns symlink if interface configuration fails part-way through 2014-09-17 15:44:34 +01:00
Matthias Radestock 11ccf4bbcb cosmetic 2014-09-17 15:31:50 +01:00
rade a94ae91921 Merge pull request #63 from bboreham/29_unknown_peer
Remove log message about unknown peer

Fixes #29
2014-09-17 15:30:53 +01:00
rade 914eceaa71 Merge pull request #62 from christianberg/patch-1
Fix typo
2014-09-17 14:04:07 +01:00
Bryan Boreham 8bac04d080 Remove message about unknown peer from the log 2014-09-17 13:19:52 +01:00
Bryan Boreham c8876e144f Revert "Change iteration over connection decoding to abort after the first error, and let the UnknownPeersError know which peer was unknown"
This reverts commit 978d374820.
2014-09-17 13:18:33 +01:00
Bryan Boreham 4e7aa85de0 Revert "Make message for UnknownPeersError more meaningful"
This reverts commit 752cfdcb67.
2014-09-17 13:18:07 +01:00
Bryan Boreham a25ccbb261 Merge branch 'master' into 29_unknown_peer 2014-09-17 12:59:30 +01:00
Christian Berg f057bcccad Fix typo
If I'm not mistaken, the IP address should be 10.0.1.101.
2014-09-17 13:22:41 +02:00
Matthias Radestock e287110099 improve error messages and make sure they all go to stderr
...since otherwise they get hidden when the output is redirected,
e.g. in the typical

    # C=$(weave run ...)

invocation.
2014-09-17 06:46:02 +01:00
Matthias Radestock b07cf729b2 tiny refactor 2014-09-16 23:13:08 +01:00
Matthias Radestock b49c3d5951 typo 2014-09-16 19:09:33 +01:00
Matthias Radestock f2e8370f3a explain service binding and routing 2014-09-16 19:06:53 +01:00
Matthias Radestock 6563c3e048 cosmetic 2014-09-16 19:02:55 +01:00
Bryan Boreham 752cfdcb67 Make message for UnknownPeersError more meaningful 2014-09-16 11:11:54 +01:00
Bryan Boreham 978d374820 Change iteration over connection decoding to abort after the first error, and let the UnknownPeersError know which peer was unknown 2014-09-16 09:32:53 +01:00
rade 2e66694355 Merge pull request #58 from bboreham/50_show_ip
Show the IP address on the end of each connection

Closes #50
2014-09-15 18:04:01 +01:00
Bryan Boreham 464a1c8246 Show the IP address on the end of each connection 2014-09-15 17:50:04 +01:00
rade af94153d96 Merge pull request #44 from bboreham/23_retry_peers
Rewrite of ConnectionMaker

Fixes #23. Fixes #26.
2014-09-15 17:42:32 +01:00
rade 3e0c0d6e55 Merge pull request #57 from bboreham/56_display_version
Added 'weave version' command

Fixes #56
2014-09-15 16:53:24 +01:00