external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #988, refine code.

Browse source
This commit is contained in:
winlin 2017-10-14 12:09:53 +08:00
parent 823dc2df21
commit 922a8f3a5c
11 changed files with 104 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/libs/srs_lib_simple_socket.cpp
View file

@ -67,6 +67,7 @@
#include <stdio.h>
#include <netdb.h>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_consts.hpp>
@ -125,23 +126,23 @@ int srs_hijack_io_connect(srs_hijack_io_t ctx, const char* server_ip, int port)
{
SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx;
char port_string[8];
snprintf(port_string, sizeof(port_string), "%d", port);
char sport[8];
snprintf(sport, sizeof(sport), "%d", port);
addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = skt->family;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_NUMERICHOST;
addrinfo* result = NULL;
if(getaddrinfo(server_ip, port_string, (const addrinfo*)&hints, &result) == 0) {
if(::connect(skt->fd, result->ai_addr, result->ai_addrlen) < 0){
freeaddrinfo(result);
addrinfo* r = NULL;
SrsAutoFree(addrinfo, r);
if(getaddrinfo(server_ip, sport, (const addrinfo*)&hints, &r) == 0) {
if(::connect(skt->fd, r->ai_addr, r->ai_addrlen) < 0){
return ERROR_SOCKET_CONNECT;
}
}
freeaddrinfo(result);
return ERROR_SUCCESS;
}
int srs_hijack_io_read(srs_hijack_io_t ctx, void* buf, size_t size, ssize_t* nread)

4
trunk/src/libs/srs_librtmp.cpp
View file

@ -342,9 +342,9 @@ const char* inet_ntop(int af, const void *src, char *dst, socklen_t size)
{
switch (af) {
case AF_INET:
return (inet_ntop4( (unsigned char*)src, (char*)dst, size));
return (inet_ntop4((unsigned char*)src, (char*)dst, size));
case AF_INET6:
return (char*)(inet_ntop6( (unsigned char*)src, (char*)dst, size));
return (char*)(inet_ntop6((unsigned char*)src, (char*)dst, size));
default:
return (NULL);
}