Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
bb937825
Commit
bb937825
authored
Aug 03, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
network: Use SOCK_CLOEXEC when available
parent
60538758
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
4 deletions
+15
-4
network.h
libavformat/network.h
+9
-0
sctp.c
libavformat/sctp.c
+1
-1
tcp.c
libavformat/tcp.c
+3
-1
udp.c
libavformat/udp.c
+1
-1
unix.c
libavformat/unix.c
+1
-1
No files found.
libavformat/network.h
View file @
bb937825
...
@@ -246,4 +246,13 @@ int ff_listen_connect(int fd, const struct sockaddr *addr,
...
@@ -246,4 +246,13 @@ int ff_listen_connect(int fd, const struct sockaddr *addr,
int
ff_http_match_no_proxy
(
const
char
*
no_proxy
,
const
char
*
hostname
);
int
ff_http_match_no_proxy
(
const
char
*
no_proxy
,
const
char
*
hostname
);
#ifndef SOCK_CLOEXEC
#define SOCK_CLOEXEC 0
#endif
static
inline
int
ff_socket
(
int
domain
,
int
type
,
int
protocol
)
{
return
socket
(
domain
,
type
|
SOCK_CLOEXEC
,
protocol
);
}
#endif
/* AVFORMAT_NETWORK_H */
#endif
/* AVFORMAT_NETWORK_H */
libavformat/sctp.c
View file @
bb937825
...
@@ -198,7 +198,7 @@ static int sctp_open(URLContext *h, const char *uri, int flags)
...
@@ -198,7 +198,7 @@ static int sctp_open(URLContext *h, const char *uri, int flags)
cur_ai
=
ai
;
cur_ai
=
ai
;
fd
=
socket
(
cur_ai
->
ai_family
,
SOCK_STREAM
,
IPPROTO_SCTP
);
fd
=
ff_
socket
(
cur_ai
->
ai_family
,
SOCK_STREAM
,
IPPROTO_SCTP
);
if
(
fd
<
0
)
if
(
fd
<
0
)
goto
fail
;
goto
fail
;
...
...
libavformat/tcp.c
View file @
bb937825
...
@@ -84,7 +84,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
...
@@ -84,7 +84,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
cur_ai
=
ai
;
cur_ai
=
ai
;
restart:
restart:
fd
=
socket
(
cur_ai
->
ai_family
,
cur_ai
->
ai_socktype
,
cur_ai
->
ai_protocol
);
fd
=
ff_socket
(
cur_ai
->
ai_family
,
cur_ai
->
ai_socktype
,
cur_ai
->
ai_protocol
);
if
(
fd
<
0
)
{
if
(
fd
<
0
)
{
ret
=
ff_neterrno
();
ret
=
ff_neterrno
();
goto
fail
;
goto
fail
;
...
...
libavformat/udp.c
View file @
bb937825
...
@@ -270,7 +270,7 @@ static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr,
...
@@ -270,7 +270,7 @@ static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr,
if
(
res0
==
0
)
if
(
res0
==
0
)
goto
fail
;
goto
fail
;
for
(
res
=
res0
;
res
;
res
=
res
->
ai_next
)
{
for
(
res
=
res0
;
res
;
res
=
res
->
ai_next
)
{
udp_fd
=
socket
(
res
->
ai_family
,
SOCK_DGRAM
,
0
);
udp_fd
=
ff_
socket
(
res
->
ai_family
,
SOCK_DGRAM
,
0
);
if
(
udp_fd
!=
-
1
)
break
;
if
(
udp_fd
!=
-
1
)
break
;
log_net_error
(
NULL
,
AV_LOG_ERROR
,
"socket"
);
log_net_error
(
NULL
,
AV_LOG_ERROR
,
"socket"
);
}
}
...
...
libavformat/unix.c
View file @
bb937825
...
@@ -71,7 +71,7 @@ static int unix_open(URLContext *h, const char *filename, int flags)
...
@@ -71,7 +71,7 @@ static int unix_open(URLContext *h, const char *filename, int flags)
s
->
addr
.
sun_family
=
AF_UNIX
;
s
->
addr
.
sun_family
=
AF_UNIX
;
av_strlcpy
(
s
->
addr
.
sun_path
,
filename
,
sizeof
(
s
->
addr
.
sun_path
));
av_strlcpy
(
s
->
addr
.
sun_path
,
filename
,
sizeof
(
s
->
addr
.
sun_path
));
if
((
fd
=
socket
(
AF_UNIX
,
s
->
type
,
0
))
<
0
)
if
((
fd
=
ff_
socket
(
AF_UNIX
,
s
->
type
,
0
))
<
0
)
return
ff_neterrno
();
return
ff_neterrno
();
if
(
s
->
listen
)
{
if
(
s
->
listen
)
{
...
...
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