Commit graph

6570 commits

Author SHA1 Message Date
Joey Hess
fdb6a88877 ignore Messages from our client's own jid
shouldn't ever happen, but hey
2012-11-05 17:54:21 -04:00
Joey Hess
02893cdc44 blog for the day 2012-11-05 17:47:25 -04:00
Joey Hess
da6fb44446 finished XMPP pairing!
This includes keeping track of which buddies we're pairing with, to know
which PairAck are legitimate.
2012-11-05 17:43:17 -04:00
Joey Hess
da65c5c1d1 tweak 2012-11-05 16:00:55 -04:00
Joey Hess
85c52c4029 clean up protocol docs 2012-11-05 15:52:03 -04:00
Joey Hess
db36b11e28 switch to silent chat messages for XMPP pairing
Along the way, significantly cleaned up Assistant.XMPP, and made XMPP
message decoding more efficient.
2012-11-05 15:40:56 -04:00
Joey Hess
a2c393b4ae fix non-xmpp build 2012-11-05 13:29:53 -04:00
Joey Hess
f0f7f93931 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-05 13:24:59 -04:00
Joey Hess
553b96127e fixed 2012-11-05 13:24:25 -04:00
annexuser
e6651f45c3 Added a comment 2012-11-05 17:20:50 +00:00
http://joeyh.name/
f2f6d400b3 Added a comment 2012-11-05 16:40:39 +00:00
Joey Hess
fa3794c978 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-05 12:40:00 -04:00
Joey Hess
1178840032 Bugfix: Fix hang in webapp when setting up a ssh remote with an absolute path. 2012-11-05 12:35:11 -04:00
Joey Hess
0b8027e527 webapp: When setting up authorized_keys, use GIT_ANNEX_SHELL_DIRECTORY. 2012-11-05 12:35:05 -04:00
Joey Hess
bd230efa56 git-annex-shell: GIT_ANNEX_SHELL_DIRECTORY can be set to limit it to operating on a specified directory. 2012-11-05 11:29:12 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
8257fe2a31 Added a comment 2012-11-05 06:43:25 +00:00
http://lj.rossia.org/users/imz/
979df760b7 rename todo/whishlist:_make_partial_files_available_during_transfer.mdwn to todo/wishlist:_make_partial_files_available_during_transfer.mdwn 2012-11-05 04:02:07 +00:00
annexuser
714686a49b Added a comment 2012-11-05 02:07:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
3e0f4a0998 Added a comment: exact version 2012-11-05 01:34:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
303cb0eaa5 Added a comment 2012-11-05 01:24:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
1dbcd5d620 Added a comment 2012-11-05 01:23:41 +00:00
http://joeyh.name/
94c2ce35a6 Added a comment 2012-11-04 20:08:02 +00:00
http://joeyh.name/
cecdc8b04f Added a comment 2012-11-04 20:03:47 +00:00
Joey Hess
b528218b0c Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-04 16:03:25 -04:00
http://joeyh.name/
7c9382ada3 Added a comment 2012-11-04 20:01:35 +00:00
http://joeyh.name/
dfa8d83709 removed 2012-11-04 19:59:01 +00:00
http://joeyh.name/
07e37172eb removed 2012-11-04 19:58:44 +00:00
http://joeyh.name/
cae5dfaff9 Added a comment 2012-11-04 19:58:28 +00:00
http://joeyh.name/
6be068f918 Added a comment 2012-11-04 19:57:48 +00:00
http://joeyh.name/
7c7ca34c5d Added a comment 2012-11-04 19:57:38 +00:00
Joey Hess
bdeea572b6 add cp to THIRDPARTY_BINS
git-annex is built with various cp options, so cp needs to match the build
environment.
2012-11-04 15:55:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
e82747fab2 2012-11-04 19:47:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
7a8ce98df6 2012-11-04 19:46:05 +00:00
http://joeyh.name/
cd5dd19296 Added a comment 2012-11-04 19:44:11 +00:00
http://olg.myid.net/
994da05473 2012-11-04 18:22:53 +00:00
http://christian.amsuess.com/chrysn
2d169589cf Added a comment: worked well 2012-11-04 12:23:57 +00:00
Joey Hess
a6cecfcf33 workaround for Google Talk's insane handling of self-directed presence
Maybe the spec allows it, but broadcasting self-directed presence info to
all buddies is just insane.

I had to bring back the IQ messages for self-pairing, while still using
directed presence for other pairing. Ugly.
2012-11-03 22:52:41 -04:00
Joey Hess
9cff286ea3 avoid repeated pairing alerts 2012-11-03 21:38:27 -04:00
Joey Hess
17e84a8096 switch to directed presence for pair requests
Testing between Google Talk and prosody, the directed IQ messages
were not received. Google Talk probably only relays them between
clients using the same account.

I first tried even more directed presence, with each client JID being sent
a separate presence, but that didn't work on Google Talk, particularly
it was ignored when one client sent it to another client using the same
account.

So, presence directed at the user@host of the client to pair with. Tested
working between Google Talk and prosody (in both directions), as well
as between two clients with the same account on Google Talk, and
two clients with the same account on prosody.

Only problem with this form of directed presence is that if I also use it
for git pushes, more clients than are interested in a push's data will
receive it. So I may need some better approach, or a hybrid between
directed IQ and directed presence.
2012-11-03 21:19:59 -04:00
Joey Hess
5108d4b364 update xmpp protocol
Amusingly, I am not really using xmpp ping for pairing. I forgot to put in
the ping tag! And when I did, it stopped working, on Google Talk. Seems
it handles client to client pings, at least using the same JID, without
actually sending them to the end client. My mistake avoided this,
and seems to work, so I've left it as-is for now, with just the git-annex
tag in an IQ message. Also tested on prosody.
2012-11-03 19:18:26 -04:00
Joey Hess
21a287a0b3 rename xmpp creds file
it's not just about push notifications anymore
2012-11-03 18:58:37 -04:00
Joey Hess
4331cf4e09 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-03 18:12:11 -04:00
Joey Hess
607fed5800 blog for the day 2012-11-03 18:11:46 -04:00
Joey Hess
42f030c905 XMPP pair requests are now received, and an alert displayed 2012-11-03 17:46:22 -04:00
2a01:e35:1382:f950:21d9:7aaa:461b:48ee
967d23d08a poll vote (Google Drive) 2012-11-03 21:17:42 +00:00
Joey Hess
b95c255b6d XMPP pairing notifications are now sent
Rest of pairing process still to do.
2012-11-03 16:01:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc
6ffc2ae502 Added a comment: git-annex.app Not working on 32 bit machines 2012-11-03 19:18:48 +00:00
Joey Hess
cbbfd4d00b bugfix 2012-11-03 14:32:59 -04:00
Joey Hess
9a8d0be866 send a presence query when the buddy list is displayed
This ensures that clients that have not sent presence in a while will show
up in the list.
2012-11-03 14:25:06 -04:00
Joey Hess
a1228e27ed refactor XMPP client 2012-11-03 14:16:17 -04:00