Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-17 04:32:04 +01:00
Code Issues Releases Wiki Activity
1629 commits 8 branches 0 tags 34 MiB
Commit graph

48 commits

Author SHA1 Message Date
Florian Schmaus
4bc7ce052d Remove RCS header attributes 2014-02-10 12:33:41 +01:00
rcollier
1b651d4939 SMACK-534 Refactored all System.out/err and printStackTrace calls with appropriate Java util logging calls. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13887 b35dd754-fafc-0310-a699-88a17e54d16e
 2014-02-02 22:39:07 +00:00
Florian Schmaus
418dd24392 SMACK-373 Don't remove listeners after a disconnect() , keep state of Connection between disconnect() and connect()/login() 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13793 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-10-27 17:40:06 +00:00
rcollier
b0bdd56b20 SMACK-412 Fixed merge error. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13589 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 13:27:55 +00:00
rcollier
a14178990b SMACK-412 Added the pingMyServer back in, cleaned up unneeded synchronization and removed minimum ping interval. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13588 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-23 11:59:08 +00:00
rcollier
aab1dcdabe SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13569 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-19 02:37:36 +00:00
Florian Schmaus
a55b54f20b SMACK-417 If both PacketReader and PacketWriter fail at the same time, connectionClosedonError() is called two times 
Refactored notifyConnectionError() and notifyReconnection() from PacketReader to XMPPConnection. Made PacketReader.done and PacketWriter.done volatile. Prevent duplicate connectionClosedonError() calls by making the method synchronzied and protected them with an enter guard: if (packetReader.done && packetWriter.done) return;

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13568 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:58:48 +00:00
Florian Schmaus
6dcf8e0123 SMACK-419 PacketWriter: Only flush if queue is empty 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13567 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-03-18 19:58:14 +00:00
Florian Schmaus
e1bb5a6123 SMACK-278: Call socket.close() in XMPPConnection.shutdown() before 
closing the reader and writer streams. This basically prevents the
deadlock reported in SMACK-278.

Additionally, we need to tell the PacketReader and PacketWriter that
the socket got closed and that subsequent caused Exceptions can be
ignored. This is done via the socketClosed boolean in XMPP Connection,
that is queried by PacketReader and PacketWriter in case an Exception
is encountered.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13390 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:44 +00:00
Florian Schmaus
3c2eaba840 KeepAliveTask: Increased the initial heartbeat dealy in order to 
prevent a heartbeat timeout in high latency situations (mobile
environments)"

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13389 b35dd754-fafc-0310-a699-88a17e54d16e
 2013-01-06 14:02:35 +00:00
Günther Niess
127319a821 SMACK-279: The XMPPConnection extends the new abstract Connection class 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
 2010-02-09 11:55:56 +00:00
Matt Tucker
e9f049adc9 Adding max queue size to throttle traffic (avoids OOM). (SMACK-208). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7419 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-03-09 02:02:27 +00:00
Matt Tucker
0f0c423480 Small tweak. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7234 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-21 17:38:05 +00:00
Matt Tucker
1eb4841970 New listener implementation for packet reader (SMACK-205). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7232 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-21 00:57:31 +00:00
Matt Tucker
3e4a1ed5b5 Optimized concurrency in packet writer, better job of cleanup on disconnect. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7183 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-19 05:48:57 +00:00
Matt Tucker
98bf0d8cfb Copyright update. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7071 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-12 00:59:05 +00:00
Matt Tucker
bf02dbe3da Added unique identifier to each thread name (SMACK-51). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6948 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-02-04 20:52:45 +00:00
Matt Tucker
8e750912a7 Re-worked security settings, clean-up of connection config, fixed concurrency when shutting down the packet writer. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6666 b35dd754-fafc-0310-a699-88a17e54d16e
 2007-01-11 19:01:24 +00:00
