1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-21 01:57:57 +01:00
Commit graph

141 commits

Author SHA1 Message Date
Florian Schmaus
c143f0de25 SMACK-525 fix NPE when initConnection() fails
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13862 b35dd754-fafc-0310-a699-88a17e54d16e
2014-01-17 10:40:10 +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
Florian Schmaus
62bc862015 SMACK-443 remove duplicate notifyReconnection()
notifyReconnection() was called in initConnection() and in connect()

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13789 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-26 11:26:19 +00:00
Florian Schmaus
aa5906f1f1 SMACK-457 Remove unnecessary printStackTrace() in XMPPConnection
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13773 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-17 17:38:19 +00:00
Florian Schmaus
9a7bf4a4c3 SMACK-456 Added the causing exception
XMPPConnection.connectUsingConfiguraiton() does now add the causing
exception to the throwed exception.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13765 b35dd754-fafc-0310-a699-88a17e54d16e
2013-10-09 11:54:03 +00:00
Florian Schmaus
0f247cf30e SMACK-405 Removed redundant code in XMPPConnection.shutdown()
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13690 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:02:09 +00:00
Florian Schmaus
30bc5afa2b 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.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13688 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-22 17:01:40 +00:00
Florian Schmaus
6eb4b39716 Spelling fixes
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13661 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:05:40 +00:00
Florian Schmaus
8e10e5f374 SMACK-369 remove try/catch block in XMPPConnection.connect()
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_1@13660 b35dd754-fafc-0310-a699-88a17e54d16e
2013-05-17 22:05:24 +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
2eb13f48d2 SMACK-225 Fixed DNS SRV handling, as per RFC 2782. Added support for multiple DNS SRV resolvers namely javax and org.xbill.dns (aka dnsjava).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13561 b35dd754-fafc-0310-a699-88a17e54d16e
2013-03-18 08:53:11 +00:00
Florian Schmaus
c6248ec000 SMACK-389 Plugable compression framework
This commit adds the ability to plug-in different compression handlers
for different compression methods. It is also possible to add more
then one handler for the same method. The order how the handlers are
added determines which handler is tried first for usage. This is used
for the 'zlib' compression method, which now can be either provided by
Java7 or by JZlib (just like it was done before).

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13522 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-26 09:26:41 +00:00
Florian Schmaus
da1987a98b SMACK-376 Allow supplying a custom SSLContext for encrypted connections.
The provided TrustManager / SSLContext implementation is very flexible,
but it does not allow to query the user about accepting possibly
invalid SSL certificates. By supplying a custom SSLContext with a
TrustManager implementing such a query mechanism it is possible to
implement this behaviour.

The patch adds ConnectionConfiguration.customSSLContext with appropriate
getter/setter methods and uses the custom context in XMPPConnection.

