From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 6FFC53858D39; Tue, 18 Jan 2022 10:32:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FFC53858D39 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: resolver: Debug to output both IP and port # in native b.o. X-Act-Checkin: newlib-cygwin X-Git-Author: Anton Lavrentiev via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: 1dd65a9ede44cafe8a52b8d85becca73d4fd7786 X-Git-Newrev: 5f40b627091d791fc4988177c4e74191ac8bb628 Message-Id: <20220118103215.6FFC53858D39@sourceware.org> Date: Tue, 18 Jan 2022 10:32:15 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 10:32:15 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D5f40b627091= d791fc4988177c4e74191ac8bb628 commit 5f40b627091d791fc4988177c4e74191ac8bb628 Author: Anton Lavrentiev via Cygwin-patches Date: Mon Jan 17 13:03:10 2022 -0500 Cygwin: resolver: Debug to output both IP and port # in native b.o. =20 Also, change a few other debug output spots for consistency Diff: --- winsup/cygwin/libc/minires.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/winsup/cygwin/libc/minires.c b/winsup/cygwin/libc/minires.c index 0979daae3..0cf9efd9b 100644 --- a/winsup/cygwin/libc/minires.c +++ b/winsup/cygwin/libc/minires.c @@ -73,7 +73,7 @@ void minires_get_search(char * string, res_state statp) statp->dnsrch[j] =3D strcpy(ptr, words[j]); statp->dnsrch[j+1] =3D NULL; ptr +=3D sizes[j]; - DPRINTF(debug, "search \"%s\"\n", words[j]); + DPRINTF(debug, "registry search \"%s\"\n", words[j]); } else if (j < MAXDNSRCH + 1) DPRINTF(debug, "no space for \"%s\"\n", words[j]); @@ -170,7 +170,7 @@ static void get_resolv(res_state statp) have_address =3D (statp->nscount !=3D 0); =20 while ( fgets(line, sizeof(line), fd) !=3D 0) { - DPRINTF(debug, "resolv.conf %s", line); + DPRINTF(debug, _PATH_RESCONF " line: %s", line); if ((i =3D scanline(line, words, sizes, DIM(words))) > 0) { if (!have_address && !strncasecmp("nameserver", words[0], sizes[0])) { @@ -186,7 +186,7 @@ static void get_resolv(res_state statp) else { statp->nsaddr_list[ns++].sin_addr.s_addr =3D address; statp->nscount++; - DPRINTF(debug, "server \"%s\"\n", words[j]); + DPRINTF(debug, "nameserver \"%s\"\n", words[j]); } } } @@ -254,6 +254,8 @@ static int open_sock(struct sockaddr_in *CliAddr, int d= ebug) DPRINTF(debug, "bind: %s\n", strerror(errno)); return -1; } + + DPRINTF(debug, "UDP socket sockfd %d\n", fd); return fd; } =0C @@ -352,10 +354,10 @@ static int get_tcp_buf(int fd, unsigned char *buf, in= t size, int debug) int res; while (size > 0) { if ((res =3D read(fd, buf, size)) < 0) { - DPRINTF(debug, "read: %s\n", strerror(errno)); + DPRINTF(debug, "read(TCP): %s\n", strerror(errno)); return -1; } - DPRINTF(debug, "read %d out of %d\n", res, size); + DPRINTF(debug, "read(TCP) %d out of %d\n", res, size); size -=3D res; buf +=3D res; } @@ -384,7 +386,7 @@ static int get_tcp(struct sockaddr_in *CliAddr, } =20 if (cygwin_connect(fd, (struct sockaddr *) CliAddr, sizeof(* CliAddr)) = < 0) { - DPRINTF(debug, "connect: %s\n", strerror(errno)); + DPRINTF(debug, "connect(TCP): %s\n", strerror(errno)); goto done; } =20 @@ -392,7 +394,7 @@ static int get_tcp(struct sockaddr_in *CliAddr, len_buf.len =3D htons(MsgLength); if (write(fd, len_buf.buf, sizeof(len_buf)) !=3D sizeof(len_buf) || write(fd, MsgPtr, MsgLength) !=3D MsgLength) { - DPRINTF(debug, "write: %s\n", strerror(errno)); + DPRINTF(debug, "write(TCP): %s\n", strerror(errno)); goto done; } =20 @@ -503,8 +505,9 @@ int res_nsend( res_state statp, const unsigned char * M= sgPtr, rslt =3D cygwin_sendto(statp->sockfd, MsgPtr, MsgLength, 0, (struct sockaddr *) &statp->nsaddr_list[wServ], sizeof(struct sockaddr_in)); - DPRINTF(debug, "sendto: server %08x sockfd %d %s\n", - statp->nsaddr_list[wServ].sin_addr.s_addr, + DPRINTF(debug, "sendto: server %08X:%hu sockfd %d %s\n", + ntohl(statp->nsaddr_list[wServ].sin_addr.s_addr), + ntohs(statp->nsaddr_list[wServ].sin_port), statp->sockfd, (rslt =3D=3D MsgLength)?"OK":strerror(errno)); if (rslt !=3D MsgLength) { statp->res_h_errno =3D NETDB_INTERNAL; @@ -519,12 +522,14 @@ int res_nsend( res_state statp, const unsigned char *= MsgPtr, timeOut.tv_usec =3D 0; rslt =3D cygwin_select(statp->sockfd + 1, &fdset_read, NULL, NULL, &ti= meOut); if ( rslt =3D=3D 0 ) { /* Timeout */ - DPRINTF(statp->options & RES_DEBUG, "timeout for server %08x\n", - statp->nsaddr_list[wServ].sin_addr.s_addr); + DPRINTF(statp->options & RES_DEBUG, "timeout for server %08X:%hu soc= kfd %d\n", + ntohl(statp->nsaddr_list[wServ].sin_addr.s_addr), + ntohs(statp->nsaddr_list[wServ].sin_port), + statp->sockfd); continue; } else if ((rslt !=3D 1) || (FD_ISSET(statp->sockfd, &fdset_read) =3D=3D= 0)) { - DPRINTF(debug, "select: %s\n", strerror(errno)); + DPRINTF(debug, "select sockfd %d: %s\n", statp->sockfd, strerror(err= no)); statp->res_h_errno =3D NETDB_INTERNAL; return -1; } @@ -533,11 +538,14 @@ int res_nsend( res_state statp, const unsigned char *= MsgPtr, rslt =3D cygwin_recvfrom(statp->sockfd, AnsPtr, AnsLength, 0, (struct sockaddr *) & dnsSockAddr, & addrLen); if (rslt <=3D 0) { - DPRINTF(debug, "recvfrom: %s\n", strerror(errno)); + DPRINTF(debug, "recvfrom sockfd %d: %s\n", statp->sockfd, strerror(e= rrno)); statp->res_h_errno =3D NETDB_INTERNAL; return -1; } - DPRINTF(debug, "recvfrom: %d bytes from %08x\n", rslt, dnsSockAddr.sin= _addr.s_addr); + DPRINTF(debug, "recvfrom: %d bytes from %08X:%hu sockfd %d\n", rslt, + ntohl(dnsSockAddr.sin_addr.s_addr), + ntohs(dnsSockAddr.sin_port), + statp->sockfd); /* Prepare to retry with tcp */