Added support for Flash clients. JM-1

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

src/java/org/jivesoftware/messenger/Connection.java

@@ -139,4 +139,24 @@ public interface Connection {
      * @throws UnauthorizedException If caller doesn't have permission to access this resource
      */
     void deliver(Packet packet) throws UnauthorizedException;
+
+    /**
+     * Sets whether the connected client is a flash client or not. Flash clients need to receive
+     * a special character (i.e. \0) at the end of each xml packet. Flash clients may send the
+     * character \0 in incoming packets and may start a connection using another openning tag
+     * such as: "flash:client".
+     *
+     * @param flashClient flag that indicates if the client is a flash client.
+     */
+    void setFlashClient(boolean flashClient);
+
+    /**
+     * Returns true if the connected client is a flash client. Flash clients need to receive
+     * a special character (i.e. \0) at the end of each xml packet. Flash clients may send the
+     * character \0 in incoming packets and may start a connection using another openning tag
+     * such as: "flash:client".
+     *
+     * @return true if the connected client is a flash client.
+     */
+    boolean isFlashClient();
 }

src/java/org/jivesoftware/messenger/net/SocketConnection.java

@@ -68,6 +68,8 @@ public class SocketConnection extends BasicConnection {
 
     private XMLWriter xmlSerializer;
 
+    private boolean flashClient = false;
+
     /**
      * Create a new session using the supplied socket.
      *
@@ -182,6 +184,9 @@ public class SocketConnection extends BasicConnection {
             synchronized (writer) {
                 try {
                     xmlSerializer.write(packet.getElement());
+                    if (flashClient) {
+                        writer.write('\0');
+                    }
                     xmlSerializer.flush();
                 }
                 catch (IOException e) {
@@ -192,4 +197,12 @@ public class SocketConnection extends BasicConnection {
             session.incrementServerPacketCount();
         }
     }
+
+    public void setFlashClient(boolean flashClient) {
+        this.flashClient = flashClient;
+    }
+
+    public boolean isFlashClient() {
+        return flashClient;
+    }
 }

src/java/org/jivesoftware/messenger/net/SocketReadThread.java

@@ -48,6 +48,7 @@ public class SocketReadThread extends Thread {
     private static String CHARSET = "UTF-8";
 
     private static final String ETHERX_NAMESPACE = "http://etherx.jabber.org/streams";
+    private static final String FLASH_NAMESPACE = "http://www.jabber.com/streams/flash";
 
     private Socket sock;
     private Session session;
@@ -236,26 +237,62 @@ public class SocketReadThread extends Thread {
      */
     private void createSession() throws UnauthorizedException, XmlPullParserException, IOException, Exception {
         XmlPullParser xpp = reader.getXPPParser();
-        for (int eventType = xpp.getEventType();
-             eventType != XmlPullParser.START_TAG;
-             eventType = xpp.next()) {
+        for (int eventType = xpp.getEventType(); eventType != XmlPullParser.START_TAG;) {
+            eventType = xpp.next();
         }
 
+        boolean isFlashClient = xpp.getPrefix().equals("flash");
         // Conduct error checking, the opening tag should be 'stream'
         // in the 'etherx' namespace
-        if (!xpp.getName().equals("stream")) {
+        if (!xpp.getName().equals("stream") && !isFlashClient) {
             throw new XmlPullParserException(LocaleUtils.getLocalizedString("admin.error.bad-stream"));
         }
-        if (!xpp.getNamespace(xpp.getPrefix()).equals(ETHERX_NAMESPACE)) {
+
+        if (!xpp.getNamespace(xpp.getPrefix()).equals(ETHERX_NAMESPACE) &&
+                !(isFlashClient && xpp.getNamespace(xpp.getPrefix()).equals(FLASH_NAMESPACE))) {
             throw new XmlPullParserException(LocaleUtils.getLocalizedString("admin.error.bad-namespace"));
         }
 
         Writer writer = connection.getWriter();
-        String startPacket = "<?xml version='1.0' encoding='"+CHARSET+"'?><stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" xmlns=\"jabber:client\" from=\""+serverName+"\" id=\""+session.getStreamID().toString()+"\">";
-        writer.write(startPacket);
-        writer.flush();
-        // TODO: check for SASL support in opening stream tag
+        // Build the start packet response
+        StringBuffer sb = new StringBuffer();
+        sb.append("<?xml version='1.0' encoding='");
+        sb.append(CHARSET);
+        sb.append("'?>");
+        if (isFlashClient) {
+            sb.append("<flash:stream xmlns:flash=\"http://www.jabber.com/streams/flash\" ");
         }
+        else {
+            sb.append("<stream:stream ");
+        }
+        sb.append("xmlns:stream=\"http://etherx.jabber.org/streams\" xmlns=\"jabber:client\" from=\"");
+        sb.append(serverName);
+        sb.append("\" id=\"");
+        sb.append(session.getStreamID().toString());
+        sb.append("\">");
+        writer.write(sb.toString());
+
+        // If this is a flash client then flag the connection and append a special caracter to the
+        // response
+        if (isFlashClient) {
+            session.getConnection().setFlashClient(true);
+            writer.write('\0');
 
+            // Skip possible end of tags and \0 characters
+            /*final int[] holderForStartAndLength = new int[2];
+            final char[] chars = xpp.getTextCharacters(holderForStartAndLength);
+            if (chars[xpp.getColumnNumber()-2] == '/') {
+                xpp.next();
+                try {
+                    xpp.next();
+                }
+                catch (XmlPullParserException ie) {
+                    // We expect this exception since the parser is reading a \0 character
+                }
+            }*/
+        }
 
+        writer.flush();
+        // TODO: check for SASL support in opening stream tag
+    }
 }