Commit graph

5598 commits

Author SHA1 Message Date
Joey Hess
16cefae7f2 add an alert while a locally initiated pairing request is in progress
Has a button to cancel the request.
2012-09-09 16:24:34 -04:00
http://joeyh.name/
5770828770 Added a comment 2012-09-09 20:01:53 +00:00
http://www.dbruhn.de/
6ddc6598be 2012-09-09 19:48:33 +00:00
http://www.dbruhn.de/
9a1da62a18 Added a comment 2012-09-09 19:45:08 +00:00
bremner
ada9bd87b1 Added a comment: more about spaces... 2012-09-09 19:33:01 +00:00
Joey Hess
ded8517545 pair request alert tweaks 2012-09-09 15:16:17 -04:00
Joey Hess
690b424cad unify bootstrap icon names in a data type 2012-09-09 15:09:22 -04:00
Joey Hess
f75ac910c4 display icon for alerts with no header too 2012-09-09 14:59:46 -04:00
http://joeyh.name/
07fa5d90a8 Added a comment 2012-09-09 18:00:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmubB1Sj2rwFoVdZYvGV0ACaQUJQyiJXJI
2366cf6663 Added a comment 2012-09-09 17:34:07 +00:00
http://joeyh.name/
b58557b71e Added a comment 2012-09-09 17:22:58 +00:00
http://joeyh.name/
d49a71f970 Added a comment 2012-09-09 17:12:55 +00:00
Joey Hess
c6f3c410d4 fix gpg pipeline stall
Bug introduced in d1da9cf221, where
I removed a forkProcess when feeding gpg. Feeding it from a thread
solves the bug.
2012-09-09 13:11:54 -04:00
Joey Hess
4eb6a2966a Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-09 13:08:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0
78f68bd02f Added a comment 2012-09-09 16:58:55 +00:00
http://joeyh.name/
0f70a0f4b0 Added a comment 2012-09-09 16:55:02 +00:00
http://joeyh.name/
3c9859fe2a Added a comment 2012-09-09 16:53:35 +00:00
http://joeyh.name/
3a9c30a925 Added a comment 2012-09-09 16:52:33 +00:00
http://joeyh.name/
787ebecd90 Added a comment 2012-09-09 16:50:40 +00:00
http://joeyh.name/
92456b2d69 Added a comment 2012-09-09 16:45:20 +00:00
http://joeyh.name/
baf58ed723 Added a comment 2012-09-09 16:25:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmubB1Sj2rwFoVdZYvGV0ACaQUJQyiJXJI
88bee7ba5d Added a comment: Hogging memory 2012-09-09 15:51:41 +00:00
Joey Hess
c066faf4b9 wording 2012-09-09 01:05:23 -04:00
Joey Hess
1e41c0d85e update pair request alert when button is pressed 2012-09-09 01:02:44 -04:00
Joey Hess
f62cc48482 reorg templates 2012-09-08 23:32:08 -04:00
Joey Hess
6e60b08060 moved the PairStage inside the Verifiable data 2012-09-08 21:06:10 -04:00
Joey Hess
1ab3ce352b add a PairDone message 2012-09-08 20:44:54 -04:00
Joey Hess
7c70c89ee7 render webapp staitc file url using yesod 2012-09-08 20:04:44 -04:00
Joey Hess
e59b0a1c88 first pass at alert buttons
They work fine. But I had to go to a lot of trouble to get Yesod to render
routes in a pure function. It may instead make more sense to have each
alert have an assocated IO action, and a single route that runs the IO
action of a given alert id. I just wish I'd realized that before the past
several hours of struggling with something Yesod really doesn't want to
allow.
2012-09-08 19:57:15 -04:00
Joey Hess
e6e0877378 blog for the day 2012-09-08 15:42:12 -04:00
Joey Hess
317ab14da2 add remote directory to pair request 2012-09-08 15:40:47 -04:00
Joey Hess
5401b9f249 filter out our own pairing requests
Due to being multicast, requests sent by one thread are received by the
listener in another thread.
2012-09-08 15:30:04 -04:00
Joey Hess
61ee1e1660 fix build without pairing support 2012-09-08 15:21:34 -04:00
Joey Hess
0f0c7f8d70 added pair listener thread 2012-09-08 15:07:44 -04:00
Joey Hess
aa0227958e Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-08 14:25:06 -04:00
Joey Hess
3e070b947a don't pass .local hostname over the wire
The remote computer may not support mDNS. Instead, pass over the uname -a
hostname, and the IP address, and leave best hostname calculation to the
remote side.
2012-09-08 14:23:35 -04:00
Joey Hess
92b1f42730 fix fd leak
also, tested on ipv6.. doesn't work
2012-09-08 13:34:50 -04:00
http://www.dbruhn.de/
8af35df0c1 2012-09-08 17:10:20 +00:00
Joey Hess
2d1b215328 Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-08 13:07:49 -04:00
http://www.dbruhn.de/
ea641a27bd 2012-09-08 17:05:14 +00:00
Joey Hess
3dd4b4058f implement pair request broadcasts
Pair requests are sent on all network interfaces, and contain the best
available hostname to use to contact the host on that interface.

Added a pairing in progress page.

Revert "reduce some boilerplate using ghc extensions", because it caused
overlapping instances for Text.
2012-09-08 13:04:19 -04:00
http://www.dbruhn.de/
61748c98b0 2012-09-08 16:58:23 +00:00
http://www.dbruhn.de/
33b3836261 2012-09-08 16:57:41 +00:00
http://www.dbruhn.de/
5df0b86a57 2012-09-08 16:56:50 +00:00
Joey Hess
0c01348b65 pairing passphrase entry form, validation, etc
Actually 3 forms in one, this handles the initial passphrase entry, and the
confirmation, and also varys wording if the same user or a different user
is confirming.
2012-09-08 02:02:39 -04:00
Joey Hess
3bee6b3c74 yesod skelton and routes for pairing
yet more changes to pairing message data types
2012-09-08 00:27:27 -04:00
Joey Hess
92df8250fa broke out Verifiable to a utility library, and added a quickcheck test 2012-09-07 23:23:52 -04:00
Joey Hess
c12caf0a4e massively simplified the pairing protocol
Only 2 messages are needed to do pairing.

And added a nice Verifiable data type.
2012-09-07 22:58:14 -04:00
Joey Hess
24bfabe263 add build dep on network-info 2012-09-07 19:44:20 -04:00
Joey Hess
01b908aea8 Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-07 18:05:19 -04:00