Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5486/src
Modified Files:
dhcp-server-control.c
Log Message:
server control now accepts server conf
Index: dhcp-server-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-control.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dhcp-server-control.c 25 Jul 2003 02:38:02 -0000 1.5
--- dhcp-server-control.c 26 Jul 2003 23:49:11 -0000 1.6
***************
*** 33,37 ****
#include "dhcp-server.h"
! dhcp_server_control_t *dhcp_server_control_create(const char *interface)
{
int dport, sport;
--- 33,37 ----
#include "dhcp-server.h"
! dhcp_server_control_t *dhcp_server_control_create(const char *interface, server_conf_t *server_conf)
{
int dport, sport;
***************
*** 42,50 ****
dhcp_server_control->interface = xstrdup(interface);
! /* read configuration information. */
! if((dhcp_server_control->server_conf = server_conf_create(interface)) == NULL) {
! FATAL_MESSAGE("could not read configuration file");
! }
!
sport = rawnet_port_for_service("bootpc", "udp");
dport = rawnet_port_for_service("bootps", "udp");
--- 42,46 ----
dhcp_server_control->interface = xstrdup(interface);
! dhcp_server_control->server_conf = server_conf;
sport = rawnet_port_for_service("bootpc", "udp");
dport = rawnet_port_for_service("bootps", "udp");
|