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
530e00b4
Commit
530e00b4
authored
Jun 23, 2020
by
Olivier Crête
Committed by
Olivier Crête
Jun 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agent: Don't go haywire if only a partial message is available
Instead, collect all the pieces until it's complete.
parent
aa055b36
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
11 deletions
+27
-11
agent/agent.c
agent/agent.c
+27
-11
No files found.
agent/agent.c
View file @
530e00b4
...
@@ -4129,8 +4129,7 @@ agent_recv_message_unlocked (
...
@@ -4129,8 +4129,7 @@ agent_recv_message_unlocked (
}
}
}
}
}
}
if
(
agent
->
rfc4571_expecting_length
>
0
&&
if
(
agent
->
rfc4571_expecting_length
>
0
)
{
available
>=
agent
->
rfc4571_expecting_length
)
{
GInputVector
*
local_bufs
;
GInputVector
*
local_bufs
;
NiceInputMessage
local_message
;
NiceInputMessage
local_message
;
gsize
off
;
gsize
off
;
...
@@ -4154,23 +4153,40 @@ agent_recv_message_unlocked (
...
@@ -4154,23 +4153,40 @@ agent_recv_message_unlocked (
/* Only read up to the expected number of bytes in the frame */
/* Only read up to the expected number of bytes in the frame */
off
=
0
;
off
=
0
;
for
(
i
=
0
;
i
<
n_bufs
;
i
++
)
{
for
(
i
=
0
;
i
<
n_bufs
;
i
++
)
{
if
(
message
->
buffers
[
i
].
size
<
agent
->
rfc4571_expecting_length
-
off
)
{
if
(
message
->
buffers
[
i
].
size
+
off
<
message
->
length
)
{
local_bufs
[
i
].
buffer
=
message
->
buffers
[
i
].
buffer
;
/* Skip already full buffers */
local_bufs
[
i
].
size
=
message
->
buffers
[
i
].
size
;
local_message
.
n_buffers
++
;
off
+=
message
->
buffers
[
i
].
size
;
off
+=
message
->
buffers
[
i
].
size
;
}
else
{
}
else
{
local_bufs
[
i
].
buffer
=
message
->
buffers
[
i
].
buffer
;
gssize
diff
=
0
;
local_bufs
[
i
].
size
=
MIN
(
message
->
buffers
[
i
].
size
,
agent
->
rfc4571_expecting_length
-
off
);
/* If we have a partially full buffer, offset the pointer */
if
(
off
<
message
->
length
)
diff
=
message
->
length
-
off
;
/* Those buffers are filled */
local_bufs
[
local_message
.
n_buffers
].
buffer
=
((
char
*
)
message
->
buffers
[
i
].
buffer
)
+
diff
;
local_bufs
[
local_message
.
n_buffers
].
size
=
MIN
(
message
->
buffers
[
i
].
size
-
diff
,
agent
->
rfc4571_expecting_length
-
off
);
off
+=
local_message
.
buffers
[
local_message
.
n_buffers
].
size
;
local_message
.
n_buffers
++
;
local_message
.
n_buffers
++
;
off
+=
local_bufs
[
i
].
size
;
/* If we have a big enough buffer, let's just stop */
if
(
off
==
message
->
length
+
agent
->
rfc4571_expecting_length
)
break
;
}
}
}
}
sockret
=
nice_socket_recv_messages
(
nicesock
,
&
local_message
,
1
);
sockret
=
nice_socket_recv_messages
(
nicesock
,
&
local_message
,
1
);
if
(
sockret
==
1
)
{
if
(
sockret
==
1
)
{
message
->
length
=
local_message
.
length
;
message
->
length
+
=
local_message
.
length
;
agent
->
rfc4571_expecting_length
-=
local_message
.
length
;
agent
->
rfc4571_expecting_length
-=
local_message
.
length
;
if
(
agent
->
rfc4571_expecting_length
!=
0
)
{
retval
=
RECV_WOULD_BLOCK
;
/* EWOULDBLOCK */
nice_debug_verbose
(
"%s: Agent %p: TCP message incomplete"
,
G_STRFUNC
,
agent
);
goto
done
;
}
}
}
}
}
}
}
...
...
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