rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity
bf0715cdf3
dhcp/dhcp-3.0.5-extended-new-option-info.patch
David Cantrell 0f9f19ccd5 - Include contrib/ subdirectory in /usr/share/doc (#230476) 
- Added back Requires for perl since dhcpd-conf-to-ldap needs it (#225691)
- Put copies of dhcp-options and dhcp-eval man pages in the dhcp and
    dhclient packages rather than having the elaborate symlink collection
- Explicitly name man pages in the %files listings
- Use the %{_sysconfdir} and %{_initrddir} macros (#225691)
- Use macros for commands in %build and %install
- Split README.ldap, draft-ietf-dhc-ldap-schema-01.txt, and
    dhcpd-conf-to-ldap.pl out of the LDAP patch
- Split linux.dbus-example script out of the extended new option info patch
- Remove unnecessary changes from the Makefile patch
2007-03-05 16:02:22 +00:00

203 lines
6.1 KiB
Diff
Raw Blame History

--- dhcp-3.0.5/client/dhclient.c.enoi 2006-08-22 11:13:57.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c 2007-03-04 15:19:43.000000000 -0500
@@ -74,6 +74,9 @@
int onetry=0;
int quiet=0;
int nowait=0;
+#ifdef EXTENDED_NEW_OPTION_INFO
+int extended_option_environment = 0;
+#endif
static void usage PROTO ((void));
@@ -204,6 +207,11 @@
} else if (!strcmp (argv [i], "--version")) {
log_info ("isc-dhclient-%s", DHCP_VERSION);
exit (0);
+#ifdef EXTENDED_NEW_OPTION_INFO
+ } else if (!strcmp (argv [i], "-x")) {
+ extended_option_environment = 1;
+ new_option_info_tree = GENERATE_NEW_OPTION_INFO;
+#endif
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -476,7 +484,11 @@
log_info (arr);
log_info (url);
+#ifdef EXTENDED_NEW_OPTION_INFO
+ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
+#else
log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
+#endif
"[-s server]");
log_error (" [-cf config-file] [-lf lease-file]%s",
"[-pf pid-file] [-e VAR=val]");
@@ -2447,8 +2459,30 @@
struct envadd_state {
struct client_state *client;
const char *prefix;
+#ifdef EXTENDED_NEW_OPTION_INFO
+ struct universe *universe;
+#endif
};
+#ifdef EXTENDED_NEW_OPTION_INFO
+static
+void build_universe_info_envvar
+( struct option_cache *oc,
+ struct packet *p, struct lease *l,
+ struct client_state *client,
+ struct option_state *in_o,
+ struct option_state *cf_o,
+ struct binding_scope **scope,
+ struct universe *u, void *es
+)
+{
+ char info_name[512], info_data[512];
+ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name);
+ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format);
+ client_envadd( client, info_name, oc->option->name, info_data );
+}
+#endif
+
void client_option_envadd (struct option_cache *oc,
struct packet *packet, struct lease *lease,
struct client_state *client_state,
@@ -2465,6 +2499,28 @@
in_options, cfg_options, scope, oc, MDL)) {
if (data.len) {
char name [256];
+#ifdef EXTENDED_NEW_OPTION_INFO
+ if (extended_option_environment) {
+ if ((oc->option->universe != &dhcp_universe)
+ && (oc->option->universe->index > fqdn_universe.index)
+ && (es->universe != oc->option->universe)) {
+ es->universe = oc->option->universe;
+ (*(es->universe->foreach)) ((struct packet *)0,
+ (struct lease *)0,
+ client_state,
+ in_options, cfg_options,
+ scope, es->universe, es,
+ build_universe_info_envvar);
+ } else {
+ if (lookup_new_option_info(oc->option) != NULL) {
+ build_universe_info_envvar(oc, packet, lease,
+ client_state, in_options,
+ cfg_options, scope,
+ oc->option->universe, es);
+ }
+ }
+ }
+#endif
if (dhcp_option_ev_name (name, sizeof name,
oc -> option)) {
client_envadd (es -> client, es -> prefix,
@@ -2704,7 +2760,14 @@
s = option -> name;
if (j + 1 == buflen)
return 0;
+#ifdef EXTENDED_NEW_OPTION_INFO
+ if (!extended_option_environment)
+ buf[j++] = '_';
+ else
+ buf[j++] = '.';
+#else
buf [j++] = '_';
+#endif
}
++i;
} while (i != 2);
--- dhcp-3.0.5/client/dhclient.8.enoi 2005-09-14 12:03:33.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.8 2007-03-04 15:19:43.000000000 -0500
@@ -82,6 +82,9 @@
.B -w
]
[
+.B -x
+]
+[
.I if0
[
.I ...ifN
@@ -265,6 +268,11 @@
supplying the
.B -nw
flag.
+.PP
+The -x argument enables extended option information to be created in the
+-s dhclient-script environment, which would allow applications running
+in that environment to handle options they do not know about in advance -
+this is a Red Hat extension to support dhcdbd and NetworkManager.
.SH CONFIGURATION
The syntax of the dhclient.conf(5) file is discussed separately.
.SH OMAPI
--- dhcp-3.0.5/common/parse.c.enoi 2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.5/common/parse.c 2007-03-04 15:19:43.000000000 -0500
@@ -1271,6 +1271,10 @@
option_hash_add (option -> universe -> hash,
(const char *)option -> name,
0, option, MDL);
+#ifdef EXTENDED_NEW_OPTION_INFO
+ if (new_option_info_tree != NULL)
+ add_new_option_info(option);
+#endif
return 1;
}
--- dhcp-3.0.5/common/tables.c.enoi 2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.5/common/tables.c 2007-03-04 15:19:43.000000000 -0500
@@ -1250,3 +1250,35 @@
fqdn_universe.name, 0,
&fqdn_universe, MDL);
}
+
+#ifdef EXTENDED_NEW_OPTION_INFO
+#include <search.h>
+
+void *new_option_info_tree = NULL;
+
+static int new_option_info_comparator(const void * p1, const void * p2) {
+ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8)
+ | (((const struct option*)p1)->code),
+ ocode2 = (((const struct option*)p2)->universe->index << 8)
+ | (((const struct option*)p2)->code);
+
+ return((ocode1 == ocode2) ? 0 : ((ocode1 > ocode2) ? 1 : -1));
+}
+
+void *add_new_option_info(struct option * option) {
+ if (option->universe->index >= fqdn_universe.index)
+ return NULL;
+
+ if (new_option_info_tree == GENERATE_NEW_OPTION_INFO)
+ new_option_info_tree = NULL;
+
+ return tsearch(option, &(new_option_info_tree), new_option_info_comparator);
+}
+
+void *lookup_new_option_info(struct option * option) {
+ if (new_option_info_tree == GENERATE_NEW_OPTION_INFO)
+ return NULL;
+
+ return tfind(option, &(new_option_info_tree), new_option_info_comparator);
+}
+#endif
--- dhcp-3.0.5/includes/dhcpd.h.enoi 2006-05-17 16:16:59.000000000 -0400
+++ dhcp-3.0.5/includes/dhcpd.h 2007-03-04 15:19:43.000000000 -0500
@@ -1811,6 +1811,13 @@
void initialize_common_option_spaces PROTO ((void));
struct universe *config_universe;
+#ifdef EXTENDED_NEW_OPTION_INFO
+#define GENERATE_NEW_OPTION_INFO ((void*)1)
+extern void *new_option_info_tree;
+extern void *add_new_option_info(struct option *);
+extern void *lookup_new_option_info(struct option *);
+#endif
+
/* stables.c */
#if defined (FAILOVER_PROTOCOL)
extern failover_option_t null_failover_option;
Reference in New Issue View Git Blame Copy Permalink