mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-15 06:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests/server/tftpd.c: fix include and enhance debug logging

Browse Source 
setjmp.h should only be included if HAVE_SETJMP_H is defined.

Add additional log statements to see wether reads and writes
are blocking or finishing before an alarm signal is received.

Assisted-by: Peter Wu
Part of #5364
This commit is contained in:
Marc Hoersken 2020-05-10 17:58:29 +02:00
parent 6f63ab41b2
commit 000f721690
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/server/tftpd.c
View File

@ -78,7 +78,9 @@
#include <sys/filio.h>
#endif
#ifdef HAVE_SETJMP_H
#include <setjmp.h>
#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
@ -1183,8 +1185,9 @@ static void sendtftp(struct testcase *test, struct formats *pf)
}
send_data:
logmsg("write");
if(swrite(peer, sdp, size + 4) != size + 4) {
logmsg("write");
logmsg("write: fail");
return;
}
read_ahead(test, pf->f_convert);
@ -1192,7 +1195,9 @@ static void sendtftp(struct testcase *test, struct formats *pf)
#ifdef HAVE_ALARM
alarm(rexmtval); /* read the ack */
#endif
logmsg("read");
n = sread(peer, &ackbuf.storage[0], sizeof(ackbuf.storage));
logmsg("read: %zd", n);
#ifdef HAVE_ALARM
alarm(0);
#endif
@ -1252,8 +1257,9 @@ static void recvtftp(struct testcase *test, struct formats *pf)
(void) sigsetjmp(timeoutbuf, 1);
#endif
send_ack:
logmsg("write");
if(swrite(peer, &ackbuf.storage[0], 4) != 4) {
logmsg("write: fail\n");
logmsg("write: fail");
goto abort;
}
write_behind(test, pf->f_convert);
@ -1261,14 +1267,16 @@ send_ack:
#ifdef HAVE_ALARM
alarm(rexmtval);
#endif
logmsg("read");
n = sread(peer, rdp, PKTSIZE);
logmsg("read: %zd", n);
#ifdef HAVE_ALARM
alarm(0);
#endif
if(got_exit_signal)
goto abort;
if(n < 0) { /* really? */
logmsg("read: fail\n");
logmsg("read: fail");
goto abort;
}
rdp->th_opcode = ntohs((unsigned short)rdp->th_opcode);