author | Tom Henderson <tomh@tomh.org> |
Wed, 17 Nov 2010 16:17:35 -0800 | |
changeset 6667 | 3e7336abae57 |
parent 6448 | 184a509cc71d |
child 6668 | 46e44607166f |
permissions | -rw-r--r-- |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1 |
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
2 |
/* |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
3 |
* Copyright (c) 2007 Georgia Tech Research Corporation |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
4 |
* |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
8 |
* |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
12 |
* GNU General Public License for more details. |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
13 |
* |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
17 |
* |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
18 |
* Author: Raj Bhattacharjea <raj.b@gatech.edu> |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
19 |
*/ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
20 |
|
5887 | 21 |
#define NS_LOG_APPEND_CONTEXT \ |
22 |
if (m_node) { std::clog << Simulator::Now ().GetSeconds () << " [node " << m_node->GetId () << "] "; } |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
23 |
|
4622
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
24 |
#include "ns3/abort.h" |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
25 |
#include "ns3/node.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
26 |
#include "ns3/inet-socket-address.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
27 |
#include "ns3/log.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
28 |
#include "ns3/ipv4.h" |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
29 |
#include "ns3/ipv4-interface-address.h" |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
30 |
#include "ns3/ipv4-route.h" |
4560
2f106fd728ab
Remove static routing dependencies in code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4505
diff
changeset
|
31 |
#include "ns3/ipv4-routing-protocol.h" |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
32 |
#include "ns3/simulation-singleton.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
33 |
#include "ns3/simulator.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
34 |
#include "ns3/packet.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
35 |
#include "ns3/uinteger.h" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
36 |
#include "ns3/trace-source-accessor.h" |
4560
2f106fd728ab
Remove static routing dependencies in code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4505
diff
changeset
|
37 |
#include "tcp-typedefs.h" |
2f106fd728ab
Remove static routing dependencies in code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4505
diff
changeset
|
38 |
#include "tcp-socket-impl.h" |
2f106fd728ab
Remove static routing dependencies in code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4505
diff
changeset
|
39 |
#include "tcp-l4-protocol.h" |
2f106fd728ab
Remove static routing dependencies in code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4505
diff
changeset
|
40 |
#include "ipv4-end-point.h" |
4740
34acfd7ad508
export headers from internet-stack
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4627
diff
changeset
|
41 |
#include "tcp-header.h" |
34acfd7ad508
export headers from internet-stack
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4627
diff
changeset
|
42 |
#include "rtt-estimator.h" |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
43 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
44 |
#include <algorithm> |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
45 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
46 |
NS_LOG_COMPONENT_DEFINE ("TcpSocketImpl"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
47 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
48 |
namespace ns3 { |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
49 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
50 |
NS_OBJECT_ENSURE_REGISTERED (TcpSocketImpl); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
51 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
52 |
TypeId |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
53 |
TcpSocketImpl::GetTypeId () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
54 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
55 |
static TypeId tid = TypeId("ns3::TcpSocketImpl") |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
56 |
.SetParent<TcpSocket> () |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
57 |
.AddTraceSource ("CongestionWindow", |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
58 |
"The TCP connection's congestion window", |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
59 |
MakeTraceSourceAccessor (&TcpSocketImpl::m_cWnd)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
60 |
; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
61 |
return tid; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
62 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
63 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
64 |
TcpSocketImpl::TcpSocketImpl () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
65 |
: m_skipRetxResched (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
66 |
m_dupAckCount (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
67 |
m_delAckCount (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
68 |
m_endPoint (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
69 |
m_node (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
70 |
m_tcp (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
71 |
m_errno (ERROR_NOTERROR), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
72 |
m_shutdownSend (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
73 |
m_shutdownRecv (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
74 |
m_connected (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
75 |
m_state (CLOSED), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
76 |
m_closeNotified (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
77 |
m_closeRequestNotified (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
78 |
m_closeOnEmpty (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
79 |
m_pendingClose (false), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
80 |
m_nextTxSequence (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
81 |
m_highTxMark (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
82 |
m_highestRxAck (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
83 |
m_lastRxAck (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
84 |
m_nextRxSequence (0), |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
85 |
m_finSequence (0), |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
86 |
m_rxAvailable (0), |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
87 |
m_rxBufSize (0), |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
88 |
m_pendingData (0), |
4627
d132345b3e10
quiet valgrind during attribute initialization
Craig Dowell <craigdo@ee.washington.edu>
parents:
4625
diff
changeset
|
89 |
m_segmentSize (0), // For attribute initialization consistency (quiet valgrind) |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
90 |
m_rxWindowSize (0), |
4627
d132345b3e10
quiet valgrind during attribute initialization
Craig Dowell <craigdo@ee.washington.edu>
parents:
4625
diff
changeset
|
91 |
m_initialCWnd (0), // For attribute initialization consistency (quiet valgrind) |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
92 |
m_persistTime (Seconds(6)), //XXX hook this into attributes? |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
93 |
m_rtt (0), |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
94 |
m_lastMeasuredRtt (Seconds(0.0)) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
95 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
96 |
NS_LOG_FUNCTION (this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
97 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
98 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
99 |
TcpSocketImpl::TcpSocketImpl(const TcpSocketImpl& sock) |
3475
8523b98f949c
Make PacketSink multitasking for TCP (closes bug 244)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3327
diff
changeset
|
100 |
: TcpSocket(sock), //copy object::m_tid, copy socket::callbacks |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
101 |
m_skipRetxResched (sock.m_skipRetxResched), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
102 |
m_dupAckCount (sock.m_dupAckCount), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
103 |
m_delAckCount (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
104 |
m_delAckMaxCount (sock.m_delAckMaxCount), |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
105 |
m_delAckTimeout (sock.m_delAckTimeout), |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
106 |
m_endPoint (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
107 |
m_node (sock.m_node), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
108 |
m_tcp (sock.m_tcp), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
109 |
m_errno (sock.m_errno), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
110 |
m_shutdownSend (sock.m_shutdownSend), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
111 |
m_shutdownRecv (sock.m_shutdownRecv), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
112 |
m_connected (sock.m_connected), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
113 |
m_state (sock.m_state), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
114 |
m_closeNotified (sock.m_closeNotified), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
115 |
m_closeRequestNotified (sock.m_closeRequestNotified), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
116 |
m_closeOnEmpty (sock.m_closeOnEmpty), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
117 |
m_pendingClose (sock.m_pendingClose), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
118 |
m_nextTxSequence (sock.m_nextTxSequence), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
119 |
m_highTxMark (sock.m_highTxMark), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
120 |
m_highestRxAck (sock.m_highestRxAck), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
121 |
m_lastRxAck (sock.m_lastRxAck), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
122 |
m_nextRxSequence (sock.m_nextRxSequence), |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
123 |
m_finSequence (sock.m_finSequence), |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
124 |
m_rxAvailable (0), |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
125 |
m_rxBufSize (0), |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
126 |
m_pendingData (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
127 |
m_segmentSize (sock.m_segmentSize), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
128 |
m_rxWindowSize (sock.m_rxWindowSize), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
129 |
m_cWnd (sock.m_cWnd), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
130 |
m_ssThresh (sock.m_ssThresh), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
131 |
m_initialCWnd (sock.m_initialCWnd), |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
132 |
m_persistTime (sock.m_persistTime), |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
133 |
m_rtt (0), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
134 |
m_lastMeasuredRtt (Seconds(0.0)), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
135 |
m_cnTimeout (sock.m_cnTimeout), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
136 |
m_cnCount (sock.m_cnCount), |
3251 | 137 |
m_sndBufSize (sock.m_sndBufSize), |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
138 |
m_rxBufMaxSize(sock.m_rxBufMaxSize) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
139 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
140 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
141 |
NS_LOG_LOGIC("Invoked the copy constructor"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
142 |
//copy the pending data if necessary |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
143 |
if(sock.m_pendingData) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
144 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
145 |
m_pendingData = sock.m_pendingData->Copy(); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
146 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
147 |
//copy the rtt if necessary |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
148 |
if (sock.m_rtt) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
149 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
150 |
m_rtt = sock.m_rtt->Copy(); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
151 |
} |
4014
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
152 |
//null out the socket base class callbacks, |
3475
8523b98f949c
Make PacketSink multitasking for TCP (closes bug 244)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3327
diff
changeset
|
153 |
//make user of the socket register this explicitly |
4014
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
154 |
Callback<void, Ptr< Socket > > vPS = |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
155 |
MakeNullCallback<void, Ptr<Socket> > (); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
156 |
Callback<void, Ptr<Socket>, const Address &> vPSA = |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
157 |
MakeNullCallback<void, Ptr<Socket>, const Address &> (); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
158 |
Callback<void, Ptr<Socket>, uint32_t> vPSUI = |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
159 |
MakeNullCallback<void, Ptr<Socket>, uint32_t> (); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
160 |
|
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
161 |
SetConnectCallback (vPS, vPS); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
162 |
SetDataSentCallback (vPSUI); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
163 |
SetSendCallback (vPSUI); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
164 |
SetRecvCallback (vPS); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
165 |
//can't "copy" the endpoint just yes, must do this when we know the peer info |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
166 |
//too; this is in SYN_ACK_TX |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
167 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
168 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
169 |
TcpSocketImpl::~TcpSocketImpl () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
170 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
171 |
NS_LOG_FUNCTION(this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
172 |
m_node = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
173 |
if (m_endPoint != 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
174 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
175 |
NS_ASSERT (m_tcp != 0); |
4621
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
176 |
/* |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
177 |
* Note that this piece of code is seriously convoluted: When we do a |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
178 |
* Bind we allocate an Ipv4Endpoint. Immediately thereafter we always do |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
179 |
* a FinishBind which sets the DestroyCallback of that endpoint to be |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
180 |
* TcpSocketImpl::Destroy, below. When m_tcp->DeAllocate is called, it |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
181 |
* will in turn call into Ipv4EndpointDemux::DeAllocate with the endpoint |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
182 |
* (m_endPoint). The demux will look up the endpoint and destroy it (the |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
183 |
* corollary is that we don't own the object pointed to by m_endpoint, we |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
184 |
* just borrowed it). The destructor for the endpoint will call the |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
185 |
* DestroyCallback which will then invoke TcpSocketImpl::Destroy below. |
4627
d132345b3e10
quiet valgrind during attribute initialization
Craig Dowell <craigdo@ee.washington.edu>
parents:
4625
diff
changeset
|
186 |
* Destroy will zero m_node, m_tcp and m_endpoint. The zero of m_node and |
d132345b3e10
quiet valgrind during attribute initialization
Craig Dowell <craigdo@ee.washington.edu>
parents:
4625
diff
changeset
|
187 |
* m_tcp need to be here also in case the endpoint is deallocated before |
d132345b3e10
quiet valgrind during attribute initialization
Craig Dowell <craigdo@ee.washington.edu>
parents:
4625
diff
changeset
|
188 |
* shutdown. |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
189 |
*/ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
190 |
NS_ASSERT (m_endPoint != 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
191 |
m_tcp->DeAllocate (m_endPoint); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
192 |
NS_ASSERT (m_endPoint == 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
193 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
194 |
m_tcp = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
195 |
delete m_pendingData; //prevents leak |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
196 |
m_pendingData = 0; |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
197 |
CancelAllTimers(); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
198 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
199 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
200 |
void |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
201 |
TcpSocketImpl::SetNode (Ptr<Node> node) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
202 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
203 |
m_node = node; |
4622
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
204 |
/* |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
205 |
* Set the congestion window to IW. This method is called from the L4 |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
206 |
* Protocol after it creates the socket. The Attribute system takes |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
207 |
* care of setting m_initialCWnd and m_segmentSize to their default |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
208 |
* values. m_cWnd depends on m_initialCwnd and m_segmentSize so it |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
209 |
* also needs to be updated in SetInitialCwnd and SetSegSize. |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
210 |
*/ |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
211 |
m_cWnd = m_initialCWnd * m_segmentSize; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
212 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
213 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
214 |
void |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
215 |
TcpSocketImpl::SetTcp (Ptr<TcpL4Protocol> tcp) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
216 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
217 |
m_tcp = tcp; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
218 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
219 |
void |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
220 |
TcpSocketImpl::SetRtt (Ptr<RttEstimator> rtt) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
221 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
222 |
m_rtt = rtt; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
223 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
224 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
225 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
226 |
enum Socket::SocketErrno |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
227 |
TcpSocketImpl::GetErrno (void) const |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
228 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
229 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
230 |
return m_errno; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
231 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
232 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
233 |
Ptr<Node> |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
234 |
TcpSocketImpl::GetNode (void) const |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
235 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
236 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
237 |
return m_node; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
238 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
239 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
240 |
void |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
241 |
TcpSocketImpl::Destroy (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
242 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
243 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
244 |
m_node = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
245 |
m_endPoint = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
246 |
m_tcp = 0; |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
247 |
NS_LOG_LOGIC (this<<" Cancelled ReTxTimeout event which was set to expire at " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
248 |
<< (Simulator::Now () + |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
249 |
Simulator::GetDelayLeft (m_retxEvent)).GetSeconds()); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
250 |
CancelAllTimers(); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
251 |
} |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
252 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
253 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
254 |
TcpSocketImpl::FinishBind (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
255 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
256 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
257 |
if (m_endPoint == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
258 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
259 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
260 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
261 |
m_endPoint->SetRxCallback (MakeCallback (&TcpSocketImpl::ForwardUp, Ptr<TcpSocketImpl>(this))); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
262 |
m_endPoint->SetDestroyCallback (MakeCallback (&TcpSocketImpl::Destroy, Ptr<TcpSocketImpl>(this))); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
263 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
264 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
265 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
266 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
267 |
TcpSocketImpl::Bind (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
268 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
269 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
270 |
m_endPoint = m_tcp->Allocate (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
271 |
return FinishBind (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
272 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
273 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
274 |
TcpSocketImpl::Bind (const Address &address) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
275 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
276 |
NS_LOG_FUNCTION (this<<address); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
277 |
if (!InetSocketAddress::IsMatchingType (address)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
278 |
{ |
3846
265004d6dc15
apply patch for bug 390 (SocketImpl::Bind returns something other than -1)
raj.b@gatech.edu
parents:
3818
diff
changeset
|
279 |
m_errno = ERROR_INVAL; |
265004d6dc15
apply patch for bug 390 (SocketImpl::Bind returns something other than -1)
raj.b@gatech.edu
parents:
3818
diff
changeset
|
280 |
return -1; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
281 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
282 |
InetSocketAddress transport = InetSocketAddress::ConvertFrom (address); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
283 |
Ipv4Address ipv4 = transport.GetIpv4 (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
284 |
uint16_t port = transport.GetPort (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
285 |
if (ipv4 == Ipv4Address::GetAny () && port == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
286 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
287 |
m_endPoint = m_tcp->Allocate (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
288 |
NS_LOG_LOGIC ("TcpSocketImpl "<<this<<" got an endpoint: "<<m_endPoint); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
289 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
290 |
else if (ipv4 == Ipv4Address::GetAny () && port != 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
291 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
292 |
m_endPoint = m_tcp->Allocate (port); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
293 |
NS_LOG_LOGIC ("TcpSocketImpl "<<this<<" got an endpoint: "<<m_endPoint); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
294 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
295 |
else if (ipv4 != Ipv4Address::GetAny () && port == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
296 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
297 |
m_endPoint = m_tcp->Allocate (ipv4); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
298 |
NS_LOG_LOGIC ("TcpSocketImpl "<<this<<" got an endpoint: "<<m_endPoint); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
299 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
300 |
else if (ipv4 != Ipv4Address::GetAny () && port != 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
301 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
302 |
m_endPoint = m_tcp->Allocate (ipv4, port); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
303 |
NS_LOG_LOGIC ("TcpSocketImpl "<<this<<" got an endpoint: "<<m_endPoint); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
304 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
305 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
306 |
return FinishBind (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
307 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
308 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
309 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
310 |
TcpSocketImpl::ShutdownSend (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
311 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
312 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
313 |
m_shutdownSend = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
314 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
315 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
316 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
317 |
TcpSocketImpl::ShutdownRecv (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
318 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
319 |
NS_LOG_FUNCTION_NOARGS (); |
4491
893d48fcf7f3
bug 535: UDP/TCP ShutdownRecv incorrect
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4472
diff
changeset
|
320 |
m_shutdownRecv = true; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
321 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
322 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
323 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
324 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
325 |
TcpSocketImpl::Close (void) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
326 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
327 |
NS_LOG_FUNCTION_NOARGS (); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
328 |
// First we check to see if there is any unread rx data |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
329 |
// Bug number 426 claims we should send reset in this case. |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
330 |
if (!m_bufferedData.empty()) |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
331 |
{ |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
332 |
SendRST(); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
333 |
return 0; |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
334 |
} |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
335 |
|
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
336 |
uint32_t remainingData = 0; |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
337 |
if (m_pendingData) |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
338 |
{ |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
339 |
remainingData = m_pendingData->SizeFromSeq (m_firstPendingSequence, |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
340 |
m_nextTxSequence); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
341 |
} |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
342 |
|
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
343 |
if (remainingData != 0) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
344 |
{ // App close with pending data must wait until all data transmitted |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
345 |
m_closeOnEmpty = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
346 |
NS_LOG_LOGIC("Socket " << this << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
347 |
" deferring close, state " << m_state); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
348 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
349 |
} |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
350 |
m_finSequence = m_nextTxSequence + SequenceNumber32 (1); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
351 |
Actions_t action = ProcessEvent (APP_CLOSE); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
352 |
ProcessAction (action); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
353 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
354 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
355 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
356 |
int |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
357 |
TcpSocketImpl::Connect (const Address & address) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
358 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
359 |
NS_LOG_FUNCTION (this << address); |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
360 |
|
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
361 |
Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> (); |
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
362 |
NS_ASSERT (ipv4 != 0); |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
363 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
364 |
if (m_endPoint == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
365 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
366 |
if (Bind () == -1) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
367 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
368 |
NS_ASSERT (m_endPoint == 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
369 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
370 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
371 |
NS_ASSERT (m_endPoint != 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
372 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
373 |
InetSocketAddress transport = InetSocketAddress::ConvertFrom (address); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
374 |
m_endPoint->SetPeer(transport.GetIpv4 (), transport.GetPort ()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
375 |
|
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
376 |
if (ipv4->GetRoutingProtocol () != 0) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
377 |
{ |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
378 |
Ipv4Header header; |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
379 |
header.SetDestination (m_endPoint->GetPeerAddress()); |
4567
32ca321e4fe7
Bug 597: Ns-3 doesn't compile under MingWin
Faker Moatamri <faker.moatamri@sophia.inria.fr>
parents:
4560
diff
changeset
|
380 |
Socket::SocketErrno errno_; |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
381 |
Ptr<Ipv4Route> route; |
5856
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
382 |
Ptr<NetDevice> oif = m_boundnetdevice; //specify non-zero if bound to a source address |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
383 |
// XXX here, cache the route in the endpoint? |
4603
67a0a49c1db4
bug 592: Ipv4RoutingProtocol::RouteOutput needs a packet pointer argument for reactive protocols
Josh Pelkey <joshpelkey@gmail.com>
parents:
4567
diff
changeset
|
384 |
route = ipv4->GetRoutingProtocol ()->RouteOutput (Ptr<Packet> (), header, oif, errno_); |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
385 |
if (route != 0) |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
386 |
{ |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
387 |
NS_LOG_LOGIC ("Route exists"); |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
388 |
m_endPoint->SetLocalAddress (route->GetSource ()); |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
389 |
} |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
390 |
else |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
391 |
{ |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
392 |
NS_LOG_LOGIC ("TcpSocketImpl::Connect(): Route to " << m_endPoint->GetPeerAddress() << " does not exist"); |
4567
32ca321e4fe7
Bug 597: Ns-3 doesn't compile under MingWin
Faker Moatamri <faker.moatamri@sophia.inria.fr>
parents:
4560
diff
changeset
|
393 |
NS_LOG_ERROR (errno_); |
32ca321e4fe7
Bug 597: Ns-3 doesn't compile under MingWin
Faker Moatamri <faker.moatamri@sophia.inria.fr>
parents:
4560
diff
changeset
|
394 |
m_errno = errno_; |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
395 |
return -1; |
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
396 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
397 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
398 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
399 |
{ |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
400 |
NS_FATAL_ERROR ("No Ipv4RoutingProtocol in the node"); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
401 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
402 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
403 |
Actions_t action = ProcessEvent (APP_CONNECT); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
404 |
bool success = ProcessAction (action); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
405 |
if (success) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
406 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
407 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
408 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
409 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
410 |
} |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
411 |
|
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
412 |
//p here is just data, no headers |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
413 |
int |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
414 |
TcpSocketImpl::Send (Ptr<Packet> p, uint32_t flags) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
415 |
{ |
3250
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
416 |
NS_LOG_FUNCTION (this << p); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
417 |
if (m_state == ESTABLISHED || m_state == SYN_SENT || m_state == CLOSE_WAIT) |
3250
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
418 |
{ |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
419 |
if (p->GetSize() > GetTxAvailable ()) |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
420 |
{ |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
421 |
m_errno = ERROR_MSGSIZE; |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
422 |
return -1; |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
423 |
} |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
424 |
if (!m_pendingData) |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
425 |
{ |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
426 |
m_pendingData = new PendingData (); // Create if non-existent |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
427 |
m_firstPendingSequence = m_nextTxSequence; // Note seq of first |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
428 |
} |
3250
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
429 |
//PendingData::Add stores a copy of the Ptr p |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
430 |
m_pendingData->Add (p); |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
431 |
NS_LOG_DEBUG("TcpSock::Send, pdsize " << m_pendingData->Size() << |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
432 |
" state " << m_state); |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
433 |
Actions_t action = ProcessEvent (APP_SEND); |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
434 |
NS_LOG_DEBUG(" action " << action); |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
435 |
if (!ProcessAction (action)) |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
436 |
{ |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
437 |
return -1; // Failed, return zero |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
438 |
} |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
439 |
return p->GetSize(); |
464a2a2690e8
Update tcpsocket to use Ptr<Packet> in Send
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3248
diff
changeset
|
440 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
441 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
442 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
443 |
m_errno = ERROR_NOTCONN; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
444 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
445 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
446 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
447 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
448 |
int TcpSocketImpl::DoSendTo (Ptr<Packet> p, const Address &address) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
449 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
450 |
NS_LOG_FUNCTION (this << p << address); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
451 |
InetSocketAddress transport = InetSocketAddress::ConvertFrom (address); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
452 |
Ipv4Address ipv4 = transport.GetIpv4 (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
453 |
uint16_t port = transport.GetPort (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
454 |
return DoSendTo (p, ipv4, port); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
455 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
456 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
457 |
int TcpSocketImpl::DoSendTo (Ptr<Packet> p, Ipv4Address ipv4, uint16_t port) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
458 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
459 |
NS_LOG_FUNCTION (this << p << ipv4 << port); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
460 |
if (m_endPoint == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
461 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
462 |
if (Bind () == -1) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
463 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
464 |
NS_ASSERT (m_endPoint == 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
465 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
466 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
467 |
NS_ASSERT (m_endPoint != 0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
468 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
469 |
if (m_shutdownSend) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
470 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
471 |
m_errno = ERROR_SHUTDOWN; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
472 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
473 |
} |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
474 |
// Get the size before sending to tcp, as the sent callback cares |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
475 |
// about payload sent, not with headers |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
476 |
uint32_t sentSize = p->GetSize(); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
477 |
m_tcp->Send (p, m_endPoint->GetLocalAddress (), ipv4, |
5856
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
478 |
m_endPoint->GetLocalPort (), port, m_boundnetdevice); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
479 |
NotifyDataSent (sentSize); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
480 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
481 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
482 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
483 |
int |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
484 |
TcpSocketImpl::SendTo (Ptr<Packet> p, uint32_t flags, const Address &address) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
485 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
486 |
NS_LOG_FUNCTION (this << address << p); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
487 |
if (!m_connected) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
488 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
489 |
m_errno = ERROR_NOTCONN; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
490 |
return -1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
491 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
492 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
493 |
{ |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
494 |
return Send (p, flags); //drop the address according to BSD manpages |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
495 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
496 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
497 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
498 |
uint32_t |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
499 |
TcpSocketImpl::GetTxAvailable (void) const |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
500 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
501 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
502 |
if (m_pendingData != 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
503 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
504 |
uint32_t unAckedDataSize = |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
505 |
m_pendingData->SizeFromSeq (m_firstPendingSequence, m_highestRxAck); |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
506 |
NS_ASSERT (m_sndBufSize >= unAckedDataSize); //else a logical error |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
507 |
return m_sndBufSize-unAckedDataSize; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
508 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
509 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
510 |
{ |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
511 |
return m_sndBufSize; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
512 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
513 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
514 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
515 |
int |
3772
f0d8608ab155
Remove queue limit from listen
Craig Dowell <craigdo@ee.washington.edu>
parents:
3644
diff
changeset
|
516 |
TcpSocketImpl::Listen (void) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
517 |
{ |
3772
f0d8608ab155
Remove queue limit from listen
Craig Dowell <craigdo@ee.washington.edu>
parents:
3644
diff
changeset
|
518 |
NS_LOG_FUNCTION (this); |
3966
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
519 |
// Linux quits EINVAL if we're not closed, so match what they do |
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
520 |
if (m_state != CLOSED) |
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
521 |
{ |
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
522 |
m_errno = ERROR_INVAL; |
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
523 |
return -1; |
b2f4788d3db7
Fix bug358; return EINVAL for inappropriate listen() call
Tom Henderson <tomh@tomh.org>
parents:
3846
diff
changeset
|
524 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
525 |
Actions_t action = ProcessEvent (APP_LISTEN); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
526 |
ProcessAction (action); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
527 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
528 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
529 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
530 |
Ptr<Packet> |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
531 |
TcpSocketImpl::Recv (uint32_t maxSize, uint32_t flags) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
532 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
533 |
NS_LOG_FUNCTION_NOARGS (); |
3245
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
534 |
if(m_bufferedData.empty()) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
535 |
{ |
4014
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
536 |
if(m_state == CLOSE_WAIT) //means EOF |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
537 |
{ |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
538 |
return Create<Packet>(); |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
539 |
} |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
540 |
//else, means nothing to read |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
541 |
return 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
542 |
} |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
543 |
UnAckData_t out; //serves as buffer to return up to the user |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
544 |
UnAckData_t::iterator i; |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
545 |
while (!m_bufferedData.empty ()) |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
546 |
{ // Check the buffered data for delivery |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
547 |
NS_LOG_LOGIC("TCP " << this << " bufferedData.size() " |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
548 |
<< m_bufferedData.size () |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
549 |
<< " time " << Simulator::Now ()); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
550 |
i = m_bufferedData.begin (); |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
551 |
SequenceNumber32 s1 (0); |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
552 |
if (i->first > m_nextRxSequence) |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
553 |
{ |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
554 |
break; // we're done, no more in-sequence data exits |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
555 |
} |
3245
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
556 |
else // (i->first <= m_nextRxSequence) |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
557 |
{ // Two cases here. |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
558 |
// 1) seq + length > nextRxSeq, can deliver partial |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
559 |
// 2) seq + length <= nextRxSeq, deliver whole |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
560 |
s1 = i->second->GetSize (); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
561 |
if (i->first + s1 > m_nextRxSequence) |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
562 |
{ // Remove partial data to prepare for delivery |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
563 |
uint32_t avail = s1 + i->first - m_nextRxSequence; |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
564 |
i->second = i->second->CreateFragment (0, avail); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
565 |
} |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
566 |
// else this packet is okay to deliver whole |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
567 |
// so don't do anything else and output it |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
568 |
out[i->first] = i->second; |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
569 |
} |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
570 |
m_rxAvailable -= i->second->GetSize (); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
571 |
m_rxBufSize -= i->second->GetSize (); |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
572 |
m_bufferedData.erase (i); // Remove from list |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
573 |
} |
3245
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
574 |
if (out.size() == 0) |
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
575 |
{ |
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
576 |
return 0; |
ad57fb768f3a
Fix up recv buffer stuff some more
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3244
diff
changeset
|
577 |
} |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
578 |
Ptr<Packet> outPacket = Create<Packet>(); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
579 |
for(i = out.begin(); i!=out.end(); ++i) |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
580 |
{ |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
581 |
if (outPacket->GetSize() + i->second->GetSize() <= maxSize ) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
582 |
{ |
3248 | 583 |
outPacket->AddAtEnd(i->second); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
584 |
} |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
585 |
else |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
586 |
{ |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
587 |
//only append as much as will fit |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
588 |
uint32_t avail = maxSize - outPacket->GetSize(); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
589 |
outPacket->AddAtEnd(i->second->CreateFragment(0,avail)); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
590 |
//put the rest back into the buffer |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
591 |
m_bufferedData[i->first+SequenceNumber32(avail)] |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
592 |
= i->second->CreateFragment(avail,i->second->GetSize()-avail); |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
593 |
m_rxAvailable += i->second->GetSize()-avail; |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
594 |
m_rxBufSize += i->second->GetSize()-avail; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
595 |
} |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
596 |
} |
4502 | 597 |
SocketAddressTag tag; |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
598 |
tag.SetAddress (InetSocketAddress (m_endPoint->GetPeerAddress(), m_endPoint->GetPeerPort())); |
4502 | 599 |
outPacket->AddPacketTag (tag); |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
600 |
return outPacket; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
601 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
602 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
603 |
uint32_t |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
604 |
TcpSocketImpl::GetRxAvailable (void) const |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
605 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
606 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
607 |
// We separately maintain this state to avoid walking the queue |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
608 |
// every time this might be called |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
609 |
return m_rxAvailable; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
610 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
611 |
|
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
612 |
Ptr<Packet> |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
613 |
TcpSocketImpl::RecvFrom (uint32_t maxSize, uint32_t flags, |
4502 | 614 |
Address &fromAddress) |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
615 |
{ |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
616 |
NS_LOG_FUNCTION (this << maxSize << flags); |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
617 |
Ptr<Packet> packet = Recv (maxSize, flags); |
4014
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
618 |
//Null packet means no data to read, and an empty packet indicates EOF |
b6349d9c007e
Null forked TCP socket callbacks, and communicate EOF to higher layers (bugs 423 and 365)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3975
diff
changeset
|
619 |
if (packet != 0 && packet->GetSize() != 0) |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
620 |
{ |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
621 |
SocketAddressTag tag; |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
622 |
bool found; |
4502 | 623 |
found = packet->PeekPacketTag (tag); |
3269
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
624 |
NS_ASSERT (found); |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
625 |
fromAddress = tag.GetAddress (); |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
626 |
} |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
627 |
return packet; |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
628 |
} |
448134601b03
RecvFrom() expansion, add flags parameter to some Send calls
Tom Henderson <tomh@tomh.org>
parents:
3251
diff
changeset
|
629 |
|
3778
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
630 |
int |
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
631 |
TcpSocketImpl::GetSockName (Address &address) const |
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
632 |
{ |
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
633 |
NS_LOG_FUNCTION_NOARGS (); |
6093
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
634 |
if (m_endPoint != 0) |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
635 |
{ |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
636 |
address = InetSocketAddress (m_endPoint->GetLocalAddress (), |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
637 |
m_endPoint->GetLocalPort ()); |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
638 |
} |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
639 |
else |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
640 |
{ |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
641 |
// It is possible to call this method on a socket without a name |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
642 |
// in which case, behavior is unspecified |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
643 |
address = InetSocketAddress (Ipv4Address::GetZero (), 0); |
bf2ffaeca24f
[bug 810] Tcp GetSockName() for unconnected sockets
Bill Roome <wdr@bell-labs.com>
parents:
5984
diff
changeset
|
644 |
} |
3778
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
645 |
return 0; |
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
646 |
} |
78c4c41557f3
Liu's GetSockName patch
Craig Dowell <craigdo@ee.washington.edu>
parents:
3772
diff
changeset
|
647 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
648 |
void |
5856
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
649 |
TcpSocketImpl::BindToNetDevice (Ptr<NetDevice> netdevice) |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
650 |
{ |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
651 |
NS_LOG_FUNCTION (netdevice); |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
652 |
Socket::BindToNetDevice (netdevice); // Includes sanity check |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
653 |
if (m_endPoint == 0) |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
654 |
{ |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
655 |
if (Bind () == -1) |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
656 |
{ |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
657 |
NS_ASSERT (m_endPoint == 0); |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
658 |
return; |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
659 |
} |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
660 |
NS_ASSERT (m_endPoint != 0); |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
661 |
} |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
662 |
m_endPoint->BindToNetDevice (netdevice); |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
663 |
return; |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
664 |
} |
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
665 |
|
7fd20c798a7d
bug 742: Implementation of SO_BINDTODEVICE
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
5378
diff
changeset
|
666 |
void |
6442
f380cf1aa4d8
Bug 671 add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
Hajime Tazaki <tazaki@sfc.wide.ad.jp>
parents:
6437
diff
changeset
|
667 |
TcpSocketImpl::ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port, |
f380cf1aa4d8
Bug 671 add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
Hajime Tazaki <tazaki@sfc.wide.ad.jp>
parents:
6437
diff
changeset
|
668 |
Ptr<Ipv4Interface> incomingInterface) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
669 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
670 |
NS_LOG_DEBUG("Socket " << this << " got forward up" << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
671 |
" dport " << m_endPoint->GetLocalPort() << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
672 |
" daddr " << m_endPoint->GetLocalAddress() << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
673 |
" sport " << m_endPoint->GetPeerPort() << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
674 |
" saddr " << m_endPoint->GetPeerAddress()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
675 |
|
6442
f380cf1aa4d8
Bug 671 add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
Hajime Tazaki <tazaki@sfc.wide.ad.jp>
parents:
6437
diff
changeset
|
676 |
NS_LOG_FUNCTION (this << packet << header << port); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
677 |
|
6442
f380cf1aa4d8
Bug 671 add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
Hajime Tazaki <tazaki@sfc.wide.ad.jp>
parents:
6437
diff
changeset
|
678 |
Address fromAddress = InetSocketAddress (header.GetSource (), port); |
f380cf1aa4d8
Bug 671 add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
Hajime Tazaki <tazaki@sfc.wide.ad.jp>
parents:
6437
diff
changeset
|
679 |
Address toAddress = InetSocketAddress (header.GetDestination (), m_endPoint->GetLocalPort()); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
680 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
681 |
TcpHeader tcpHeader; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
682 |
packet->RemoveHeader (tcpHeader); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
683 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
684 |
if (tcpHeader.GetFlags () & TcpHeader::ACK) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
685 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
686 |
Time m = m_rtt->AckSeq (tcpHeader.GetAckNumber () ); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
687 |
if (m != Seconds (0.0)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
688 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
689 |
m_lastMeasuredRtt = m; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
690 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
691 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
692 |
|
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
693 |
if (m_rxWindowSize == 0 && tcpHeader.GetWindowSize () != 0) |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
694 |
{ //persist probes end |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
695 |
NS_LOG_LOGIC (this<<" Leaving zerowindow persist state"); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
696 |
m_persistEvent.Cancel (); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
697 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
698 |
m_rxWindowSize = tcpHeader.GetWindowSize (); //update the flow control window |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
699 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
700 |
Events_t event = SimulationSingleton<TcpStateMachine>::Get ()->FlagsEvent (tcpHeader.GetFlags () ); |
6255
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
701 |
// Given an ACK_RX event and FIN_WAIT_1, CLOSING, or LAST_ACK state, |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
702 |
// we have to check the sequence numbers to determine if the |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
703 |
// ACK is for the FIN |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
704 |
if ((m_state == FIN_WAIT_1 || m_state == CLOSING |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
705 |
|| m_state == LAST_ACK) && event == ACK_RX) |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
706 |
{ |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
707 |
if (tcpHeader.GetSequenceNumber () == m_nextRxSequence) |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
708 |
{ |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
709 |
// This ACK is for the fin, change event to |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
710 |
// recognize this |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
711 |
event = FIN_ACKED; |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
712 |
} |
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
713 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
714 |
Actions_t action = ProcessEvent (event); //updates the state |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
715 |
NS_LOG_DEBUG("Socket " << this << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
716 |
" processing pkt action, " << action << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
717 |
" current state " << m_state); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
718 |
ProcessPacketAction (action, packet, tcpHeader, fromAddress, toAddress); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
719 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
720 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
721 |
Actions_t TcpSocketImpl::ProcessEvent (Events_t e) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
722 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
723 |
NS_LOG_FUNCTION (this << e); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
724 |
States_t saveState = m_state; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
725 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " processing event " << e); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
726 |
// simulation singleton is a way to get a single global static instance of a |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
727 |
// class intended to be a singleton; see simulation-singleton.h |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
728 |
SA stateAction = SimulationSingleton<TcpStateMachine>::Get ()->Lookup (m_state,e); |
4625
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
729 |
NS_LOG_LOGIC ("TcpSocketImpl::ProcessEvent stateAction " << stateAction.action); |
5931
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
730 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
731 |
bool needCloseNotify = (stateAction.state == CLOSED && m_state != CLOSED |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
732 |
&& e != TIMEOUT); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
733 |
m_state = stateAction.state; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
734 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " moved from state " << saveState |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
735 |
<< " to state " <<m_state); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
736 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " pendingData " << m_pendingData); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
737 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
738 |
//extra event logic is here for RX events |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
739 |
//e = SYN_ACK_RX |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
740 |
if (saveState == SYN_SENT && m_state == ESTABLISHED) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
741 |
// this means the application side has completed its portion of |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
742 |
// the handshaking |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
743 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
744 |
Simulator::ScheduleNow(&TcpSocketImpl::ConnectionSucceeded, this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
745 |
m_connected = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
746 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " Connected!"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
747 |
} |
4625
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
748 |
if (saveState < CLOSING && (m_state == CLOSING || m_state == TIMED_WAIT) ) |
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
749 |
{ |
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
750 |
NS_LOG_LOGIC ("TcpSocketImpl peer closing, send EOF to application"); |
6195
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
751 |
if (!m_shutdownRecv) |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
752 |
{ |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
753 |
NotifyDataRecv (); |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
754 |
} |
4625
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
755 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
756 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
757 |
if (needCloseNotify && !m_closeNotified) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
758 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
759 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " transition to CLOSED from " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
760 |
<< m_state << " event " << e << " closeNot " << m_closeNotified |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
761 |
<< " action " << stateAction.action); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
762 |
NotifyNormalClose(); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
763 |
m_closeNotified = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
764 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " calling Closed from PE" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
765 |
<< " origState " << saveState |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
766 |
<< " event " << e); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
767 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " transition to CLOSED from " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
768 |
<< m_state << " event " << e |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
769 |
<< " set CloseNotif "); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
770 |
} |
4621
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
771 |
|
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
772 |
if (m_state == CLOSED && saveState != CLOSED && m_endPoint != 0) |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
773 |
{ |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
774 |
NS_ASSERT (m_tcp != 0); |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
775 |
/* |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
776 |
* We want to deallocate the endpoint now. We can't just naively call |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
777 |
* Deallocate (see the comment in TcpSocketImpl::~TcpSocketImpl), we |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
778 |
* have to turn off the DestroyCallback to keep it from calling back |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
779 |
* into TcpSocketImpl::Destroy and closing pretty much everything down. |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
780 |
* Once we have the callback disconnected, we can DeAllocate the |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
781 |
* endpoint which actually deals with destroying the actual endpoint, |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
782 |
* and then zero our member varible on general principles. |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
783 |
*/ |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
784 |
m_endPoint->SetDestroyCallback(MakeNullCallback<void>()); |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
785 |
m_tcp->DeAllocate (m_endPoint); |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
786 |
m_endPoint = 0; |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
787 |
CancelAllTimers(); |
4621
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
788 |
} |
bb360763b0e2
Fix 559, cpSocketImpl doesnt free endpoint quickly enough after being closed
Ewgenij Starostin <estar@cs.tu-berlin.de>
parents:
4603
diff
changeset
|
789 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
790 |
return stateAction.action; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
791 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
792 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
793 |
void TcpSocketImpl::SendEmptyPacket (uint8_t flags) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
794 |
{ |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
795 |
NS_LOG_FUNCTION (this << (uint32_t)flags); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
796 |
Ptr<Packet> p = Create<Packet> (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
797 |
TcpHeader header; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
798 |
|
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
799 |
if (m_endPoint == 0) |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
800 |
{ |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
801 |
NS_LOG_WARN ("Failed to send empty packet due to null endpoint"); |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
802 |
return; |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
803 |
} |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
804 |
|
4270
5ae6683ea586
add ACKs to naked FINs
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4269
diff
changeset
|
805 |
if (flags & TcpHeader::FIN) |
5ae6683ea586
add ACKs to naked FINs
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4269
diff
changeset
|
806 |
{ |
5ae6683ea586
add ACKs to naked FINs
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4269
diff
changeset
|
807 |
flags |= TcpHeader::ACK; |
5ae6683ea586
add ACKs to naked FINs
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4269
diff
changeset
|
808 |
} |
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
809 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
810 |
header.SetFlags (flags); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
811 |
header.SetSequenceNumber (m_nextTxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
812 |
header.SetAckNumber (m_nextRxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
813 |
header.SetSourcePort (m_endPoint->GetLocalPort ()); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
814 |
header.SetDestinationPort (m_endPoint->GetPeerPort ()); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
815 |
header.SetWindowSize (AdvertisedWindowSize()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
816 |
m_tcp->SendPacket (p, header, m_endPoint->GetLocalAddress (), |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
817 |
m_endPoint->GetPeerAddress (), m_boundnetdevice); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
818 |
Time rto = m_rtt->RetransmitTimeout (); |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
819 |
bool hasSyn = flags & TcpHeader::SYN; |
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
820 |
bool hasFin = flags & TcpHeader::FIN; |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
821 |
bool isAck = flags == TcpHeader::ACK; |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
822 |
if (hasSyn) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
823 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
824 |
rto = m_cnTimeout; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
825 |
m_cnTimeout = m_cnTimeout + m_cnTimeout; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
826 |
m_cnCount--; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
827 |
} |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
828 |
if (m_retxEvent.IsExpired () && (hasSyn || hasFin) && !isAck ) |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
829 |
//no outstanding timer |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
830 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
831 |
NS_LOG_LOGIC ("Schedule retransmission timeout at time " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
832 |
<< Simulator::Now ().GetSeconds () << " to expire at time " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
833 |
<< (Simulator::Now () + rto).GetSeconds ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
834 |
m_retxEvent = Simulator::Schedule (rto, &TcpSocketImpl::ReTxTimeout, this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
835 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
836 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
837 |
|
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
838 |
// This function closes the endpoint completely |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
839 |
void TcpSocketImpl::SendRST() |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
840 |
{ |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
841 |
SendEmptyPacket(TcpHeader::RST); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
842 |
NotifyErrorClose(); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
843 |
CancelAllTimers(); |
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
844 |
if (m_endPoint != 0) |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
845 |
{ |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
846 |
m_endPoint->SetDestroyCallback(MakeNullCallback<void>()); |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
847 |
m_tcp->DeAllocate (m_endPoint); |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
848 |
m_endPoint = 0; |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
849 |
} |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
850 |
} |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
851 |
|
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
852 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
853 |
bool TcpSocketImpl::ProcessAction (Actions_t a) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
854 |
{ // These actions do not require a packet or any TCP Headers |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
855 |
NS_LOG_FUNCTION (this << a); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
856 |
switch (a) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
857 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
858 |
case NO_ACT: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
859 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action: NO_ACT"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
860 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
861 |
case ACK_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
862 |
SendEmptyPacket (TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
863 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
864 |
case ACK_TX_1: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
865 |
NS_ASSERT (false); // This should be processed in ProcessPacketAction |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
866 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
867 |
case RST_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
868 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action RST_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
869 |
SendEmptyPacket (TcpHeader::RST); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
870 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
871 |
case SYN_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
872 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action SYN_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
873 |
// TCP SYN Flag consumes one byte |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
874 |
// is the above correct? we're SENDING a syn, not acking back -- Raj |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
875 |
// commented out for now |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
876 |
// m_nextTxSequence+= 1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
877 |
SendEmptyPacket (TcpHeader::SYN); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
878 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
879 |
case SYN_ACK_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
880 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action SYN_ACK_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
881 |
// TCP SYN Flag consumes one byte |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
882 |
++m_nextRxSequence; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
883 |
SendEmptyPacket (TcpHeader::SYN | TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
884 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
885 |
case FIN_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
886 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action FIN_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
887 |
SendEmptyPacket (TcpHeader::FIN); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
888 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
889 |
case FIN_ACK_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
890 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action FIN_ACK_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
891 |
SendEmptyPacket (TcpHeader::FIN | TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
892 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
893 |
case NEW_ACK: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
894 |
NS_ASSERT (false); // This should be processed in ProcessPacketAction |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
895 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
896 |
case NEW_SEQ_RX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
897 |
NS_ASSERT (false); // This should be processed in ProcessPacketAction |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
898 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
899 |
case RETX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
900 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action RETX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
901 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
902 |
case TX_DATA: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
903 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action TX_DATA"); |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
904 |
SendPendingData (m_connected); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
905 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
906 |
case PEER_CLOSE: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
907 |
NS_ASSERT (false); // This should be processed in ProcessPacketAction |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
908 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action PEER_CLOSE"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
909 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
910 |
case APP_CLOSED: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
911 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action APP_CLOSED"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
912 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
913 |
case CANCEL_TM: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
914 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action CANCEL_TM"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
915 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
916 |
case APP_NOTIFY: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
917 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action APP_NOTIFY"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
918 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
919 |
case SERV_NOTIFY: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
920 |
NS_ASSERT (false); // This should be processed in ProcessPacketAction |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
921 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
922 |
case LAST_ACTION: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
923 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action LAST_ACTION"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
924 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
925 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
926 |
return true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
927 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
928 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
929 |
bool TcpSocketImpl::ProcessPacketAction (Actions_t a, Ptr<Packet> p, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
930 |
const TcpHeader& tcpHeader, |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
931 |
const Address& fromAddress, |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
932 |
const Address& toAddress) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
933 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
934 |
NS_LOG_FUNCTION (this << a << p << fromAddress); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
935 |
Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> (); |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
936 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
937 |
switch (a) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
938 |
{ |
5931
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
939 |
case RST_TX: |
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
940 |
{ |
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
941 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " Action RST_TX"); |
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
942 |
SendRST(); |
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
943 |
return NO_ACT; |
894221b51957
Fix bug 747: Listening TCP socket closes on RST
Fabian Mauchle <fabian.mauchle@hsr.ch>
parents:
5887
diff
changeset
|
944 |
} |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
945 |
case ACK_TX: |
4625
615583240b77
(bug 613) Tcp should NotifyDataRecv () when a FIN arrives
Tom Henderson <tomh@tomh.org>
parents:
4624
diff
changeset
|
946 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action ACK_TX"); |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
947 |
if(tcpHeader.GetFlags() & TcpHeader::FIN) |
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
948 |
{ |
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
949 |
++m_nextRxSequence; //bump this to account for the FIN |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
950 |
m_nextTxSequence = m_finSequence; |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
951 |
} |
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
952 |
SendEmptyPacket (TcpHeader::ACK); |
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
953 |
break; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
954 |
case SYN_ACK_TX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
955 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action SYN_ACK_TX"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
956 |
if (m_state == LISTEN) //this means we should fork a new TcpSocketImpl |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
957 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
958 |
NS_LOG_DEBUG("In SYN_ACK_TX, m_state is LISTEN, this " << this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
959 |
//notify the server that we got a SYN |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
960 |
// If server refuses connection do nothing |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
961 |
if (!NotifyConnectionRequest(fromAddress)) return true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
962 |
// Clone the socket |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
963 |
Ptr<TcpSocketImpl> newSock = Copy (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
964 |
NS_LOG_LOGIC ("Cloned a TcpSocketImpl " << newSock); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
965 |
//this listening socket should do nothing more |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
966 |
Simulator::ScheduleNow (&TcpSocketImpl::CompleteFork, newSock, |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
967 |
p, tcpHeader, fromAddress, toAddress); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
968 |
return true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
969 |
} |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
970 |
else |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
971 |
{ |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
972 |
// This is the cloned endpoint |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
973 |
// TCP SYN consumes one byte |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
974 |
m_nextRxSequence = tcpHeader.GetSequenceNumber () |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
975 |
+ SequenceNumber32 (1); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
976 |
SendEmptyPacket (TcpHeader::SYN | TcpHeader::ACK); |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
977 |
} |
4472
e20a31541404
src/ and utils/ changes for IPv4 routing rework
Tom Henderson <tomh@tomh.org>
parents:
4375
diff
changeset
|
978 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
979 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
980 |
case ACK_TX_1: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
981 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action ACK_TX_1"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
982 |
// TCP SYN consumes one byte |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
983 |
m_nextRxSequence = tcpHeader.GetSequenceNumber() + SequenceNumber32(1); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
984 |
m_nextTxSequence = tcpHeader.GetAckNumber (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
985 |
m_firstPendingSequence = m_nextTxSequence; //bug 166 |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
986 |
NS_LOG_DEBUG ("TcpSocketImpl " << this << " ACK_TX_1" << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
987 |
" nextRxSeq " << m_nextRxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
988 |
SendEmptyPacket (TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
989 |
if (tcpHeader.GetAckNumber () > m_highestRxAck) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
990 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
991 |
m_highestRxAck = tcpHeader.GetAckNumber (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
992 |
// Data freed from the send buffer; notify any blocked sender |
3327
ea16c44eb90d
Apply Patch for Bug 237
Craig Dowell <craigdo@ee.washington.edu>
parents:
3291
diff
changeset
|
993 |
if (GetTxAvailable () > 0) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
994 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
995 |
NotifySend (GetTxAvailable ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
996 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
997 |
} |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
998 |
SendPendingData (m_connected); //send acks if we are connected |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
999 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1000 |
case NEW_ACK: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1001 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action NEW_ACK_TX"); |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1002 |
//check to see of the ACK had data with it; if so, pass it along |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1003 |
//to NEW_SEQ_RX |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1004 |
if(p->GetSize () > 0) |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1005 |
{ |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1006 |
Simulator::ScheduleNow(&TcpSocketImpl::ProcessPacketAction, |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1007 |
this, |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1008 |
NEW_SEQ_RX, |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1009 |
p, |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1010 |
tcpHeader, |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1011 |
fromAddress, |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1012 |
toAddress); |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1013 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1014 |
if (tcpHeader.GetAckNumber () < m_highestRxAck) //old ack, do nothing |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1015 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1016 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1017 |
} |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1018 |
if (tcpHeader.GetAckNumber () == m_highestRxAck) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1019 |
{ |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1020 |
if (tcpHeader.GetAckNumber () < m_nextTxSequence) |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1021 |
{ |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1022 |
DupAck (tcpHeader, ++m_dupAckCount); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1023 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1024 |
NS_ASSERT(tcpHeader.GetAckNumber () <= m_nextTxSequence); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1025 |
//if the ack is precisely equal to the nextTxSequence |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1026 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1027 |
} |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1028 |
if (tcpHeader.GetAckNumber () > m_highestRxAck) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1029 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1030 |
m_dupAckCount = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1031 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1032 |
NewAck (tcpHeader.GetAckNumber ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1033 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1034 |
case NEW_SEQ_RX: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1035 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action NEW_SEQ_RX"); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1036 |
NewRx (p, tcpHeader, fromAddress, toAddress); // Process new data received |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1037 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1038 |
case PEER_CLOSE: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1039 |
{ |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1040 |
NS_LOG_LOGIC("Got Peer Close"); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1041 |
// First we have to be sure the FIN packet was not received |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1042 |
// out of sequence. If so, note pending close and process |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1043 |
// new sequence rx |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1044 |
if (tcpHeader.GetSequenceNumber () != m_nextRxSequence) |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1045 |
{ |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1046 |
if (m_finSequence != m_nextRxSequence) |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1047 |
{ |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1048 |
// process close later |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1049 |
m_finSequence = tcpHeader.GetSequenceNumber () + SequenceNumber32 (p->GetSize ()); |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1050 |
m_pendingClose = true; |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1051 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " setting pendingClose" |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1052 |
<< " rxseq " << tcpHeader.GetSequenceNumber () |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1053 |
<< " nextRxSeq " << m_nextRxSequence); |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1054 |
NewRx (p, tcpHeader, fromAddress, toAddress); |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1055 |
return true; |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1056 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1057 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1058 |
// Now we need to see if any data came with the FIN |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1059 |
// if so, call NewRx, unless NewRx was already called |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1060 |
if (p->GetSize () != 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1061 |
{ |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1062 |
if (m_finSequence != m_nextRxSequence) |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1063 |
{ |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1064 |
NewRx (p, tcpHeader, fromAddress, toAddress); |
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1065 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1066 |
} |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
1067 |
++m_nextRxSequence; //bump this to account for the FIN |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1068 |
States_t saveState = m_state; // Used to see if app responds |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1069 |
NS_LOG_LOGIC ("TcpSocketImpl " << this |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1070 |
<< " peer close, state " << m_state); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1071 |
if (!m_closeRequestNotified) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1072 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1073 |
NS_LOG_LOGIC ("TCP " << this |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1074 |
<< " calling AppCloseRequest"); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1075 |
NotifyNormalClose(); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1076 |
m_closeRequestNotified = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1077 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1078 |
NS_LOG_LOGIC ("TcpSocketImpl " << this |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1079 |
<< " peer close, state after " << m_state); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1080 |
if (m_state == saveState) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1081 |
{ // Need to ack, the application will close later |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1082 |
SendEmptyPacket (TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1083 |
// // Also need to re-tx the ack if we |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1084 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1085 |
if (m_state == LAST_ACK) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1086 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1087 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " scheduling LATO1"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1088 |
m_lastAckEvent = Simulator::Schedule (m_rtt->RetransmitTimeout (), |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1089 |
&TcpSocketImpl::LastAckTimeout,this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1090 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1091 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1092 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1093 |
case SERV_NOTIFY: |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1094 |
NS_LOG_LOGIC ("TcpSocketImpl " << this <<" Action SERV_NOTIFY"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1095 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " Connected!"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1096 |
m_connected = true; // ! This is bogus; fix when we clone the tcp |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1097 |
m_endPoint->SetPeer (m_endPoint->GetPeerAddress(), m_endPoint->GetPeerPort()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1098 |
//treat the connection orientation final ack as a newack |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1099 |
CommonNewAck (tcpHeader.GetAckNumber (), true); |
3532
a88c0d54e43b
Add a test to TcpSocketImpl unit tests
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3529
diff
changeset
|
1100 |
NotifyNewConnectionCreated (this, fromAddress); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1101 |
break; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1102 |
default: |
3643
7afa66c2b291
Fix TCP closedown FINs, and remove broken tcp-erros example (bug 242)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3588
diff
changeset
|
1103 |
return ProcessAction (a); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1104 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1105 |
return true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1106 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1107 |
|
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1108 |
void TcpSocketImpl::CompleteFork(Ptr<Packet> p, const TcpHeader& h, const Address& fromAddress, const Address& toAddress) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1109 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1110 |
// Get port and address from peer (connecting host) |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1111 |
m_endPoint = m_tcp->Allocate (InetSocketAddress::ConvertFrom(toAddress).GetIpv4 (), |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1112 |
InetSocketAddress::ConvertFrom(toAddress).GetPort (), |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1113 |
InetSocketAddress::ConvertFrom (fromAddress).GetIpv4 (), |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1114 |
InetSocketAddress::ConvertFrom (fromAddress).GetPort ()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1115 |
//the cloned socket with be in listen state, so manually change state |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1116 |
m_state = SYN_RCVD; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1117 |
//equivalent to FinishBind |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1118 |
m_endPoint->SetRxCallback (MakeCallback (&TcpSocketImpl::ForwardUp, Ptr<TcpSocketImpl>(this))); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1119 |
m_endPoint->SetDestroyCallback (MakeCallback (&TcpSocketImpl::Destroy, Ptr<TcpSocketImpl>(this))); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1120 |
ProcessPacketAction(SYN_ACK_TX, p, h, fromAddress, toAddress); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1121 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1122 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1123 |
void TcpSocketImpl::ConnectionSucceeded() |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1124 |
{ // We would preferred to have scheduled an event directly to |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1125 |
// NotifyConnectionSucceeded, but (sigh) these are protected |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1126 |
// and we can get the address of it :( |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1127 |
NotifyConnectionSucceeded(); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1128 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1129 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1130 |
bool TcpSocketImpl::SendPendingData (bool withAck) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1131 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1132 |
NS_LOG_FUNCTION (this << withAck); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1133 |
NS_LOG_LOGIC ("ENTERING SendPendingData"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1134 |
if (!m_pendingData) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1135 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1136 |
return false; // No data exists |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1137 |
} |
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1138 |
if (m_endPoint == 0) |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1139 |
{ |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1140 |
NS_LOG_INFO ("TcpSocketImpl::SendPendingData: No endpoint; m_shutdownSend=" << m_shutdownSend); |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1141 |
return false; // Is this the right way to handle this condition? |
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1142 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1143 |
uint32_t nPacketsSent = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1144 |
while (m_pendingData->SizeFromSeq (m_firstPendingSequence, m_nextTxSequence)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1145 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1146 |
uint32_t w = AvailableWindow ();// Get available window size |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1147 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " SendPendingData" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1148 |
<< " w " << w |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1149 |
<< " rxwin " << m_rxWindowSize |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1150 |
<< " cWnd " << m_cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1151 |
<< " segsize " << m_segmentSize |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1152 |
<< " nextTxSeq " << m_nextTxSequence |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1153 |
<< " highestRxAck " << m_highestRxAck |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1154 |
<< " pd->Size " << m_pendingData->Size () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1155 |
<< " pd->SFS " << m_pendingData->SizeFromSeq (m_firstPendingSequence, m_nextTxSequence)); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1156 |
//XXX pd->Size is probably a bug, should be SizeFromSeq(...) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1157 |
if (w < m_segmentSize && m_pendingData->Size () > w) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1158 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1159 |
break; // No more |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1160 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1161 |
uint32_t s = std::min (w, m_segmentSize); // Send no more than window |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1162 |
Ptr<Packet> p = m_pendingData->CopyFromSeq (s, m_firstPendingSequence, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1163 |
m_nextTxSequence); |
3246
d734f62d4921
Change log output to be more consistent
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3245
diff
changeset
|
1164 |
NS_LOG_LOGIC("TcpSocketImpl " << this << " SendPendingData" |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1165 |
<< " txseq " << m_nextTxSequence |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1166 |
<< " s " << s |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1167 |
<< " datasize " << p->GetSize() ); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1168 |
uint8_t flags = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1169 |
uint32_t sz = p->GetSize (); // Size of packet |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1170 |
uint32_t remainingData = m_pendingData->SizeFromSeq( |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1171 |
m_firstPendingSequence, |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1172 |
m_nextTxSequence + SequenceNumber32 (sz)); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1173 |
if (m_closeOnEmpty && (remainingData == 0)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1174 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1175 |
m_finSequence = m_nextTxSequence + SequenceNumber32 (1 + sz); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1176 |
flags = TcpHeader::FIN; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1177 |
m_state = FIN_WAIT_1; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1178 |
} |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1179 |
if (withAck) |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1180 |
{ |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1181 |
flags |= TcpHeader::ACK; |
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1182 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1183 |
TcpHeader header; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1184 |
header.SetFlags (flags); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1185 |
header.SetSequenceNumber (m_nextTxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1186 |
header.SetAckNumber (m_nextRxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1187 |
header.SetSourcePort (m_endPoint->GetLocalPort()); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1188 |
header.SetDestinationPort (m_endPoint->GetPeerPort()); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1189 |
header.SetWindowSize (AdvertisedWindowSize()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1190 |
if (m_shutdownSend) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1191 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1192 |
m_errno = ERROR_SHUTDOWN; |
5984
7a60b058e7b4
[bug 804] null pointer references in internet-stack
Bill Roome <wdr@bell-labs.com>
parents:
5971
diff
changeset
|
1193 |
return false; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1194 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1195 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1196 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1197 |
if (m_retxEvent.IsExpired () ) //go ahead and schedule the retransmit |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1198 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1199 |
Time rto = m_rtt->RetransmitTimeout (); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1200 |
NS_LOG_LOGIC (this<<" SendPendingData Schedule ReTxTimeout at time " << |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1201 |
Simulator::Now ().GetSeconds () << " to expire at time " << |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1202 |
(Simulator::Now () + rto).GetSeconds () ); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1203 |
m_retxEvent = Simulator::Schedule (rto,&TcpSocketImpl::ReTxTimeout,this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1204 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1205 |
NS_LOG_LOGIC ("About to send a packet with flags: " << flags); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1206 |
m_tcp->SendPacket (p, header, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1207 |
m_endPoint->GetLocalAddress (), |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1208 |
m_endPoint->GetPeerAddress (), |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1209 |
m_boundnetdevice); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1210 |
m_rtt->SentSeq(m_nextTxSequence, sz); // notify the RTT |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1211 |
// Notify the application of the data being sent |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1212 |
Simulator::ScheduleNow(&TcpSocketImpl::NotifyDataSent, this, sz); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1213 |
nPacketsSent++; // Count sent this loop |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1214 |
m_nextTxSequence += sz; // Advance next tx sequence |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1215 |
// Note the high water mark |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1216 |
m_highTxMark = std::max (m_nextTxSequence, m_highTxMark); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1217 |
} |
3246
d734f62d4921
Change log output to be more consistent
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3245
diff
changeset
|
1218 |
NS_LOG_LOGIC ("SendPendingData Sent "<<nPacketsSent<<" packets"); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1219 |
NS_LOG_LOGIC("RETURN SendPendingData"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1220 |
return (nPacketsSent>0); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1221 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1222 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1223 |
uint32_t TcpSocketImpl::UnAckDataCount () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1224 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1225 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1226 |
return m_nextTxSequence - m_highestRxAck; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1227 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1228 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1229 |
uint32_t TcpSocketImpl::BytesInFlight () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1230 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1231 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1232 |
return m_highTxMark - m_highestRxAck; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1233 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1234 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1235 |
uint32_t TcpSocketImpl::Window () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1236 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1237 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1238 |
NS_LOG_LOGIC ("TcpSocketImpl::Window() "<<this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1239 |
return std::min (m_rxWindowSize, m_cWnd.Get()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1240 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1241 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1242 |
uint32_t TcpSocketImpl::AvailableWindow () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1243 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1244 |
NS_LOG_FUNCTION_NOARGS (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1245 |
uint32_t unack = UnAckDataCount (); // Number of outstanding bytes |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1246 |
uint32_t win = Window (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1247 |
if (win < unack) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1248 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1249 |
return 0; // No space available |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1250 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1251 |
return (win - unack); // Amount of window space available |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1252 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1253 |
|
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1254 |
uint32_t TcpSocketImpl::RxBufferFreeSpace() |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1255 |
{ |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1256 |
return m_rxBufMaxSize - m_rxBufSize; |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1257 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1258 |
|
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1259 |
uint16_t TcpSocketImpl::AdvertisedWindowSize() |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1260 |
{ |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1261 |
uint32_t max = 0xffff; |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1262 |
return std::min(RxBufferFreeSpace(), max); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1263 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1264 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1265 |
void TcpSocketImpl::NewRx (Ptr<Packet> p, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1266 |
const TcpHeader& tcpHeader, |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1267 |
const Address& fromAddress, |
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1268 |
const Address& toAddress) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1269 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1270 |
NS_LOG_FUNCTION (this << p << "tcpHeader " << fromAddress); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1271 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " NewRx," |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1272 |
<< " seq " << tcpHeader.GetSequenceNumber() |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1273 |
<< " ack " << tcpHeader.GetAckNumber() |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1274 |
<< " p.size is " << p->GetSize () ); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1275 |
States_t origState = m_state; |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1276 |
if (RxBufferFreeSpace() < p->GetSize()) |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1277 |
{ //if not enough room, fragment |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1278 |
p = p->CreateFragment(0, RxBufferFreeSpace()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1279 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1280 |
//XXX |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1281 |
//fragmenting here MIGHT not be the right thing to do, since possibly we trim |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1282 |
//the front and back off the packet below if it isn't all new data, so the |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1283 |
//check against RxBufferFreeSpace and fragmentation should ideally occur |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1284 |
//just before insertion into m_bufferedData, but this strategy is more |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1285 |
//agressive in rejecting oversized packets and still gives acceptable TCP |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1286 |
uint32_t s = p->GetSize (); // Size of associated data |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1287 |
if (s == 0) |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1288 |
{//if there is no data or no rx buffer space, just ack anyway |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1289 |
SendEmptyPacket (TcpHeader::ACK); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1290 |
return; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1291 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1292 |
// Log sequence received if enabled |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1293 |
// NoteTimeSeq(LOG_SEQ_RX, h->sequenceNumber); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1294 |
// Three possibilities |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
1295 |
// 1) Received seq is expected, buffer this, update rxAvailable, and ack |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1296 |
// 2) Received seq is < expected, just re-ack previous |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1297 |
// 3) Received seq is > expected, just re-ack previous and buffer data |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1298 |
if (tcpHeader.GetSequenceNumber () == m_nextRxSequence) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1299 |
{ // If seq is expected seq |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1300 |
// Trim the end if necessary |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1301 |
// 1) Update nextRxSeq |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
1302 |
// 2) Buffer this packet so Recv can read it |
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
1303 |
// 3) Send the ack |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1304 |
UnAckData_t::iterator next = m_bufferedData.upper_bound (m_nextRxSequence); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1305 |
if (next != m_bufferedData.end ()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1306 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1307 |
SequenceNumber32 nextBufferedSeq = next->first; |
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1308 |
if (m_nextRxSequence + SequenceNumber32(s) > nextBufferedSeq) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1309 |
{//tail end isn't all new, trim enough off the end |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1310 |
s = nextBufferedSeq - m_nextRxSequence; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1311 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1312 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1313 |
p = p->CreateFragment (0,s); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1314 |
m_nextRxSequence += s; // Advance next expected sequence |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1315 |
NS_LOG_LOGIC("Case 1, advanced nrxs to " << m_nextRxSequence ); |
3244
dbf56f98a11d
Fix tcp rx buffer semantics; fromaddress tagging is broken at the moment
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3136
diff
changeset
|
1316 |
//buffer this, it'll be read by call to Recv |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1317 |
// Save for later delivery if there is room |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1318 |
m_bufferedData[tcpHeader.GetSequenceNumber () ] = p; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1319 |
m_rxAvailable += p->GetSize (); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1320 |
RxBufFinishInsert (tcpHeader.GetSequenceNumber ()); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1321 |
m_rxBufSize += p->GetSize (); |
6195
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1322 |
if (!m_shutdownRecv) |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1323 |
{ |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1324 |
NotifyDataRecv (); |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1325 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1326 |
if (m_closeNotified) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1327 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1328 |
NS_LOG_LOGIC ("Tcp " << this << " HuH? Got data after closeNotif"); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1329 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1330 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " adv rxseq by " << s); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1331 |
if (m_pendingClose || (origState > ESTABLISHED)) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1332 |
{ // See if we can close now |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1333 |
if (m_bufferedData.empty()) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1334 |
{ |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1335 |
ProcessPacketAction (PEER_CLOSE, p, tcpHeader, fromAddress, toAddress); |
6328
f03f4d82daaf
Bug 902 - TCP: handle out-of-order packets during connection shutdown
Antti Mäkelä <zarhan@cc.hut.fi>
parents:
6273
diff
changeset
|
1336 |
return; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1337 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1338 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1339 |
} |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1340 |
else if (tcpHeader.GetSequenceNumber () > m_nextRxSequence) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1341 |
{ // Need to buffer this one, but trim off the front and back if necessary |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1342 |
NS_LOG_LOGIC ("Case 2, buffering " << tcpHeader.GetSequenceNumber () ); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1343 |
UnAckData_t::iterator previous = |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1344 |
m_bufferedData.lower_bound (tcpHeader.GetSequenceNumber ()); |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1345 |
SequenceNumber32 startSeq = tcpHeader.GetSequenceNumber(); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1346 |
if (previous != m_bufferedData.begin ()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1347 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1348 |
--previous; |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1349 |
startSeq = previous->first + SequenceNumber32(previous->second->GetSize()); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1350 |
if (startSeq > tcpHeader.GetSequenceNumber ()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1351 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1352 |
s = tcpHeader.GetSequenceNumber () + SequenceNumber32(s) - startSeq; |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1353 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1354 |
else |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1355 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1356 |
startSeq = tcpHeader.GetSequenceNumber(); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1357 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1358 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1359 |
//possibly trim off the end |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1360 |
UnAckData_t::iterator next = m_bufferedData.upper_bound (tcpHeader.GetSequenceNumber()); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1361 |
if (next != m_bufferedData.end ()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1362 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1363 |
SequenceNumber32 nextBufferedSeq = next->first; |
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1364 |
if (startSeq + SequenceNumber32(s) > nextBufferedSeq) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1365 |
{//tail end isn't all new either, trim enough off the end |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1366 |
s = nextBufferedSeq - startSeq; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1367 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1368 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1369 |
p = p->CreateFragment (startSeq - tcpHeader.GetSequenceNumber (),s); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1370 |
UnAckData_t::iterator i = |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1371 |
m_bufferedData.find (startSeq); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1372 |
if (i != m_bufferedData.end () ) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1373 |
{ |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1374 |
if(p->GetSize() > i->second->GetSize()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1375 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1376 |
i->second = 0; // relase reference to already buffered |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1377 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1378 |
else |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1379 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1380 |
p = i->second; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1381 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1382 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1383 |
// Save for later delivery |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1384 |
m_bufferedData[startSeq] = p; |
5378 | 1385 |
m_rxBufSize += p->GetSize(); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1386 |
i = m_bufferedData.find (startSeq); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1387 |
next = i; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1388 |
++next; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1389 |
if(next != m_bufferedData.end()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1390 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1391 |
NS_ASSERT(next->first >= i->first + SequenceNumber32(i->second->GetSize ())); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1392 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1393 |
} |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1394 |
else if (tcpHeader.GetSequenceNumber () + SequenceNumber32(s) > m_nextRxSequence) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1395 |
{//parial new data case, only part of the packet is new data |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1396 |
//trim the beginning |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1397 |
s = tcpHeader.GetSequenceNumber () + SequenceNumber32(s) - m_nextRxSequence; //how much new |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1398 |
//possibly trim off the end |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1399 |
UnAckData_t::iterator next = m_bufferedData.upper_bound (m_nextRxSequence); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1400 |
if (next != m_bufferedData.end ()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1401 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1402 |
SequenceNumber32 nextBufferedSeq = next->first; |
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1403 |
if (m_nextRxSequence + SequenceNumber32(s) > nextBufferedSeq) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1404 |
{//tail end isn't all new either, trim enough off the end |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1405 |
s = nextBufferedSeq - m_nextRxSequence; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1406 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1407 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1408 |
p = p->CreateFragment (m_nextRxSequence - tcpHeader.GetSequenceNumber (),s); |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1409 |
SequenceNumber32 start = m_nextRxSequence; |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1410 |
m_nextRxSequence += s; // Advance next expected sequence |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1411 |
//buffer the new fragment, it'll be read by call to Recv |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1412 |
UnAckData_t::iterator i = m_bufferedData.find (start); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1413 |
if (i != m_bufferedData.end () ) //we found it already in the buffer |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1414 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1415 |
i->second = 0; // relase reference to already buffered |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1416 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1417 |
// Save for later delivery |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1418 |
m_bufferedData[start] = p; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1419 |
m_rxAvailable += p->GetSize (); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1420 |
m_rxBufSize += p->GetSize(); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1421 |
RxBufFinishInsert(start); |
6195
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1422 |
if (!m_shutdownRecv) |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1423 |
{ |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1424 |
NotifyDataRecv (); |
cc5b5294031f
Bug 876 - Tcp socket does not handle ShutdownRecv correctly
Josh Pelkey <jpelkey@gatech.edu>
parents:
6163
diff
changeset
|
1425 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1426 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1427 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1428 |
{ // debug |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1429 |
NS_LOG_LOGIC("TCP " << this |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1430 |
<< " got seq " << tcpHeader.GetSequenceNumber () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1431 |
<< " expected " << m_nextRxSequence |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1432 |
<< " flags " << tcpHeader.GetFlags ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1433 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1434 |
// Now send a new ack packet acknowledging all received and delivered data |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1435 |
if(++m_delAckCount >= m_delAckMaxCount) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1436 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1437 |
m_delAckEvent.Cancel(); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1438 |
m_delAckCount = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1439 |
SendEmptyPacket (TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1440 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1441 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1442 |
{ |
3975
7a636112d9cd
Support TCP delackcount>2 (bug 250)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3966
diff
changeset
|
1443 |
if (m_delAckEvent.IsExpired()) |
7a636112d9cd
Support TCP delackcount>2 (bug 250)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3966
diff
changeset
|
1444 |
{ |
7a636112d9cd
Support TCP delackcount>2 (bug 250)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3966
diff
changeset
|
1445 |
m_delAckEvent = Simulator::Schedule (m_delAckTimeout, &TcpSocketImpl::DelAckTimeout, this); |
7a636112d9cd
Support TCP delackcount>2 (bug 250)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3966
diff
changeset
|
1446 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1447 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1448 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1449 |
|
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1450 |
void TcpSocketImpl::RxBufFinishInsert (SequenceNumber32 seq) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1451 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1452 |
//putting data into the buffer might have filled in a sequence gap so we have |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1453 |
//to iterate through the list to find the largest contiguous sequenced chunk, |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1454 |
//and update m_rxAvailable and m_nextRxSequence appropriately |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1455 |
UnAckData_t::iterator i = m_bufferedData.find (seq); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1456 |
UnAckData_t::iterator next = i; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1457 |
++next; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1458 |
//make sure the buffer is logically sequenced |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1459 |
if(next != m_bufferedData.end()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1460 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1461 |
NS_ASSERT(next->first >= i->first + SequenceNumber32(i->second->GetSize ())); |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1462 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1463 |
while(next != m_bufferedData.end()) |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1464 |
{ |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1465 |
if(i->first + SequenceNumber32(i->second->GetSize ()) == next->first) |
3493
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1466 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1467 |
//next packet is in sequence, count it |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1468 |
m_rxAvailable += next->second->GetSize(); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1469 |
m_nextRxSequence += next->second->GetSize(); |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1470 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1471 |
else |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1472 |
{ |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1473 |
break; //no more in this contiguous chunk |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1474 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1475 |
++i; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1476 |
++next; |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1477 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1478 |
} |
53ec8893863d
Fix TcpSocketImpl rx buffer logic (closes 248)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3475
diff
changeset
|
1479 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1480 |
void TcpSocketImpl::DelAckTimeout () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1481 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1482 |
m_delAckCount = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1483 |
SendEmptyPacket (TcpHeader::ACK); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1484 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1485 |
|
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1486 |
void TcpSocketImpl::CommonNewAck (SequenceNumber32 ack, bool skipTimer) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1487 |
{ // CommonNewAck is called only for "New" (non-duplicate) acks |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1488 |
// and MUST be called by any subclass, from the NewAck function |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1489 |
// Always cancel any pending re-tx timer on new acknowledgement |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1490 |
NS_LOG_FUNCTION (this << ack << skipTimer); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1491 |
if (!skipTimer) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1492 |
{ |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1493 |
NS_LOG_LOGIC (this<<" Cancelled ReTxTimeout event which was set to expire at " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1494 |
<< (Simulator::Now () + |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1495 |
Simulator::GetDelayLeft (m_retxEvent)).GetSeconds()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1496 |
m_retxEvent.Cancel (); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1497 |
//On recieving a "New" ack we restart retransmission timer .. RFC 2988 |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1498 |
Time rto = m_rtt->RetransmitTimeout (); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1499 |
NS_LOG_LOGIC (this<<" Schedule ReTxTimeout at time " |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1500 |
<< Simulator::Now ().GetSeconds () << " to expire at time " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1501 |
<< (Simulator::Now () + rto).GetSeconds ()); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1502 |
m_retxEvent = |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1503 |
Simulator::Schedule (rto, &TcpSocketImpl::ReTxTimeout, this); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1504 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1505 |
if (m_rxWindowSize == 0 && m_persistEvent.IsExpired ()) //zerowindow |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1506 |
{ |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1507 |
NS_LOG_LOGIC (this<<"Enter zerowindow persist state"); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1508 |
NS_LOG_LOGIC (this<<" Cancelled ReTxTimeout event which was set to expire at " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1509 |
<< (Simulator::Now () + |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1510 |
Simulator::GetDelayLeft (m_retxEvent)).GetSeconds()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1511 |
m_retxEvent.Cancel (); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1512 |
NS_LOG_LOGIC ("Schedule persist timeout at time " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1513 |
<<Simulator::Now ().GetSeconds () << " to expire at time " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1514 |
<< (Simulator::Now () + m_persistTime).GetSeconds()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1515 |
m_persistEvent = |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1516 |
Simulator::Schedule (m_persistTime, &TcpSocketImpl::PersistTimeout, this); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1517 |
NS_ASSERT (m_persistTime == Simulator::GetDelayLeft (m_persistEvent)); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1518 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1519 |
NS_LOG_LOGIC ("TCP " << this << " NewAck " << ack |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1520 |
<< " numberAck " << (ack - m_highestRxAck)); // Number bytes ack'ed |
6273
8d70de29d514
spell check, mostly in comments.
Andrey Mazo <mazo@iitp.ru>
parents:
6255
diff
changeset
|
1521 |
m_highestRxAck = ack; // Note the highest received Ack |
3327
ea16c44eb90d
Apply Patch for Bug 237
Craig Dowell <craigdo@ee.washington.edu>
parents:
3291
diff
changeset
|
1522 |
if (GetTxAvailable () > 0) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1523 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1524 |
NotifySend (GetTxAvailable ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1525 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1526 |
if (ack > m_nextTxSequence) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1527 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1528 |
m_nextTxSequence = ack; // If advanced |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1529 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1530 |
// See if all pending ack'ed; if so we can delete the data |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1531 |
if (m_pendingData) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1532 |
{ // Data exists, see if can be deleted |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1533 |
if (m_pendingData->SizeFromSeq (m_firstPendingSequence, m_highestRxAck) == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1534 |
{ // All pending acked, can be deleted |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1535 |
m_pendingData->Clear (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1536 |
delete m_pendingData; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1537 |
m_pendingData = 0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1538 |
// Insure no re-tx timer |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1539 |
NS_LOG_LOGIC (this<<" Cancelled ReTxTimeout event which was set to expire at " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1540 |
<< (Simulator::Now () + |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1541 |
Simulator::GetDelayLeft (m_retxEvent)).GetSeconds()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1542 |
m_retxEvent.Cancel (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1543 |
} |
6163
cdabef59da08
Bug 829 - TCP unbound memory problem (pending data)
Josh Pelkey <jpelkey@gatech.edu>
parents:
6160
diff
changeset
|
1544 |
else if (m_pendingData->SizeFromSeq (m_firstPendingSequence, m_highestRxAck) > 0) |
cdabef59da08
Bug 829 - TCP unbound memory problem (pending data)
Josh Pelkey <jpelkey@gatech.edu>
parents:
6160
diff
changeset
|
1545 |
{ |
cdabef59da08
Bug 829 - TCP unbound memory problem (pending data)
Josh Pelkey <jpelkey@gatech.edu>
parents:
6160
diff
changeset
|
1546 |
// Remove from front, if possible |
cdabef59da08
Bug 829 - TCP unbound memory problem (pending data)
Josh Pelkey <jpelkey@gatech.edu>
parents:
6160
diff
changeset
|
1547 |
m_firstPendingSequence += m_pendingData->RemoveToSeq (m_firstPendingSequence, m_highestRxAck); |
cdabef59da08
Bug 829 - TCP unbound memory problem (pending data)
Josh Pelkey <jpelkey@gatech.edu>
parents:
6160
diff
changeset
|
1548 |
} |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1549 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1550 |
// Try to send more data |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1551 |
SendPendingData (m_connected); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1552 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1553 |
|
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1554 |
void TcpSocketImpl::CancelAllTimers() |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1555 |
{ |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1556 |
m_retxEvent.Cancel (); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1557 |
m_persistEvent.Cancel (); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1558 |
m_delAckEvent.Cancel(); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1559 |
m_lastAckEvent.Cancel (); |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1560 |
} |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1561 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1562 |
Ptr<TcpSocketImpl> TcpSocketImpl::Copy () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1563 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1564 |
return CopyObject<TcpSocketImpl> (this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1565 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1566 |
|
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1567 |
void TcpSocketImpl::NewAck (SequenceNumber32 seq) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1568 |
{ // New acknowledgement up to sequence number "seq" |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1569 |
// Adjust congestion window in response to new ack's received |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1570 |
NS_LOG_FUNCTION (this << seq); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1571 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " NewAck " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1572 |
<< " seq " << seq |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1573 |
<< " cWnd " << m_cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1574 |
<< " ssThresh " << m_ssThresh); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1575 |
if (m_cWnd < m_ssThresh) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1576 |
{ // Slow start mode, add one segSize to cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1577 |
m_cWnd += m_segmentSize; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1578 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " NewCWnd SlowStart, cWnd " << m_cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1579 |
<< " sst " << m_ssThresh); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1580 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1581 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1582 |
{ // Congestion avoidance mode, adjust by (ackBytes*segSize) / cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1583 |
double adder = ((double) m_segmentSize * m_segmentSize) / m_cWnd.Get(); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1584 |
if (adder < 1.0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1585 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1586 |
adder = 1.0; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1587 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1588 |
m_cWnd += (uint32_t) adder; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1589 |
NS_LOG_LOGIC ("NewCWnd CongAvoid, cWnd " << m_cWnd |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1590 |
<< " sst " << m_ssThresh); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1591 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1592 |
CommonNewAck (seq, false); // Complete newAck processing |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1593 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1594 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1595 |
void TcpSocketImpl::DupAck (const TcpHeader& t, uint32_t count) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1596 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1597 |
NS_LOG_FUNCTION (this << "t " << count); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1598 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " DupAck " << t.GetAckNumber () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1599 |
<< ", count " << count |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1600 |
<< ", time " << Simulator::Now ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1601 |
if (count == 3) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1602 |
{ // Count of three indicates triple duplicate ack |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1603 |
m_ssThresh = Window () / 2; // Per RFC2581 |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1604 |
m_ssThresh = std::max (m_ssThresh, 2 * m_segmentSize); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1605 |
NS_LOG_LOGIC("TcpSocketImpl " << this << "Tahoe TDA, time " << Simulator::Now () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1606 |
<< " seq " << t.GetAckNumber () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1607 |
<< " in flight " << BytesInFlight () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1608 |
<< " new ssthresh " << m_ssThresh); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1609 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1610 |
m_cWnd = m_segmentSize; // Collapse cwnd (re-enter slowstart) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1611 |
// For Tahoe, we also reset nextTxSeq |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1612 |
m_nextTxSequence = m_highestRxAck; |
4269
78d709bebd55
Set TCP ACK whenver connection is established (closes bugs 499 and 198)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
4014
diff
changeset
|
1613 |
SendPendingData (m_connected); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1614 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1615 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1616 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1617 |
void TcpSocketImpl::ReTxTimeout () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1618 |
{ // Retransmit timeout |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1619 |
NS_LOG_FUNCTION (this); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1620 |
NS_LOG_LOGIC (this<<" ReTxTimeout Expired at time "<<Simulator::Now ().GetSeconds()); |
5377
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1621 |
// If erroneous timeout in closed/timed-wait state, just return |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1622 |
if (m_state == CLOSED || m_state == TIMED_WAIT) return; |
c54b36fb7317
TCP bug fixes 424, 426, 559, 663, 664, 697
Josh Pelkey <jpelkey@gatech.edu>
parents:
5166
diff
changeset
|
1623 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1624 |
m_ssThresh = Window () / 2; // Per RFC2581 |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1625 |
m_ssThresh = std::max (m_ssThresh, 2 * m_segmentSize); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1626 |
// Set cWnd to segSize on timeout, per rfc2581 |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1627 |
// Collapse congestion window (re-enter slowstart) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1628 |
m_cWnd = m_segmentSize; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1629 |
m_nextTxSequence = m_highestRxAck; // Start from highest Ack |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1630 |
m_rtt->IncreaseMultiplier (); // DoubleValue timeout value for next retx timer |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1631 |
Retransmit (); // Retransmit the packet |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1632 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1633 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1634 |
void TcpSocketImpl::LastAckTimeout () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1635 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1636 |
m_lastAckEvent.Cancel (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1637 |
if (m_state == LAST_ACK) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1638 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1639 |
Actions_t action = ProcessEvent (TIMEOUT); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1640 |
ProcessAction (action); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1641 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1642 |
if (!m_closeNotified) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1643 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1644 |
m_closeNotified = true; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1645 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1646 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1647 |
|
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1648 |
void TcpSocketImpl::PersistTimeout () |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1649 |
{ |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1650 |
NS_LOG_LOGIC ("PersistTimeout expired at "<<Simulator::Now ().GetSeconds ()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1651 |
m_persistTime = Scalar(2)*m_persistTime; |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1652 |
m_persistTime = std::min(Seconds(60),m_persistTime); //maxes out at 60 |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1653 |
//the persist timeout sends exactly one byte probes |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1654 |
//this is explicit in stevens, and kind of in rfc793 p42, rfc1122 sec4.2.2.17 |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1655 |
Ptr<Packet> p = |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1656 |
m_pendingData->CopyFromSeq(1,m_firstPendingSequence,m_nextTxSequence); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1657 |
TcpHeader tcpHeader; |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1658 |
tcpHeader.SetSequenceNumber (m_nextTxSequence); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1659 |
tcpHeader.SetAckNumber (m_nextRxSequence); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1660 |
tcpHeader.SetSourcePort (m_endPoint->GetLocalPort()); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1661 |
tcpHeader.SetDestinationPort (m_endPoint->GetPeerPort ()); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1662 |
tcpHeader.SetWindowSize (AdvertisedWindowSize()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1663 |
|
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1664 |
m_tcp->SendPacket (p, tcpHeader, m_endPoint->GetLocalAddress (), |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1665 |
m_endPoint->GetPeerAddress (), m_boundnetdevice); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1666 |
NS_LOG_LOGIC ("Schedule persist timeout at time " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1667 |
<<Simulator::Now ().GetSeconds () << " to expire at time " |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1668 |
<< (Simulator::Now () + m_persistTime).GetSeconds()); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1669 |
m_persistEvent = |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1670 |
Simulator::Schedule (m_persistTime, &TcpSocketImpl::PersistTimeout, this); |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1671 |
} |
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1672 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1673 |
void TcpSocketImpl::Retransmit () |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1674 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1675 |
NS_LOG_FUNCTION (this); |
6255
ca79ce283a19
Bug 818 - TCP Socket implementation does not set ACK flag on retransmits
Josh Pelkey <jpelkey@gatech.edu>
parents:
6195
diff
changeset
|
1676 |
uint8_t flags = TcpHeader::ACK; |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1677 |
if (m_state == SYN_SENT) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1678 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1679 |
if (m_cnCount > 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1680 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1681 |
SendEmptyPacket (TcpHeader::SYN); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1682 |
return; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1683 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1684 |
else |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1685 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1686 |
NotifyConnectionFailed (); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1687 |
return; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1688 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1689 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1690 |
if (!m_pendingData) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1691 |
{ |
3276
8869a79a391f
Changes for bug 205, unlisted FIN bug
Craig Dowell <craigdo@ee.washington.edu>
parents:
3272
diff
changeset
|
1692 |
if (m_state == FIN_WAIT_1) |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1693 |
{ // Must have lost FIN, re-send |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1694 |
SendEmptyPacket (TcpHeader::FIN); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1695 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1696 |
return; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1697 |
} |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1698 |
NS_ASSERT(m_nextTxSequence == m_highestRxAck); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1699 |
Ptr<Packet> p = m_pendingData->CopyFromSeq (m_segmentSize, |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1700 |
m_firstPendingSequence, |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1701 |
m_nextTxSequence); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1702 |
// Calculate remaining data for COE check |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1703 |
uint32_t remainingData = m_pendingData->SizeFromSeq ( |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1704 |
m_firstPendingSequence, |
6434
ac8b4bf77e50
Bug 385 - Add a generic "sequence number" class.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6328
diff
changeset
|
1705 |
m_nextTxSequence + SequenceNumber32(p->GetSize ())); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1706 |
if (m_closeOnEmpty && remainingData == 0) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1707 |
{ // Add the FIN flag |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1708 |
flags = flags | TcpHeader::FIN; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1709 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1710 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1711 |
NS_LOG_LOGIC ("TcpSocketImpl " << this << " retxing seq " << m_highestRxAck); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1712 |
if (m_retxEvent.IsExpired () ) |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1713 |
{ |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1714 |
Time rto = m_rtt->RetransmitTimeout (); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1715 |
NS_LOG_LOGIC (this<<" Schedule ReTxTimeout at time " |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1716 |
<< Simulator::Now ().GetSeconds () << " to expire at time " |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1717 |
<< (Simulator::Now () + rto).GetSeconds ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1718 |
m_retxEvent = Simulator::Schedule (rto,&TcpSocketImpl::ReTxTimeout,this); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1719 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1720 |
m_rtt->SentSeq (m_highestRxAck,p->GetSize ()); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1721 |
// And send the packet |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1722 |
TcpHeader tcpHeader; |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1723 |
tcpHeader.SetSequenceNumber (m_nextTxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1724 |
tcpHeader.SetAckNumber (m_nextRxSequence); |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1725 |
tcpHeader.SetSourcePort (m_endPoint->GetLocalPort()); |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1726 |
tcpHeader.SetDestinationPort (m_endPoint->GetPeerPort ()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1727 |
tcpHeader.SetFlags (flags); |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1728 |
tcpHeader.SetWindowSize (AdvertisedWindowSize()); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1729 |
|
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1730 |
m_tcp->SendPacket (p, tcpHeader, m_endPoint->GetLocalAddress (), |
5971
805783c866fc
Bug 748 - Cloned TCP socket uses wrong source address
Fabian Mauchle <f1mauchl@hsr.ch>
parents:
5931
diff
changeset
|
1731 |
m_endPoint->GetPeerAddress (), m_boundnetdevice); |
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1732 |
} |
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1733 |
|
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1734 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1735 |
TcpSocketImpl::SetSndBufSize (uint32_t size) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1736 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1737 |
m_sndBufSize = size; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1738 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1739 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1740 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1741 |
TcpSocketImpl::GetSndBufSize (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1742 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1743 |
return m_sndBufSize; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1744 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1745 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1746 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1747 |
TcpSocketImpl::SetRcvBufSize (uint32_t size) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1748 |
{ |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1749 |
m_rxBufMaxSize = size; |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1750 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1751 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1752 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1753 |
TcpSocketImpl::GetRcvBufSize (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1754 |
{ |
3644
5d836ab1523b
Implement TCP finite rx buffer (bug 239)
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3643
diff
changeset
|
1755 |
return m_rxBufMaxSize; |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1756 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1757 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1758 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1759 |
TcpSocketImpl::SetSegSize (uint32_t size) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1760 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1761 |
m_segmentSize = size; |
4622
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1762 |
/* |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1763 |
* Make sure that the congestion window is initialized for IW properly. We |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1764 |
* can't do this after the connection starts up or would would most likely |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1765 |
* change m_cWnd out from under the protocol. That would be Bad (TM). |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1766 |
*/ |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1767 |
NS_ABORT_MSG_UNLESS (m_state == CLOSED, "TcpSocketImpl::SetSegSize(): Cannot change segment size dynamically."); |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1768 |
m_cWnd = m_initialCWnd * m_segmentSize; |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1769 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1770 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1771 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1772 |
TcpSocketImpl::GetSegSize (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1773 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1774 |
return m_segmentSize; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1775 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1776 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1777 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1778 |
TcpSocketImpl::SetSSThresh (uint32_t threshold) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1779 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1780 |
m_ssThresh = threshold; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1781 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1782 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1783 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1784 |
TcpSocketImpl::GetSSThresh (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1785 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1786 |
return m_ssThresh; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1787 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1788 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1789 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1790 |
TcpSocketImpl::SetInitialCwnd (uint32_t cwnd) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1791 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1792 |
m_initialCWnd = cwnd; |
4622
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1793 |
/* |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1794 |
* Make sure that the congestion window is initialized for IW properly. We |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1795 |
* can't do this after the connection starts up or would would most likely |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1796 |
* change m_cWnd out from under the protocol. That would be Bad (TM). |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1797 |
*/ |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1798 |
NS_ABORT_MSG_UNLESS (m_state == CLOSED, "TcpSocketImpl::SetInitialCwnd(): Cannot change initial cwnd dynamically."); |
aca8363b2e21
Fix bug 579 -- TCP congestion window is not updated whent segment size chages
Craig Dowell <craigdo@ee.washington.edu>
parents:
4603
diff
changeset
|
1799 |
m_cWnd = m_initialCWnd * m_segmentSize; |
3136
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1800 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1801 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1802 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1803 |
TcpSocketImpl::GetInitialCwnd (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1804 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1805 |
return m_initialCWnd; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1806 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1807 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1808 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1809 |
TcpSocketImpl::SetConnTimeout (Time timeout) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1810 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1811 |
m_cnTimeout = timeout; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1812 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1813 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1814 |
Time |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1815 |
TcpSocketImpl::GetConnTimeout (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1816 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1817 |
return m_cnTimeout; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1818 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1819 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1820 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1821 |
TcpSocketImpl::SetConnCount (uint32_t count) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1822 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1823 |
m_cnCount = count; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1824 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1825 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1826 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1827 |
TcpSocketImpl::GetConnCount (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1828 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1829 |
return m_cnCount; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1830 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1831 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1832 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1833 |
TcpSocketImpl::SetDelAckTimeout (Time timeout) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1834 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1835 |
m_delAckTimeout = timeout; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1836 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1837 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1838 |
Time |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1839 |
TcpSocketImpl::GetDelAckTimeout (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1840 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1841 |
return m_delAckTimeout; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1842 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1843 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1844 |
void |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1845 |
TcpSocketImpl::SetDelAckMaxCount (uint32_t count) |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1846 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1847 |
m_delAckMaxCount = count; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1848 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1849 |
|
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1850 |
uint32_t |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1851 |
TcpSocketImpl::GetDelAckMaxCount (void) const |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1852 |
{ |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1853 |
return m_delAckMaxCount; |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1854 |
} |
a59b9ce95b6b
Move Tcp attributes from factory to TcpSocket
Tom Henderson <tomh@tomh.org>
parents:
3134
diff
changeset
|
1855 |
|
6448
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1856 |
bool |
6437
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1857 |
TcpSocketImpl::SetAllowBroadcast (bool allowBroadcast) |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1858 |
{ |
6448
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1859 |
if (allowBroadcast) |
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1860 |
{ |
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1861 |
return false; |
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1862 |
} |
184a509cc71d
Still Bug 943: fix UdpSocketImpl::GetAllowBroadcast, let Socket::SetAllowBroadcast return a bool indicating success/failure, instead of a fatal error.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6442
diff
changeset
|
1863 |
return true; |
6437
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1864 |
} |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1865 |
|
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1866 |
bool |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1867 |
TcpSocketImpl::GetAllowBroadcast () const |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1868 |
{ |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1869 |
return false; |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1870 |
} |
c11291f51d57
Bug 943 - Add a SO_BROADCAST socket option
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
6434
diff
changeset
|
1871 |
|
3131
d82336dfd269
change TcpSocket to TcpSocketImpl
Tom Henderson <tomh@tomh.org>
parents:
diff
changeset
|
1872 |
}//namespace ns3 |
3528
10c667a90efa
Stub TcpSocketImpl unit test
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3493
diff
changeset
|
1873 |
|
10c667a90efa
Stub TcpSocketImpl unit test
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
3493
diff
changeset
|
1874 |