RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-09-19 Eric Norum <eric.norum@usask.ca>

Browse Source 
* lib/tftpDriver.c: Add some debugging capability.
This commit is contained in:
Joel Sherrill
2001-09-19 17:40:37 +00:00
parent 6a9db57002
commit 5400f070e6
6 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/exec/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-09-19 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Add some debugging capability.
2001-09-19 Chris Johns <ccj@acm.org> 2001-09-19 Chris Johns <ccj@acm.org>
* nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h, * nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h,

35
c/src/exec/libnetworking/lib/tftpDriver.c
View File

@@ -35,6 +35,9 @@
do { errno = (_error); return -1; } while(0) do { errno = (_error); return -1; } while(0)
#endif #endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1;
#endif
/* /*
* Range of UDP ports to try * Range of UDP ports to try
@@ -349,6 +352,29 @@ getPacket (struct tftpStream *tp, int retryCount)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv); setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug) {
if (len >= (int) sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
switch (opcode) {
default:
printf ("TFTP: OPCODE %d\n", opcode);
break;
case TFTP_OPCODE_DATA:
printf ("TFTP: RECV %d\n", ntohs (tp->pkbuf.tftpDATA.blocknum));
break;
case TFTP_OPCODE_ACK:
printf ("TFTP: GOT ACK %d\n", ntohs (tp->pkbuf.tftpACK.blocknum));
break;
}
}
else {
printf ("TFTP: %d0-byte packet\n", len);
}
}
#endif
return len; return len;
} }
@@ -358,6 +384,11 @@ getPacket (struct tftpStream *tp, int retryCount)
static int static int
sendAck (struct tftpStream *tp) sendAck (struct tftpStream *tp)
{ {
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: ACK %d\n", tp->blocknum);
#endif
/* /*
* Create the acknowledgement * Create the acknowledgement
*/ */
@@ -719,6 +750,10 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
for (;;) { for (;;) {
tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA); tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA);
tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum); tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: SEND %d\n", tp->blocknum);
#endif
if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0, if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0,
(struct sockaddr *)&tp->farAddress, (struct sockaddr *)&tp->farAddress,
sizeof tp->farAddress) < 0) sizeof tp->farAddress) < 0)

4
c/src/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-09-19 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Add some debugging capability.
2001-09-19 Chris Johns <ccj@acm.org> 2001-09-19 Chris Johns <ccj@acm.org>
* nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h, * nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h,

35
c/src/libnetworking/lib/tftpDriver.c
View File

@@ -35,6 +35,9 @@
do { errno = (_error); return -1; } while(0) do { errno = (_error); return -1; } while(0)
#endif #endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1;
#endif
/* /*
* Range of UDP ports to try * Range of UDP ports to try
@@ -349,6 +352,29 @@ getPacket (struct tftpStream *tp, int retryCount)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv); setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug) {
if (len >= (int) sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
switch (opcode) {
default:
printf ("TFTP: OPCODE %d\n", opcode);
break;
case TFTP_OPCODE_DATA:
printf ("TFTP: RECV %d\n", ntohs (tp->pkbuf.tftpDATA.blocknum));
break;
case TFTP_OPCODE_ACK:
printf ("TFTP: GOT ACK %d\n", ntohs (tp->pkbuf.tftpACK.blocknum));
break;
}
}
else {
printf ("TFTP: %d0-byte packet\n", len);
}
}
#endif
return len; return len;
} }
@@ -358,6 +384,11 @@ getPacket (struct tftpStream *tp, int retryCount)
static int static int
sendAck (struct tftpStream *tp) sendAck (struct tftpStream *tp)
{ {
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: ACK %d\n", tp->blocknum);
#endif
/* /*
* Create the acknowledgement * Create the acknowledgement
*/ */
@@ -719,6 +750,10 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
for (;;) { for (;;) {
tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA); tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA);
tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum); tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: SEND %d\n", tp->blocknum);
#endif
if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0, if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0,
(struct sockaddr *)&tp->farAddress, (struct sockaddr *)&tp->farAddress,
sizeof tp->farAddress) < 0) sizeof tp->farAddress) < 0)

4
cpukit/libnetworking/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-09-19 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Add some debugging capability.
2001-09-19 Chris Johns <ccj@acm.org> 2001-09-19 Chris Johns <ccj@acm.org>
* nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h, * nfs/bootp_subr.c, rtems/rtems_bootp.c, rtems/rtems_bsdnet.h,

35
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -35,6 +35,9 @@
do { errno = (_error); return -1; } while(0) do { errno = (_error); return -1; } while(0)
#endif #endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1;
#endif
/* /*
* Range of UDP ports to try * Range of UDP ports to try
@@ -349,6 +352,29 @@ getPacket (struct tftpStream *tp, int retryCount)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv); setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug) {
if (len >= (int) sizeof tp->pkbuf.tftpACK) {
int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
switch (opcode) {
default:
printf ("TFTP: OPCODE %d\n", opcode);
break;
case TFTP_OPCODE_DATA:
printf ("TFTP: RECV %d\n", ntohs (tp->pkbuf.tftpDATA.blocknum));
break;
case TFTP_OPCODE_ACK:
printf ("TFTP: GOT ACK %d\n", ntohs (tp->pkbuf.tftpACK.blocknum));
break;
}
}
else {
printf ("TFTP: %d0-byte packet\n", len);
}
}
#endif
return len; return len;
} }
@@ -358,6 +384,11 @@ getPacket (struct tftpStream *tp, int retryCount)
static int static int
sendAck (struct tftpStream *tp) sendAck (struct tftpStream *tp)
{ {
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: ACK %d\n", tp->blocknum);
#endif
/* /*
* Create the acknowledgement * Create the acknowledgement
*/ */
@@ -719,6 +750,10 @@ static int rtems_tftp_flush ( struct tftpStream *tp )
for (;;) { for (;;) {
tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA); tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA);
tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum); tp->pkbuf.tftpDATA.blocknum = htons (tp->blocknum);
#ifdef RTEMS_TFTP_DRIVER_DEBUG
if (rtems_tftp_driver_debug)
printf ("TFTP: SEND %d\n", tp->blocknum);
#endif
if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0, if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0,
(struct sockaddr *)&tp->farAddress, (struct sockaddr *)&tp->farAddress,
sizeof tp->farAddress) < 0) sizeof tp->farAddress) < 0)