mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
229 lines
6.8 KiB
Diff
229 lines
6.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aaron Miller <aaronmiller@fb.com>
|
|
Date: Fri, 29 Jul 2016 17:41:38 +0800
|
|
Subject: [PATCH] net: read bracketed ipv6 addrs and port numbers
|
|
|
|
Allow specifying port numbers for http and tftp paths, and allow ipv6 addresses
|
|
to be recognized with brackets around them, which is required to specify a port
|
|
number
|
|
---
|
|
grub-core/net/http.c | 21 +++++++++++---
|
|
grub-core/net/net.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
grub-core/net/tftp.c | 8 ++++--
|
|
include/grub/net.h | 1 +
|
|
4 files changed, 101 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
|
|
index 5aa4ad3befc..f182d7b871d 100644
|
|
--- a/grub-core/net/http.c
|
|
+++ b/grub-core/net/http.c
|
|
@@ -312,12 +312,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|
int i;
|
|
struct grub_net_buff *nb;
|
|
grub_err_t err;
|
|
+ char* server = file->device->net->server;
|
|
+ int port = file->device->net->port;
|
|
|
|
nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE
|
|
+ sizeof ("GET ") - 1
|
|
+ grub_strlen (data->filename)
|
|
+ sizeof (" HTTP/1.1\r\nHost: ") - 1
|
|
- + grub_strlen (file->device->net->server)
|
|
+ + grub_strlen (server) + sizeof (":XXXXXXXXXX")
|
|
+ sizeof ("\r\nUser-Agent: " PACKAGE_STRING
|
|
"\r\n") - 1
|
|
+ sizeof ("Range: bytes=XXXXXXXXXXXXXXXXXXXX"
|
|
@@ -356,7 +358,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|
sizeof (" HTTP/1.1\r\nHost: ") - 1);
|
|
|
|
ptr = nb->tail;
|
|
- err = grub_netbuff_put (nb, grub_strlen (file->device->net->server));
|
|
+ err = grub_netbuff_put (nb, grub_strlen (server));
|
|
if (err)
|
|
{
|
|
grub_netbuff_free (nb);
|
|
@@ -365,6 +367,15 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|
grub_memcpy (ptr, file->device->net->server,
|
|
grub_strlen (file->device->net->server));
|
|
|
|
+ if (port)
|
|
+ {
|
|
+ ptr = nb->tail;
|
|
+ grub_snprintf ((char *) ptr,
|
|
+ sizeof (":XXXXXXXXXX"),
|
|
+ ":%d",
|
|
+ port);
|
|
+ }
|
|
+
|
|
ptr = nb->tail;
|
|
err = grub_netbuff_put (nb,
|
|
sizeof ("\r\nUser-Agent: " PACKAGE_STRING "\r\n")
|
|
@@ -390,8 +401,10 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
|
|
grub_netbuff_put (nb, 2);
|
|
grub_memcpy (ptr, "\r\n", 2);
|
|
|
|
- data->sock = grub_net_tcp_open (file->device->net->server,
|
|
- HTTP_PORT, http_receive,
|
|
+ grub_dprintf ("http", "opening path %s on host %s TCP port %d\n",
|
|
+ data->filename, server, port ? port : HTTP_PORT);
|
|
+ data->sock = grub_net_tcp_open (server,
|
|
+ port ? port : HTTP_PORT, http_receive,
|
|
http_err, http_err,
|
|
file);
|
|
if (!data->sock)
|
|
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
index 9b8944292c7..1f887d44b32 100644
|
|
--- a/grub-core/net/net.c
|
|
+++ b/grub-core/net/net.c
|
|
@@ -439,6 +439,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
|
|
grub_uint16_t newip[8];
|
|
const char *ptr = val;
|
|
int word, quaddot = -1;
|
|
+ int bracketed = 0;
|
|
+
|
|
+ if (ptr[0] == '[') {
|
|
+ bracketed = 1;
|
|
+ ptr++;
|
|
+ }
|
|
|
|
if (ptr[0] == ':' && ptr[1] != ':')
|
|
return 0;
|
|
@@ -477,6 +483,9 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
|
|
grub_memset (&newip[quaddot], 0, (7 - word) * sizeof (newip[0]));
|
|
}
|
|
grub_memcpy (ip, newip, 16);
|
|
+ if (bracketed && *ptr == ']') {
|
|
+ ptr++;
|
|
+ }
|
|
if (rest)
|
|
*rest = ptr;
|
|
return 1;
|
|
@@ -1336,8 +1345,10 @@ grub_net_open_real (const char *name)
|
|
{
|
|
grub_net_app_level_t proto;
|
|
const char *protname, *server;
|
|
+ char *host;
|
|
grub_size_t protnamelen;
|
|
int try;
|
|
+ int port = 0;
|
|
|
|
if (grub_strncmp (name, "pxe:", sizeof ("pxe:") - 1) == 0)
|
|
{
|
|
@@ -1375,6 +1386,72 @@ grub_net_open_real (const char *name)
|
|
return NULL;
|
|
}
|
|
|
|
+ char* port_start;
|
|
+ /* ipv6 or port specified? */
|
|
+ if ((port_start = grub_strchr (server, ':')))
|
|
+ {
|
|
+ char* ipv6_begin;
|
|
+ if((ipv6_begin = grub_strchr (server, '[')))
|
|
+ {
|
|
+ char* ipv6_end = grub_strchr (server, ']');
|
|
+ if(!ipv6_end)
|
|
+ {
|
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
|
+ N_("mismatched [ in address"));
|
|
+ return NULL;
|
|
+ }
|
|
+ /* port number after bracketed ipv6 addr */
|
|
+ if(ipv6_end[1] == ':')
|
|
+ {
|
|
+ port = grub_strtoul (ipv6_end + 2, NULL, 10);
|
|
+ if(port > 65535)
|
|
+ {
|
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
|
+ N_("bad port number"));
|
|
+ return NULL;
|
|
+ }
|
|
+ }
|
|
+ host = grub_strndup (ipv6_begin, (ipv6_end - ipv6_begin) + 1);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (grub_strchr (port_start + 1, ':'))
|
|
+ {
|
|
+ int iplen = grub_strlen (server);
|
|
+ /* bracket bare ipv6 addrs */
|
|
+ host = grub_malloc (iplen + 3);
|
|
+ if(!host)
|
|
+ {
|
|
+ return NULL;
|
|
+ }
|
|
+ host[0] = '[';
|
|
+ grub_memcpy (host + 1, server, iplen);
|
|
+ host[iplen + 1] = ']';
|
|
+ host[iplen + 2] = '\0';
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* hostname:port or ipv4:port */
|
|
+ port = grub_strtol (port_start + 1, NULL, 10);
|
|
+ if(port > 65535)
|
|
+ {
|
|
+ grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
|
+ N_("bad port number"));
|
|
+ return NULL;
|
|
+ }
|
|
+ host = grub_strndup (server, port_start - server);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ host = grub_strdup (server);
|
|
+ }
|
|
+ if (!host)
|
|
+ {
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
for (try = 0; try < 2; try++)
|
|
{
|
|
FOR_NET_APP_LEVEL (proto)
|
|
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
|
|
index f90071353ad..e267af354f4 100644
|
|
--- a/grub-core/net/tftp.c
|
|
+++ b/grub-core/net/tftp.c
|
|
@@ -333,6 +333,7 @@ tftp_open (struct grub_file *file, const char *filename)
|
|
grub_err_t err;
|
|
grub_uint8_t *nbd;
|
|
grub_net_network_level_address_t addr;
|
|
+ int port = file->device->net->port;
|
|
|
|
data = grub_zalloc (sizeof (*data));
|
|
if (!data)
|
|
@@ -405,7 +406,10 @@ tftp_open (struct grub_file *file, const char *filename)
|
|
err = grub_net_resolve_address (file->device->net->server, &addr);
|
|
if (err)
|
|
{
|
|
- grub_dprintf("tftp", "Address resolution failed: %d\n", err);
|
|
+ grub_dprintf ("tftp", "Address resolution failed: %d\n", err);
|
|
+ grub_dprintf ("tftp", "file_size is %llu, block_size is %llu\n",
|
|
+ (unsigned long long)data->file_size,
|
|
+ (unsigned long long)data->block_size);
|
|
destroy_pq (data);
|
|
grub_free (data);
|
|
return err;
|
|
@@ -413,7 +417,7 @@ tftp_open (struct grub_file *file, const char *filename)
|
|
|
|
grub_dprintf("tftp", "opening connection\n");
|
|
data->sock = grub_net_udp_open (addr,
|
|
- TFTP_SERVER_PORT, tftp_receive,
|
|
+ port ? port : TFTP_SERVER_PORT, tftp_receive,
|
|
file);
|
|
if (!data->sock)
|
|
{
|
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
|
index e9ebc6a1b4f..f4cd86e582f 100644
|
|
--- a/include/grub/net.h
|
|
+++ b/include/grub/net.h
|
|
@@ -273,6 +273,7 @@ typedef struct grub_net
|
|
{
|
|
char *server;
|
|
char *name;
|
|
+ int port;
|
|
grub_net_app_level_t protocol;
|
|
grub_net_packets_t packs;
|
|
grub_off_t offset;
|