Commit d93645fd authored by Thiago Camargo's avatar Thiago Camargo Committed by thiago

[OF-408] - Jingle Nodes API version Upgrade and Tracker Feature Support

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11947 b35dd754-fafc-0310-a699-88a17e54d16e
parent c55e07de
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
package org.jinglenodes; package org.jinglenodes;
import org.dom4j.Element; import org.dom4j.Element;
import org.dom4j.DocumentHelper;
import org.jivesoftware.openfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -27,9 +28,14 @@ import org.xmpp.component.AbstractComponent; ...@@ -27,9 +28,14 @@ import org.xmpp.component.AbstractComponent;
import org.xmpp.jnodes.RelayChannel; import org.xmpp.jnodes.RelayChannel;
import org.xmpp.jnodes.nio.LocalIPResolver; import org.xmpp.jnodes.nio.LocalIPResolver;
import org.xmpp.jnodes.smack.JingleChannelIQ; import org.xmpp.jnodes.smack.JingleChannelIQ;
import org.xmpp.jnodes.smack.JingleTrackerIQ;
import org.xmpp.jnodes.smack.TrackerEntry;
import org.xmpp.packet.IQ; import org.xmpp.packet.IQ;
import org.xmpp.packet.PacketError; import org.xmpp.packet.PacketError;
import java.util.List;
import java.util.ArrayList;
class JingleNodesComponent extends AbstractComponent { class JingleNodesComponent extends AbstractComponent {
private static final Logger Log = LoggerFactory.getLogger(JingleNodesComponent.class); private static final Logger Log = LoggerFactory.getLogger(JingleNodesComponent.class);
...@@ -55,7 +61,7 @@ class JingleNodesComponent extends AbstractComponent { ...@@ -55,7 +61,7 @@ class JingleNodesComponent extends AbstractComponent {
@Override @Override
protected String[] discoInfoFeatureNamespaces() { protected String[] discoInfoFeatureNamespaces() {
return new String[] { JingleChannelIQ.NAMESPACE }; return new String[]{JingleChannelIQ.NAMESPACE, JingleTrackerIQ.NAMESPACE};
} }
@Override @Override
...@@ -81,19 +87,51 @@ class JingleNodesComponent extends AbstractComponent { ...@@ -81,19 +87,51 @@ class JingleNodesComponent extends AbstractComponent {
childElement.addAttribute(REMOTE_PORT, Integer.toString(channel.getPortB())); childElement.addAttribute(REMOTE_PORT, Integer.toString(channel.getPortB()));
reply.setChildElement(childElement); reply.setChildElement(childElement);
Log.debug("Created relay channel {}:{}, {}:{}, {}:{}", new Object[] { HOST, Log.debug("Created relay channel {}:{}, {}:{}, {}:{}", new Object[]{HOST,
LocalIPResolver.getLocalIP(), LOCAL_PORT, Integer.toString(channel.getPortA()), REMOTE_PORT, LocalIPResolver.getLocalIP(), LOCAL_PORT, Integer.toString(channel.getPortA()), REMOTE_PORT,
Integer.toString(channel.getPortB()) }); Integer.toString(channel.getPortB())});
} else { } else {
reply.setError(PacketError.Condition.internal_server_error); reply.setError(PacketError.Condition.internal_server_error);
} }
return reply;
} else if (JingleTrackerIQ.NAME.equals(element.getName()) && JingleTrackerIQ.NAMESPACE.equals(namespace)) {
final List<TrackerEntry> entries = new ArrayList<TrackerEntry>();
entries.add(new TrackerEntry(TrackerEntry.Type.relay, TrackerEntry.Policy._roster, plugin.getServiceName() + "." + getDomain(), UDP));
final String elements = getChildElementXML(entries);
final Element e = DocumentHelper.parseText(elements).getRootElement();
reply.setChildElement(e);
return reply; return reply;
} }
return null; // feature not implemented. return null; // feature not implemented.
} }
public String getChildElementXML(final List<TrackerEntry> entries) {
final StringBuilder str = new StringBuilder();
str.append("<").append(JingleTrackerIQ.NAME).append(" xmlns='").append(JingleTrackerIQ.NAMESPACE).append("'>");
for (final TrackerEntry entry : entries) {
str.append("<").append(entry.getType().toString());
str.append(" policy='").append(entry.getPolicy().toString()).append("'");
str.append(" address='").append(entry.getJid()).append("'");
str.append(" protocol='").append(entry.getProtocol()).append("'");
if (entry.isVerified()) {
str.append(" verified='").append(entry.isVerified()).append("'");
}
str.append("/>");
}
str.append("</").append(JingleTrackerIQ.NAME).append(">");
return str.toString();
}
@Override @Override
public String getDomain() { public String getDomain() {
return XMPPServer.getInstance().getServerInfo().getXMPPDomain(); return XMPPServer.getInstance().getServerInfo().getXMPPDomain();
......
...@@ -102,6 +102,10 @@ public class JingleNodesPlugin implements Plugin { ...@@ -102,6 +102,10 @@ public class JingleNodesPlugin implements Plugin {
c.close(); c.close();
} }
public String getServiceName() {
return serviceName;
}
public void destroyPlugin() { public void destroyPlugin() {
try { try {
componentManager.removeComponent(serviceName); componentManager.removeComponent(serviceName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment