X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=secnet.h;h=7cdeeda2bad90f00c0fdb56e4eef15c31460e013;hp=ec630db092602bd1a6548ee7003fa73af72400b4;hb=d3fe100dfc120244d316e083ce87b1eb130fe4fd;hpb=b2a56f7c93d221607864761c590952b9a614dc9f diff --git a/secnet.h b/secnet.h index ec630db..7cdeeda 100644 --- a/secnet.h +++ b/secnet.h @@ -14,34 +14,8 @@ typedef char *string_t; typedef enum {False,True} bool_t; -#define ASSERT(x) do { if (!(x)) { fatal("assertion failed line " __LINE__ \ - " file " __FILE__ "\n"); } while(0) - -/***** SHARED types *****/ - -/* These are stored in HOST byte order */ -struct subnet { - uint32_t prefix; - uint32_t mask; - uint32_t len; -}; - -struct subnet_list { - uint32_t entries; - struct subnet *list; -}; - -/* Match an address (in HOST byte order) with a subnet list. - Returns True if matched. */ -extern bool_t subnet_match(struct subnet *s, uint32_t address); -extern bool_t subnet_matches_list(struct subnet_list *list, uint32_t address); -extern bool_t subnets_intersect(struct subnet a, struct subnet b); -extern bool_t subnet_intersects_with_list(struct subnet a, - struct subnet_list *b); -extern bool_t subnet_lists_intersect(struct subnet_list *a, - struct subnet_list *b); - -/***** END of shared types *****/ +#define ASSERT(x) do { if (!(x)) { fatal("assertion failed line %d file " \ + __FILE__ "\n",__LINE__); } } while(0) /***** CONFIGURATION support *****/ @@ -122,10 +96,6 @@ extern uint32_t dict_read_number(dict_t *dict, string_t key, bool_t required, string_t desc, struct cloc loc, uint32_t def); extern bool_t dict_read_bool(dict_t *dict, string_t key, bool_t required, string_t desc, struct cloc loc, bool_t def); -extern void dict_read_subnet_list(dict_t *dict, string_t key, bool_t required, - string_t desc, struct cloc loc, - struct subnet_list *sl); -extern uint32_t string_to_ipaddr(item_t *i, string_t desc); struct flagstr { string_t name; uint32_t value; @@ -137,7 +107,7 @@ extern uint32_t string_list_to_word(list_t *l, struct flagstr *f, /***** END of configuration support *****/ -/***** UTILITY functions *****/ +/***** LOG functions *****/ #define M_DEBUG_CONFIG 0x001 #define M_DEBUG_PHASE 0x002 @@ -145,7 +115,7 @@ extern uint32_t string_list_to_word(list_t *l, struct flagstr *f, #define M_INFO 0x008 #define M_NOTICE 0x010 #define M_WARNING 0x020 -#define M_ERROR 0x040 +#define M_ERR 0x040 #define M_SECURITY 0x080 #define M_FATAL 0x100 @@ -155,13 +125,14 @@ extern void fatal_status(int status, char *message, ...); extern void fatal_perror_status(int status, char *message, ...); extern void cfgfatal(struct cloc loc, string_t facility, char *message, ...); -extern char *safe_strdup(char *string, char *message); -extern void *safe_malloc(size_t size, char *message); - extern void Message(uint32_t class, char *message, ...); -extern string_t ipaddr_to_string(uint32_t addr); -extern string_t subnet_to_string(struct subnet *sn); +/***** END of log functions *****/ + +/***** UTILITY functions *****/ + +extern char *safe_strdup(char *string, char *message); +extern void *safe_malloc(size_t size, char *message); extern int sys_cmd(const char *file, char *argc, ...); @@ -211,6 +182,9 @@ typedef void hook_fn(void *self, uint32_t newphase); bool_t add_hook(uint32_t phase, hook_fn *f, void *state); bool_t remove_hook(uint32_t phase, hook_fn *f, void *state); +extern uint32_t current_phase; +extern void enter_phase(uint32_t new_phase); + extern bool_t require_root_privileges; /* Some features (like netlink 'soft' routes) require that secnet retain root @@ -226,26 +200,26 @@ extern string_t require_root_privileges_explanation; /* Module initialisation function type - modules export one function of this type which is called to initialise them. For dynamically loaded modules it's called "secnet_module". */ -typedef void (init_module)(dict_t *dict); +typedef void init_module(dict_t *dict); /***** END of module support *****/ /***** CLOSURE TYPES and interface definitions *****/ -#define CL_PURE 0 -#define CL_RESOLVER 1 -#define CL_RANDOMSRC 2 -#define CL_RSAPUBKEY 3 -#define CL_RSAPRIVKEY 4 -#define CL_COMM 5 -#define CL_IPIF 6 -#define CL_LOG 7 -#define CL_SITE 8 -#define CL_TRANSFORM 9 -#define CL_NETLINK 10 -#define CL_DH 11 -#define CL_HASH 12 -#define CL_BUFFER 13 +#define CL_PURE 0 +#define CL_RESOLVER 1 +#define CL_RANDOMSRC 2 +#define CL_RSAPUBKEY 3 +#define CL_RSAPRIVKEY 4 +#define CL_COMM 5 +#define CL_IPIF 6 +#define CL_LOG 7 +#define CL_SITE 8 +#define CL_TRANSFORM 9 +#define CL_DH 11 +#define CL_HASH 12 +#define CL_BUFFER 13 +#define CL_NETLINK 14 struct buffer_if; @@ -380,7 +354,7 @@ struct transform_if { netlink_regnets_fn. If buf has size 0 then the function is just being called for its site-effects (eg. making the site code attempt to bring up a network link) */ -typedef void netlink_deliver_fn(void *st, void *cid, struct buffer_if *buf); +typedef void netlink_deliver_fn(void *st, struct buffer_if *buf); /* site code can tell netlink when outgoing packets will be dropped, so netlink can generate appropriate ICMP and make routing decisions */ #define LINK_QUALITY_DOWN 0 /* No chance of a packet being delivered */ @@ -388,23 +362,21 @@ typedef void netlink_deliver_fn(void *st, void *cid, struct buffer_if *buf); #define LINK_QUALITY_DOWN_CURRENT_ADDRESS 2 /* Link down, current address information */ #define LINK_QUALITY_UP 3 /* Link active */ #define MAXIMUM_LINK_QUALITY 3 -typedef void netlink_link_quality_fn(void *st, void *cid, uint32_t quality); -/* Register for packets from specified networks. Return value is - client identifier. 'hard_route' indicates whether the routes being - registered are permanent (hard) or temporary (soft); some types of - netlink device can only cope with hard routes. */ -#define NETLINK_OPTION_SOFTROUTE 1 -#define NETLINK_OPTION_ALLOW_ROUTE 2 -typedef void *netlink_regnets_fn(void *st, struct subnet_list *networks, - netlink_deliver_fn *deliver, void *dst, - uint32_t max_start_pad, uint32_t max_end_pad, - uint32_t options, string_t client_name); - +typedef void netlink_link_quality_fn(void *st, uint32_t quality); +typedef void netlink_register_fn(void *st, netlink_deliver_fn *deliver, + void *dst, uint32_t max_start_pad, + uint32_t max_end_pad); +typedef void netlink_output_config_fn(void *st, struct buffer_if *buf); +typedef bool_t netlink_check_config_fn(void *st, struct buffer_if *buf); +typedef void netlink_set_mtu_fn(void *st, uint32_t new_mtu); struct netlink_if { void *st; - netlink_regnets_fn *regnets; + netlink_register_fn *reg; netlink_deliver_fn *deliver; netlink_link_quality_fn *set_quality; + netlink_output_config_fn *output_config; + netlink_check_config_fn *check_config; + netlink_set_mtu_fn *set_mtu; }; /* DH interface */