projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcpv4: force renew nonce authentication support
[project/odhcpd.git]
/
src
/
odhcpd.h
diff --git
a/src/odhcpd.h
b/src/odhcpd.h
index
1803a41
..
3d8f254
100644
(file)
--- a/
src/odhcpd.h
+++ b/
src/odhcpd.h
@@
-16,7
+16,6
@@
#include <netinet/in.h>
#include <netinet/icmp6.h>
#include <netinet/ether.h>
#include <netinet/in.h>
#include <netinet/icmp6.h>
#include <netinet/ether.h>
-#include <net/if.h>
#include <stdbool.h>
#include <syslog.h>
#include <stdbool.h>
#include <syslog.h>
@@
-41,10
+40,6
@@
#define ND_OPT_RECURSIVE_DNS 25
#define ND_OPT_DNS_SEARCH 31
#define ND_OPT_RECURSIVE_DNS 25
#define ND_OPT_DNS_SEARCH 31
-#define RELAYD_BUFFER_SIZE 8192
-#define RELAYD_MAX_PREFIXES 8
-#define RELAYD_MAX_ADDRS 8
-
#define INFINITE_VALID(x) ((x) == 0)
#define _unused __attribute__((unused))
#define INFINITE_VALID(x) ((x) == 0)
#define _unused __attribute__((unused))
@@
-71,20
+66,29
@@
struct odhcpd_event {
void (*recv_msgs)(struct odhcpd_event *e);
};
void (*recv_msgs)(struct odhcpd_event *e);
};
+union if_addr {
+ struct in_addr in;
+ struct in6_addr in6;
+};
struct odhcpd_ipaddr {
struct odhcpd_ipaddr {
-
struct in6
_addr addr;
+
union if
_addr addr;
uint8_t prefix;
uint8_t prefix;
- uint8_t dprefix;
uint32_t preferred;
uint32_t valid;
uint32_t preferred;
uint32_t valid;
+
+ /* ipv6 only */
+ uint8_t dprefix;
+
+ /* ipv4 only */
+ struct in_addr broadcast;
};
enum odhcpd_mode {
};
enum odhcpd_mode {
-
RELAYD
_DISABLED,
-
RELAYD
_SERVER,
-
RELAYD
_RELAY,
-
RELAYD
_HYBRID
+
MODE
_DISABLED,
+
MODE
_SERVER,
+
MODE
_RELAY,
+
MODE
_HYBRID
};
};
@@
-118,20
+122,31
@@
struct interface {
struct list_head head;
int ifindex;
struct list_head head;
int ifindex;
- char
ifname[IF_NAMESIZE]
;
- c
har name[IF_NAMESIZE]
;
+ char
*ifname
;
+ c
onst char *name
;
- // Runtime data
- struct uloop_timeout timer_rs;
- struct list_head ia_assignments;
- struct odhcpd_ipaddr ia_addr[RELAYD_MAX_ADDRS];
+ // IPv6 runtime data
+ struct odhcpd_ipaddr *ia_addr;
size_t ia_addr_len;
size_t ia_addr_len;
- // DHCPv4
+ // RA runtime data
+ struct uloop_timeout timer_rs;
+
+ // DHCPv6 runtime data
struct odhcpd_event dhcpv6_event;
struct odhcpd_event dhcpv6_event;
- struct odhcpd_event dhcpv4_event;
+ struct list_head ia_assignments;
+
+ // NDP runtime data
struct odhcpd_event ndp_event;
struct odhcpd_event ndp_event;
+
+ // IPv4 runtime data
+ struct odhcpd_ipaddr *addr4;
+ size_t addr4_len;
+
+ // DHCPv4 runtime data
+ struct odhcpd_event dhcpv4_event;
struct list_head dhcpv4_assignments;
struct list_head dhcpv4_assignments;
+ struct list_head dhcpv4_fr_ips;
// Managed PD
char dhcpv6_pd_manager[128];
// Managed PD
char dhcpv6_pd_manager[128];
@@
-157,7
+172,7
@@
struct interface {
// RA
int learn_routes;
int default_router;
// RA
int learn_routes;
int default_router;
- int managed;
+ int
ra_
managed;
int route_preference;
int ra_maxinterval;
int ra_mininterval;
int route_preference;
int ra_maxinterval;
int ra_mininterval;
@@
-170,11
+185,17
@@
struct interface {
// DHCPv4
struct in_addr dhcpv4_start;
struct in_addr dhcpv4_end;
// DHCPv4
struct in_addr dhcpv4_start;
struct in_addr dhcpv4_end;
+ struct in_addr dhcpv4_start_ip;
+ struct in_addr dhcpv4_end_ip;
+ struct in_addr dhcpv4_local;
+ struct in_addr dhcpv4_bcast;
+ struct in_addr dhcpv4_mask;
struct in_addr *dhcpv4_router;
size_t dhcpv4_router_cnt;
struct in_addr *dhcpv4_dns;
size_t dhcpv4_dns_cnt;
uint32_t dhcpv4_leasetime;
struct in_addr *dhcpv4_router;
size_t dhcpv4_router_cnt;
struct in_addr *dhcpv4_dns;
size_t dhcpv4_dns_cnt;
uint32_t dhcpv4_leasetime;
+ bool dhcpv4_forcereconf;
// DNS
struct in6_addr *dns;
// DNS
struct in6_addr *dns;
@@
-182,8
+203,10
@@
struct interface {
uint8_t *search;
size_t search_len;
uint8_t *search;
size_t search_len;
+ // DHCPV6
void *dhcpv6_raw;
size_t dhcpv6_raw_len;
void *dhcpv6_raw;
size_t dhcpv6_raw_len;
+ bool dhcpv6_assignall;
char *upstream;
size_t upstream_len;
char *upstream;
size_t upstream_len;
@@
-193,8
+216,9
@@
struct interface {
extern struct list_head interfaces;
extern struct list_head interfaces;
-#define RELAYD_MANAGED_MFLAG 1
-#define RELAYD_MANAGED_NO_AFLAG 2
+#define RA_MANAGED_NO_MFLAG 0
+#define RA_MANAGED_MFLAG 1
+#define RA_MANAGED_NO_AFLAG 2
// Exported main functions
// Exported main functions
@@
-206,8
+230,8
@@
struct nl_sock *odhcpd_create_nl_socket(int protocol);
ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
struct iovec *iov, size_t iov_len,
const struct interface *iface);
ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
struct iovec *iov, size_t iov_len,
const struct interface *iface);
-ssize_t odhcpd_get_interface_addresses(int ifindex,
- struct odhcpd_ipaddr *
addrs, size_t cnt
);
+ssize_t odhcpd_get_interface_addresses(int ifindex,
bool v6,
+ struct odhcpd_ipaddr *
*addrs
);
int odhcpd_get_interface_dns_addr(const struct interface *iface,
struct in6_addr *addr);
struct interface* odhcpd_get_interface_by_name(const char *name);
int odhcpd_get_interface_dns_addr(const struct interface *iface,
struct in6_addr *addr);
struct interface* odhcpd_get_interface_by_name(const char *name);
@@
-221,6
+245,9
@@
int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen,
const uint32_t metric, const bool add);
int odhcpd_setup_proxy_neigh(const struct in6_addr *addr,
const struct interface *iface, const bool add);
const uint32_t metric, const bool add);
int odhcpd_setup_proxy_neigh(const struct in6_addr *addr,
const struct interface *iface, const bool add);
+int odhcpd_setup_addr(struct odhcpd_ipaddr *addr,
+ const struct interface *iface, const bool v6,
+ const bool add);
void odhcpd_run(void);
time_t odhcpd_time(void);
void odhcpd_run(void);
time_t odhcpd_time(void);
@@
-230,10
+257,12
@@
void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len);
int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
+int odhcpd_netmask2bitlen(bool v6, void *mask);
+bool odhcpd_bitlen2netmask(bool v6, unsigned int bits, void *mask);
+
int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
-void ndp_handle_addr6_dump(void);
-void ndp_rqs_addr6_dump(void);
+void dhcpv4_addr_update(struct interface *iface);
#ifdef WITH_UBUS
int init_ubus(void);
#ifdef WITH_UBUS
int init_ubus(void);