Changeset 50192 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 23, 2014 5:14:52 PM (11 years ago)

Author:

vboxsync

Message:

lwip: Sync with git master up to
commit 32b1a9fc8a335c4c771023dd8ace9db9fd814ad1
Date: Sat Jan 18 21:40:17 2014 +0100

tcp_rexmit_rto: update pcb->unsent_oversize for TCP_OVERSIZE_DBGCHECK
to match assertion in tcp_write().

Location:

trunk/src/VBox/Devices/Network/lwip-new

Files:

• CHANGELOG (modified) (1 diff)
• src/core/tcp_out.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/CHANGELOG

@@ -84 +84 @@
 
  ++ Bugfixes:
+
+  2014-01-18: Brian Fahs
+  * tcp_out.c: patch #8237: tcp_rexmit_rto fails to update pcb->unsent_oversize
+    when necessary
 
   2014-01-17: Grant Erickson, Jay Logue, Simon Goldschmidt

trunk/src/VBox/Devices/Network/lwip-new/src/core/tcp_out.c

@@ -1263 +1263 @@
   /* concatenate unsent queue after unacked queue */
   seg->next = pcb->unsent;
+#if TCP_OVERSIZE && TCP_OVERSIZE_DBGCHECK
+  /* if last unsent changed, we need to update unsent_oversize */
+  if (pcb->unsent == NULL) {
+    pcb->unsent_oversize = seg->oversize_left;
+  }
+#endif /* TCP_OVERSIZE && TCP_OVERSIZE_DBGCHECK*/
   /* unsent queue is the concatenated queue (of unacked, unsent) */
   pcb->unsent = pcb->unacked;
   /* unacked queue is now empty */
   pcb->unacked = NULL;
-  /* last unsent hasn't changed, no need to reset unsent_oversize */
 
   /* increment number of retransmissions */