Restructurisations, cleanups and few bugfixes
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
c4d038f632
commit
7e0c2d162a
6 changed files with 251 additions and 178 deletions
|
|
@ -16,8 +16,107 @@ typedef struct tftp_data
|
|||
grub_uint64_t file_size;
|
||||
grub_uint64_t block;
|
||||
grub_uint32_t block_size;
|
||||
int have_oack;
|
||||
grub_net_socket_t sock;
|
||||
} *tftp_data_t;
|
||||
|
||||
static grub_err_t
|
||||
tftp_receive (grub_net_socket_t sock __attribute__ ((unused)),
|
||||
struct grub_net_buff *nb,
|
||||
void *f)
|
||||
{
|
||||
grub_file_t file = f;
|
||||
struct tftphdr *tftph = (void *) nb->data;
|
||||
char nbdata[512];
|
||||
tftp_data_t data = file->data;
|
||||
grub_err_t err;
|
||||
char *ptr;
|
||||
struct grub_net_buff nb_ack;
|
||||
|
||||
nb_ack.head = nbdata;
|
||||
nb_ack.end = nbdata + sizeof (nbdata);
|
||||
|
||||
tftph = (struct tftphdr *) nb->data;
|
||||
switch (grub_be_to_cpu16 (tftph->opcode))
|
||||
{
|
||||
case TFTP_OACK:
|
||||
data->block_size = 512;
|
||||
data->have_oack = 1;
|
||||
for (ptr = nb->data + sizeof (tftph->opcode); ptr < nb->tail;)
|
||||
{
|
||||
if (grub_memcmp (ptr, "tsize\0", sizeof ("tsize\0") - 1) == 0)
|
||||
{
|
||||
data->file_size = grub_strtoul (ptr + sizeof ("tsize\0") - 1,
|
||||
0, 0);
|
||||
}
|
||||
if (grub_memcmp (ptr, "blksize\0", sizeof ("blksize\0") - 1) == 0)
|
||||
{
|
||||
data->block_size = grub_strtoul (ptr + sizeof ("blksize\0") - 1,
|
||||
0, 0);
|
||||
}
|
||||
while (ptr < nb->tail && *ptr)
|
||||
ptr++;
|
||||
ptr++;
|
||||
}
|
||||
data->block = 0;
|
||||
grub_netbuff_free (nb);
|
||||
break;
|
||||
case TFTP_DATA:
|
||||
err = grub_netbuff_pull (nb, sizeof (tftph->opcode) +
|
||||
sizeof (tftph->u.data.block));
|
||||
if (err)
|
||||
return err;
|
||||
if (grub_be_to_cpu16 (tftph->u.data.block) == data->block + 1)
|
||||
{
|
||||
unsigned size = nb->tail - nb->data;
|
||||
data->block++;
|
||||
if (size < data->block_size)
|
||||
{
|
||||
file->device->net->eof = 1;
|
||||
}
|
||||
/* Prevent garbage in broken cards. */
|
||||
if (size > data->block_size)
|
||||
{
|
||||
err = grub_netbuff_unput (nb, size - data->block_size);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
/* If there is data, puts packet in socket list. */
|
||||
if ((nb->tail - nb->data) > 0)
|
||||
grub_net_put_packet (&file->device->net->packs, nb);
|
||||
else
|
||||
grub_netbuff_free (nb);
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
break;
|
||||
case TFTP_ERROR:
|
||||
grub_netbuff_free (nb);
|
||||
return grub_error (GRUB_ERR_IO, (char *) tftph->u.err.errmsg);
|
||||
}
|
||||
grub_netbuff_clear (&nb_ack);
|
||||
grub_netbuff_reserve (&nb_ack, 512);
|
||||
err = grub_netbuff_push (&nb_ack, sizeof (tftph->opcode)
|
||||
+ sizeof (tftph->u.ack.block));
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tftph = (struct tftphdr *) nb_ack.data;
|
||||
tftph->opcode = grub_cpu_to_be16 (TFTP_ACK);
|
||||
tftph->u.ack.block = grub_cpu_to_be16 (data->block);
|
||||
|
||||
err = grub_net_send_udp_packet (data->sock, &nb_ack);
|
||||
if (file->device->net->eof)
|
||||
{
|
||||
grub_net_udp_close (data->sock);
|
||||
data->sock = NULL;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
tftp_open (struct grub_file *file, const char *filename)
|
||||
{
|
||||
|
|
@ -31,17 +130,17 @@ tftp_open (struct grub_file *file, const char *filename)
|
|||
tftp_data_t data;
|
||||
grub_err_t err;
|
||||
|
||||
data = grub_malloc (sizeof (*data));
|
||||
data = grub_zalloc (sizeof (*data));
|
||||
if (!data)
|
||||
return grub_errno;
|
||||
|
||||
file->device->net->socket->data = (void *) data;
|
||||
nb.head = open_data;
|
||||
nb.end = open_data + sizeof (open_data);
|
||||
grub_netbuff_clear (&nb);
|
||||
|
||||
grub_netbuff_reserve (&nb, 1500);
|
||||
if ((err = grub_netbuff_push (&nb, sizeof (*tftph))) != GRUB_ERR_NONE)
|
||||
err = grub_netbuff_push (&nb, sizeof (*tftph));
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tftph = (struct tftphdr *) nb.data;
|
||||
|
|
@ -78,11 +177,21 @@ tftp_open (struct grub_file *file, const char *filename)
|
|||
err = grub_netbuff_unput (&nb, nb.tail - (nb.data + hdrlen));
|
||||
if (err)
|
||||
return err;
|
||||
file->device->net->socket->out_port = TFTP_SERVER_PORT;
|
||||
|
||||
err = grub_net_send_udp_packet (file->device->net->socket, &nb);
|
||||
file->not_easily_seekable = 1;
|
||||
file->data = data;
|
||||
data->sock = grub_net_udp_open (file->device->net->server,
|
||||
TFTP_SERVER_PORT, tftp_receive,
|
||||
file);
|
||||
if (!data->sock)
|
||||
return grub_errno;
|
||||
|
||||
err = grub_net_send_udp_packet (data->sock, &nb);
|
||||
if (err)
|
||||
return err;
|
||||
{
|
||||
grub_net_udp_close (data->sock);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Receive OACK packet. */
|
||||
for (i = 0; i < 3; i++)
|
||||
|
|
@ -90,106 +199,34 @@ tftp_open (struct grub_file *file, const char *filename)
|
|||
grub_net_poll_cards (100);
|
||||
if (grub_errno)
|
||||
return grub_errno;
|
||||
if (file->device->net->socket->status != 0)
|
||||
if (data->have_oack)
|
||||
break;
|
||||
/* Retry. */
|
||||
err = grub_net_send_udp_packet (file->device->net->socket, &nb);
|
||||
err = grub_net_send_udp_packet (data->sock, &nb);
|
||||
if (err)
|
||||
return err;
|
||||
{
|
||||
grub_net_udp_close (data->sock);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (file->device->net->socket->status == 0)
|
||||
return grub_error (GRUB_ERR_TIMEOUT, "Time out opening tftp.");
|
||||
if (!data->have_oack)
|
||||
{
|
||||
grub_net_udp_close (data->sock);
|
||||
return grub_error (GRUB_ERR_TIMEOUT, "Time out opening tftp.");
|
||||
}
|
||||
file->size = data->file_size;
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
tftp_receive (grub_net_socket_t sock, struct grub_net_buff *nb)
|
||||
tftp_close (struct grub_file *file)
|
||||
{
|
||||
struct tftphdr *tftph;
|
||||
char nbdata[128];
|
||||
tftp_data_t data = sock->data;
|
||||
grub_err_t err;
|
||||
char *ptr;
|
||||
struct grub_net_buff nb_ack;
|
||||
|
||||
nb_ack.head = nbdata;
|
||||
nb_ack.end = nbdata + sizeof (nbdata);
|
||||
|
||||
tftph = (struct tftphdr *) nb->data;
|
||||
switch (grub_be_to_cpu16 (tftph->opcode))
|
||||
{
|
||||
case TFTP_OACK:
|
||||
data->block_size = 512;
|
||||
for (ptr = nb->data + sizeof (tftph->opcode); ptr < nb->tail;)
|
||||
{
|
||||
if (grub_memcmp (ptr, "tsize\0", sizeof ("tsize\0") - 1) == 0)
|
||||
{
|
||||
data->file_size = grub_strtoul (ptr + sizeof ("tsize\0") - 1,
|
||||
0, 0);
|
||||
}
|
||||
if (grub_memcmp (ptr, "blksize\0", sizeof ("blksize\0") - 1) == 0)
|
||||
{
|
||||
data->block_size = grub_strtoul (ptr + sizeof ("blksize\0") - 1,
|
||||
0, 0);
|
||||
}
|
||||
while (ptr < nb->tail && *ptr)
|
||||
ptr++;
|
||||
ptr++;
|
||||
}
|
||||
sock->status = 1;
|
||||
data->block = 0;
|
||||
grub_netbuff_clear (nb);
|
||||
break;
|
||||
case TFTP_DATA:
|
||||
err = grub_netbuff_pull (nb, sizeof (tftph->opcode) +
|
||||
sizeof (tftph->u.data.block));
|
||||
if (err)
|
||||
return err;
|
||||
if (grub_be_to_cpu16 (tftph->u.data.block) == data->block + 1)
|
||||
{
|
||||
data->block++;
|
||||
unsigned size = nb->tail - nb->data;
|
||||
if (size < data->block_size)
|
||||
sock->status = 2;
|
||||
/* Prevent garbage in broken cards. */
|
||||
if (size > data->block_size)
|
||||
{
|
||||
err = grub_netbuff_unput (nb, size - data->block_size);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
else
|
||||
grub_netbuff_clear (nb);
|
||||
|
||||
break;
|
||||
case TFTP_ERROR:
|
||||
grub_netbuff_clear (nb);
|
||||
return grub_error (GRUB_ERR_IO, (char *) tftph->u.err.errmsg);
|
||||
break;
|
||||
}
|
||||
grub_netbuff_clear (&nb_ack);
|
||||
grub_netbuff_reserve (&nb_ack, 128);
|
||||
err = grub_netbuff_push (&nb_ack, sizeof (tftph->opcode)
|
||||
+ sizeof (tftph->u.ack.block));
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tftph = (struct tftphdr *) nb_ack.data;
|
||||
tftph->opcode = grub_cpu_to_be16 (TFTP_ACK);
|
||||
tftph->u.ack.block = grub_cpu_to_be16 (data->block);
|
||||
|
||||
err = grub_net_send_udp_packet (sock, &nb_ack);
|
||||
return err;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
tftp_close (struct grub_file *file __attribute__ ((unused)))
|
||||
{
|
||||
grub_free (file->device->net->socket->data);
|
||||
tftp_data_t data = file->data;
|
||||
if (data->sock)
|
||||
grub_net_udp_close (data->sock);
|
||||
grub_free (data);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -197,7 +234,6 @@ static struct grub_net_app_protocol grub_tftp_protocol =
|
|||
{
|
||||
.name = "tftp",
|
||||
.open = tftp_open,
|
||||
.read = tftp_receive,
|
||||
.close = tftp_close
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue