rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

4.3.0rc1

Browse Source
This commit is contained in:
Jiri Popelka 2014-01-29 10:08:47 +01:00
parent 4037da5848
commit 90936e4422
6 changed files with 100 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@
/dhcp-4.2.5.tar.gz /dhcp-4.2.5.tar.gz
/dhcp-4.3.0a1.tar.gz /dhcp-4.3.0a1.tar.gz
/dhcp-4.3.0b1.tar.gz /dhcp-4.3.0b1.tar.gz
/dhcp-4.3.0rc1.tar.gz

14
dhcp-garbage-chars.patch
View File

@ -1,12 +1,12 @@
diff -up dhcp-4.3.0a1/common/tables.c.garbage dhcp-4.3.0a1/common/tables.c diff -up dhcp-4.3.0rc1/common/tables.c.garbage dhcp-4.3.0rc1/common/tables.c
--- dhcp-4.3.0a1/common/tables.c.garbage 2013-12-13 21:30:25.000000000 +0100 --- dhcp-4.3.0rc1/common/tables.c.garbage 2014-01-29 10:03:52.132624677 +0100
+++ dhcp-4.3.0a1/common/tables.c 2013-12-19 15:38:29.131655530 +0100 +++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:04:51.413875343 +0100
@@ -209,7 +209,7 @@ static struct option dhcp_options[] = { @@ -213,7 +213,7 @@ static struct option dhcp_options[] = {
{ "netinfo-server-tag", "t", &dhcp_universe, 113, 1 }, { "name-service-search", "Sa", &dhcp_universe, 117, 1 },
{ "default-url", "t", &dhcp_universe, 114, 1 }, #endif
{ "subnet-selection", "I", &dhcp_universe, 118, 1 }, { "subnet-selection", "I", &dhcp_universe, 118, 1 },
- { "domain-search", "Dc", &dhcp_universe, 119, 1 }, - { "domain-search", "Dc", &dhcp_universe, 119, 1 },
+ { "domain-search", "D", &dhcp_universe, 119, 1 }, + { "domain-search", "D", &dhcp_universe, 119, 1 },
{ "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
{ "vivso", "Evendor.", &dhcp_universe, 125, 1 }, { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
#if 0 #if 0

116
dhcp-rfc3442-classless-static-routes.patch
View File

@ -1,7 +1,7 @@
diff -up dhcp-4.3.0a1/client/clparse.c.rfc3442 dhcp-4.3.0a1/client/clparse.c diff -up dhcp-4.3.0rc1/client/clparse.c.rfc3442 dhcp-4.3.0rc1/client/clparse.c
--- dhcp-4.3.0a1/client/clparse.c.rfc3442 2013-12-19 15:57:58.641263026 +0100 --- dhcp-4.3.0rc1/client/clparse.c.rfc3442 2014-01-29 10:05:48.474400352 +0100
+++ dhcp-4.3.0a1/client/clparse.c 2013-12-19 15:57:58.685262413 +0100 +++ dhcp-4.3.0rc1/client/clparse.c 2014-01-29 10:05:48.517399955 +0100
@@ -37,7 +37,7 @@ @@ -31,7 +31,7 @@
struct client_config top_level_config; struct client_config top_level_config;
@ -10,7 +10,7 @@ diff -up dhcp-4.3.0a1/client/clparse.c.rfc3442 dhcp-4.3.0a1/client/clparse.c
struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1]; struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
static void parse_client_default_duid(struct parse *cfile); static void parse_client_default_duid(struct parse *cfile);
@@ -90,7 +90,11 @@ isc_result_t read_client_conf () @@ -84,7 +84,11 @@ isc_result_t read_client_conf ()
dhcp_universe.code_hash, &code, 0, MDL); dhcp_universe.code_hash, &code, 0, MDL);
/* 4 */ /* 4 */
@ -23,7 +23,7 @@ diff -up dhcp-4.3.0a1/client/clparse.c.rfc3442 dhcp-4.3.0a1/client/clparse.c
option_code_hash_lookup(&default_requested_options[3], option_code_hash_lookup(&default_requested_options[3],
dhcp_universe.code_hash, &code, 0, MDL); dhcp_universe.code_hash, &code, 0, MDL);
@@ -144,6 +148,11 @@ isc_result_t read_client_conf () @@ -138,6 +142,11 @@ isc_result_t read_client_conf ()
option_code_hash_lookup(&default_requested_options[13], option_code_hash_lookup(&default_requested_options[13],
dhcp_universe.code_hash, &code, 0, MDL); dhcp_universe.code_hash, &code, 0, MDL);
@ -35,10 +35,10 @@ diff -up dhcp-4.3.0a1/client/clparse.c.rfc3442 dhcp-4.3.0a1/client/clparse.c
for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
if (default_requested_options[code] == NULL) if (default_requested_options[code] == NULL)
log_fatal("Unable to find option definition for " log_fatal("Unable to find option definition for "
diff -up dhcp-4.3.0a1/common/dhcp-options.5.rfc3442 dhcp-4.3.0a1/common/dhcp-options.5 diff -up dhcp-4.3.0rc1/common/dhcp-options.5.rfc3442 dhcp-4.3.0rc1/common/dhcp-options.5
--- dhcp-4.3.0a1/common/dhcp-options.5.rfc3442 2013-12-19 15:57:58.627263221 +0100 --- dhcp-4.3.0rc1/common/dhcp-options.5.rfc3442 2014-01-29 10:05:48.466400426 +0100
+++ dhcp-4.3.0a1/common/dhcp-options.5 2013-12-19 15:57:58.686262399 +0100 +++ dhcp-4.3.0rc1/common/dhcp-options.5 2014-01-29 10:05:48.518399945 +0100
@@ -116,6 +116,26 @@ hexadecimal, separated by colons. For e @@ -111,6 +111,26 @@ hexadecimal, separated by colons. For e
or or
option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f; option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
.fi .fi
@ -65,7 +65,7 @@ diff -up dhcp-4.3.0a1/common/dhcp-options.5.rfc3442 dhcp-4.3.0a1/common/dhcp-opt
.SH SETTING OPTION VALUES USING EXPRESSIONS .SH SETTING OPTION VALUES USING EXPRESSIONS
Sometimes it's helpful to be able to set the value of a DHCP option Sometimes it's helpful to be able to set the value of a DHCP option
based on some value that the client has sent. To do this, you can based on some value that the client has sent. To do this, you can
@@ -932,6 +952,29 @@ dhclient-script will create routes: @@ -972,6 +992,29 @@ dhclient-script will create routes:
.RE .RE
.PP .PP
.nf .nf
@ -95,10 +95,10 @@ diff -up dhcp-4.3.0a1/common/dhcp-options.5.rfc3442 dhcp-4.3.0a1/common/dhcp-opt
.B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
[\fB,\fR \fIip-address\fR...]\fB;\fR [\fB,\fR \fIip-address\fR...]\fB;\fR
.fi .fi
diff -up dhcp-4.3.0a1/common/inet.c.rfc3442 dhcp-4.3.0a1/common/inet.c diff -up dhcp-4.3.0rc1/common/inet.c.rfc3442 dhcp-4.3.0rc1/common/inet.c
--- dhcp-4.3.0a1/common/inet.c.rfc3442 2013-12-11 01:25:12.000000000 +0100 --- dhcp-4.3.0rc1/common/inet.c.rfc3442 2014-01-26 19:40:44.000000000 +0100
+++ dhcp-4.3.0a1/common/inet.c 2013-12-19 15:57:58.686262399 +0100 +++ dhcp-4.3.0rc1/common/inet.c 2014-01-29 10:05:48.519399936 +0100
@@ -527,6 +527,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne @@ -521,6 +521,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
@ -159,10 +159,10 @@ diff -up dhcp-4.3.0a1/common/inet.c.rfc3442 dhcp-4.3.0a1/common/inet.c
/* piaddr() turns an iaddr structure into a printable address. */ /* piaddr() turns an iaddr structure into a printable address. */
/* XXX: should use a const pointer rather than passing the structure */ /* XXX: should use a const pointer rather than passing the structure */
const char * const char *
diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c diff -up dhcp-4.3.0rc1/common/options.c.rfc3442 dhcp-4.3.0rc1/common/options.c
--- dhcp-4.3.0a1/common/options.c.rfc3442 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.0rc1/common/options.c.rfc3442 2014-01-26 19:40:44.000000000 +0100
+++ dhcp-4.3.0a1/common/options.c 2013-12-19 15:57:58.687262386 +0100 +++ dhcp-4.3.0rc1/common/options.c 2014-01-29 10:05:48.520399927 +0100
@@ -713,7 +713,11 @@ cons_options(struct packet *inpacket, st @@ -707,7 +707,11 @@ cons_options(struct packet *inpacket, st
* packet. * packet.
*/ */
priority_list[priority_len++] = DHO_SUBNET_MASK; priority_list[priority_len++] = DHO_SUBNET_MASK;
@ -175,7 +175,7 @@ diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c
priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS; priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
priority_list[priority_len++] = DHO_HOST_NAME; priority_list[priority_len++] = DHO_HOST_NAME;
priority_list[priority_len++] = DHO_FQDN; priority_list[priority_len++] = DHO_FQDN;
@@ -1694,6 +1698,7 @@ const char *pretty_print_option (option, @@ -1688,6 +1692,7 @@ const char *pretty_print_option (option,
unsigned long tval; unsigned long tval;
isc_boolean_t a_array = ISC_FALSE; isc_boolean_t a_array = ISC_FALSE;
int len_used; int len_used;
@ -183,7 +183,7 @@ diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c
if (emit_commas) if (emit_commas)
comma = ','; comma = ',';
@@ -1702,6 +1707,7 @@ const char *pretty_print_option (option, @@ -1696,6 +1701,7 @@ const char *pretty_print_option (option,
memset (enumbuf, 0, sizeof enumbuf); memset (enumbuf, 0, sizeof enumbuf);
@ -191,7 +191,7 @@ diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c
/* Figure out the size of the data. */ /* Figure out the size of the data. */
for (l = i = 0; option -> format [i]; i++, l++) { for (l = i = 0; option -> format [i]; i++, l++) {
if (l >= sizeof(fmtbuf) - 1) if (l >= sizeof(fmtbuf) - 1)
@@ -1876,6 +1882,33 @@ const char *pretty_print_option (option, @@ -1870,6 +1876,33 @@ const char *pretty_print_option (option,
if (numhunk < 0) if (numhunk < 0)
numhunk = 1; numhunk = 1;
@ -225,7 +225,7 @@ diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c
/* Cycle through the array (or hunk) printing the data. */ /* Cycle through the array (or hunk) printing the data. */
for (i = 0; i < numhunk; i++) { for (i = 0; i < numhunk; i++) {
if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) { if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
@@ -2031,6 +2064,20 @@ const char *pretty_print_option (option, @@ -2025,6 +2058,20 @@ const char *pretty_print_option (option,
strcpy(op, piaddr(iaddr)); strcpy(op, piaddr(iaddr));
dp += 4; dp += 4;
break; break;
@ -246,10 +246,10 @@ diff -up dhcp-4.3.0a1/common/options.c.rfc3442 dhcp-4.3.0a1/common/options.c
case '6': case '6':
iaddr.len = 16; iaddr.len = 16;
memcpy(iaddr.iabuf, dp, 16); memcpy(iaddr.iabuf, dp, 16);
diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c diff -up dhcp-4.3.0rc1/common/parse.c.rfc3442 dhcp-4.3.0rc1/common/parse.c
--- dhcp-4.3.0a1/common/parse.c.rfc3442 2013-12-19 15:57:58.660262761 +0100 --- dhcp-4.3.0rc1/common/parse.c.rfc3442 2014-01-29 10:05:48.491400195 +0100
+++ dhcp-4.3.0a1/common/parse.c 2013-12-19 15:57:58.689262358 +0100 +++ dhcp-4.3.0rc1/common/parse.c 2014-01-29 10:05:48.522399908 +0100
@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr) @@ -335,6 +335,39 @@ int parse_ip_addr (cfile, addr)
} }
/* /*
@ -289,7 +289,7 @@ diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c
* Return true if every character in the string is hexadecimal. * Return true if every character in the string is hexadecimal.
*/ */
static int static int
@@ -719,8 +752,10 @@ unsigned char *parse_numeric_aggregate ( @@ -713,8 +746,10 @@ unsigned char *parse_numeric_aggregate (
if (count) { if (count) {
token = peek_token (&val, (unsigned *)0, cfile); token = peek_token (&val, (unsigned *)0, cfile);
if (token != separator) { if (token != separator) {
@ -301,7 +301,7 @@ diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c
if (token != RBRACE && token != LBRACE) if (token != RBRACE && token != LBRACE)
token = next_token (&val, token = next_token (&val,
(unsigned *)0, (unsigned *)0,
@@ -1660,6 +1695,9 @@ int parse_option_code_definition (cfile, @@ -1654,6 +1689,9 @@ int parse_option_code_definition (cfile,
case IP_ADDRESS: case IP_ADDRESS:
type = 'I'; type = 'I';
break; break;
@ -311,7 +311,7 @@ diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c
case IP6_ADDRESS: case IP6_ADDRESS:
type = '6'; type = '6';
break; break;
@@ -5077,6 +5115,15 @@ int parse_option_token (rv, cfile, fmt, @@ -5071,6 +5109,15 @@ int parse_option_token (rv, cfile, fmt,
} }
break; break;
@ -327,7 +327,7 @@ diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c
case '6': /* IPv6 address. */ case '6': /* IPv6 address. */
if (!parse_ip6_addr(cfile, &addr)) { if (!parse_ip6_addr(cfile, &addr)) {
return 0; return 0;
@@ -5354,6 +5401,13 @@ int parse_option_decl (oc, cfile) @@ -5348,6 +5395,13 @@ int parse_option_decl (oc, cfile)
goto exit; goto exit;
len = ip_addr.len; len = ip_addr.len;
dp = ip_addr.iabuf; dp = ip_addr.iabuf;
@ -341,10 +341,10 @@ diff -up dhcp-4.3.0a1/common/parse.c.rfc3442 dhcp-4.3.0a1/common/parse.c
alloc: alloc:
if (hunkix + len > sizeof hunkbuf) { if (hunkix + len > sizeof hunkbuf) {
diff -up dhcp-4.3.0a1/common/tables.c.rfc3442 dhcp-4.3.0a1/common/tables.c diff -up dhcp-4.3.0rc1/common/tables.c.rfc3442 dhcp-4.3.0rc1/common/tables.c
--- dhcp-4.3.0a1/common/tables.c.rfc3442 2013-12-19 15:57:58.652262873 +0100 --- dhcp-4.3.0rc1/common/tables.c.rfc3442 2014-01-29 10:05:48.485400250 +0100
+++ dhcp-4.3.0a1/common/tables.c 2013-12-19 15:57:58.690262344 +0100 +++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:06:25.724038563 +0100
@@ -52,6 +52,7 @@ HASH_FUNCTIONS (option_code, const unsig @@ -46,6 +46,7 @@ HASH_FUNCTIONS (option_code, const unsig
Format codes: Format codes:
I - IPv4 address I - IPv4 address
@ -352,29 +352,18 @@ diff -up dhcp-4.3.0a1/common/tables.c.rfc3442 dhcp-4.3.0a1/common/tables.c
6 - IPv6 address 6 - IPv6 address
l - 32-bit signed integer l - 32-bit signed integer
L - 32-bit unsigned integer L - 32-bit unsigned integer
@@ -210,6 +211,7 @@ static struct option dhcp_options[] = { @@ -214,6 +215,7 @@ static struct option dhcp_options[] = {
{ "default-url", "t", &dhcp_universe, 114, 1 }, #endif
{ "subnet-selection", "I", &dhcp_universe, 118, 1 }, { "subnet-selection", "I", &dhcp_universe, 118, 1 },
{ "domain-search", "D", &dhcp_universe, 119, 1 }, { "domain-search", "D", &dhcp_universe, 119, 1 },
+ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 }, + { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
{ "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
{ "vivso", "Evendor.", &dhcp_universe, 125, 1 }, { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
#if 0 #if 0
diff -up dhcp-4.3.0a1/includes/dhcp.h.rfc3442 dhcp-4.3.0a1/includes/dhcp.h diff -up dhcp-4.3.0rc1/includes/dhcpd.h.rfc3442 dhcp-4.3.0rc1/includes/dhcpd.h
--- dhcp-4.3.0a1/includes/dhcp.h.rfc3442 2013-12-11 01:01:03.000000000 +0100 --- dhcp-4.3.0rc1/includes/dhcpd.h.rfc3442 2014-01-29 10:05:48.470400389 +0100
+++ dhcp-4.3.0a1/includes/dhcp.h 2013-12-19 15:57:58.691262330 +0100 +++ dhcp-4.3.0rc1/includes/dhcpd.h 2014-01-29 10:05:48.525399881 +0100
@@ -163,6 +163,7 @@ struct dhcp_packet { @@ -2725,6 +2725,7 @@ isc_result_t range2cidr(struct iaddrcidr
#define DHO_ASSOCIATED_IP 92
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */
#define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
#define DHO_VIVCO_SUBOPTIONS 124
#define DHO_VIVSO_SUBOPTIONS 125
diff -up dhcp-4.3.0a1/includes/dhcpd.h.rfc3442 dhcp-4.3.0a1/includes/dhcpd.h
--- dhcp-4.3.0a1/includes/dhcpd.h.rfc3442 2013-12-19 15:57:58.637263082 +0100
+++ dhcp-4.3.0a1/includes/dhcpd.h 2013-12-19 15:57:58.691262330 +0100
@@ -2731,6 +2731,7 @@ isc_result_t range2cidr(struct iaddrcidr
const struct iaddr *lo, const struct iaddr *hi); const struct iaddr *lo, const struct iaddr *hi);
isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result); isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
const char *piaddr (struct iaddr); const char *piaddr (struct iaddr);
@ -382,7 +371,7 @@ diff -up dhcp-4.3.0a1/includes/dhcpd.h.rfc3442 dhcp-4.3.0a1/includes/dhcpd.h
char *piaddrmask(struct iaddr *, struct iaddr *); char *piaddrmask(struct iaddr *, struct iaddr *);
char *piaddrcidr(const struct iaddr *, unsigned int); char *piaddrcidr(const struct iaddr *, unsigned int);
u_int16_t validate_port(char *); u_int16_t validate_port(char *);
@@ -2940,6 +2941,7 @@ void parse_client_lease_declaration (str @@ -2934,6 +2935,7 @@ void parse_client_lease_declaration (str
int parse_option_decl (struct option_cache **, struct parse *); int parse_option_decl (struct option_cache **, struct parse *);
void parse_string_list (struct parse *, struct string_list **, int); void parse_string_list (struct parse *, struct string_list **, int);
int parse_ip_addr (struct parse *, struct iaddr *); int parse_ip_addr (struct parse *, struct iaddr *);
@ -390,10 +379,21 @@ diff -up dhcp-4.3.0a1/includes/dhcpd.h.rfc3442 dhcp-4.3.0a1/includes/dhcpd.h
int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *); int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
void parse_reject_statement (struct parse *, struct client_config *); void parse_reject_statement (struct parse *, struct client_config *);
diff -up dhcp-4.3.0a1/includes/dhctoken.h.rfc3442 dhcp-4.3.0a1/includes/dhctoken.h diff -up dhcp-4.3.0rc1/includes/dhcp.h.rfc3442 dhcp-4.3.0rc1/includes/dhcp.h
--- dhcp-4.3.0a1/includes/dhctoken.h.rfc3442 2013-12-19 15:57:58.692262316 +0100 --- dhcp-4.3.0rc1/includes/dhcp.h.rfc3442 2014-01-26 19:40:44.000000000 +0100
+++ dhcp-4.3.0a1/includes/dhctoken.h 2013-12-19 15:59:10.660260438 +0100 +++ dhcp-4.3.0rc1/includes/dhcp.h 2014-01-29 10:05:48.524399890 +0100
@@ -374,7 +374,8 @@ enum dhcp_token { @@ -159,6 +159,7 @@ struct dhcp_packet {
#define DHO_ASSOCIATED_IP 92
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */
#define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
#define DHO_VIVCO_SUBOPTIONS 124
#define DHO_VIVSO_SUBOPTIONS 125
diff -up dhcp-4.3.0rc1/includes/dhctoken.h.rfc3442 dhcp-4.3.0rc1/includes/dhctoken.h
--- dhcp-4.3.0rc1/includes/dhctoken.h.rfc3442 2014-01-29 10:05:48.435400713 +0100
+++ dhcp-4.3.0rc1/includes/dhctoken.h 2014-01-29 10:05:48.526399871 +0100
@@ -368,7 +368,8 @@ enum dhcp_token {
POOL6 = 669, POOL6 = 669,
V6RELAY = 670, V6RELAY = 670,
V6RELOPT = 671, V6RELOPT = 671,

56
dhcp-xen-checksum.patch
View File

@ -1,18 +1,18 @@
diff -up dhcp-4.3.0a1/common/bpf.c.xen dhcp-4.3.0a1/common/bpf.c diff -up dhcp-4.3.0rc1/common/bpf.c.xen dhcp-4.3.0rc1/common/bpf.c
--- dhcp-4.3.0a1/common/bpf.c.xen 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.0rc1/common/bpf.c.xen 2014-01-29 10:03:27.503941664 +0100
+++ dhcp-4.3.0a1/common/bpf.c 2013-12-19 15:14:40.226614464 +0100 +++ dhcp-4.3.0rc1/common/bpf.c 2014-01-29 10:03:37.564812175 +0100
@@ -486,7 +486,7 @@ ssize_t receive_packet (interface, buf, @@ -481,7 +481,7 @@ ssize_t receive_packet (interface, buf,
offset = decode_udp_ip_header (interface, /* Decode the IP and UDP headers... */
interface -> rbuf, offset = decode_udp_ip_header(interface, interface->rbuf,
interface -> rbuf_offset, interface->rbuf_offset,
- from, hdr.bh_caplen, &paylen); - from, hdr.bh_caplen, &paylen);
+ from, hdr.bh_caplen, &paylen, 0); + from, hdr.bh_caplen, &paylen, 0);
/* If the IP or UDP checksum was bad, skip the packet... */ /* If the IP or UDP checksum was bad, skip the packet... */
if (offset < 0) { if (offset < 0) {
diff -up dhcp-4.3.0a1/common/dlpi.c.xen dhcp-4.3.0a1/common/dlpi.c diff -up dhcp-4.3.0rc1/common/dlpi.c.xen dhcp-4.3.0rc1/common/dlpi.c
--- dhcp-4.3.0a1/common/dlpi.c.xen 2013-12-11 01:25:12.000000000 +0100 --- dhcp-4.3.0rc1/common/dlpi.c.xen 2014-01-25 05:18:03.000000000 +0100
+++ dhcp-4.3.0a1/common/dlpi.c 2013-12-19 15:14:40.227614451 +0100 +++ dhcp-4.3.0rc1/common/dlpi.c 2014-01-29 10:03:27.503941664 +0100
@@ -691,7 +691,7 @@ ssize_t receive_packet (interface, buf, @@ -691,7 +691,7 @@ ssize_t receive_packet (interface, buf,
length -= offset; length -= offset;
#endif #endif
@ -22,9 +22,9 @@ diff -up dhcp-4.3.0a1/common/dlpi.c.xen dhcp-4.3.0a1/common/dlpi.c
/* /*
* If the IP or UDP checksum was bad, skip the packet... * If the IP or UDP checksum was bad, skip the packet...
diff -up dhcp-4.3.0a1/common/lpf.c.xen dhcp-4.3.0a1/common/lpf.c diff -up dhcp-4.3.0rc1/common/lpf.c.xen dhcp-4.3.0rc1/common/lpf.c
--- dhcp-4.3.0a1/common/lpf.c.xen 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.0rc1/common/lpf.c.xen 2014-01-25 05:18:03.000000000 +0100
+++ dhcp-4.3.0a1/common/lpf.c 2013-12-19 15:25:33.635559701 +0100 +++ dhcp-4.3.0rc1/common/lpf.c 2014-01-29 10:03:27.504941651 +0100
@@ -29,14 +29,15 @@ @@ -29,14 +29,15 @@
#include "dhcpd.h" #include "dhcpd.h"
@ -192,10 +192,10 @@ diff -up dhcp-4.3.0a1/common/lpf.c.xen dhcp-4.3.0a1/common/lpf.c
/* If the IP or UDP checksum was bad, skip the packet... */ /* If the IP or UDP checksum was bad, skip the packet... */
if (offset < 0) if (offset < 0)
diff -up dhcp-4.3.0a1/common/nit.c.xen dhcp-4.3.0a1/common/nit.c diff -up dhcp-4.3.0rc1/common/nit.c.xen dhcp-4.3.0rc1/common/nit.c
--- dhcp-4.3.0a1/common/nit.c.xen 2013-11-07 20:15:08.000000000 +0100 --- dhcp-4.3.0rc1/common/nit.c.xen 2014-01-26 19:40:44.000000000 +0100
+++ dhcp-4.3.0a1/common/nit.c 2013-12-19 15:14:40.228614437 +0100 +++ dhcp-4.3.0rc1/common/nit.c 2014-01-29 10:03:27.504941651 +0100
@@ -369,7 +369,7 @@ ssize_t receive_packet (interface, buf, @@ -363,7 +363,7 @@ ssize_t receive_packet (interface, buf,
/* Decode the IP and UDP headers... */ /* Decode the IP and UDP headers... */
offset = decode_udp_ip_header (interface, ibuf, bufix, offset = decode_udp_ip_header (interface, ibuf, bufix,
@ -204,9 +204,9 @@ diff -up dhcp-4.3.0a1/common/nit.c.xen dhcp-4.3.0a1/common/nit.c
/* If the IP or UDP checksum was bad, skip the packet... */ /* If the IP or UDP checksum was bad, skip the packet... */
if (offset < 0) if (offset < 0)
diff -up dhcp-4.3.0a1/common/packet.c.xen dhcp-4.3.0a1/common/packet.c diff -up dhcp-4.3.0rc1/common/packet.c.xen dhcp-4.3.0rc1/common/packet.c
--- dhcp-4.3.0a1/common/packet.c.xen 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.0rc1/common/packet.c.xen 2013-12-11 01:01:02.000000000 +0100
+++ dhcp-4.3.0a1/common/packet.c 2013-12-19 15:14:40.228614437 +0100 +++ dhcp-4.3.0rc1/common/packet.c 2014-01-29 10:03:27.504941651 +0100
@@ -226,7 +226,7 @@ ssize_t @@ -226,7 +226,7 @@ ssize_t
decode_udp_ip_header(struct interface_info *interface, decode_udp_ip_header(struct interface_info *interface,
unsigned char *buf, unsigned bufix, unsigned char *buf, unsigned bufix,
@ -225,10 +225,10 @@ diff -up dhcp-4.3.0a1/common/packet.c.xen dhcp-4.3.0a1/common/packet.c
udp_packets_bad_checksum++; udp_packets_bad_checksum++;
if (udp_packets_seen > 4 && if (udp_packets_seen > 4 &&
(udp_packets_seen / udp_packets_bad_checksum) < 2) { (udp_packets_seen / udp_packets_bad_checksum) < 2) {
diff -up dhcp-4.3.0a1/common/upf.c.xen dhcp-4.3.0a1/common/upf.c diff -up dhcp-4.3.0rc1/common/upf.c.xen dhcp-4.3.0rc1/common/upf.c
--- dhcp-4.3.0a1/common/upf.c.xen 2013-11-07 20:15:08.000000000 +0100 --- dhcp-4.3.0rc1/common/upf.c.xen 2014-01-26 19:40:44.000000000 +0100
+++ dhcp-4.3.0a1/common/upf.c 2013-12-19 15:14:40.228614437 +0100 +++ dhcp-4.3.0rc1/common/upf.c 2014-01-29 10:03:27.505941638 +0100
@@ -320,7 +320,7 @@ ssize_t receive_packet (interface, buf, @@ -314,7 +314,7 @@ ssize_t receive_packet (interface, buf,
/* Decode the IP and UDP headers... */ /* Decode the IP and UDP headers... */
offset = decode_udp_ip_header (interface, ibuf, bufix, offset = decode_udp_ip_header (interface, ibuf, bufix,
@ -237,10 +237,10 @@ diff -up dhcp-4.3.0a1/common/upf.c.xen dhcp-4.3.0a1/common/upf.c
/* If the IP or UDP checksum was bad, skip the packet... */ /* If the IP or UDP checksum was bad, skip the packet... */
if (offset < 0) if (offset < 0)
diff -up dhcp-4.3.0a1/includes/dhcpd.h.xen dhcp-4.3.0a1/includes/dhcpd.h diff -up dhcp-4.3.0rc1/includes/dhcpd.h.xen dhcp-4.3.0rc1/includes/dhcpd.h
--- dhcp-4.3.0a1/includes/dhcpd.h.xen 2013-12-19 15:14:40.213614645 +0100 --- dhcp-4.3.0rc1/includes/dhcpd.h.xen 2014-01-29 10:03:27.489941844 +0100
+++ dhcp-4.3.0a1/includes/dhcpd.h 2013-12-19 15:14:40.229614423 +0100 +++ dhcp-4.3.0rc1/includes/dhcpd.h 2014-01-29 10:03:27.506941626 +0100
@@ -2867,7 +2867,7 @@ ssize_t decode_hw_header (struct interfa @@ -2861,7 +2861,7 @@ ssize_t decode_hw_header (struct interfa
unsigned, struct hardware *); unsigned, struct hardware *);
ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *, ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *,
unsigned, struct sockaddr_in *, unsigned, struct sockaddr_in *,

7
dhcp.spec
View File

@ -9,7 +9,7 @@
#%%global patchver P2 #%%global patchver P2
%global prever b1 %global prever rc1
#%%global VERSION %{version}-%{patchver} #%%global VERSION %{version}-%{patchver}
#%%global VERSION %{version} #%%global VERSION %{version}
@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.0 Version: 4.3.0
Release: 0.6.%{prever}%{?dist} Release: 0.7.%{prever}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -626,6 +626,9 @@ done
%changelog %changelog
* Wed Jan 29 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-0.7.rc1
- 4.3.0rc1
* Tue Jan 28 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-0.6.b1 * Tue Jan 28 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-0.6.b1
- don't apply retransmission.patch for now (RHBZ#1026565) - don't apply retransmission.patch for now (RHBZ#1026565)

2
sources
View File

@ -1 +1 @@
1cde1782c62af89610d9c73035b1e288 dhcp-4.3.0b1.tar.gz 0dcb3f6b098ac8a8acb74349eeca1161 dhcp-4.3.0rc1.tar.gz