#include "config.h"
#include <stdlib.h>
#include <stdarg.h>
-#include <syslog.h>
#include <sys/poll.h>
#include <sys/types.h>
#include <sys/time.h>
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 *****/
/***** CONFIGURATION support *****/
extern bool_t just_check_config; /* If True then we're going to exit after
reading the configuration file */
+extern bool_t background; /* If True then we'll eventually run as a daemon */
typedef struct dict dict_t; /* Configuration dictionary */
typedef struct closure closure_t;
/* List-manipulation functions */
extern list_t *list_new(void);
+extern uint32_t list_length(list_t *a);
extern list_t *list_append(list_t *a, item_t *i);
extern list_t *list_append_list(list_t *a, list_t *b);
/* Returns an item from the list (index starts at 0), or NULL */
string_t name;
uint32_t value;
};
+extern uint32_t string_to_word(string_t s, struct cloc loc,
+ struct flagstr *f, string_t desc);
extern uint32_t string_list_to_word(list_t *l, struct flagstr *f,
string_t desc);
/***** END of configuration support *****/
-/***** UTILITY functions *****/
+/***** LOG functions *****/
-#define M_WARNING 1
-#define M_ERROR 2
-#define M_FATAL 4
-#define M_INFO 8
-#define M_DEBUG_CONFIG 16
-#define M_DEBUG_PHASE 32
+#define M_DEBUG_CONFIG 0x001
+#define M_DEBUG_PHASE 0x002
+#define M_DEBUG 0x004
+#define M_INFO 0x008
+#define M_NOTICE 0x010
+#define M_WARNING 0x020
+#define M_ERR 0x040
+#define M_SECURITY 0x080
+#define M_FATAL 0x100
extern void fatal(char *message, ...);
extern void fatal_perror(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, ...);
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
/* 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;
/* LOG interface */
-typedef void log_msg_fn(void *st, int priority, char *message, ...);
-typedef void log_vmsg_fn(void *st, int priority, char *message, va_list args);
+typedef void log_msg_fn(void *st, int class, char *message, ...);
+typedef void log_vmsg_fn(void *st, int class, char *message, va_list args);
struct log_if {
void *st;
log_msg_fn *log;
log_vmsg_fn *vlog;
};
/* (convenience function, defined in util.c) */
-extern void log(struct log_if *lf, int priority, char *message, ...);
+extern void log(struct log_if *lf, int class, char *message, ...);
/* SITE interface */
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 */
#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. */
-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,
- bool_t hard_routes, 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);
struct netlink_if {
void *st;
- netlink_regnets_fn *regnets;
+ netlink_register_fn *reg;
netlink_deliver_fn *deliver;
netlink_link_quality_fn *set_quality;
};