diff --git a/libresapi/src/webui-src/app/downloads.js b/libresapi/src/webui-src/app/downloads.js index 26dac3b1e..6438f68ae 100644 --- a/libresapi/src/webui-src/app/downloads.js +++ b/libresapi/src/webui-src/app/downloads.js @@ -23,7 +23,7 @@ function progressBar(file){ m("div[style=" + 'background-color:lime;' + 'height:100%;' - + 'width:' + (file.transfered / file.size * 100)+'%' + + 'width:' + (file.transferred / file.size * 100)+'%' + ']' ,"") ]); @@ -33,7 +33,7 @@ function cntrlBtn(file, act) { return( m("div.btn",{ onclick: function(){ - rs.request("transfers/control_download",{action: act, id: file.id}); + rs.request("transfers/control_download",{action: act, hash: file.hash}); } }, act) @@ -68,7 +68,7 @@ module.exports = { ]), paths.map(function (file){ var ctrlBtn = m("div",""); - var progress = file.transfered / file.size * 100; + var progress = file.transferred / file.size * 100; return m("tr",[ m("td",[ m("a.filelink", diff --git a/libretroshare/src/util/rsnet.cc b/libretroshare/src/util/rsnet.cc index d7d60241a..2703b1001 100644 --- a/libretroshare/src/util/rsnet.cc +++ b/libretroshare/src/util/rsnet.cc @@ -31,6 +31,8 @@ #include #endif +#include + /* enforce LITTLE_ENDIAN on Windows */ #ifdef WINDOWS_SYS #define BYTE_ORDER 1234 @@ -76,55 +78,25 @@ void sockaddr_clear(struct sockaddr_in *addr) bool rsGetHostByName(const std::string& hostname, in_addr& returned_addr) { - addrinfo *info = NULL; - int res = getaddrinfo(hostname.c_str(),NULL,NULL,&info) ; + addrinfo hint; memset(&hint, 0, sizeof(hint)); + hint.ai_family = AF_INET; + addrinfo* info = nullptr; + int res = getaddrinfo(hostname.c_str(), nullptr, &hint, &info); - bool ok = true; - if(res > 0 || info == NULL || info->ai_addr == NULL) - { - std::cerr << "(EE) getaddrinfo returned error " << res << " on string \"" << hostname << "\"" << std::endl; - returned_addr.s_addr = 0 ; - ok = false; - } - else - returned_addr.s_addr = ((sockaddr_in*)info->ai_addr)->sin_addr.s_addr ; - - if(info) - freeaddrinfo(info) ; - -#ifdef DEPRECATED_TO_REMOVE -#if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__HAIKU__) - hostent *result = gethostbyname(hostname.c_str()) ; -#else - RsTemporaryMemory mem(8192) ; + bool ok = true; + if(res > 0 || !info || !info->ai_addr) + { + std::cerr << __PRETTY_FUNCTION__ << "(EE) getaddrinfo returned error " + << res << " on string \"" << hostname << "\"" << std::endl; + returned_addr.s_addr = 0; + ok = false; + } + else + returned_addr.s_addr = ((sockaddr_in*)info->ai_addr)->sin_addr.s_addr; - if(!mem) - { - std::cerr << __PRETTY_FUNCTION__ << ": Cannot allocate memory!" << std::endl; - return false; // Do something. - } + if(info) freeaddrinfo(info); - int error = 0; - struct hostent pHost; - struct hostent *result; - - if(gethostbyname_r(hostname.c_str(), &pHost, (char*)(unsigned char*)mem, mem.size(), &result, &error) != 0) - { - std::cerr << __PRETTY_FUNCTION__ << ": cannot call gethostname_r. Internal error reported. Check buffer size." << std::endl; - return false ; - } -#endif - if(!result) - { - std::cerr << __PRETTY_FUNCTION__ << ": gethostname returned null result." << std::endl; - return false ; - } - // Use contents of result. - - returned_addr.s_addr = *(unsigned long*) (result->h_addr); -#endif - - return ok; + return ok; } bool isValidNet(const struct in_addr *addr)