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
ceef96fe
Commit
ceef96fe
authored
Nov 16, 2018
by
Olivier Crête
Committed by
Olivier Crête
Nov 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
udp-bsd: Protect the GSocketAddress cache with a mutex
parent
5496500b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
8 deletions
+22
-8
socket/udp-bsd.c
socket/udp-bsd.c
+22
-8
No files found.
socket/udp-bsd.c
View file @
ceef96fe
...
@@ -71,6 +71,9 @@ static void socket_set_writable_callback (NiceSocket *sock,
...
@@ -71,6 +71,9 @@ static void socket_set_writable_callback (NiceSocket *sock,
struct
UdpBsdSocketPrivate
struct
UdpBsdSocketPrivate
{
{
GMutex
mutex
;
/* protected by mutex */
NiceAddress
niceaddr
;
NiceAddress
niceaddr
;
GSocketAddress
*
gaddr
;
GSocketAddress
*
gaddr
;
};
};
...
@@ -157,6 +160,8 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
...
@@ -157,6 +160,8 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
sock
->
set_writable_callback
=
socket_set_writable_callback
;
sock
->
set_writable_callback
=
socket_set_writable_callback
;
sock
->
close
=
socket_close
;
sock
->
close
=
socket_close
;
g_mutex_init
(
&
priv
->
mutex
);
return
sock
;
return
sock
;
}
}
...
@@ -165,8 +170,8 @@ socket_close (NiceSocket *sock)
...
@@ -165,8 +170,8 @@ socket_close (NiceSocket *sock)
{
{
struct
UdpBsdSocketPrivate
*
priv
=
sock
->
priv
;
struct
UdpBsdSocketPrivate
*
priv
=
sock
->
priv
;
if
(
priv
->
gaddr
)
g_clear_object
(
&
priv
->
gaddr
);
g_object_unref
(
priv
->
gaddr
);
g_mutex_clear
(
&
priv
->
mutex
);
g_slice_free
(
struct
UdpBsdSocketPrivate
,
sock
->
priv
);
g_slice_free
(
struct
UdpBsdSocketPrivate
,
sock
->
priv
);
sock
->
priv
=
NULL
;
sock
->
priv
=
NULL
;
...
@@ -247,34 +252,43 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
...
@@ -247,34 +252,43 @@ socket_send_message (NiceSocket *sock, const NiceAddress *to,
struct
UdpBsdSocketPrivate
*
priv
=
sock
->
priv
;
struct
UdpBsdSocketPrivate
*
priv
=
sock
->
priv
;
GError
*
child_error
=
NULL
;
GError
*
child_error
=
NULL
;
gssize
len
;
gssize
len
;
GSocketAddress
*
gaddr
=
NULL
;
/* Make sure socket has not been freed: */
/* Make sure socket has not been freed: */
g_assert
(
sock
->
priv
!=
NULL
);
g_assert
(
sock
->
priv
!=
NULL
);
g_mutex_lock
(
&
priv
->
mutex
);
if
(
!
nice_address_is_valid
(
&
priv
->
niceaddr
)
||
if
(
!
nice_address_is_valid
(
&
priv
->
niceaddr
)
||
!
nice_address_equal
(
&
priv
->
niceaddr
,
to
))
{
!
nice_address_equal
(
&
priv
->
niceaddr
,
to
))
{
union
{
union
{
struct
sockaddr_storage
storage
;
struct
sockaddr_storage
storage
;
struct
sockaddr
addr
;
struct
sockaddr
addr
;
}
sa
;
}
sa
;
GSocketAddress
*
gaddr
;
if
(
priv
->
gaddr
)
g_clear_object
(
&
priv
->
gaddr
);
g_object_unref
(
priv
->
gaddr
);
nice_address_copy_to_sockaddr
(
to
,
&
sa
.
addr
);
nice_address_copy_to_sockaddr
(
to
,
&
sa
.
addr
);
gaddr
=
g_socket_address_new_from_native
(
&
sa
.
addr
,
sizeof
(
sa
));
gaddr
=
g_socket_address_new_from_native
(
&
sa
.
addr
,
sizeof
(
sa
));
priv
->
gaddr
=
gaddr
;
if
(
gaddr
)
priv
->
gaddr
=
g_object_ref
(
gaddr
);
if
(
gaddr
==
NULL
)
if
(
gaddr
==
NULL
)
{
g_mutex_unlock
(
&
priv
->
mutex
);
return
-
1
;
return
-
1
;
}
priv
->
niceaddr
=
*
to
;
priv
->
niceaddr
=
*
to
;
}
else
{
if
(
priv
->
gaddr
)
gaddr
=
g_object_ref
(
priv
->
gaddr
);
}
}
g_mutex_unlock
(
&
priv
->
mutex
);
len
=
g_socket_send_message
(
sock
->
fileno
,
priv
->
gaddr
,
message
->
buffers
,
len
=
g_socket_send_message
(
sock
->
fileno
,
gaddr
,
message
->
buffers
,
message
->
n_buffers
,
NULL
,
0
,
G_SOCKET_MSG_NONE
,
NULL
,
&
child_error
);
message
->
n_buffers
,
NULL
,
0
,
G_SOCKET_MSG_NONE
,
NULL
,
&
child_error
);
g_clear_object
(
&
gaddr
);
if
(
len
<
0
)
{
if
(
len
<
0
)
{
if
(
g_error_matches
(
child_error
,
G_IO_ERROR
,
G_IO_ERROR_WOULD_BLOCK
))
{
if
(
g_error_matches
(
child_error
,
G_IO_ERROR
,
G_IO_ERROR_WOULD_BLOCK
))
{
len
=
0
;
len
=
0
;
...
...
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