Gaston Dombiak
3af86fd462 Added reconnection support. SMACK-172 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5367 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-09-14 19:16:40 +00:00
Matt Tucker
9895123ff3 Additional refactoring work. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4539 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-18 06:47:38 +00:00
Gaston Dombiak
f57ff10ad9 1. Clean up code 
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-07-18 05:14:33 +00:00
Gaston Dombiak
3252a2a77c keep alive final fixes. SMACK-141 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3972 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-06-12 16:32:18 +00:00
Gaston Dombiak
6e49d6cb05 Temp fix for SSL exception problem until we finish final solution that consists of changing the keep alive thread to send a hearbeat when the connection is idle (i.e. nothing has been sent for a while). SMACK-141 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3968 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-06-09 23:24:54 +00:00
Matt Tucker
d323d6db9c Removed thread from packet writer (SMACK-123). 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3412 b35dd754-fafc-0310-a699-88a17e54d16e
 2006-02-08 23:11:21 +00:00
Gaston Dombiak
d67b49289b Added support for PacketInterceptors. SMACK-104 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3020 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-11-01 23:49:07 +00:00
Gaston Dombiak
d61e2e5c59 Don't include version=1.0 when using old SSL connections. SMACK-90 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2818 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-09-13 20:09:28 +00:00
Gaston Dombiak
ad6be5887c 1. Added support for TLS. SMACK-76 
2. Added support for SASL. SMACK-24

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2732 b35dd754-fafc-0310-a699-88a17e54d16e
 2005-08-27 02:29:04 +00:00
Matt Tucker
fdb4b017ff Updated to Apache 2.0 license. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2408 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-11-02 23:53:30 +00:00
Matt Tucker
7877a29af0 Renamed variable. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2357 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 21:47:00 +00:00
Matt Tucker
785e319e7c Cleanup of listener logic, now possible to get count of listeners. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2355 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-08-09 21:15:04 +00:00
Matt Tucker
a1af5c79e7 Flush writer during keep-alives. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2319 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-06-02 16:51:19 +00:00
Matt Tucker
147288ed74 Use notifyAll() (Smack-130) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2288 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-04-07 23:49:00 +00:00
Matt Tucker
2f0c000c82 Fixed regression. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2256 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-15 22:58:48 +00:00
Matt Tucker
167d40ac20 Work on keep-alive interval. Fixes SMACK-123 and SMACK-121. Also general work on SmackConfiguration class. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2253 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-03-15 18:59:41 +00:00
Matt Tucker
14896e4d31 Implemented keep-alives. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2219 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-28 21:30:37 +00:00
Gaston Dombiak
3abb8b109c Fixes a problem that prevented to remove listeners 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2207 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-15 13:05:44 +00:00
Gaston Dombiak
4dfb2b08fa Fixes a problem that didn't allow to terminate daemon threads 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2205 b35dd754-fafc-0310-a699-88a17e54d16e
 2004-01-13 18:13:23 +00:00
Gaston Dombiak
7d7c02b750 References to PacketWriterListener changed to PacketListener 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2172 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-11-18 17:06:47 +00:00
Gaston Dombiak
24f965ead7 Adds notification for sent packets 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2167 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-11-15 19:24:00 +00:00
Matt Tucker
8688966ca6 Keeps track of the number of packets written. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2153 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-21 17:39:18 +00:00
Matt Tucker
889a908873 Removed unused import. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2129 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-10-03 00:47:51 +00:00
Matt Tucker
d843cc9a77 Packet writer errors will now notify listeners of errors (SMACK-85) 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2092 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-09-18 22:35:42 +00:00
Matt Tucker
1ac4992358 Close stream properly. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1941 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-05-16 15:42:41 +00:00
Matt Tucker
5a1f449f03 Cleaned up connection close operation. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1829 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-01-27 15:56:21 +00:00
Matt Tucker
1f325771ab Fixed license header. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1811 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-01-17 20:34:50 +00:00
Matt Tucker
5e4d91c269 Packet reader and writer are now hidden. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1799 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-01-17 07:11:33 +00:00
Matt Tucker
6a1b7c6c2f Code cleanup. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1781 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-01-15 15:01:01 +00:00
Matt Tucker
f3837581f8 Importing. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1777 b35dd754-fafc-0310-a699-88a17e54d16e
 2003-01-13 16:58:47 +00:00