Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DHCPCSVC] Eliminate unused code and associated parameters

Browse source 
This is mostly the same as OpenBSD commit b4e4f16f2ae0ddf1e786bb12c99b8c51170a1a33
This commit is contained in:
Hervé Poussineau 2019-04-06 23:11:53 +02:00
parent a3e870be51
commit 15a828c86d
3 changed files with 13 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/services/dhcpcsvc/dhcp/dhclient.c
View file

@ -1288,7 +1288,7 @@ make_discover(struct interface_info *ip, struct client_lease *lease)
/* Set up the option buffer... */ /* Set up the option buffer... */
ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0,
options, 0, 0, 0, NULL, 0); options);
if (ip->client->packet_length < BOOTP_MIN_LEN) if (ip->client->packet_length < BOOTP_MIN_LEN)
ip->client->packet_length = BOOTP_MIN_LEN; ip->client->packet_length = BOOTP_MIN_LEN;
@ -1380,7 +1380,7 @@ make_request(struct interface_info *ip, struct client_lease * lease)
/* Set up the option buffer... */ /* Set up the option buffer... */
ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0,
options, 0, 0, 0, NULL, 0); options);
if (ip->client->packet_length < BOOTP_MIN_LEN) if (ip->client->packet_length < BOOTP_MIN_LEN)
ip->client->packet_length = BOOTP_MIN_LEN; ip->client->packet_length = BOOTP_MIN_LEN;
@ -1464,7 +1464,7 @@ make_decline(struct interface_info *ip, struct client_lease *lease)
/* Set up the option buffer... */ /* Set up the option buffer... */
ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0,
options, 0, 0, 0, NULL, 0); options);
if (ip->client->packet_length < BOOTP_MIN_LEN) if (ip->client->packet_length < BOOTP_MIN_LEN)
ip->client->packet_length = BOOTP_MIN_LEN; ip->client->packet_length = BOOTP_MIN_LEN;

70
base/services/dhcpcsvc/dhcp/options.c
View file