Signed-Off-By: Georg Lukas <georg@op-co.de>

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13520 b35dd754-fafc-0310-a699-88a17e54d16e
2013-02-26 08:44:17 +00:00
Florian Schmaus
43619de7aa SMACK-377 Avoid an unnecessary DNS request by using directly the, at this point known IP, instead of using the hostname as argument for the new socket.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13420 b35dd754-fafc-0310-a699-88a17e54d16e
2013-01-31 22:31:31 +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
rcollier
e08c8afe44 SMACK-363 Applied code cleanup patches for many generics related issues.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13325 b35dd754-fafc-0310-a699-88a17e54d16e
2012-10-26 10:47:55 +00:00
rcollier
402b430291 SMACK-230 Added synchronization since disconnect can be called from multiple threads.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12540 b35dd754-fafc-0310-a699-88a17e54d16e
2011-06-23 19:55:10 +00:00
rcollier
0ec7e23666 Updated some javadoc that caused confusion as to the login() behaviour.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12194 b35dd754-fafc-0310-a699-88a17e54d16e
2011-03-28 13:13:41 +00:00
Henning Staib
a5693609b2 add the ability to register for roster events before logging in (SMACK-156)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11826 b35dd754-fafc-0310-a699-88a17e54d16e
2010-08-15 16:32:09 +00:00
Günther Niess
5f50f087ac SMACK-295: Fire reconnectionSuccessful event when session is established
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11652 b35dd754-fafc-0310-a699-88a17e54d16e
2010-02-24 00:45:40 +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
Günther Niess
87b3f805c7 SMACK-271: Fix deadlock in XMPPConnection while login and parsing stream features (for Tigase servers)
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11227 b35dd754-fafc-0310-a699-88a17e54d16e
2009-08-29 18:48:56 +00:00
Jay Kline
0014cff963 Callback handler was not getting set properly
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11018 b35dd754-fafc-0310-a699-88a17e54d16e
2009-05-27 16:51:39 +00:00
Matt Tucker
8cd6f3ef1a Javadoc formatting.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10876 b35dd754-fafc-0310-a699-88a17e54d16e
2008-11-13 18:31:37 +00:00
Gaston Dombiak
2da448d2fd Simplified list of #login methods in XMPPConnection.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10846 b35dd754-fafc-0310-a699-88a17e54d16e
2008-10-24 05:17:50 +00:00
Daniel Henninger
fda687b6cb [SMACK-254] Now possible to log in without loading roster automatically.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10823 b35dd754-fafc-0310-a699-88a17e54d16e
2008-08-29 13:04:16 +00:00
Gaston Dombiak
f13c56dbb7 Updated javadoc.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10745 b35dd754-fafc-0310-a699-88a17e54d16e
2008-08-12 17:42:44 +00:00
Daniel Henninger
0a5229f7ad Changing PKCS to PKCS11 and config to library for proper terminology.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9692 b35dd754-fafc-0310-a699-88a17e54d16e
2007-12-27 16:38:25 +00:00
Daniel Henninger
a0021b17be We're using an inputstream now, not a string.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9690 b35dd754-fafc-0310-a699-88a17e54d16e
2007-12-27 16:17:58 +00:00
Daniel Henninger
5c92ced702 Checking for PKCS support in java and punting if it doesn't exist.
Using bytestream config instead of full config.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9689 b35dd754-fafc-0310-a699-88a17e54d16e
2007-12-27 16:15:57 +00:00
Daniel Henninger
882d47fb6c Silenced some stderr messages.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9552 b35dd754-fafc-0310-a699-88a17e54d16e
2007-12-04 03:14:32 +00:00
Jay Kline
e51e9432f2 Fixed a problem where not fully setting up PKI results in
failed logins.


git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9543 b35dd754-fafc-0310-a699-88a17e54d16e
2007-11-30 22:11:04 +00:00
Jay Kline
1b5203d24e Fix some ordering.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9539 b35dd754-fafc-0310-a699-88a17e54d16e
2007-11-30 20:02:01 +00:00
Jay Kline
d3ee0e2f3e Added support for key and trust stores when making SSL/TLS connections
that require the client authenticate itself.  This supports PKCS#11 devices.


git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9538 b35dd754-fafc-0310-a699-88a17e54d16e
2007-11-30 19:40:31 +00:00
Jay Kline
13b8d313ba Big change for authentication, which now supports more SASL mechanisms and
callbacks.  This should address issues SMACK-210 and SMACK-142, as well as 
set the stage for SMACK-234. 



git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9498 b35dd754-fafc-0310-a699-88a17e54d16e
2007-11-14 16:27:47 +00:00
Matt Tucker
a86cb5a5d3 Removing method (doesn't help with anything).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7687 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-24 20:49:57 +00:00
Derek DeMoro
93766ee788 Changed flushing type of jzlib to fix hang in client.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7613 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-20 22:09:15 +00:00
Matt Tucker
c7fc4734b8 Added ability to get the local network address that connects to the server.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7525 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-15 02:53:01 +00:00
Matt Tucker
2c0984815b Javadoc tweak.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7334 b35dd754-fafc-0310-a699-88a17e54d16e
2007-03-01 18:44:08 +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
Gaston Dombiak
87fb2df3ec Check that roster is not null when disconnecting (fixed NPE).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7221 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-20 18:48:26 +00:00
Matt Tucker
0bd96e5156 Moving variable to private. Why was it protected?
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7199 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-19 22:24:07 +00:00
Matt Tucker
3aa94b2a4e Set connected to false before closing reader and writer (SMACK-196).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7186 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-19 08:38:19 +00:00
Matt Tucker
2e5f42aa39 Added support for offline presence, code cleanup (SMACK-74, SMACK-201).
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7185 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-19 08:35:05 +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
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
Matt Tucker
5c1fc7f8b7 * Roster.getPresence now forces bare JID (SMACK-192).
* RosterListner API changes (SMACK-191).

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7070 b35dd754-fafc-0310-a699-88a17e54d16e
2007-02-12 00:56:47 +00:00