mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

- Merge dhcrelay6 into dhcrelay

Browse Source 
- Prep for 4.1.0a2 release
This commit is contained in:
Evan Hunt
2008-06-13 00:55:53 +00:00
parent ffbaa8801e
commit 7de20a9518
10 changed files with 1242 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
includes/dhcpd.h
View File

@@ -1141,6 +1141,9 @@ struct interface_info {
#define INTERFACE_REQUESTED 1
#define INTERFACE_AUTOMATIC 2
#define INTERFACE_RUNNING 4
#define INTERFACE_DOWNSTREAM 8
#define INTERFACE_UPSTREAM 16
#define INTERFACE_STREAMS (INTERFACE_DOWNSTREAM | INTERFACE_UPSTREAM)
/* Only used by DHCP client code. */
struct client_state *client;
@@ -1325,6 +1328,10 @@ typedef unsigned char option_mask [16];
#define _PATH_DHCRELAY_PID LOCALSTATEDIR"/run/dhcrelay.pid"
#endif
#ifndef _PATH_DHCRELAY6_PID
#define _PATH_DHCRELAY6_PID LOCALSTATEDIR"/run/dhcrelay6.pid"
#endif
#ifndef DHCPD_LOG_FACILITY
#define DHCPD_LOG_FACILITY LOG_DAEMON
#endif
@@ -2646,19 +2653,6 @@ int parse_ip_addr PROTO ((struct parse *, struct iaddr *));
int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
void parse_reject_statement PROTO ((struct parse *, struct client_config *));
/* dhcrelay.c */
void relay PROTO ((struct interface_info *, struct dhcp_packet *, unsigned,
unsigned int, struct iaddr, struct hardware *));
int strip_relay_agent_options PROTO ((struct interface_info *,
struct interface_info **,
struct dhcp_packet *, unsigned));
int find_interface_by_agent_option PROTO ((struct dhcp_packet *,
struct interface_info **,
u_int8_t *, int));
int add_relay_agent_options PROTO ((struct interface_info *,
struct dhcp_packet *,
unsigned, struct in_addr));
/* icmp.c */
OMAPI_OBJECT_ALLOC_DECL (icmp_state, struct icmp_state, dhcp_type_icmp)
extern struct icmp_state *icmp_state;