vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-10-18 20:25:59 +02:00
Code Issues Releases Wiki Activity

Merge pull request #576 from Flowdalic/inet-addr-ignore-zone-id

Browse source 
Ignore zone IDs of internet addresses
This commit is contained in:
Florian Schmaus 2024-04-02 15:09:34 +02:00 committed by GitHub
commit 435e736995
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
View file

@ -295,7 +295,7 @@ public class Bytestream extends IQ {
* @param port port of the stream host. * @param port port of the stream host.
*/ */
public StreamHost(final Jid jid, final String address, int port) { public StreamHost(final Jid jid, final String address, int port) {
this(jid, InternetAddress.from(address), port); this(jid, InternetAddress.fromIgnoringZoneId(address), port);
} }
public StreamHost(Jid jid, InetAddress address, int port) { public StreamHost(Jid jid, InetAddress address, int port) {

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java
View file

@ -51,7 +51,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
private final Type type; private final Type type;
public JingleS5BTransportCandidate(String candidateId, String hostString, Jid jid, int port, int priority, Type type) { public JingleS5BTransportCandidate(String candidateId, String hostString, Jid jid, int port, int priority, Type type) {
this(candidateId, InternetAddress.from(hostString), jid, port, priority, type); this(candidateId, InternetAddress.fromIgnoringZoneId(hostString), jid, port, priority, type);
} }
public JingleS5BTransportCandidate(String candidateId, InternetAddress host, Jid jid, int port, int priority, Type type) { public JingleS5BTransportCandidate(String candidateId, InternetAddress host, Jid jid, int port, int priority, Type type) {
@ -176,7 +176,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
} }
public Builder setHost(String host) { public Builder setHost(String host) {
InternetAddress inetAddress = InternetAddress.from(host); InternetAddress inetAddress = InternetAddress.fromIgnoringZoneId(host);
return setHost(inetAddress); return setHost(inetAddress);
} }