@ -49,7 +49,7 @@ int bad_options_max = 5;
void parse_options(struct packet *); void parse_options(struct packet *);
void parse_option_buffer(struct packet *, unsigned char *, int); void parse_option_buffer(struct packet *, unsigned char *, int);
int store_options(unsigned char *, int, struct tree_cache **, int store_options(unsigned char *, int, struct tree_cache **,
unsigned char *, int, int, int, int); unsigned char *, int, int, int);
/* /*
@ -197,12 +197,10 @@ parse_option_buffer(struct packet *packet,
*/ */
int int
cons_options(struct packet *inpacket, struct dhcp_packet *outpacket, cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
int mms, struct tree_cache **options, int mms, struct tree_cache **options)
int overload, /* Overload flags that may be set. */
int terminate, int bootpp, u_int8_t *prl, int prl_len)
{ {
unsigned char priority_list[300], buffer[4096]; unsigned char priority_list[300], buffer[4096];
int priority_len, main_buffer_size, mainbufix, bufix; int priority_len, main_buffer_size, mainbufix;
int option_size, length; int option_size, length;
/* /*
@ -223,8 +221,6 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
if (mms) if (mms)
main_buffer_size = mms - DHCP_FIXED_LEN; main_buffer_size = mms - DHCP_FIXED_LEN;
else if (bootpp)
main_buffer_size = 64;
else else
main_buffer_size = 576 - DHCP_FIXED_LEN; main_buffer_size = 576 - DHCP_FIXED_LEN;
@ -254,14 +250,6 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
inpacket->options[DHO_DHCP_PARAMETER_REQUEST_LIST].data, inpacket->options[DHO_DHCP_PARAMETER_REQUEST_LIST].data,
prlen); prlen);
priority_len += prlen; priority_len += prlen;
prl = priority_list;
} else if (prl) {
if (prl_len + priority_len > sizeof(priority_list))
prl_len = sizeof(priority_list) - priority_len;
memcpy(&priority_list[priority_len], prl, prl_len);
priority_len += prl_len;
prl = priority_list;
} else { } else {
memcpy(&priority_list[priority_len], memcpy(&priority_list[priority_len],
dhcp_option_default_priority_list, dhcp_option_default_priority_list,
@ -272,11 +260,9 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
/* Copy the options into the big buffer... */ /* Copy the options into the big buffer... */
option_size = store_options( option_size = store_options(
buffer, buffer,
(main_buffer_size - 7 + ((overload & 1) ? DHCP_FILE_LEN : 0) + main_buffer_size - 7,
((overload & 2) ? DHCP_SNAME_LEN : 0)),
options, priority_list, priority_len, main_buffer_size, options, priority_list, priority_len, main_buffer_size,
(main_buffer_size + ((overload & 1) ? DHCP_FILE_LEN : 0)), main_buffer_size);
terminate);
/* Put the cookie up front... */ /* Put the cookie up front... */
memcpy(outpacket->options, DHCP_OPTIONS_COOKIE, 4); memcpy(outpacket->options, DHCP_OPTIONS_COOKIE, 4);
@ -305,33 +291,7 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
memcpy(&outpacket->options[mainbufix], memcpy(&outpacket->options[mainbufix],
buffer, main_buffer_size - mainbufix); buffer, main_buffer_size - mainbufix);
bufix = main_buffer_size - mainbufix;
length = DHCP_FIXED_NON_UDP + mainbufix; length = DHCP_FIXED_NON_UDP + mainbufix;
if (overload & 1) {
if (option_size - bufix <= DHCP_FILE_LEN) {
memcpy(outpacket->file,
&buffer[bufix], option_size - bufix);
mainbufix = option_size - bufix;
if (mainbufix < DHCP_FILE_LEN)
outpacket->file[mainbufix++] = (char)DHO_END;
while (mainbufix < DHCP_FILE_LEN)
outpacket->file[mainbufix++] = (char)DHO_PAD;
} else {
memcpy(outpacket->file,
&buffer[bufix], DHCP_FILE_LEN);
bufix += DHCP_FILE_LEN;
}
}
if ((overload & 2) && option_size < bufix) {
memcpy(outpacket->sname,
&buffer[bufix], option_size - bufix);
mainbufix = option_size - bufix;
if (mainbufix < DHCP_SNAME_LEN)
outpacket->file[mainbufix++] = (char)DHO_END;
while (mainbufix < DHCP_SNAME_LEN)
outpacket->file[mainbufix++] = (char)DHO_PAD;
}
} }
return (length); return (length);
} }
@ -342,9 +302,9 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
int int
store_options(unsigned char *buffer, int buflen, struct tree_cache **options, store_options(unsigned char *buffer, int buflen, struct tree_cache **options,
unsigned char *priority_list, int priority_len, int first_cutoff, unsigned char *priority_list, int priority_len, int first_cutoff,
int second_cutoff, int terminate) int second_cutoff)
{ {
int bufix = 0, option_stored[256], i, ix, tto; int bufix = 0, option_stored[256], i, ix;
/* Zero out the stored-lengths array. */ /* Zero out the stored-lengths array. */
memset(option_stored, 0, sizeof(option_stored)); memset(option_stored, 0, sizeof(option_stored));
@ -380,13 +340,6 @@ store_options(unsigned char *buffer, int buflen, struct tree_cache **options,
/* We should now have a constant length for the option. */ /* We should now have a constant length for the option. */
length = options[code]->len; length = options[code]->len;
/* Do we add a NUL? */
if (terminate && dhcp_options[code].format[0] == 't') {
length++;
tto = 1;
} else
tto = 0;
/* Try to store the option. */ /* Try to store the option. */
/* /*
@ -426,13 +379,8 @@ store_options(unsigned char *buffer, int buflen, struct tree_cache **options,
/* Everything looks good - copy it in! */ /* Everything looks good - copy it in! */
buffer[bufix] = code; buffer[bufix] = code;
buffer[bufix + 1] = incr; buffer[bufix + 1] = incr;
if (tto && incr == length) { memcpy(buffer + bufix + 2,
memcpy(buffer + bufix + 2, options[code]->value + ix, incr);
options[code]->value + ix, incr - 1);
buffer[bufix + 2 + incr - 1] = 0;
} else
memcpy(buffer + bufix + 2,
options[code]->value + ix, incr);
length -= incr; length -= incr;
ix += incr; ix += incr;
bufix += 2 + incr; bufix += 2 + incr;

2
base/services/dhcpcsvc/include/dhcpd.h
View file

@ -282,7 +282,7 @@ struct hash_table {
/* options.c */ /* options.c */
int cons_options(struct packet *, struct dhcp_packet *, int, int cons_options(struct packet *, struct dhcp_packet *, int,
struct tree_cache **, int, int, int, u_int8_t *, int); struct tree_cache **);
char *pretty_print_option(unsigned int, char *pretty_print_option(unsigned int,
unsigned char *, int, int, int); unsigned char *, int, int, int);
void do_packet(struct interface_info *, struct dhcp_packet *, void do_packet(struct interface_info *, struct dhcp_packet *,