From 96abfb0fa0815718c67e546a4fea1f220788112e Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Sun, 2 Jun 2013 20:20:40 +0000 Subject: Report getaddrinfo() errors using gai_strerror() --- src/htsftp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/htsftp.c') diff --git a/src/htsftp.c b/src/htsftp.c index 1a9ff77..331d35b 100644 --- a/src/htsftp.c +++ b/src/htsftp.c @@ -256,6 +256,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) { t_hostent *hp; char *a; char _adr[256]; + const char *error = "unknown error"; _adr[0] = '\0'; //T_SOC soc_ctl; @@ -272,9 +273,10 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) { // récupérer adresse résolue strcpybuff(back->info, "host name"); - hp = hts_gethostbyname(opt, _adr, &fullhostent_buffer); + hp = hts_gethostbyname2(opt, _adr, &fullhostent_buffer, &error); if (hp == NULL) { - strcpybuff(back->r.msg, "Unable to get server's address"); + snprintf(back->r.msg, sizeof(back->r.msg), + "Unable to get server's address: %s", error); // back->status=STATUS_FTP_READY; // fini back->r.statuscode = STATUSCODE_NON_FATAL; _HALT_FTP return 0; @@ -583,6 +585,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) { SOCaddr server; int server_size = sizeof(server); t_hostent *hp; + const char *error = "unknown error"; // effacer structure memset(&server, 0, sizeof(server)); @@ -592,7 +595,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) { // résoudre if (adr_ip[0]) { - hp = hts_gethostbyname(opt, adr_ip, &fullhostent_buffer); + hp = hts_gethostbyname2(opt, adr_ip, &fullhostent_buffer, &error); if (hp) { SOCaddr_copyaddr(server, server_size, hp->h_addr_list[0], hp->h_length); @@ -657,7 +660,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) { back->r.statuscode = STATUSCODE_INVALID; } // sinon on est prêts } else { - sprintf(back->r.msg, "Unable to resolve IP %s", adr_ip); + snprintf(back->r.msg, sizeof(back->r.msg), + "Unable to resolve IP %s: %s", adr_ip, error); // back->status=STATUS_FTP_READY; // fini back->r.statuscode = STATUSCODE_INVALID; } // sinon on est prêts -- cgit v1.2.3