0001202: tftp not work - BusyBox Bug and Patch Tracking

(0002130)
rockeychu
02-06-07 23:00

You are right. You can correct it with following patch:

Index: tftp.c
===================================================================
--- tftp.c (revision 17803)
+++ tftp.c (working copy)
@@ -132,7 +132,7 @@
#if ENABLE_FEATURE_TFTP_GET && ENABLE_FEATURE_TFTP_PUT
                const int cmd,
#endif
- const len_and_sockaddr *peer_lsa,
+ len_and_sockaddr *peer_lsa,
                const char *remotefile, const int localfd,
                unsigned port, int tftp_bufsize)
{
@@ -265,7 +265,6 @@
                        }

                        /* receive packet */
- recv_again:
                        tv.tv_sec = TFTP_TIMEOUT;
                        tv.tv_usec = 0;

@@ -290,11 +289,11 @@
#if ENABLE_FEATURE_IPV6
                                if (from->sa_family == AF_INET6)
                                        if (((struct sockaddr_in6*)from)->sin6_port != port)
- goto recv_again;
+ peer_lsa->sin6.sin6_port=((struct sockaddr_in6*)from)->sin6_port;
#endif
                                if (from->sa_family == AF_INET)
                                        if (((struct sockaddr_in*)from)->sin_port != port)
- goto recv_again;
+ peer_lsa->sin.sin_port=((struct sockaddr_in*)from)->sin_port;
                                timeout = 0;
                                break;
                        case 0:

(0002131)
regunkov
02-07-07 00:03
edited on: 02-07-07 00:53

I'm aplay your patch on 1.4.1 manualy. And it's work right now.

ps: How I can fix "Category"? I'm forget change this, when create issue.

(0002132)
rockeychu
02-07-07 01:00

Good news.
You can ask the Manager to change "Category" as you wanted.

(0002135)
vda
02-07-07 12:49

I don't understand that tcpdump. We are sending a packet to tfpt port (69), but are getting replies from port 1474? Is this okay? wow...

07:51:23.730535 IP 10.0.54.254.1024 > roman.nsg.tftp: 28 RRQ nftlroot-ppc.tar.gz" octet
07:51:23.737704 IP roman.nsg.1474 > 10.0.54.254.1024: UDP, length 516

(0002136)
vda
02-07-07 13:20

Please test attached patch. Diffed agains current svn, but probably will apply to 1.4.1

(0002138)
rockeychu
02-07-07 18:03

vda's patch still can't work. With his patch, you'll get a port number as -1.

The following patch resovled this problem:

Index: networking/tftp.c
===================================================================
--- networking/tftp.c (revision 17809)
+++ networking/tftp.c (working copy)
@@ -280,7 +280,7 @@
                                unsigned from_port;
                        case 1:
                                from->len = peer_lsa->len;
- memset(from, 0, peer_lsa->len);
+ memset(&from->sa, 0, peer_lsa->len);
                                len = recvfrom(socketfd, rbuf, tftp_bufsize, 0,
                                                        &from->sa, &from->len);
                                if (len < 0) {

(0002141)
vda
02-08-07 12:42

Thanks rockeychu, fixed in rev 17823.

Issue History
Date Modified	Username	Field	Change
02-06-07 21:09	regunkov	New Issue
02-06-07 21:09	regunkov	Status	new => assigned
02-06-07 21:09	regunkov	Assigned To	=> BusyBox
02-06-07 23:00	rockeychu	Note Added: 0002130
02-07-07 00:03	regunkov	Note Added: 0002131
02-07-07 00:53	regunkov	Note Edited: 0002131
02-07-07 01:00	rockeychu	Note Added: 0002132
02-07-07 12:49	vda	Note Added: 0002135
02-07-07 13:19	vda	File Added: 1.patch
02-07-07 13:20	vda	Note Added: 0002136
02-07-07 18:03	rockeychu	Note Added: 0002138
02-08-07 12:42	vda	Status	assigned => closed
02-08-07 12:42	vda	Note Added: 0002141
02-08-07 12:42	vda	Resolution	open => fixed

Notes
(0002130) rockeychu 02-06-07 23:00	You are right. You can correct it with following patch: Index: tftp.c =================================================================== --- tftp.c (revision 17803) +++ tftp.c (working copy) @@ -132,7 +132,7 @@ #if ENABLE_FEATURE_TFTP_GET && ENABLE_FEATURE_TFTP_PUT const int cmd, #endif - const len_and_sockaddr peer_lsa, + len_and_sockaddr peer_lsa, const char remotefile, const int localfd, unsigned port, int tftp_bufsize) { @@ -265,7 +265,6 @@ } / receive packet / - recv_again: tv.tv_sec = TFTP_TIMEOUT; tv.tv_usec = 0; @@ -290,11 +289,11 @@ #if ENABLE_FEATURE_IPV6 if (from->sa_family == AF_INET6) if (((struct sockaddr_in6)from)->sin6_port != port) - goto recv_again; + peer_lsa->sin6.sin6_port=((struct sockaddr_in6)from)->sin6_port; #endif if (from->sa_family == AF_INET) if (((struct sockaddr_in)from)->sin_port != port) - goto recv_again; + peer_lsa->sin.sin_port=((struct sockaddr_in*)from)->sin_port; timeout = 0; break; case 0:

(0002131) regunkov 02-07-07 00:03 edited on: 02-07-07 00:53	I'm aplay your patch on 1.4.1 manualy. And it's work right now. ps: How I can fix "Category"? I'm forget change this, when create issue.

(0002132) rockeychu 02-07-07 01:00	Good news. You can ask the Manager to change "Category" as you wanted.

(0002135) vda 02-07-07 12:49	I don't understand that tcpdump. We are sending a packet to tfpt port (69), but are getting replies from port 1474? Is this okay? wow... 07:51:23.730535 IP 10.0.54.254.1024 > roman.nsg.tftp: 28 RRQ nftlroot-ppc.tar.gz" octet 07:51:23.737704 IP roman.nsg.1474 > 10.0.54.254.1024: UDP, length 516

(0002136) vda 02-07-07 13:20	Please test attached patch. Diffed agains current svn, but probably will apply to 1.4.1

(0002138) rockeychu 02-07-07 18:03	vda's patch still can't work. With his patch, you'll get a port number as -1. The following patch resovled this problem: Index: networking/tftp.c =================================================================== --- networking/tftp.c (revision 17809) +++ networking/tftp.c (working copy) @@ -280,7 +280,7 @@ unsigned from_port; case 1: from->len = peer_lsa->len; - memset(from, 0, peer_lsa->len); + memset(&from->sa, 0, peer_lsa->len); len = recvfrom(socketfd, rbuf, tftp_bufsize, 0, &from->sa, &from->len); if (len < 0) {

(0002141) vda 02-08-07 12:42	Thanks rockeychu, fixed in rev 17823.

Relationships