Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-06 05:01:12 +01:00
Code Issues Releases Wiki Activity

Significant improvement to Jingle logging messages, and a new SmackLogger that allows for use of java.commons.logging. Improvements to Jingle processing to keep up with recent changes in the XEPs as we approach approval of the standard. (There will be more changes as the standard changes.) Fixes to the way STUN gets used, and a new JSTUN library (including performance and reliability changes we added to it).

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@10852 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Jeff Williams 2008-10-30 21:20:29 +00:00 • committed by jeff.williams
parent 995f319f1e
commit 84fcf53512
40 changed files with 755 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jingle/extension/source/org/jivesoftware/smackx/packet/Jingle.java
View file

@ -44,7 +44,7 @@ public class Jingle extends IQ {
// static
public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0166.html#ns";
public static final String NAMESPACE = "urn:xmpp:tmp:jingle";
public static final String NODENAME = "jingle";
@ -190,8 +190,6 @@ public class Jingle extends IQ {
/**
* Returns the XML namespace of the extension sub-packet root element.
* According the specification the namespace is always
* "http://www.xmpp.org/extensions/xep-0166.html#ns"
*
* @return the XML namespace of the packet extension.
*/

2
jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentDescription.java
View file

@ -172,7 +172,7 @@ public abstract class JingleContentDescription implements PacketExtension {
*/
public static class Audio extends JingleContentDescription {
public static final String NAMESPACE = "http://jabber.org/protocol/jingle/description/audio";
public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
public Audio() {
super();

2
jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentInfo.java
View file

@ -96,7 +96,7 @@ public class JingleContentInfo implements PacketExtension {
*/
public static class Audio extends JingleContentInfo {
public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0167.html#ns-info";
public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
public Audio(final ContentInfo mi) {
super(mi);

15
jingle/extension/source/org/jivesoftware/smackx/packet/JingleDescription.java
View file

@ -19,14 +19,15 @@
*/
package org.jivesoftware.smackx.packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smackx.jingle.media.PayloadType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smackx.jingle.SmackLogger;
import org.jivesoftware.smackx.jingle.media.PayloadType;
/**
* Jingle content description.
*
@ -34,7 +35,9 @@ import java.util.List;
*/
public abstract class JingleDescription implements PacketExtension {
// static
private static final SmackLogger LOGGER = SmackLogger.getLogger(JingleDescription.class);
// static
public static final String NODENAME = "description";
@ -73,7 +76,7 @@ public abstract class JingleDescription implements PacketExtension {
public void addPayloadType(final PayloadType pt) {
synchronized (payloads) {
if (pt == null) {
System.err.println("Null payload type");
LOGGER.error("Null payload type");
} else {
payloads.add(pt);
}
@ -176,7 +179,7 @@ public abstract class JingleDescription implements PacketExtension {
*/
public static class Audio extends JingleDescription {
public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0167.html#ns";
public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
public Audio() {
super();

2
jingle/extension/source/org/jivesoftware/smackx/packet/JingleError.java
View file

@ -27,7 +27,7 @@ import org.xmlpull.v1.XmlPullParser;
public class JingleError implements PacketExtension {
public static String NAMESPACE = "http://www.xmpp.org/extensions/xep-0166.html#ns-errors";
public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");

2
jingle/extension/source/org/jivesoftware/smackx/packet/JingleTransport.java
View file

@ -270,7 +270,7 @@ public class JingleTransport implements PacketExtension {
* RTP-ICE profile
*/
public static class Ice extends JingleTransport {
public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0176.html#ns-udp";
public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp";
public Ice() {
super();