[dhcp-agent-commits] dhcp-agent/src dhcp-server-control.c,1.4,1.5

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23410/src

Modified Files:
	dhcp-server-control.c 
Log Message:
now using new rawnet interface

Index: dhcp-server-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-control.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dhcp-server-control.c	20 Jul 2003 05:52:31 -0000	1.4
--- dhcp-server-control.c	25 Jul 2003 02:38:02 -0000	1.5
***************
*** 35,39 ****
  dhcp_server_control_t *dhcp_server_control_create(const char *interface)
  {
!     int port;
      stringbuffer_t *filter;
      dhcp_server_control_t *dhcp_server_control;
--- 35,39 ----
  dhcp_server_control_t *dhcp_server_control_create(const char *interface)
  {
!     int dport, sport;
      stringbuffer_t *filter;
      dhcp_server_control_t *dhcp_server_control;
***************
*** 47,62 ****
      }
  
!     /* get the source port for BOOTP. */
!     port = rawnet_port_for_service("bootpc", "udp");
  
!     if(port == -1) {
  
          WARN_MESSAGE
              ("could not lookup dhcp services in service db (%s) will use reasonable defaults.");
  
!         port = BOOTP_SERVER;
      }
  
!     port = ntohs(port);
  
      /* Create filter. */
--- 47,64 ----
      }
  
!     sport = rawnet_port_for_service("bootpc", "udp");
!     dport = rawnet_port_for_service("bootps", "udp");
  
!     if(dport == -1 || sport == -1) {
  
          WARN_MESSAGE
              ("could not lookup dhcp services in service db (%s) will use reasonable defaults.");
  
!         sport = BOOTP_CLIENT;
!         dport = BOOTP_SERVER;
      }
  
!     dport = ntohs(dport);
!     sport = ntohs(sport);
  
      /* Create filter. */
***************
*** 66,76 ****
      /* create rawnet handler: we pass sport/dport as 0 because we
       * won't be doing any DHCP handling rawly for the server. */
!     if((dhcp_server_control->rawnet = rawnet_create(interface, stringbuffer_getstring(filter), -1, 0, 
!                                                     0, 0, 0)) == NULL) {
          FATAL_MESSAGE("could not create raw network handler.");
      }
  
      if((dhcp_server_control->udp_sock = 
!         udp_sock_create(port, 
                          rawnet_get_ip_addr(dhcp_server_control->rawnet))) < 0) {
          FATAL_MESSAGE("unable to open udp socket");
--- 68,77 ----
      /* create rawnet handler: we pass sport/dport as 0 because we
       * won't be doing any DHCP handling rawly for the server. */
!     if((dhcp_server_control->rawnet = rawnet_create_open(interface, stringbuffer_getstring(filter), dport, sport, 0)) == NULL)  {
          FATAL_MESSAGE("could not create raw network handler.");
      }
  
      if((dhcp_server_control->udp_sock = 
!         udp_sock_create(dport, 
                          rawnet_get_ip_addr(dhcp_server_control->rawnet))) < 0) {
          FATAL_MESSAGE("unable to open udp socket");