Fixes in Negotiations

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7720 b35dd754-fafc-0310-a699-88a17e54d16e

jingle/extension/source/org/jivesoftware/smackx/jingle/IncomingJingleSession.java

@@ -136,18 +136,6 @@ public class IncomingJingleSession extends JingleSession {
 
         updatePacketListener();
 
-        Jingle packet = initialJingleSessionRequest.getJingle();
-        if (packet != null) {
-
-            // Initialize the session information
-            setSid(packet.getSid());
-
-            respond(packet);
-        }
-        else {
-            throw new XMPPException(
-                    "Session request with null Jingle packet.");
-        }
 
     }
 
@@ -173,6 +161,20 @@ public class IncomingJingleSession extends JingleSession {
      * @throws XMPPException
      */
     public void start(JingleSessionRequest initialJingleSessionRequest) throws XMPPException {
+        Jingle packet = initialJingleSessionRequest.getJingle();
+        if (packet != null) {
+
+            // Initialize the session information
+            setSid(packet.getSid());
+
+            sendAck(packet);
+        }
+        else {
+            throw new XMPPException(
+                    "Session request with null Jingle packet.");
+        }
+        // Set the new session state
+        setState(pending);
     }
 
     /**
@@ -181,11 +183,12 @@ public class IncomingJingleSession extends JingleSession {
      * @throws XMPPException
      */
     public void start() throws XMPPException {
-
+        start(this.getInitialSessionRequest());
     }
 
     /**
      * Force a call acceptance. Used to accept a hooked call.
+     *
      * @deprecated Avoid to use this method. Not compliance.
      */
     public void accept() {
@@ -230,8 +233,6 @@ public class IncomingJingleSession extends JingleSession {
          * @throws XMPPException
          */
         public Jingle eventInitiate(Jingle inJingle) throws XMPPException {
-            // Set the new session state
-            setState(pending);
             return super.eventInitiate(inJingle);
         }
 

jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java

@@ -202,6 +202,7 @@ public abstract class JingleSession extends JingleNegotiator {
 
     /**
      * Get the JingleMediaSession of this Jingle Session
+     *
      * @return the JingleMediaSession
      */
     public JingleMediaSession getJingleMediaSession() {
@@ -428,7 +429,6 @@ public abstract class JingleSession extends JingleNegotiator {
                             jout = getState().eventInfo(jin);
                         }
                         else if (action.equals(Jingle.Action.SESSIONINITIATE)) {
-                            if (getState() != null)
                             jout = getState().eventInitiate(jin);
                         }
                         else if (action.equals(Jingle.Action.SESSIONREDIRECT)) {
@@ -493,6 +493,7 @@ public abstract class JingleSession extends JingleNegotiator {
                 }
 
                 // Acknowledge the IQ reception
+                if (!(getState() instanceof IncomingJingleSession.Accepting))
                     sendAck(iq);
 
                 // ... and send all these parts in a Jingle response.
@@ -502,6 +503,7 @@ public abstract class JingleSession extends JingleNegotiator {
             }
             catch (JingleException e) {
                 // Send an error message, if present
+                System.out.println("E:" + iq);
                 JingleError error = e.getError();
                 if (error != null) {
                     sendFormattedError(iq, error);
@@ -511,6 +513,9 @@ public abstract class JingleSession extends JingleNegotiator {
                 triggerSessionClosedOnError(e);
             }
         }
+        else {
+            System.out.println("K:" + iq);
+        }
 
         return response;
     }

jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUN.java

@@ -244,6 +244,8 @@ public class STUN extends IQ {
                             return true;
                 }
 
+                System.out.println(item.getName()+"-"+info.getType());
+
             }
         }
         catch (XMPPException e) {

jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java

@@ -134,7 +134,6 @@ public class JingleMediaTest extends SmackTestCase {
             XMPPConnection x0 = getConnection(0);
             XMPPConnection x1 = getConnection(1);
 
-
             ICETransportManager icetm0 = new ICETransportManager(x0, "jivesoftware.com", 3478);
             ICETransportManager icetm1 = new ICETransportManager(x1, "jivesoftware.com", 3478);
 
@@ -170,7 +169,7 @@ public class JingleMediaTest extends SmackTestCase {
 
                     try {
                         IncomingJingleSession session = request.accept(jm1.getMediaManager().getPayloads());
-                        session.start(request);
+                        //session.start(request);
                     }
                     catch (XMPPException e) {
                         e.printStackTrace();
@@ -179,17 +178,31 @@ public class JingleMediaTest extends SmackTestCase {
                 }
             });
 
+           for (int i = 0; i < 10; i++) {
+
                 OutgoingJingleSession js0 = jm0.createOutgoingJingleSession(x1.getUser());
 
+                js0.addStateListener(new JingleSessionStateListener() {
+
+                    public void beforeChange(JingleNegotiator.State old, JingleNegotiator.State newOne) throws JingleNegotiator.JingleException {
+                    }
+
+                    public void afterChanged(JingleNegotiator.State old, JingleNegotiator.State newOne) {
+                        if (newOne != null) {
+                            System.out.println(newOne.getClass().getCanonicalName());
+                            assertFalse(newOne instanceof OutgoingJingleSession.Active);
+                        }
+                    }
+                });
+
                 js0.start();
 
-            Thread.sleep(60000);
+                Thread.sleep(5000);
                 js0.terminate();
 
-            Thread.sleep(6000);
+                Thread.sleep(1500);
 
-            x0.disconnect();
+            }
-            x1.disconnect();
 
         }
         catch (Exception e) {

test/org/jivesoftware/smack/PacketReaderTest.java

@@ -210,13 +210,13 @@ public class PacketReaderTest extends SmackTestCase {
 
         for (int j = 0; j < repeat; j++) {
 
-             PacketListener listener = new PacketListener() {
+            PacketListener listener0 = new PacketListener() {
                 public void processPacket(Packet packet) {
                     System.out.println("Packet Captured");
                     incCounter();
                 }
             };
-             PacketFilter pf = new PacketFilter() {
+            PacketFilter pf0 = new PacketFilter() {
                 public boolean accept(Packet packet) {
                     System.out.println("Packet Filtered");
                     incCounter();
@@ -224,12 +224,33 @@ public class PacketReaderTest extends SmackTestCase {
                 }
             };
 
-             getConnection(0).addPacketListener(listener,pf);
+            PacketListener listener1 = new PacketListener() {
+                public void processPacket(Packet packet) {
+                    System.out.println("Packet Captured");
+                    incCounter();
+                }
+            };
+            PacketFilter pf1 = new PacketFilter() {
+                public boolean accept(Packet packet) {
+                    System.out.println("Packet Filtered");
+                    incCounter();
+                    return true;
+                }
+            };
+
+            getConnection(0).addPacketListener(listener0, pf0);
+            getConnection(1).addPacketListener(listener1, pf1);
+
             // Check that the listener was added
 
-             Message msg = new Message(getConnection(0).getUser(), Message.Type.normal);
+            Message msg0 = new Message(getConnection(0).getUser(), Message.Type.normal);
+            Message msg1 = new Message(getConnection(1).getUser(), Message.Type.normal);
 
-             getConnection(1).sendPacket(msg);
+
+            for (int i = 0; i < 5; i++) {
+                getConnection(1).sendPacket(msg0);
+                getConnection(0).sendPacket(msg1);
+            }
 
             try {
                 Thread.sleep(100);
@@ -239,17 +260,20 @@ public class PacketReaderTest extends SmackTestCase {
             }
 
             // Remove the listener
-             getConnection(0).removePacketListener(listener);
+            getConnection(0).removePacketListener(listener0);
+            getConnection(1).removePacketListener(listener1);
 
             try {
-                 Thread.sleep(200);
+                Thread.sleep(300);
             }
             catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
-             for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 10; i++) {
-                 getConnection(1).sendPacket(msg);
+                getConnection(0).sendPacket(msg1);
+                getConnection(1).sendPacket(msg0);
+            }
 
             try {
                 Thread.sleep(100);
@@ -259,7 +283,7 @@ public class PacketReaderTest extends SmackTestCase {
             }
         }
         System.out.println(valCounter());
-         assertEquals(valCounter(),repeat*2);
+        assertEquals(valCounter(), repeat * 2 * 10);
     }
 
     protected int getMaxConnections() {

test/org/jivesoftware/smack/test/SmackTestCase.java

@@ -65,6 +65,7 @@ public abstract class SmackTestCase extends TestCase {
      */
     public SmackTestCase(String arg0) {
         super(arg0);
+        XMPPConnection.DEBUG_ENABLED=true;
     }
 
     /**