Commit ff13ac8c7bbebb238e339592de765c546dba1073

Authored by Wolfgang Denk
1 parent 1900fbf255
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Backout commit 8f1bc284 as it causes TFTP to fail.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -238,9 +238,9 @@
238 238 static void
239 239 TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
240 240 {
241   - char * blksize;
242 241 ushort proto;
243 242 ushort *s;
  243 + int i;
244 244  
245 245 if (dest != TftpOurPort) {
246 246 #ifdef CONFIG_MCAST_TFTP
247 247  
248 248  
249 249  
250 250  
251 251  
... ... @@ -272,22 +272,22 @@
272 272  
273 273 case TFTP_OACK:
274 274 #ifdef ET_DEBUG
275   - printf("Got OACK:\n");
276   - print_buffer (0, pkt, 1, len, 16);
  275 + printf("Got OACK: %s %s\n", pkt, pkt+strlen(pkt)+1);
277 276 #endif
278 277 TftpState = STATE_OACK;
279 278 TftpServerPort = src;
280   -
281 279 /* Check for 'blksize' option */
282   - pkt[len] = 0; /* NULL terminate so string ops work */
283   - blksize = strstr((char*)pkt, "blksize");
284   - if ((blksize) && (blksize + 8 < (char*)pkt + len)) {
285   - TftpBlkSize = simple_strtoul(blksize + 8, NULL, 10);
  280 + for (i=0;i<len-8;i++) {
  281 + if (strcmp ((char*)pkt+i,"blksize") == 0) {
  282 + TftpBlkSize = (unsigned short)
  283 + simple_strtoul((char*)pkt+i+8,NULL,10);
286 284 #ifdef ET_DEBUG
287   - printf("Blocksize ack: %d\n", TftpBlkSize);
  285 + printf ("Blocksize ack: %s, %d\n",
  286 + (char*)pkt+i+8,TftpBlkSize);
288 287 #endif
  288 + break;
  289 + }
289 290 }
290   -
291 291 #ifdef CONFIG_MCAST_TFTP
292 292 parse_multicast_oack((char *)pkt,len-1);
293 293 if ((Multicast) && (!MasterClient))