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
6742a35e
Commit
6742a35e
authored
Nov 03, 2008
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace close by closesocket for windows
parent
50455d76
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
socket/tcp-turn.c
socket/tcp-turn.c
+6
-1
socket/udp-bsd.c
socket/udp-bsd.c
+16
-0
No files found.
socket/tcp-turn.c
View file @
6742a35e
...
@@ -361,7 +361,11 @@ static void
...
@@ -361,7 +361,11 @@ static void
socket_close
(
NiceSocket
*
sock
)
socket_close
(
NiceSocket
*
sock
)
{
{
TurnTcpPriv
*
priv
=
sock
->
priv
;
TurnTcpPriv
*
priv
=
sock
->
priv
;
#ifdef G_OS_WIN32
closesocket
(
sock
->
fileno
);
#else
close
(
sock
->
fileno
);
close
(
sock
->
fileno
);
#endif
g_queue_foreach
(
&
priv
->
send_queue
,
(
GFunc
)
free_to_be_sent
,
NULL
);
g_queue_foreach
(
&
priv
->
send_queue
,
(
GFunc
)
free_to_be_sent
,
NULL
);
g_queue_clear
(
&
priv
->
send_queue
);
g_queue_clear
(
&
priv
->
send_queue
);
g_io_channel_unref
(
priv
->
io_channel
);
g_io_channel_unref
(
priv
->
io_channel
);
...
@@ -425,10 +429,11 @@ nice_tcp_turn_socket_new (
...
@@ -425,10 +429,11 @@ nice_tcp_turn_socket_new (
#ifdef G_OS_WIN32
#ifdef G_OS_WIN32
if
(
ret
<
0
&&
WSAGetLastError
()
!=
WSAEINPROGRESS
)
{
if
(
ret
<
0
&&
WSAGetLastError
()
!=
WSAEINPROGRESS
)
{
closesocket
(
sockfd
);
#else
#else
if
(
ret
<
0
&&
errno
!=
EINPROGRESS
)
{
if
(
ret
<
0
&&
errno
!=
EINPROGRESS
)
{
#endif
close
(
sockfd
);
close
(
sockfd
);
#endif
g_slice_free
(
NiceSocket
,
sock
);
g_slice_free
(
NiceSocket
,
sock
);
return
NULL
;
return
NULL
;
}
}
...
...
socket/udp-bsd.c
View file @
6742a35e
...
@@ -128,7 +128,11 @@ socket_is_reliable (NiceSocket *sock)
...
@@ -128,7 +128,11 @@ socket_is_reliable (NiceSocket *sock)
static
void
static
void
socket_close
(
NiceSocket
*
sock
)
socket_close
(
NiceSocket
*
sock
)
{
{
#ifdef G_OS_WIN32
closesocket
(
sock
->
fileno
);
#else
close
(
sock
->
fileno
);
close
(
sock
->
fileno
);
#endif
}
}
...
@@ -168,7 +172,11 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
...
@@ -168,7 +172,11 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
if (!v6)
if (!v6)
#endif
#endif
{
{
#ifdef G_OS_WIN32
closesocket
(
sock
->
fileno
);
#else
close
(
sockfd
);
close
(
sockfd
);
#endif
sockfd
=
-
1
;
sockfd
=
-
1
;
}
}
else
else
...
@@ -217,13 +225,21 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
...
@@ -217,13 +225,21 @@ nice_udp_bsd_socket_new (NiceAddress *addr)
if
(
bind
(
sockfd
,
(
struct
sockaddr
*
)
&
name
,
sizeof
(
name
))
!=
0
)
{
if
(
bind
(
sockfd
,
(
struct
sockaddr
*
)
&
name
,
sizeof
(
name
))
!=
0
)
{
g_slice_free
(
NiceSocket
,
sock
);
g_slice_free
(
NiceSocket
,
sock
);
#ifdef G_OS_WIN32
closesocket
(
sock
->
fileno
);
#else
close
(
sockfd
);
close
(
sockfd
);
#endif
return
NULL
;
return
NULL
;
}
}
if
(
getsockname
(
sockfd
,
(
struct
sockaddr
*
)
&
name
,
&
name_len
)
!=
0
)
{
if
(
getsockname
(
sockfd
,
(
struct
sockaddr
*
)
&
name
,
&
name_len
)
!=
0
)
{
g_slice_free
(
NiceSocket
,
sock
);
g_slice_free
(
NiceSocket
,
sock
);
#ifdef G_OS_WIN32
closesocket
(
sock
->
fileno
);
#else
close
(
sockfd
);
close
(
sockfd
);
#endif
return
NULL
;
return
NULL
;
}
}
...
...
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