From 36f5cb7ca400299f1e8fc0931406c67d3986be13 Mon Sep 17 00:00:00 2001 From: Ted Lemon Date: Fri, 6 Feb 1998 00:58:36 +0000 Subject: [PATCH] Change cons_option calling convention. Declare dhcp_max_agent_option_packet_length. --- client/dhclient.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c index 13488105..363b4303 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -56,7 +56,7 @@ #ifndef lint static char copyright[] = -"$Id: dhclient.c,v 1.45 1997/12/09 20:29:00 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhclient.c,v 1.46 1998/02/06 00:58:36 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -70,6 +70,8 @@ char *path_dhclient_conf = _PATH_DHCLIENT_CONF; char *path_dhclient_db = _PATH_DHCLIENT_DB; char *path_dhclient_pid = _PATH_DHCLIENT_PID; +int dhcp_max_agent_option_packet_length = 0; + int interfaces_requested = 0; int log_perror = 1; @@ -1358,8 +1360,8 @@ void make_discover (ip, lease) /* Set up the option buffer... */ ip -> client -> packet_length = - cons_options ((struct packet *)0, &ip -> client -> packet, - options, 0, 0, 0); + cons_options ((struct packet *)0, &ip -> client -> packet, 0, + options, (struct agent_options *)0, 0, 0, 0); if (ip -> client -> packet_length < BOOTP_MIN_LEN) ip -> client -> packet_length = BOOTP_MIN_LEN; @@ -1465,8 +1467,8 @@ void make_request (ip, lease) /* Set up the option buffer... */ ip -> client -> packet_length = - cons_options ((struct packet *)0, &ip -> client -> packet, - options, 0, 0, 0); + cons_options ((struct packet *)0, &ip -> client -> packet, 0, + options, (struct agent_options *)0, 0, 0, 0); if (ip -> client -> packet_length < BOOTP_MIN_LEN) ip -> client -> packet_length = BOOTP_MIN_LEN; @@ -1564,8 +1566,8 @@ void make_decline (ip, lease) /* Set up the option buffer... */ ip -> client -> packet_length = - cons_options ((struct packet *)0, &ip -> client -> packet, - options, 0, 0, 0); + cons_options ((struct packet *)0, &ip -> client -> packet, 0, + options, (struct agent_options *)0, 0, 0, 0); if (ip -> client -> packet_length < BOOTP_MIN_LEN) ip -> client -> packet_length = BOOTP_MIN_LEN; @@ -1630,8 +1632,8 @@ void make_release (ip, lease) /* Set up the option buffer... */ ip -> client -> packet_length = - cons_options ((struct packet *)0, &ip -> client -> packet, - options, 0, 0, 0); + cons_options ((struct packet *)0, &ip -> client -> packet, 0, + options, (struct agent_options *)0, 0, 0, 0); if (ip -> client -> packet_length < BOOTP_MIN_LEN) ip -> client -> packet_length = BOOTP_MIN_LEN;