mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-20 19:52:10 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f186bdcbc7 | ||
|
|
ed1bd54b5c | ||
|
|
da2cad4b14 | ||
|
|
0a4a04969d | ||
|
|
45cb8dd9be | ||
|
|
88b09aaddc | ||
|
|
fe71bba356 | ||
|
|
cbc100fc81 | ||
|
|
68bea10bbf |
No files matched your search
@@ -76,6 +76,47 @@ version 2.76
|
|||||||
The number to be logged can be changed as SERVERS_LOGGED
|
The number to be logged can be changed as SERVERS_LOGGED
|
||||||
in src/config.h.
|
in src/config.h.
|
||||||
|
|
||||||
|
Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
|
||||||
|
These were previously wrong due to an error in RFC 4578.
|
||||||
|
If you're using BC_EFI to boot 64-bit EFI machines, you
|
||||||
|
will need to update your config.
|
||||||
|
|
||||||
|
Add ARM32_EFI and ARM64_EFI as valid architectures in
|
||||||
|
--pxe-service.
|
||||||
|
|
||||||
|
Fix PXE booting for UEFI architectures. Modify PXE boot
|
||||||
|
sequence in this case to force the client to talk to dnsmasq
|
||||||
|
over port 4011. This makes PXE and especially proxy-DHCP PXE
|
||||||
|
work with these archictectures.
|
||||||
|
|
||||||
|
Workaround problems with UEFI PXE clients. There exist
|
||||||
|
in the wild PXE clients which have problems with PXE
|
||||||
|
boot menus. To work around this, when there's a single
|
||||||
|
--pxe-service which applies to client, then that target
|
||||||
|
will be booted directly, rather then sending a
|
||||||
|
single-item boot menu.
|
||||||
|
|
||||||
|
Many thanks to Jarek Polok, Michael Kuron and Dreamcat4
|
||||||
|
for their work on the long-standing UEFI PXE problem.
|
||||||
|
|
||||||
|
Subtle change in the semantics of "basename" in
|
||||||
|
--pxe-service. The historical behaviour has always been
|
||||||
|
that the actual filename downloaded from the TFTP server
|
||||||
|
is <basename>.<layer> where <layer> is an integer which
|
||||||
|
corresponds to the layer parameter supplied by the client.
|
||||||
|
It's not clear what the function of the "layer"
|
||||||
|
actually is in the PXE protocol, and in practise layer
|
||||||
|
is always zero, so the filename is <basename>.0
|
||||||
|
The new behaviour is the same as the old, except when
|
||||||
|
<basename> includes a file suffix, in which case
|
||||||
|
the layer suffix is no longer added. This allows
|
||||||
|
sensible suffices to be used, rather then the
|
||||||
|
meaningless ".0". Only in the unlikely event that you
|
||||||
|
have a config with a basename which already has a
|
||||||
|
suffix, is this an incompatible change, since the file
|
||||||
|
downloaded will change from name.suffix.0 to just
|
||||||
|
name.suffix
|
||||||
|
|
||||||
|
|
||||||
version 2.75
|
version 2.75
|
||||||
Fix reversion on 2.74 which caused 100% CPU use when a
|
Fix reversion on 2.74 which caused 100% CPU use when a
|
||||||
|
|||||||
@@ -350,11 +350,12 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet){
|
|||||||
|
|
||||||
|
|
||||||
int main(int argc, char * const argv[]) {
|
int main(int argc, char * const argv[]) {
|
||||||
const char* iface = "";
|
const char* UNINITIALIZED = "";
|
||||||
const char* ip = "";
|
const char* iface = UNINITIALIZED;
|
||||||
const char* client_id = "";
|
const char* ip = UNINITIALIZED;
|
||||||
const char* server_id = "";
|
const char* client_id = UNINITIALIZED;
|
||||||
const char* iaid = "";
|
const char* server_id = UNINITIALIZED;
|
||||||
|
const char* iaid = UNINITIALIZED;
|
||||||
int dry_run = 0;
|
int dry_run = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
int option_index = 0;
|
int option_index = 0;
|
||||||
@@ -392,7 +393,7 @@ int main(int argc, char * const argv[]) {
|
|||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
usage(argv[0], stdout);
|
usage(argv[0], stdout);
|
||||||
break;
|
return 0;
|
||||||
case '?':
|
case '?':
|
||||||
usage(argv[0], stderr);
|
usage(argv[0], stderr);
|
||||||
return -1;
|
return -1;
|
||||||
@@ -402,6 +403,34 @@ int main(int argc, char * const argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
if (iaid == UNINITIALIZED){
|
||||||
|
fprintf(stderr, "Missing required iaid parameter\n");
|
||||||
|
usage(argv[0], stderr);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (server_id == UNINITIALIZED){
|
||||||
|
fprintf(stderr, "Missing required server-id parameter\n");
|
||||||
|
usage(argv[0], stderr);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (client_id == UNINITIALIZED){
|
||||||
|
fprintf(stderr, "Missing required client-id parameter\n");
|
||||||
|
usage(argv[0], stderr);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (ip == UNINITIALIZED){
|
||||||
|
fprintf(stderr, "Missing required ip parameter\n");
|
||||||
|
usage(argv[0], stderr);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (iface == UNINITIALIZED){
|
||||||
|
fprintf(stderr, "Missing required iface parameter\n");
|
||||||
|
usage(argv[0], stderr);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct dhcp6_packet packet = create_release_packet(iaid, ip, client_id, server_id);
|
struct dhcp6_packet packet = create_release_packet(iaid, ip, client_id, server_id);
|
||||||
if (dry_run){
|
if (dry_run){
|
||||||
uint16_t i;
|
uint16_t i;
|
||||||
|
|||||||
Vendored
+2
-2
@@ -7,13 +7,13 @@ dnsmasq (2.76-1) unstable; urgency=low
|
|||||||
/etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
|
/etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
|
||||||
* Add --help to manpage and mention dhcp6 in summary. (closes: #821226)
|
* Add --help to manpage and mention dhcp6 in summary. (closes: #821226)
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thur, 10 Sep 2015 23:07:21 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 10 Sep 2015 23:07:21 +0000
|
||||||
|
|
||||||
dnsmasq (2.75-1) unstable; urgency=low
|
dnsmasq (2.75-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream. (closes: #794095)
|
* New upstream. (closes: #794095)
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thur, 30 Jul 2015 20:58:31 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 30 Jul 2015 20:58:31 +0000
|
||||||
|
|
||||||
dnsmasq (2.74-1) unstable; urgency=low
|
dnsmasq (2.74-1) unstable; urgency=low
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -1358,7 +1358,7 @@ functions when supported by a suitable DHCP server.
|
|||||||
This specifies a boot option which may appear in a PXE boot menu. <CSA> is
|
This specifies a boot option which may appear in a PXE boot menu. <CSA> is
|
||||||
client system type, only services of the correct type will appear in a
|
client system type, only services of the correct type will appear in a
|
||||||
menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
|
menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
|
||||||
Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI; an
|
Intel_Lean_Client, IA32_EFI, X86-64_EFI, Xscale_EFI, BC_EFI, ARM32_EFI and ARM64_EFI; an
|
||||||
integer may be used for other types. The
|
integer may be used for other types. The
|
||||||
parameter after the menu text may be a file name, in which case dnsmasq acts as a
|
parameter after the menu text may be a file name, in which case dnsmasq acts as a
|
||||||
boot server and directs the PXE client to download the file by TFTP,
|
boot server and directs the PXE client to download the file by TFTP,
|
||||||
@@ -1367,8 +1367,9 @@ either from itself (
|
|||||||
must be set for this to work) or another TFTP server if the final server
|
must be set for this to work) or another TFTP server if the final server
|
||||||
address/name is given.
|
address/name is given.
|
||||||
Note that the "layer"
|
Note that the "layer"
|
||||||
suffix (normally ".0") is supplied by PXE, and should not be added to
|
suffix (normally ".0") is supplied by PXE, and need not be added to
|
||||||
the basename. If an integer boot service type, rather than a basename
|
the basename. Alternatively, the basename may be a filename, complete with suffix, in which case
|
||||||
|
no layer suffix is added. If an integer boot service type, rather than a basename
|
||||||
is given, then the PXE client will search for a
|
is given, then the PXE client will search for a
|
||||||
suitable boot service for that type on the network. This search may be done
|
suitable boot service for that type on the network. This search may be done
|
||||||
by broadcast, or direct to a server if its IP address/name is provided.
|
by broadcast, or direct to a server if its IP address/name is provided.
|
||||||
|
|||||||
+527
-477
File diff suppressed because it is too large.
Load diff
+2
-1
@@ -3298,7 +3298,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
{
|
{
|
||||||
struct pxe_service *new = opt_malloc(sizeof(struct pxe_service));
|
struct pxe_service *new = opt_malloc(sizeof(struct pxe_service));
|
||||||
char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client",
|
char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client",
|
||||||
"IA32_EFI", "BC_EFI", "Xscale_EFI", "x86-64_EFI", NULL };
|
"IA32_EFI", "x86-64_EFI", "Xscale_EFI", "BC_EFI",
|
||||||
|
"ARM32_EFI", "ARM64_EFI", NULL };
|
||||||
static int boottype = 32768;
|
static int boottype = 32768;
|
||||||
|
|
||||||
new->netid = NULL;
|
new->netid = NULL;
|
||||||
|
|||||||
+25
-12
@@ -63,7 +63,7 @@ static void pxe_misc(struct dhcp_packet *mess, unsigned char *end, unsigned char
|
|||||||
static int prune_vendor_opts(struct dhcp_netid *netid);
|
static int prune_vendor_opts(struct dhcp_netid *netid);
|
||||||
static struct dhcp_opt *pxe_opts(int pxe_arch, struct dhcp_netid *netid, struct in_addr local, time_t now);
|
static struct dhcp_opt *pxe_opts(int pxe_arch, struct dhcp_netid *netid, struct in_addr local, time_t now);
|
||||||
struct dhcp_boot *find_boot(struct dhcp_netid *netid);
|
struct dhcp_boot *find_boot(struct dhcp_netid *netid);
|
||||||
static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dhcp_packet *mess, struct in_addr local, time_t now);
|
static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dhcp_packet *mess, struct in_addr local, time_t now, int pxe);
|
||||||
|
|
||||||
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
size_t sz, time_t now, int unicast_dest, int *is_inform, int pxe, struct in_addr fallback)
|
size_t sz, time_t now, int unicast_dest, int *is_inform, int pxe, struct in_addr fallback)
|
||||||
@@ -824,7 +824,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
else
|
else
|
||||||
mess->siaddr = context->local;
|
mess->siaddr = context->local;
|
||||||
|
|
||||||
snprintf((char *)mess->file, sizeof(mess->file), "%s.%d", service->basename, layer);
|
snprintf((char *)mess->file, sizeof(mess->file),
|
||||||
|
strchr(service->basename, '.') ? "%s" :"%s.%d",
|
||||||
|
service->basename, layer);
|
||||||
|
|
||||||
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
||||||
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
|
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
|
||||||
pxe_misc(mess, end, uuid);
|
pxe_misc(mess, end, uuid);
|
||||||
@@ -861,6 +864,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
if (tmp)
|
if (tmp)
|
||||||
{
|
{
|
||||||
struct dhcp_boot *boot;
|
struct dhcp_boot *boot;
|
||||||
|
int redirect4011 = 0;
|
||||||
|
|
||||||
if (tmp->netid.net)
|
if (tmp->netid.net)
|
||||||
{
|
{
|
||||||
@@ -879,11 +883,16 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
|
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
|
|
||||||
/* Only do workaround for replies to 4011 */
|
/* Redirect EFI clients to port 4011 */
|
||||||
if (!pxe)
|
if (pxearch >= 6)
|
||||||
|
{
|
||||||
|
redirect4011 = 1;
|
||||||
mess->siaddr = tmp->local;
|
mess->siaddr = tmp->local;
|
||||||
else
|
}
|
||||||
workaround = pxe_uefi_workaround(pxearch, tagif_netid, mess, tmp->local, now);
|
|
||||||
|
/* Returns true if only one matching service is available. On port 4011,
|
||||||
|
it also inserts the boot file and server name. */
|
||||||
|
workaround = pxe_uefi_workaround(pxearch, tagif_netid, mess, tmp->local, now, pxe);
|
||||||
|
|
||||||
if (!workaround && boot)
|
if (!workaround && boot)
|
||||||
{
|
{
|
||||||
@@ -903,7 +912,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|||||||
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr));
|
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr));
|
||||||
pxe_misc(mess, end, uuid);
|
pxe_misc(mess, end, uuid);
|
||||||
prune_vendor_opts(tagif_netid);
|
prune_vendor_opts(tagif_netid);
|
||||||
if (!workaround)
|
if ((pxe && !workaround) || !redirect4011)
|
||||||
do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
|
do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
|
||||||
|
|
||||||
log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid);
|
log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid);
|
||||||
@@ -1989,16 +1998,16 @@ static int prune_vendor_opts(struct dhcp_netid *netid)
|
|||||||
and jamb the data direct into the DHCP file, siaddr and sname fields.
|
and jamb the data direct into the DHCP file, siaddr and sname fields.
|
||||||
Note that in this case, we have to assume that layer zero would be requested
|
Note that in this case, we have to assume that layer zero would be requested
|
||||||
by the client PXE stack. */
|
by the client PXE stack. */
|
||||||
static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dhcp_packet *mess, struct in_addr local, time_t now)
|
static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dhcp_packet *mess, struct in_addr local, time_t now, int pxe)
|
||||||
{
|
{
|
||||||
struct pxe_service *service, *found;
|
struct pxe_service *service, *found;
|
||||||
|
|
||||||
/* Only workaround UEFI archs. */
|
/* Only workaround UEFI archs. */
|
||||||
if (pxe_arch != 6 && pxe_arch != 7 && pxe_arch != 8 && pxe_arch != 9)
|
if (pxe_arch < 6)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (found = NULL, service = daemon->pxe_services; service; service = service->next)
|
for (found = NULL, service = daemon->pxe_services; service; service = service->next)
|
||||||
if (pxe_arch == service->CSA && match_netid(service->netid, netid, 1))
|
if (pxe_arch == service->CSA && service->basename && match_netid(service->netid, netid, 1))
|
||||||
{
|
{
|
||||||
if (found)
|
if (found)
|
||||||
return 0; /* More than one relevant menu item */
|
return 0; /* More than one relevant menu item */
|
||||||
@@ -2009,6 +2018,9 @@ static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dh
|
|||||||
if (!found)
|
if (!found)
|
||||||
return 0; /* No relevant menu items. */
|
return 0; /* No relevant menu items. */
|
||||||
|
|
||||||
|
if (!pxe)
|
||||||
|
return 1;
|
||||||
|
|
||||||
if (found->sname)
|
if (found->sname)
|
||||||
{
|
{
|
||||||
mess->siaddr = a_record_from_hosts(found->sname, now);
|
mess->siaddr = a_record_from_hosts(found->sname, now);
|
||||||
@@ -2024,7 +2036,8 @@ static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dh
|
|||||||
inet_ntop(AF_INET, &mess->siaddr, (char *)mess->sname, INET_ADDRSTRLEN);
|
inet_ntop(AF_INET, &mess->siaddr, (char *)mess->sname, INET_ADDRSTRLEN);
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf((char *)mess->file, sizeof(mess->file), "%s.0", found->basename);
|
snprintf((char *)mess->file, sizeof(mess->file),
|
||||||
|
strchr(found->basename, '.') ? "%s" : "%s.0", found->basename);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -2563,7 +2576,7 @@ static void do_options(struct dhcp_context *context,
|
|||||||
if (context && pxe_arch != -1)
|
if (context && pxe_arch != -1)
|
||||||
{
|
{
|
||||||
pxe_misc(mess, end, uuid);
|
pxe_misc(mess, end, uuid);
|
||||||
if (!pxe_uefi_workaround(pxe_arch, tagif, mess, context->local, now))
|
if (!pxe_uefi_workaround(pxe_arch, tagif, mess, context->local, now, 0))
|
||||||
config_opts = pxe_opts(pxe_arch, tagif, context->local, now);
|
config_opts = pxe_opts(pxe_arch, tagif, context->local, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user