diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2022-08-30 09:38:09 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-31 08:31:21 +0200 |
commit | 9e21f4a6184f020dbc89fd0613f57e8519365454 (patch) | |
tree | 1935e7a682e3e077df3199204db2d655d5f35cc9 | |
parent | 9821f7f47a1fd2b5e250c2b4ed39a5364a00eb07 (diff) | |
download | barebox-9e21f4a6184f020dbc89fd0613f57e8519365454.tar.gz barebox-9e21f4a6184f020dbc89fd0613f57e8519365454.tar.xz |
tftp: refactor data processing
move block handling into dedicated function
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Link: https://lore.barebox.org/20220830073816.2694734-15-enrico.scholz@sigma-chemnitz.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | fs/tftp.c | 37 |
1 files changed, 21 insertions, 16 deletions
@@ -298,6 +298,26 @@ err: return priv->err; } +static void tftp_put_data(struct file_priv *priv, uint16_t block, + void const *pkt, size_t len) +{ + if (len > priv->blocksize) { + pr_warn("tftp: oversized packet (%zu > %d) received\n", + len, priv->blocksize); + return; + } + + priv->last_block = block; + + kfifo_put(priv->fifo, pkt, len); + + if (len < priv->blocksize) { + tftp_send(priv); + priv->err = 0; + priv->state = STATE_DONE; + } +} + static void tftp_recv(struct file_priv *priv, uint8_t *pkt, unsigned len, uint16_t uh_sport) { @@ -390,23 +410,8 @@ static void tftp_recv(struct file_priv *priv, /* Same block again; ignore it. */ break; - if (len > priv->blocksize) { - pr_warn("tftp: oversized packet (%u > %d) received\n", - len, priv->blocksize); - break; - } - - priv->last_block = priv->block; - tftp_timer_reset(priv); - - kfifo_put(priv->fifo, pkt + 2, len); - - if (len < priv->blocksize) { - tftp_send(priv); - priv->err = 0; - priv->state = STATE_DONE; - } + tftp_put_data(priv, priv->block, pkt + 2, len); break; |