mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-14 23:54:49 +02:00
dde0cfd7f6
With bb8dcc9874 the concept if IQ request
handlers was introduced in Smack. This doesn't allow packet/stanza
collectors/listeners to filter for incoming IQ requests. Unfortunately
the file transfer code relied on this being able, so it broke with the
change.
There were two places where the file transfer code was listening for
incoming IQ requests:
- InitationListener(s)
- Negotiator(s)
With this change, we let the InitiationListener signal the existence of
an incoming initation request, send by an IQ of type 'set', using the
newly created EventManager utility.
The negotiator waits for those events to arrive and proceedes as it would
have done when the packet collector was used.
111 lines
4.1 KiB
Java
111 lines
4.1 KiB
Java
/**
|
|
*
|
|
* Copyright 2003-2006 Jive Software.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smackx.filetransfer;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
|
|
import org.jivesoftware.smack.SmackException;
|
|
import org.jivesoftware.smack.XMPPConnection;
|
|
import org.jivesoftware.smack.XMPPException;
|
|
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
|
|
import org.jivesoftware.smack.packet.IQ;
|
|
import org.jivesoftware.smack.packet.Stanza;
|
|
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
|
|
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
|
|
import org.jivesoftware.smackx.si.packet.StreamInitiation;
|
|
|
|
|
|
/**
|
|
* The fault tolerant negotiator takes two stream negotiators, the primary and the secondary
|
|
* negotiator. If the primary negotiator fails during the stream negotiaton process, the second
|
|
* negotiator is used.
|
|
*/
|
|
public class FaultTolerantNegotiator extends StreamNegotiator {
|
|
|
|
private final StreamNegotiator primaryNegotiator;
|
|
private final StreamNegotiator secondaryNegotiator;
|
|
private final XMPPConnection connection;
|
|
|
|
public FaultTolerantNegotiator(XMPPConnection connection, StreamNegotiator primary,
|
|
StreamNegotiator secondary) {
|
|
this.primaryNegotiator = primary;
|
|
this.secondaryNegotiator = secondary;
|
|
this.connection = connection;
|
|
}
|
|
|
|
@Override
|
|
public void newStreamInitiation(String from, String streamID) {
|
|
primaryNegotiator.newStreamInitiation(from, streamID);
|
|
secondaryNegotiator.newStreamInitiation(from, streamID);
|
|
}
|
|
|
|
InputStream negotiateIncomingStream(Stanza streamInitiation) {
|
|
throw new UnsupportedOperationException("Negotiation only handled by create incoming " +
|
|
"stream method.");
|
|
}
|
|
|
|
public InputStream createIncomingStream(final StreamInitiation initiation) throws SmackException, XMPPErrorException {
|
|
// This could be either an xep47 ibb 'open' iq or an xep65 streamhost iq
|
|
IQ initationSet = initiateIncomingStream(connection, initiation);
|
|
|
|
StreamNegotiator streamNegotiator = determineNegotiator(initationSet);
|
|
try {
|
|
return streamNegotiator.negotiateIncomingStream(initationSet);
|
|
}
|
|
catch (InterruptedException e) {
|
|
// TODO remove this try/catch once merged into 4.2's master branch
|
|
throw new IllegalStateException(e);
|
|
}
|
|
}
|
|
|
|
private StreamNegotiator determineNegotiator(Stanza streamInitiation) {
|
|
if (streamInitiation instanceof Bytestream) {
|
|
return primaryNegotiator;
|
|
} else if (streamInitiation instanceof Open){
|
|
return secondaryNegotiator;
|
|
} else {
|
|
throw new IllegalStateException("Unknown stream initation type");
|
|
}
|
|
}
|
|
|
|
public OutputStream createOutgoingStream(String streamID, String initiator, String target)
|
|
throws SmackException, XMPPException {
|
|
OutputStream stream;
|
|
try {
|
|
stream = primaryNegotiator.createOutgoingStream(streamID, initiator, target);
|
|
}
|
|
catch (Exception ex) {
|
|
stream = secondaryNegotiator.createOutgoingStream(streamID, initiator, target);
|
|
}
|
|
|
|
return stream;
|
|
}
|
|
|
|
public String[] getNamespaces() {
|
|
String[] primary = primaryNegotiator.getNamespaces();
|
|
String[] secondary = secondaryNegotiator.getNamespaces();
|
|
|
|
String[] namespaces = new String[primary.length + secondary.length];
|
|
System.arraycopy(primary, 0, namespaces, 0, primary.length);
|
|
System.arraycopy(secondary, 0, namespaces, primary.length, secondary.length);
|
|
|
|
return namespaces;
|
|
}
|
|
|
|
}
|