diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-16 11:11:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-20 17:00:10 +0100 |
| commit | 12ef4d0df9ad86a7dc3eb4abf9175e227d7a7305 (patch) | |
| tree | 26122d1e1b1395150ad7bd3b1e3506e166b743e5 /fs/tftp.c | |
| parent | 525d82f33e32427da0eefe0878b53ad73a6a7139 (diff) | |
| download | barebox-12ef4d0df9ad86a7dc3eb4abf9175e227d7a7305.tar.gz barebox-12ef4d0df9ad86a7dc3eb4abf9175e227d7a7305.tar.xz | |
tftp: reset timer on progress
When during tftp receive operation a ACK packet can't successfully be sent
the timer was resetted directly after send resulting in a deadlock.
This patch changes the timer reset operation in a way that it is only resetted
when the actually is progress, namely in the TFTP_ACK/TFTP_DATA pathes in the
tftp handler.
Reported-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Antony Pavlov <antonynpavlov@gmail.com>
Diffstat (limited to 'fs/tftp.c')
| -rw-r--r-- | fs/tftp.c | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -246,6 +246,11 @@ static void tftp_parse_oack(struct file_priv *priv, unsigned char *pkt, int len) } } +static void tftp_timer_reset(struct file_priv *priv) +{ + priv->progress_timeout = priv->resend_timeout = get_time_ns(); +} + static void tftp_handler(void *ctx, char *packet, unsigned len) { struct file_priv *priv = ctx; @@ -282,6 +287,9 @@ static void tftp_handler(void *ctx, char *packet, unsigned len) } priv->block++; + + tftp_timer_reset(priv); + if (priv->state == STATE_LAST) { priv->state = STATE_DONE; break; @@ -335,6 +343,8 @@ static void tftp_handler(void *ctx, char *packet, unsigned len) priv->last_block = priv->block; + tftp_timer_reset(priv); + kfifo_put(priv->fifo, pkt + 2, len); if (len < priv->blocksize) { @@ -364,11 +374,6 @@ static void tftp_handler(void *ctx, char *packet, unsigned len) } } -static void tftp_timer_reset(struct file_priv *priv) -{ - priv->progress_timeout = priv->resend_timeout = get_time_ns(); -} - static struct file_priv *tftp_do_open(struct device_d *dev, int accmode, const char *filename) { @@ -549,8 +554,6 @@ static int tftp_read(struct device_d *dev, FILE *f, void *buf, size_t insize) debug("%s %d\n", __func__, insize); - tftp_timer_reset(priv); - while (insize) { now = kfifo_get(priv->fifo, buf, insize); if (priv->state == STATE_DONE) @@ -561,10 +564,8 @@ static int tftp_read(struct device_d *dev, FILE *f, void *buf, size_t insize) insize -= now; } - if (TFTP_FIFO_SIZE - kfifo_len(priv->fifo) >= priv->blocksize) { + if (TFTP_FIFO_SIZE - kfifo_len(priv->fifo) >= priv->blocksize) tftp_send(priv); - tftp_timer_reset(priv); - } ret = tftp_poll(priv); if (ret == TFTP_ERR_RESEND) |