several net bugfixes and improvements and fix some memory leaks
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
da1b289afc
commit
bd40efbf0b
8 changed files with 365 additions and 180 deletions
|
|
@ -36,8 +36,6 @@ enum
|
|||
|
||||
typedef struct http_data
|
||||
{
|
||||
grub_uint64_t file_size;
|
||||
grub_uint64_t position;
|
||||
char *current_line;
|
||||
grub_size_t current_line_len;
|
||||
int headers_recv;
|
||||
|
|
@ -47,18 +45,53 @@ typedef struct http_data
|
|||
char *filename;
|
||||
grub_err_t err;
|
||||
char *errmsg;
|
||||
int chunked;
|
||||
grub_size_t chunk_rem;
|
||||
int in_chunk_len;
|
||||
} *http_data_t;
|
||||
|
||||
static grub_off_t
|
||||
have_ahead (struct grub_file *file)
|
||||
{
|
||||
grub_net_t net = file->device->net;
|
||||
grub_off_t ret = net->offset;
|
||||
struct grub_net_packet *pack;
|
||||
for (pack = net->packs.first; pack; pack = pack->next)
|
||||
ret += pack->nb->tail - pack->nb->data;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
parse_line (http_data_t data, char *ptr, grub_size_t len)
|
||||
parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
|
||||
{
|
||||
char *end = ptr + len;
|
||||
while (end > ptr && *(end - 1) == '\r')
|
||||
end--;
|
||||
*end = 0;
|
||||
/* Trailing CRLF. */
|
||||
if (data->in_chunk_len == 1)
|
||||
{
|
||||
data->in_chunk_len = 2;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
if (data->in_chunk_len == 2)
|
||||
{
|
||||
data->chunk_rem = grub_strtoul (ptr, 0, 16);
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
if (data->chunk_rem == 0)
|
||||
{
|
||||
file->device->net->eof = 1;
|
||||
if (file->size == GRUB_FILE_SIZE_UNKNOWN)
|
||||
file->size = have_ahead (file);
|
||||
}
|
||||
data->in_chunk_len = 0;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
if (ptr == end)
|
||||
{
|
||||
data->headers_recv = 1;
|
||||
if (data->chunked)
|
||||
data->in_chunk_len = 2;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -93,10 +126,17 @@ parse_line (http_data_t data, char *ptr, grub_size_t len)
|
|||
== 0 && !data->size_recv)
|
||||
{
|
||||
ptr += sizeof ("Content-Length: ") - 1;
|
||||
data->file_size = grub_strtoull (ptr, &ptr, 10);
|
||||
file->size = grub_strtoull (ptr, &ptr, 10);
|
||||
data->size_recv = 1;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
if (grub_memcmp (ptr, "Transfer-Encoding: chunked",
|
||||
sizeof ("Transfer-Encoding: chunked") - 1) == 0)
|
||||
{
|
||||
data->chunked = 1;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -113,6 +153,8 @@ http_err (grub_net_tcp_socket_t sock __attribute__ ((unused)),
|
|||
grub_free (data->current_line);
|
||||
grub_free (data);
|
||||
file->device->net->eof = 1;
|
||||
if (file->size == GRUB_FILE_SIZE_UNKNOWN)
|
||||
file->size = have_ahead (file);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
|
|
@ -122,94 +164,116 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
|
|||
{
|
||||
grub_file_t file = f;
|
||||
http_data_t data = file->data;
|
||||
char *ptr = (char *) nb->data;
|
||||
grub_err_t err;
|
||||
|
||||
if (!data->headers_recv && data->current_line)
|
||||
while (1)
|
||||
{
|
||||
int have_line = 1;
|
||||
char *t;
|
||||
ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data);
|
||||
if (ptr)
|
||||
ptr++;
|
||||
else
|
||||
char *ptr = (char *) nb->data;
|
||||
if ((!data->headers_recv || data->in_chunk_len) && data->current_line)
|
||||
{
|
||||
have_line = 0;
|
||||
ptr = (char *) nb->tail;
|
||||
}
|
||||
t = grub_realloc (data->current_line,
|
||||
data->current_line_len + (ptr - (char *) nb->data));
|
||||
if (!t)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
data->current_line = t;
|
||||
grub_memcpy (data->current_line + data->current_line_len,
|
||||
nb->data, ptr - (char *) nb->data);
|
||||
data->current_line_len += ptr - (char *) nb->data;
|
||||
if (!have_line)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
err = parse_line (data, data->current_line, data->current_line_len);
|
||||
grub_free (data->current_line);
|
||||
data->current_line = 0;
|
||||
data->current_line_len = 0;
|
||||
if (err)
|
||||
{
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
grub_netbuff_free (nb);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
while (ptr < (char *) nb->tail && !data->headers_recv)
|
||||
{
|
||||
char *ptr2;
|
||||
ptr2 = grub_memchr (ptr, '\n', (char *) nb->tail - ptr);
|
||||
if (!ptr2)
|
||||
{
|
||||
data->current_line = grub_malloc ((char *) nb->tail - ptr);
|
||||
if (!data->current_line)
|
||||
int have_line = 1;
|
||||
char *t;
|
||||
ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data);
|
||||
if (ptr)
|
||||
ptr++;
|
||||
else
|
||||
{
|
||||
have_line = 0;
|
||||
ptr = (char *) nb->tail;
|
||||
}
|
||||
t = grub_realloc (data->current_line,
|
||||
data->current_line_len + (ptr - (char *) nb->data));
|
||||
if (!t)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
return grub_errno;
|
||||
}
|
||||
data->current_line_len = (char *) nb->tail - ptr;
|
||||
grub_memcpy (data->current_line, ptr, data->current_line_len);
|
||||
|
||||
data->current_line = t;
|
||||
grub_memcpy (data->current_line + data->current_line_len,
|
||||
nb->data, ptr - (char *) nb->data);
|
||||
data->current_line_len += ptr - (char *) nb->data;
|
||||
if (!have_line)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
err = parse_line (file, data, data->current_line,
|
||||
data->current_line_len);
|
||||
grub_free (data->current_line);
|
||||
data->current_line = 0;
|
||||
data->current_line_len = 0;
|
||||
if (err)
|
||||
{
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
grub_netbuff_free (nb);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
while (ptr < (char *) nb->tail && (!data->headers_recv
|
||||
|| data->in_chunk_len))
|
||||
{
|
||||
char *ptr2;
|
||||
ptr2 = grub_memchr (ptr, '\n', (char *) nb->tail - ptr);
|
||||
if (!ptr2)
|
||||
{
|
||||
data->current_line = grub_malloc ((char *) nb->tail - ptr);
|
||||
if (!data->current_line)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
return grub_errno;
|
||||
}
|
||||
data->current_line_len = (char *) nb->tail - ptr;
|
||||
grub_memcpy (data->current_line, ptr, data->current_line_len);
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
err = parse_line (file, data, ptr, ptr2 - ptr);
|
||||
if (err)
|
||||
{
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
grub_netbuff_free (nb);
|
||||
return err;
|
||||
}
|
||||
ptr = ptr2 + 1;
|
||||
}
|
||||
|
||||
if (((char *) nb->tail - ptr) <= 0)
|
||||
{
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
err = parse_line (data, ptr, ptr2 - ptr);
|
||||
if (err)
|
||||
{
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
grub_netbuff_free (nb);
|
||||
return err;
|
||||
}
|
||||
ptr = ptr2 + 1;
|
||||
}
|
||||
|
||||
if (((char *) nb->tail - ptr) > 0)
|
||||
{
|
||||
data->position += ((char *) nb->tail - ptr);
|
||||
}
|
||||
err = grub_netbuff_pull (nb, ptr - (char *) nb->data);
|
||||
if (err)
|
||||
{
|
||||
grub_net_tcp_close (data->sock, GRUB_NET_TCP_ABORT);
|
||||
grub_netbuff_free (nb);
|
||||
return err;
|
||||
}
|
||||
grub_net_put_packet (&file->device->net->packs, nb);
|
||||
}
|
||||
if (!(data->chunked && (grub_ssize_t) data->chunk_rem
|
||||
< nb->tail - nb->data))
|
||||
{
|
||||
grub_net_put_packet (&file->device->net->packs, nb);
|
||||
if (data->chunked)
|
||||
data->chunk_rem -= nb->tail - nb->data;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
if (data->chunk_rem)
|
||||
{
|
||||
struct grub_net_buff *nb2;
|
||||
nb2 = grub_netbuff_alloc (data->chunk_rem);
|
||||
if (!nb2)
|
||||
return grub_errno;
|
||||
grub_netbuff_put (nb2, data->chunk_rem);
|
||||
grub_memcpy (nb2->data, nb->data, data->chunk_rem);
|
||||
grub_net_put_packet (&file->device->net->packs, nb2);
|
||||
grub_netbuff_pull (nb, data->chunk_rem);
|
||||
}
|
||||
data->in_chunk_len = 1;
|
||||
}
|
||||
else
|
||||
grub_netbuff_free (nb);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
|
|
@ -294,7 +358,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|||
"\r\n"),
|
||||
"Content-Range: bytes %" PRIuGRUB_UINT64_T "-%"
|
||||
PRIuGRUB_UINT64_T "/%" PRIuGRUB_UINT64_T "\r\n\r\n",
|
||||
offset, data->file_size - 1, data->file_size);
|
||||
offset, file->size - 1, file->size);
|
||||
grub_netbuff_put (nb, grub_strlen ((char *) ptr));
|
||||
}
|
||||
ptr = nb->tail;
|
||||
|
|
@ -303,7 +367,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|||
|
||||
data->sock = grub_net_tcp_open (file->device->net->server,
|
||||
HTTP_PORT, http_receive,
|
||||
http_err,
|
||||
http_err, http_err,
|
||||
file);
|
||||
if (!data->sock)
|
||||
{
|
||||
|
|
@ -351,13 +415,17 @@ http_seek (struct grub_file *file, grub_off_t off)
|
|||
grub_net_tcp_close (old_data->sock, GRUB_NET_TCP_ABORT);
|
||||
|
||||
while (file->device->net->packs.first)
|
||||
grub_net_remove_packet (file->device->net->packs.first);
|
||||
{
|
||||
grub_netbuff_free (file->device->net->packs.first->nb);
|
||||
grub_net_remove_packet (file->device->net->packs.first);
|
||||
}
|
||||
|
||||
file->device->net->offset = off;
|
||||
|
||||
data = grub_zalloc (sizeof (*data));
|
||||
if (!data)
|
||||
return grub_errno;
|
||||
|
||||
data->file_size = old_data->file_size;
|
||||
data->size_recv = 1;
|
||||
data->filename = old_data->filename;
|
||||
if (!data->filename)
|
||||
|
|
@ -367,6 +435,7 @@ http_seek (struct grub_file *file, grub_off_t off)
|
|||
}
|
||||
grub_free (old_data);
|
||||
|
||||
file->data = data;
|
||||
err = http_establish (file, off, 0);
|
||||
if (err)
|
||||
{
|
||||
|
|
@ -386,6 +455,7 @@ http_open (struct grub_file *file, const char *filename)
|
|||
data = grub_zalloc (sizeof (*data));
|
||||
if (!data)
|
||||
return grub_errno;
|
||||
file->size = GRUB_FILE_SIZE_UNKNOWN;
|
||||
|
||||
data->filename = grub_strdup (filename);
|
||||
if (!data->filename)
|
||||
|
|
@ -404,7 +474,6 @@ http_open (struct grub_file *file, const char *filename)
|
|||
grub_free (data);
|
||||
return err;
|
||||
}
|
||||
file->size = data->file_size;
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue