patch updated

Author: ZoltanBojthe

doc/inet4-migration-notes/inet4patch_for_openflow_migration_test.patch

@@ -1,29 +1,29 @@
 diff --git a/src/inet/transportlayer/tcp/Tcp.ned b/src/inet/transportlayer/tcp/Tcp.ned
-index cb940aaec7..1a028372fc 100644
+index 437f92bcbb..f16d58b861 100644
 --- a/src/inet/transportlayer/tcp/Tcp.ned
 +++ b/src/inet/transportlayer/tcp/Tcp.ned
-@@ -156,7 +156,7 @@ simple Tcp like ITcp
+@@ -186,7 +186,7 @@ simple Tcp like ITcp
          string crcMode @enum("declared", "computed") = default("declared");
-         int advertisedWindow = default(14 * this.mss); // In bytes, corresponds with the maximal receiver buffer capacity (Note: normally, NIC queues should be at least this size)
-         bool delayedAcksEnabled = default(false); // Delayed ACK algorithm (RFC 1122) enabled/disabled
+         int advertisedWindow = default(14*this.mss); // in bytes, corresponds with the maximal receiver buffer capacity (Note: normally, NIC queues should be at least this size)
+         bool delayedAcksEnabled = default(false); // delayed ACK algorithm (RFC 1122) enabled/disabled
 -        bool nagleEnabled = default(true); // Nagle's algorithm (RFC 896) enabled/disabled
 +        bool nagleEnabled = default(false); // Nagle's algorithm (RFC 896) enabled/disabled
          bool limitedTransmitEnabled = default(false); // Limited Transmit algorithm (RFC 3042) enabled/disabled (can be used for TcpReno/TcpTahoe/TcpNewReno/TcpNoCongestionControl)
          bool increasedIWEnabled = default(false); // Increased Initial Window (RFC 3390) enabled/disabled
          bool sackSupport = default(false); // Selective Acknowledgment (RFC 2018, 2883, 3517) support (header option) (SACK will be enabled for a connection if both endpoints support it)
 diff --git a/src/inet/transportlayer/tcp/TcpConnectionUtil.cc b/src/inet/transportlayer/tcp/TcpConnectionUtil.cc
-index 8c1f006965..7a0b5bdde7 100644
+index a1b2b0e8d8..8e7f0dba40 100644
 --- a/src/inet/transportlayer/tcp/TcpConnectionUtil.cc
 +++ b/src/inet/transportlayer/tcp/TcpConnectionUtil.cc
-@@ -908,6 +908,7 @@ bool TcpConnection::sendData(uint32_t congestionWindow)
+@@ -889,6 +889,7 @@ bool TcpConnection::sendData(uint32_t congestionWindow)
      // start sending 'bytesToSend' bytes
      EV_INFO << "May send " << bytesToSend << " bytes (effectiveWindow " << effectiveWin << ", in buffer " << buffered << " bytes)\n";
 
 +
      // send whole segments
      while (bytesToSend >= effectiveMss) {
          uint32_t sentBytes = sendSegment(effectiveMss);
-@@ -923,8 +924,11 @@ bool TcpConnection::sendData(uint32_t congestionWindow)
+@@ -904,8 +905,11 @@ bool TcpConnection::sendData(uint32_t congestionWindow)
          bool containsFin = state->send_fin && (state->snd_nxt + bytesToSend) == state->snd_fin_seq;
          if (state->nagle_enabled && unacknowledgedData && !containsFin)
              EV_WARN << "Cannot send (last) segment due to Nagle, not enough data for a full segment\n";