Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
ff13ac8c
Commit
ff13ac8c
authored
17 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Patches
Plain Diff
Backout commit
8f1bc284
as it causes TFTP to fail.
Signed-off-by:
Wolfgang Denk
<
wd@denx.de
>
parent
1900fbf2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
net/tftp.c
+10
-10
10 additions, 10 deletions
net/tftp.c
with
10 additions
and
10 deletions
net/tftp.c
+
10
−
10
View file @
ff13ac8c
...
@@ -238,9 +238,9 @@ TftpSend (void)
...
@@ -238,9 +238,9 @@ TftpSend (void)
static
void
static
void
TftpHandler
(
uchar
*
pkt
,
unsigned
dest
,
unsigned
src
,
unsigned
len
)
TftpHandler
(
uchar
*
pkt
,
unsigned
dest
,
unsigned
src
,
unsigned
len
)
{
{
char
*
blksize
;
ushort
proto
;
ushort
proto
;
ushort
*
s
;
ushort
*
s
;
int
i
;
if
(
dest
!=
TftpOurPort
)
{
if
(
dest
!=
TftpOurPort
)
{
#ifdef CONFIG_MCAST_TFTP
#ifdef CONFIG_MCAST_TFTP
...
@@ -272,22 +272,22 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
...
@@ -272,22 +272,22 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
case
TFTP_OACK
:
case
TFTP_OACK
:
#ifdef ET_DEBUG
#ifdef ET_DEBUG
printf
(
"Got OACK:
\n
"
);
printf
(
"Got OACK: %s %s
\n
"
,
pkt
,
pkt
+
strlen
(
pkt
)
+
1
);
print_buffer
(
0
,
pkt
,
1
,
len
,
16
);
#endif
#endif
TftpState
=
STATE_OACK
;
TftpState
=
STATE_OACK
;
TftpServerPort
=
src
;
TftpServerPort
=
src
;
/* Check for 'blksize' option */
/* Check for 'blksize' option */
pkt
[
len
]
=
0
;
/* NULL terminate so string ops work */
for
(
i
=
0
;
i
<
len
-
8
;
i
++
)
{
blksize
=
strstr
((
char
*
)
pkt
,
"blksize"
)
;
if
(
strcmp
((
char
*
)
pkt
+
i
,
"blksize"
)
==
0
)
{
if
((
b
lk
s
ize
)
&&
(
blksize
+
8
<
(
char
*
)
pkt
+
len
))
{
TftpB
lk
S
ize
=
(
unsigned
short
)
TftpBlkSize
=
simple_strtoul
(
blksize
+
8
,
NULL
,
10
);
simple_strtoul
(
(
char
*
)
pkt
+
i
+
8
,
NULL
,
10
);
#ifdef ET_DEBUG
#ifdef ET_DEBUG
printf
(
"Blocksize ack: %d
\n
"
,
TftpBlkSize
);
printf
(
"Blocksize ack: %s, %d
\n
"
,
(
char
*
)
pkt
+
i
+
8
,
TftpBlkSize
);
#endif
#endif
break
;
}
}
}
#ifdef CONFIG_MCAST_TFTP
#ifdef CONFIG_MCAST_TFTP
parse_multicast_oack
((
char
*
)
pkt
,
len
-
1
);
parse_multicast_oack
((
char
*
)
pkt
,
len
-
1
);
if
((
Multicast
)
&&
(
!
MasterClient
))
if
((
Multicast
)
&&
(
!
MasterClient
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment