mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-26 08:18:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

IPv6 improvements

Browse Source
This commit is contained in:
Kfir Itzhak committed 2013-11-22 15:30:05 +02:00
1 parent 4555a8bf92
commit eff58367b4
3 files changed
+33 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/zm_remote_camera.cpp
+12 -16
View File
@@ -35,6 +35,10 @@ RemoteCamera::RemoteCamera( int p_id, const std::string &p_protocol, const std::
RemoteCamera::~RemoteCamera()
{
if(hp != NULL) {
freeaddrinfo(hp);
hp = NULL;
}
}
void RemoteCamera::Initialise()
@@ -61,23 +65,15 @@ void RemoteCamera::Initialise()
auth64 = base64Encode( auth );
}
if ( !hp )
{
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
hints.ai_flags = AI_PASSIVE;
hints.ai_socktype = SOCK_STREAM;
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
if ( getaddrinfo(host.c_str(), NULL, &hints, &hp) != 0 )
{
Fatal( "Can't gethostbyname(%s): %s", host.c_str(), strerror(h_errno) );
}
//memcpy((char *)&sa.sin_addr, (char *)hp->h_addr, hp->h_length);
//sa.sin_family = hp->h_addrtype;
//sa.sin_port = htons(atoi(port.c_str()));
sa = hp->ai_addr;
((struct sockaddr_in *)sa)->sin_port = htons(atoi(port.c_str()));
int ret = getaddrinfo(host.c_str(), port.c_str(), &hints, &hp);
if ( ret != 0 )
{
Fatal( "Can't getaddrinfo(%s port %s): %s", host.c_str(), port.c_str(), gai_strerror(ret) );
}
}