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

-n [master]

Browse Source 
Fix the socket handling for DHCPv6 clients to allow multiple instances
of a clinet on a single machine to work properly.
[ISC-Bugs #34784]
This commit is contained in:
Shawn Routhier
2013-10-21 14:59:41 -07:00
parent d7d9c0c7c3
commit 4b8251a0c0
4 changed files with 112 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/dhcpd.h
View File

@@ -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;