If a message is too big to be sent as a datagram, fall back to

sending it on the stream.  However, also increase the maximum 
datagram size.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5670 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/client/Client.java

@@ -60,7 +60,7 @@ public class Client
     public static final int[] DEFAULT_DATAGRAM_PORTS = { };
 
     /** The maximum size of a datagram. */
-    public static final int MAX_DATAGRAM_SIZE = 1500;
+    public static final int MAX_DATAGRAM_SIZE = 8192;
 
     /** Our default maximum outgoing message rate in messages per second. */
     public static final int DEFAULT_MSGS_PER_SECOND = 10;

src/java/com/threerings/presents/server/net/ConnectionManager.java

@@ -906,8 +906,8 @@ public class ConnectionManager extends LoopingThread
 
         try {
             // send it as a datagram if hinted and possible
-            if (!msg.getTransport().isReliable() && conn.getDatagramAddress() != null) {
+            if (!msg.getTransport().isReliable() && conn.getDatagramAddress() != null &&
-                postDatagram(conn, msg);
+                    postDatagram(conn, msg)) {
                 return;
             }
 
@@ -934,8 +934,10 @@ public class ConnectionManager extends LoopingThread
 
     /**
      * Helper function for {@link #postMessage}; handles posting the message as a datagram.
+     *
+     * @return true if the datagram was successfully posted, false if it was too big.
      */
-    protected void postDatagram (Connection conn, Message msg)
+    protected boolean postDatagram (Connection conn, Message msg)
         throws Exception
     {
         _flattener.reset();
@@ -944,11 +946,18 @@ public class ConnectionManager extends LoopingThread
         DatagramSequencer sequencer = conn.getDatagramSequencer();
         sequencer.writeDatagram(msg);
 
+        // if the message is too big, we must fall back to sending it through the stream channel
+        if (_flattener.size() > Client.MAX_DATAGRAM_SIZE) {
+            return false;
+        }
+
         // extract as a byte array
         byte[] data = _flattener.toByteArray();
 
         // slap it on the queue
         _dataq.append(Tuple.newTuple(conn, data));
+
+        return true;
     }
 
     /**