Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
e31932bd
Commit
e31932bd
authored
Feb 02, 2016
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pseudotcp: Make debug more useful
parent
8ccb2c17
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
agent/pseudotcp.c
agent/pseudotcp.c
+11
-5
No files found.
agent/pseudotcp.c
View file @
e31932bd
...
@@ -992,6 +992,8 @@ pseudo_tcp_socket_notify_clock(PseudoTcpSocket *self)
...
@@ -992,6 +992,8 @@ pseudo_tcp_socket_notify_clock(PseudoTcpSocket *self)
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
priv
->
ssthresh
=
max
(
nInFlight
/
2
,
2
*
priv
->
mss
);
priv
->
ssthresh
=
max
(
nInFlight
/
2
,
2
*
priv
->
mss
);
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"ssthresh: %u = (nInFlight: %u / 2) + "
"2 * mss: %u"
,
priv
->
ssthresh
,
nInFlight
,
priv
->
mss
);
//LOG(LS_INFO) << "priv->ssthresh: " << priv->ssthresh << " nInFlight: " << nInFlight << " priv->mss: " << priv->mss;
//LOG(LS_INFO) << "priv->ssthresh: " << priv->ssthresh << " nInFlight: " << nInFlight << " priv->mss: " << priv->mss;
priv
->
cwnd
=
priv
->
mss
;
priv
->
cwnd
=
priv
->
mss
;
...
@@ -1669,8 +1671,8 @@ process(PseudoTcpSocket *self, Segment *seg)
...
@@ -1669,8 +1671,8 @@ process(PseudoTcpSocket *self, Segment *seg)
priv
->
rx_rto
=
bound
(
MIN_RTO
,
priv
->
rx_rto
=
bound
(
MIN_RTO
,
priv
->
rx_srtt
+
max
(
1LU
,
4
*
priv
->
rx_rttvar
),
MAX_RTO
);
priv
->
rx_srtt
+
max
(
1LU
,
4
*
priv
->
rx_rttvar
),
MAX_RTO
);
DEBUG
(
PSEUDO_TCP_DEBUG_VERBOSE
,
"rtt: %ld
srtt: %u
rto: %u"
,
DEBUG
(
PSEUDO_TCP_DEBUG_VERBOSE
,
"rtt: %ld
srtt: %u rttvar: %u
rto: %u"
,
rtt
,
priv
->
rx_srtt
,
priv
->
rx_rto
);
rtt
,
priv
->
rx_srtt
,
priv
->
rx_rttvar
,
priv
->
rx_rto
);
}
else
{
}
else
{
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"Invalid RTT: %ld"
,
rtt
);
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"Invalid RTT: %ld"
,
rtt
);
return
FALSE
;
return
FALSE
;
...
@@ -1720,7 +1722,7 @@ process(PseudoTcpSocket *self, Segment *seg)
...
@@ -1720,7 +1722,7 @@ process(PseudoTcpSocket *self, Segment *seg)
guint32
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
guint32
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
// (Fast Retransmit)
// (Fast Retransmit)
priv
->
cwnd
=
min
(
priv
->
ssthresh
,
nInFlight
+
priv
->
mss
);
priv
->
cwnd
=
min
(
priv
->
ssthresh
,
nInFlight
+
priv
->
mss
);
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"exit recovery
"
);
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"exit recovery
cwnd=%d ssthresh=%d nInFlight=%d mss: %d"
,
priv
->
cwnd
,
priv
->
ssthresh
,
nInFlight
,
priv
->
mss
);
priv
->
dup_acks
=
0
;
priv
->
dup_acks
=
0
;
}
else
{
}
else
{
int
transmit_status
;
int
transmit_status
;
...
@@ -1773,6 +1775,8 @@ process(PseudoTcpSocket *self, Segment *seg)
...
@@ -1773,6 +1775,8 @@ process(PseudoTcpSocket *self, Segment *seg)
priv
->
recover
=
priv
->
snd_nxt
;
priv
->
recover
=
priv
->
snd_nxt
;
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
nInFlight
=
priv
->
snd_nxt
-
priv
->
snd_una
;
priv
->
ssthresh
=
max
(
nInFlight
/
2
,
2
*
priv
->
mss
);
priv
->
ssthresh
=
max
(
nInFlight
/
2
,
2
*
priv
->
mss
);
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"ssthresh: %u = (nInFlight: %u / 2) + "
"2 * mss: %u"
,
priv
->
ssthresh
,
nInFlight
,
priv
->
mss
);
//LOG(LS_INFO) << "priv->ssthresh: " << priv->ssthresh << " nInFlight: " << nInFlight << " priv->mss: " << priv->mss;
//LOG(LS_INFO) << "priv->ssthresh: " << priv->ssthresh << " nInFlight: " << nInFlight << " priv->mss: " << priv->mss;
priv
->
cwnd
=
priv
->
ssthresh
+
3
*
priv
->
mss
;
priv
->
cwnd
=
priv
->
ssthresh
+
3
*
priv
->
mss
;
}
else
if
(
priv
->
dup_acks
>
3
)
{
}
else
if
(
priv
->
dup_acks
>
3
)
{
...
@@ -2166,12 +2170,13 @@ attempt_send(PseudoTcpSocket *self, SendFlags sflags)
...
@@ -2166,12 +2170,13 @@ attempt_send(PseudoTcpSocket *self, SendFlags sflags)
if
(
bFirst
)
{
if
(
bFirst
)
{
gsize
available_space
=
pseudo_tcp_fifo_get_write_remaining
(
&
priv
->
sbuf
);
gsize
available_space
=
pseudo_tcp_fifo_get_write_remaining
(
&
priv
->
sbuf
);
bFirst
=
FALSE
;
bFirst
=
FALSE
;
DEBUG
(
PSEUDO_TCP_DEBUG_VERBOSE
,
"[cwnd: %u nWindow: %u nInFlight: %u "
DEBUG
(
PSEUDO_TCP_DEBUG_VERBOSE
,
"[cwnd: %u nWindow: %u nInFlight: %u "
"nAvailable: %u nQueued: %"
G_GSIZE_FORMAT
" nEmpty: %"
G_GSIZE_FORMAT
"nAvailable: %u nQueued: %"
G_GSIZE_FORMAT
" nEmpty: %"
G_GSIZE_FORMAT
" ssthresh: %u]"
,
"
nWaiting: %zu
ssthresh: %u]"
,
priv
->
cwnd
,
nWindow
,
nInFlight
,
nAvailable
,
snd_buffered
,
priv
->
cwnd
,
nWindow
,
nInFlight
,
nAvailable
,
snd_buffered
,
available_space
,
priv
->
ssthresh
);
available_space
,
snd_buffered
-
nInFlight
,
priv
->
ssthresh
);
}
}
if
(
nAvailable
==
0
&&
sflags
!=
sfFin
&&
sflags
!=
sfRst
)
{
if
(
nAvailable
==
0
&&
sflags
!=
sfFin
&&
sflags
!=
sfRst
)
{
...
@@ -2305,6 +2310,7 @@ apply_window_scale_option (PseudoTcpSocket *self, guint8 scale_factor)
...
@@ -2305,6 +2310,7 @@ apply_window_scale_option (PseudoTcpSocket *self, guint8 scale_factor)
PseudoTcpSocketPrivate
*
priv
=
self
->
priv
;
PseudoTcpSocketPrivate
*
priv
=
self
->
priv
;
priv
->
swnd_scale
=
scale_factor
;
priv
->
swnd_scale
=
scale_factor
;
DEBUG
(
PSEUDO_TCP_DEBUG_NORMAL
,
"Setting scale factor to %u"
,
scale_factor
);
}
}
static
void
static
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment