Fix odhcp6c_find_entry

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a4343b19216ec8293388922da74b6eb30da30e3a..104213681c8b18001bf5a131ceb98c9a12c61c26 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -65,10 +65,6 @@ enum dhcvp6_opt {
        DHCPV6_OPT_PD_EXCLUDE = 67,
        DHCPV6_OPT_SOL_MAX_RT = 82,
        DHCPV6_OPT_INF_MAX_RT = 83,
-#ifdef EXT_PREFIX_CLASS
-       /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
-       DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
-#endif
 #ifdef EXT_CER_ID
        /* draft-donley-dhc-cer-id-option-03 */
        DHCPV6_OPT_CER_ID = EXT_CER_ID,
@@ -188,9 +184,6 @@ struct dhcpv6_auth_reconfigure {
 struct dhcpv6_cer_id {
        uint16_t type;
        uint16_t len;
-       uint16_t reserved;
-       uint16_t auth_type;
-       uint8_t auth[16];
        struct in6_addr addr;
 } _packed;
 
@@ -303,7 +296,6 @@ struct odhcp6c_entry {
        uint32_t preferred;
        uint32_t t1;
        uint32_t t2;
-       uint16_t class;
        uint32_t iaid;
 };
 
@@ -322,14 +314,18 @@ int init_rtnetlink(void);
 int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,
                uint32_t pref, uint32_t valid);
 
+int ra_conf_hoplimit(int newvalue);
+int ra_conf_mtu(int newvalue);
+int ra_conf_reachable(int newvalue);
+int ra_conf_retransmit(int newvalue);
+
 int script_init(const char *path, const char *ifname);
 ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src);
 void script_call(const char *status);
-void script_delay_call(const char *status, int timeout);
 
 bool odhcp6c_signal_process(void);
 uint64_t odhcp6c_get_milli_time(void);
-void odhcp6c_random(void *buf, size_t len);
+int odhcp6c_random(void *buf, size_t len);
 bool odhcp6c_is_bound(void);
 
 // State manipulation
@@ -342,9 +338,7 @@ void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len);
 void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);
 
 // Entry manipulation
-struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new);
-bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new);
-bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe);
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe, bool filterexcess);
 
 void odhcp6c_expire(void);
 uint32_t odhcp6c_elapsed(void);