--- deliantra/server/socket/loop.C	2007/07/01 04:08:14	1.54
+++ deliantra/server/socket/loop.C	2007/07/28 00:15:03	1.63
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -169,7 +168,7 @@
 
             if (!faces_sent [scrub_idx])
               {
-                send_face (scrub_idx);
+                send_face (scrub_idx, -120);
                 flush_fx ();
 
                 bg_scrub = 1; // send up to one face per tick, unless an image was requested
@@ -181,64 +180,94 @@
     }
   else
     {
-      int ol = outputbuffer_len ();
-
-      rate_avail = min (max_rate, rate_avail + max_rate);
-      rate_avail -= ol;
+      bool overload = false;
 
-      int avail = rate_avail;
-
-      // if we can split images, transfer up to mss-sized packets if possible
-      // but never 768 bytes more.
-      if (fxix) avail += min (768, mss - (ol % mss));
-
-      bg_scrub = BG_SCRUB_RATE;
+#if HAVE_TCP_INFO
+      // do bandwidth checking
+      if (tcpi.tcpi_unacked + 1 > max (4, tcpi.tcpi_snd_cwnd))
+        {
+          overload = true;
+          if (next_rate_adjust <= NOW)
+            {
+              next_rate_adjust = NOW + 2;
+              max_rate = max (max_rate >> 1, int (5000 * TICK));
+              LOG (llevDebug, "tcp %s overloaded (%d + 1 > 4 | %d), rate now %d\n",
+                   host, (int)tcpi.tcpi_unacked, (int)tcpi.tcpi_snd_cwnd, int (max_rate / TICK));//D
+              send_packet_printf ("drawinfo %d Due to possible network congestion, your output-rate has been reduced to %dbps.",
+                                  NDI_RED, int (max_rate / TICK));
+            }
+        }
+#endif
 
-      while (avail > 0)
+      if (!overload)
         {
-          ixsend &ix = ixface.back ();
+          int ol = outputbuffer_len ();
 
-          if (facedata *d = face_data (ix.idx, faceset))
-            {
-              if (fxix)
-                {
-                  // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
-                  int chunk = min (min (avail - 40, MAXSOCKBUF - 9), ix.ofs);
+          rate_avail = min (max_rate, rate_avail + max_rate);
+          rate_avail -= ol;
 
-                  if (chunk <= 0)
-                    break;
+          int avail = rate_avail;
 
-                  ix.ofs -= chunk;
+          // if we can split images, transfer up to mss-sized packets if possible
+          // but never 768 bytes more.
+          if (fxix) avail += min (768, mss - (ol % mss));
 
-                  packet sl ("ix");
+          bg_scrub = BG_SCRUB_RATE;
 
-                  sl << ber32 (ix.idx)
-                     << ber32 (ix.ofs)
-                     << data (d->data.data () + ix.ofs, chunk);
+          while (avail > 0)
+            {
+              ixsend &ix = ixface.back ();
 
-                  send_packet (sl);
-                }
-              else
+              if (facedata *d = face_data (ix.idx, faceset))
                 {
-                  send_image (ix.idx);
-                  ix.ofs = 0;
+                  if (fxix)
+                    {
+                      // only transfer something if the amount of data transferred
+                      // has a healthy relation to the header overhead
+                      if (avail <= 40)
+                        break;
+
+                      // 9 bytes is enough for fx_FFFOOO
+                      int chunk = min (min (avail, MAXSOCKBUF - 9), (int)ix.ofs);
+
+                      if (chunk <= 0)
+                        break;
+
+                      ix.ofs -= chunk;
+
+                      //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
+
+                      packet sl ("ix");
+
+                      sl << ber32 (ix.idx)
+                         << ber32 (ix.ofs)
+                         << data (d->data.data () + ix.ofs, chunk);
+
+                      send_packet (sl);
+                    }
+                  else
+                    {
+                      send_image (ix.idx);
+                      ix.ofs = 0;
+                    }
                 }
-            }
-          else
-            ix.ofs = 0;
+              else
+                ix.ofs = 0;
 
-          int consumed = ol - outputbuffer_len ();
+              int consumed = outputbuffer_len () - ol;
 
-          avail      -= consumed;
-          rate_avail -= consumed;
+              avail      -= consumed;
+              rate_avail -= consumed;
 
-          ol = outputbuffer_len ();
+              ol = outputbuffer_len ();
 
-          if (!ix.ofs)
-            {
-              ixface.pop_back ();
-              if (ixface.empty ())
-                break;
+              if (!ix.ofs)
+                {
+                  ixface.pop_back ();
+
+                  if (ixface.empty ())
+                    break;
+                }
             }
         }
     }