virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

network: use getservbyport() only if available

Browse Source 
The absence of this function will only give a less informative
string back from our fallback implementation of getnameinfo().

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard
2012-10-14 20:24:51 +01:00
parent da0d0ae9a4
commit c3e73100af
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -1190,6 +1190,7 @@ HAVE_LIST="
GetProcessTimes GetProcessTimes
GetSystemTimeAsFileTime GetSystemTimeAsFileTime
getrusage getrusage
getservbyport
gettimeofday gettimeofday
gnu_as gnu_as
ibm_asm ibm_asm
@@ -3158,6 +3159,7 @@ if enabled network; then
check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
check_type netinet/sctp.h "struct sctp_event_subscribe" check_type netinet/sctp.h "struct sctp_event_subscribe"
check_func getaddrinfo $network_extralibs check_func getaddrinfo $network_extralibs
check_func getservbyport $network_extralibs
# Prefer arpa/inet.h over winsock2 # Prefer arpa/inet.h over winsock2
if check_header arpa/inet.h ; then if check_header arpa/inet.h ; then
check_func closesocket check_func closesocket

2
libavformat/os_support.c
View File

@@ -235,8 +235,10 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen,
if (serv && servlen > 0) { if (serv && servlen > 0) {
struct servent *ent = NULL; struct servent *ent = NULL;
#if HAVE_GETSERVBYPORT
if (!(flags & NI_NUMERICSERV)) if (!(flags & NI_NUMERICSERV))
ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp"); ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp");
#endif
if (ent) if (ent)
snprintf(serv, servlen, "%s", ent->s_name); snprintf(serv, servlen, "%s", ent->s_name);