mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-01 08:27:59 +00:00
Code Issues Releases Activity

Resolve conflicts:

Browse Source 
* rev. 1.33/1.25
This commit is contained in:
Martin Blapp 2003-09-02 11:09:45 +00:00
parent cc55dd3ffa
commit 09f775bd13
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=119672
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contrib/isc-dhcp/client/dhclient.c
View File

@ -41,8 +41,8 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n"
"$FreeBSD$\n";
"$FreeBSD$\n"
"$Id: dhclient.c,v 1.129.2.16 2003/04/26 21:51:39 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -207,6 +207,8 @@ int main (argc, argv, envp)
if (++i == argc)
usage ();
relay = argv [i];
} else if (!strcmp (argv [i], "-nw")) {
nowait = 1;
} else if (!strcmp (argv [i], "-n")) {
/* do not start up any interfaces */
interfaces_requested = 1;
@ -240,8 +242,6 @@ int main (argc, argv, envp)
} else if (!strcmp (argv [i], "--version")) {
log_info ("isc-dhclient-%s", DHCP_VERSION);
exit (0);
} else if (!strcmp (argv [i], "-nw")) {
nowait = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@ -290,6 +290,7 @@ int main (argc, argv, envp)
/* first kill of any currently running client */
if (release_mode) {
FILE *pidfd;
pid_t oldpid;
long temp;
@ -1969,10 +1970,17 @@ void make_discover (client, lease)
/* Set up the option buffer... */
client -> packet_length =
cons_options ((struct packet *)0, &client -> packet,
(struct lease *)0, client, 0,
(struct option_state *)0, options,
&global_scope, 0, 0, 0, (struct data_string *)0,
(struct lease *)0, client,
/* maximum packet size */1500,
(struct option_state *)0,
options,
/* scope */ &global_scope,
/* overload */ 0,
/* terminate */0,
/* bootpp */0,
(struct data_string *)0,
client -> config -> vendor_space_name);
option_state_dereference (&options, MDL);
if (client -> packet_length < BOOTP_MIN_LEN)
client -> packet_length = BOOTP_MIN_LEN;
@ -2036,10 +2044,17 @@ void make_request (client, lease)
/* Set up the option buffer... */
client -> packet_length =
cons_options ((struct packet *)0, &client -> packet,
(struct lease *)0, client, 0,
(struct option_state *)0, client -> sent_options,
&global_scope, 0, 0, 0, (struct data_string *)0,
(struct lease *)0, client,
/* maximum packet size */1500,
(struct option_state *)0,
client -> sent_options,
/* scope */ &global_scope,
/* overload */ 0,
/* terminate */0,
/* bootpp */0,
(struct data_string *)0,
client -> config -> vendor_space_name);
option_state_dereference (&client -> sent_options, MDL);
if (client -> packet_length < BOOTP_MIN_LEN)
client -> packet_length = BOOTP_MIN_LEN;
@ -2165,10 +2180,17 @@ void make_release (client, lease)
/* Set up the option buffer... */
client -> packet_length =
cons_options ((struct packet *)0, &client -> packet,
(struct lease *)0, client, 0,
(struct option_state *)0, options,
&global_scope, 0, 0, 0, (struct data_string *)0,
(struct lease *)0, client,
/* maximum packet size */1500,
(struct option_state *)0,
options,
/* scope */ &global_scope,
/* overload */ 0,
/* terminate */0,
/* bootpp */0,
(struct data_string *)0,
client -> config -> vendor_space_name);
if (client -> packet_length < BOOTP_MIN_LEN)
client -> packet_length = BOOTP_MIN_LEN;
option_state_dereference (&options, MDL);