1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-14 00:02:05 +01:00
Commit graph

93 commits

Author SHA1 Message Date
Florian Schmaus
4cd53e4419 SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza.
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13685 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:00:27 +00:00
Florian Schmaus
bd70a95f8c SMACK-384 Don't use a semaphore while waiting for PacketReader to be started.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13581 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-22 18:15:13 +00:00
Florian Schmaus
26338a2754 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/trunk@13566 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-18 19:57:28 +00:00
Florian Schmaus
9123578ea5 SMACK-361 Added support for Entity Capabilities.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13558 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-18 08:40:35 +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
7770511111 Fixed typo
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13388 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-06 14:01:52 +00:00
Günther Niess
539f652443 SMACK-282: Support SASL-related error conditions
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11616 b35dd754-fafc-0310-a699-88a17e54d16e
2010-02-09 12:40:11 +00:00
Günther Niess
e3efee2e8f SMACK-280: The SASL mechanisms work transparent with packet listeners
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11615 b35dd754-fafc-0310-a699-88a17e54d16e
2010-02-09 12:24:24 +00:00
Günther Niess
ad65a76e77 SMACK-281: Move more packet parsing code to PacketParserUtils
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11614 b35dd754-fafc-0310-a699-88a17e54d16e
2010-02-09 12:11:39 +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
Gaston Dombiak
1a3fb47b5f Fixed parsing of SUCCESS during SASL. SMACK-258
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10856 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-31 03:51:12 +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
e155c302ad Another collection change.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7168 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-16 01:56:16 +00:00
Matt Tucker
7c847dad6a Switched from volatile collection to copy on write array. Fixes concurrency bugs and leaking resources, but may have performance ramifications.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7159 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-16 00:12:17 +00:00
Matt Tucker
322292cad9 Added ability to sign off with a custom presence packet (SMACK-195).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7081 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-13 02:23:28 +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
Gaston Dombiak
2db477145d 1) Use #notifyAll to notify all waiting threads on listenethread. SMACK-189
2) Added try/catch while notifying listener to recover gracefully from potential errors. SMACK-190

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7043 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-08 18:23:44 +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
Matt Tucker
5a57e2390a Javadoc fixes, builds now go to target directory.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6616 b35dd754-fafc-0310-a699-88a17e54d16e
2007-01-07 23:03:16 +00:00
Gaston Dombiak
69b36d5861 ProviderManager is no longer static. SMACK-182
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6128 b35dd754-fafc-0310-a699-88a17e54d16e
2006-11-16 19:31:30 +00:00
Alex Wenckus
0537629ee9 Spellcheck.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6106 b35dd754-fafc-0310-a699-88a17e54d16e
2006-11-14 21:58:03 +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
Gaston Dombiak
e558ee8fa6 Replaces lock object with Semaphore. SMACK-168
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5359 b35dd754-fafc-0310-a699-88a17e54d16e
2006-09-13 17:58:28 +00:00
Gaston Dombiak
157a1e9659 Listeners are now removed from PacketReader. SMACK-165
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4883 b35dd754-fafc-0310-a699-88a17e54d16e
2006-08-10 22:09:30 +00:00
Gaston Dombiak
b34152e9f5 Use stream feature to discover whether in-band registration is available. SMACK-160
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4797 b35dd754-fafc-0310-a699-88a17e54d16e
2006-08-03 17:04:01 +00:00
Gaston Dombiak
47cc26e234 Fixed possible delay when TLS is not supported by the server. SMACK-161
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4773 b35dd754-fafc-0310-a699-88a17e54d16e
2006-08-02 22:17:11 +00:00
Matt Tucker
47abf627b7 Added privacy list support and improved error handling from Francisco (SMACK-121, SMACK-31).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4603 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-19 19:24:00 +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
f9ecbb3297 Reuse empty slots in the collection to store new listeners/collectors. Fixed by Alex. :) SMACK-149
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4340 b35dd754-fafc-0310-a699-88a17e54d16e
2006-07-10 16:51:56 +00:00
Pete Matern
8398c6f4a9 Re-applied fix for SMACK-120
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3823 b35dd754-fafc-0310-a699-88a17e54d16e
2006-05-01 16:34:41 +00:00
Gaston Dombiak
5247fce7ca Moved resource binding parsing as a core IQ packet. SMACK-124
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3492 b35dd754-fafc-0310-a699-88a17e54d16e
2006-02-27 18:17:27 +00:00
Alex Wenckus
e7c89235ba -shutting down the listener thread properly {SMACK-120}
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3367 b35dd754-fafc-0310-a699-88a17e54d16e
2006-01-26 18:31:35 +00:00
Gaston Dombiak
15defec50f Added stream compression support. SMACK-112
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3306 b35dd754-fafc-0310-a699-88a17e54d16e
2006-01-16 17:34:56 +00:00
Gaston Dombiak
38f7e5bba7 Refactoring work.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3179 b35dd754-fafc-0310-a699-88a17e54d16e
2005-12-08 21:10:41 +00:00
Gaston Dombiak
c23b4f20db Added stream errors support. SMACK-107
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3042 b35dd754-fafc-0310-a699-88a17e54d16e
2005-11-08 20:10:33 +00:00
Gaston Dombiak
283b0f33f5 Throw an XMPPException if SASL authentication fails. SMACK-89
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2817 b35dd754-fafc-0310-a699-88a17e54d16e
2005-09-13 20:05:29 +00:00
Gaston Dombiak
391e7269e6 Allow to perform SASL authentication over plain connections. SMACK-83
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2784 b35dd754-fafc-0310-a699-88a17e54d16e
2005-09-05 22:03:47 +00:00
Matt Tucker
06b7a0eacc New logic for delivering messages without a thread ID to a Chat object. This improves compatibility with clients that don't support thread ID. Also some misc formatting updates.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2779 b35dd754-fafc-0310-a699-88a17e54d16e
2005-09-05 20:00:45 +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
Gaston Dombiak
49847ac1c6 Print the exception for which the connection was closed.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2511 b35dd754-fafc-0310-a699-88a17e54d16e
2005-07-23 15:56:06 +00:00
Gaston Dombiak
2b22cde400 1. Username and password are optional in Registration. SMACK-62
2. Added try/catch block when invoking packet listeners.


git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2504 b35dd754-fafc-0310-a699-88a17e54d16e
2005-06-17 22:29:33 +00:00
Matt Tucker
93ca7bc991 Improved packet timeout logic.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2501 b35dd754-fafc-0310-a699-88a17e54d16e
2005-06-15 23:04:52 +00:00
Matt Tucker
92869fa583 Better threading logic when waiting for a connection (SMACK-37).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2469 b35dd754-fafc-0310-a699-88a17e54d16e
2005-03-29 19:54:29 +00:00
Gaston Dombiak
3f83402148 Modified to be compatible with latest minimal version of XPP. SMACK-49
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2466 b35dd754-fafc-0310-a699-88a17e54d16e
2005-03-23 02:36:19 +00:00
Gaston Dombiak
3157a29d28 Public API for parsing Messages and Presences. SMACK-47
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2462 b35dd754-fafc-0310-a699-88a17e54d16e
2005-02-23 03:32:10 +00:00
Gaston Dombiak
3fe4678384 Modified to assume an error code of -1 if the received error does not include a code. SMACK-44
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2454 b35dd754-fafc-0310-a699-88a17e54d16e
2005-02-03 01:03:10 +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
Gaston Dombiak
cd8f9f5682 Allows to remove a connection listener while notifying that the connection is being closed. SMACK-162
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2386 b35dd754-fafc-0310-a699-88a17e54d16e
2004-09-24 20:40:51 +00:00