diff options
author | Shawn Routhier <sar@isc.org> | 2013-10-21 14:59:41 -0700 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2013-10-21 14:59:41 -0700 |
commit | 4b8251a0c06b7d8706a28904fdef2414f045cc2c (patch) | |
tree | b6a682708884249d8faae43d458984099ec9cfb7 /includes/dhcpd.h | |
parent | d7d9c0c7c36d37fc42e51987af77207ced36d9bf (diff) | |
download | isc-dhcp-4b8251a0c06b7d8706a28904fdef2414f045cc2c.tar.gz |
-n [master]
Fix the socket handling for DHCPv6 clients to allow multiple instances
of a clinet on a single machine to work properly.
[ISC-Bugs #34784]
Diffstat (limited to 'includes/dhcpd.h')
-rw-r--r-- | includes/dhcpd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 73c632f4..9e18818b 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -2414,7 +2414,7 @@ void get_hw_addr(const char *name, struct hardware *hw); /* socket.c */ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \ || defined (USE_SOCKET_FALLBACK) -int if_register_socket(struct interface_info *, int, int *); +int if_register_socket(struct interface_info *, int, int *, struct in6_addr *); #endif #if defined (USE_SOCKET_FALLBACK) && !defined (USE_SOCKET_SEND) @@ -2425,7 +2425,7 @@ ssize_t send_fallback (struct interface_info *, struct in_addr, struct sockaddr_in *, struct hardware *); ssize_t send_fallback6(struct interface_info *, struct packet *, - struct dhcp_packet *, size_t, struct in6_addr, + struct dhcp_packet *, size_t, struct in6_addr *, struct sockaddr_in6 *, struct hardware *); #endif @@ -2461,6 +2461,7 @@ void maybe_setup_fallback (void); #endif void if_register6(struct interface_info *info, int do_multicast); +void if_register_linklocal6(struct interface_info *info); ssize_t receive_packet6(struct interface_info *interface, unsigned char *buf, size_t len, struct sockaddr_in6 *from, struct in6_addr *to_addr, @@ -2606,7 +2607,6 @@ void interface_trace_setup (void); extern struct in_addr limited_broadcast; extern int local_family; extern struct in_addr local_address; -extern struct in6_addr local_address6; extern u_int16_t local_port; extern u_int16_t remote_port; |