Nightly Distribution of the master branch
Build: #1878 was successful Changes by Florian Schmaus <flo@geekplace.eu>
Code commits
Smack (master)
-
Florian Schmaus <flo@geekplace.eu> 19b20fefeca69cccc3637e01ec2f151a054a3351
Merge pull request #537 from MF1-MS/mf1-ms/use_xmpp_connection_as_local_socks5_address
Use XMPP connection as local socks5 address -
Martin Fidczuk <mfidczuk@microsoft.com> ffd027cc7deaaff0af70dfee4f0765cdce78d9e3 m
Use XMPP connection as local SOCKS5 address
The default local address is often just "the first address found in the list of addresses read from the OS" and this might mean an internal IP address that cannot reach external servers. So wherever possible use the same IP address being used to connect to the XMPP server because this local address has a better chance of being suitable.
This MR adds the above behaviour, and two UTs to test that we use the local XMPP connection IP when connected, and the previous behaviour when not.- smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/c2s/ModularXmppClientToServerConnection.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-core/src/testFixtures/java/org/jivesoftware/smack/DummyConnection.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)
- smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java (version ffd027cc7deaaff0af70dfee4f0765cdce78d9e3) (diffs)