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
5619d893
Commit
5619d893
authored
Jan 18, 2011
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a crash (Broken pipe) if we send to a TCP socket that had an error
parent
fa68cdd4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
socket/tcp-bsd.c
socket/tcp-bsd.c
+14
-1
No files found.
socket/tcp-bsd.c
View file @
5619d893
...
...
@@ -60,6 +60,7 @@ typedef struct {
GMainContext
*
context
;
GIOChannel
*
io_channel
;
GSource
*
io_source
;
gboolean
error
;
}
TcpPriv
;
struct
to_be_sent
{
...
...
@@ -165,6 +166,7 @@ nice_tcp_bsd_socket_new (NiceAgent *agent, GMainContext *ctx, NiceAddress *addr)
priv
->
agent
=
agent
;
priv
->
context
=
ctx
;
priv
->
server_addr
=
*
addr
;
priv
->
error
=
FALSE
;
sock
->
fileno
=
sockfd
;
sock
->
send
=
socket_send
;
...
...
@@ -204,12 +206,18 @@ socket_recv (NiceSocket *sock, NiceAddress *from, guint len, gchar *buf)
TcpPriv
*
priv
=
sock
->
priv
;
int
ret
;
/* Don't try to access the socket if it had an error */
if
(
priv
->
error
)
return
-
1
;
ret
=
recv
(
sock
->
fileno
,
buf
,
len
,
0
);
/* recv returns 0 when the peer performed a shutdown.. we must return -1 here
* so that the agent destroys the g_source */
if
(
ret
==
0
)
if
(
ret
==
0
)
{
priv
->
error
=
TRUE
;
return
-
1
;
}
if
(
ret
<
0
)
{
#ifdef G_OS_WIN32
...
...
@@ -237,6 +245,11 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
TcpPriv
*
priv
=
sock
->
priv
;
int
ret
;
/* Don't try to access the socket if it had an error, otherwise we risk a
crash with SIGPIPE (Broken pipe) */
if
(
priv
->
error
)
return
-
1
;
/* First try to send the data, don't send it later if it can be sent now
this way we avoid allocating memory on every send */
if
(
g_queue_is_empty
(
&
priv
->
send_queue
))
{
...
...
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