defs.h (mrouted-4.3) | : | defs.h (mrouted-4.4) | ||
---|---|---|---|---|
skipping to change at line 78 | skipping to change at line 78 | |||
typedef void (*cfunc_t) (void*); | typedef void (*cfunc_t) (void*); | |||
typedef void (*ihfunc_t) (int); | typedef void (*ihfunc_t) (int); | |||
#include "dvmrp.h" | #include "dvmrp.h" | |||
#include "igmpv2.h" | #include "igmpv2.h" | |||
#include "igmpv3.h" | #include "igmpv3.h" | |||
#include "vif.h" | #include "vif.h" | |||
#include "route.h" | #include "route.h" | |||
#include "prune.h" | #include "prune.h" | |||
#include "pathnames.h" | #include "pathnames.h" | |||
#ifdef RSRR | ||||
#include "rsrr.h" | ||||
#include "rsrr_var.h" | ||||
#endif | ||||
/* | /* | |||
* Miscellaneous constants and macros. | * Miscellaneous constants and macros. | |||
*/ | */ | |||
/* Older versions of UNIX don't really give us true raw sockets. | /* Older versions of UNIX don't really give us true raw sockets. | |||
* Instead, they expect ip_len and ip_off in host byte order, and also | * Instead, they expect ip_len and ip_off in host byte order, and also | |||
* provide them to us in that format when receiving raw frames. | * provide them to us in that format when receiving raw frames. | |||
* | * | |||
* This list could probably be made longer, e.g., SunOS and __bsdi__ | * This list could probably be made longer, e.g., SunOS and __bsdi__ | |||
skipping to change at line 124 | skipping to change at line 120 | |||
#define LEAF_FLAGS (neighbor_vifs == 1 ? 0x010000 : 0) | #define LEAF_FLAGS (neighbor_vifs == 1 ? 0x010000 : 0) | |||
/* more for IGMP 'group' field of DVMRP messages */ | /* more for IGMP 'group' field of DVMRP messages */ | |||
#define DEL_RTE_GROUP 0 | #define DEL_RTE_GROUP 0 | |||
#define DEL_ALL_ROUTES 1 | #define DEL_ALL_ROUTES 1 | |||
/* for Deleting kernel table entries */ | /* for Deleting kernel table entries */ | |||
#define JAN_1970 2208988800UL /* 1970 - 1900 in seconds */ | #define JAN_1970 2208988800UL /* 1970 - 1900 in seconds */ | |||
#ifdef RSRR | ||||
#define BIT_ZERO(X) ((X) = 0) | ||||
#define BIT_SET(X,n) ((X) |= 1 << (n)) | ||||
#define BIT_CLR(X,n) ((X) &= ~(1 << (n))) | ||||
#define BIT_TST(X,n) ((X) & 1 << (n)) | ||||
#endif | ||||
#if defined(_AIX) || (defined(BSD) && BSD >= 199103) | #if defined(_AIX) || (defined(BSD) && BSD >= 199103) | |||
#define HAVE_SA_LEN | #define HAVE_SA_LEN | |||
#endif | #endif | |||
/* | /* | |||
* Extensions to errno for singaling to cfparse.y | * Extensions to errno for singaling to cfparse.y | |||
*/ | */ | |||
#define ENOTMINE 2000 | #define ENOTMINE 2000 | |||
#define ELOOPBACK 2001 | #define ELOOPBACK 2001 | |||
#define ERMTLOCAL 2002 | #define ERMTLOCAL 2002 | |||
skipping to change at line 175 | skipping to change at line 164 | |||
#define DEBUG_ROUTE 0x0004 | #define DEBUG_ROUTE 0x0004 | |||
#define DEBUG_PEER 0x0008 | #define DEBUG_PEER 0x0008 | |||
#define DEBUG_CACHE 0x0010 | #define DEBUG_CACHE 0x0010 | |||
#define DEBUG_TIMEOUT 0x0020 | #define DEBUG_TIMEOUT 0x0020 | |||
#define DEBUG_IF 0x0040 | #define DEBUG_IF 0x0040 | |||
#define DEBUG_MEMBER 0x0080 | #define DEBUG_MEMBER 0x0080 | |||
#define DEBUG_TRACE 0x0100 | #define DEBUG_TRACE 0x0100 | |||
#define DEBUG_IGMP 0x0200 | #define DEBUG_IGMP 0x0200 | |||
#define DEBUG_RTDETAIL 0x0400 | #define DEBUG_RTDETAIL 0x0400 | |||
#define DEBUG_KERN 0x0800 | #define DEBUG_KERN 0x0800 | |||
#define DEBUG_RSRR 0x1000 | #define DEBUG_RSRR 0x1000 /* UNUSED */ | |||
#define DEBUG_ICMP 0x2000 | #define DEBUG_ICMP 0x2000 | |||
#define DEBUG_PARSE_ERR 0x80000000 | #define DEBUG_PARSE_ERR 0x80000000 | |||
#define DEBUG_ALL 0xffffffdf /* All except noisy timer */ | #define DEBUG_ALL 0xffffffdf /* All except noisy timer */ | |||
struct debugnm { | struct debugnm { | |||
char *name; | char *name; | |||
uint32_t level; | uint32_t level; | |||
size_t nchars; | size_t nchars; | |||
}; | }; | |||
skipping to change at line 313 | skipping to change at line 302 | |||
/* route.c */ | /* route.c */ | |||
extern void init_routes(void); | extern void init_routes(void); | |||
extern void start_route_updates(void); | extern void start_route_updates(void); | |||
extern void update_route(uint32_t, uint32_t, uint32_t, uint32_t, vifi _t, struct listaddr *); | extern void update_route(uint32_t, uint32_t, uint32_t, uint32_t, vifi _t, struct listaddr *); | |||
extern void age_routes(void); | extern void age_routes(void); | |||
extern void expire_all_routes(void); | extern void expire_all_routes(void); | |||
extern void free_all_routes(void); | extern void free_all_routes(void); | |||
extern void accept_probe(uint32_t, uint32_t, char *, size_t, uint32_t ); | extern void accept_probe(uint32_t, uint32_t, char *, size_t, uint32_t ); | |||
extern void accept_report(uint32_t, uint32_t, char *, size_t, uint32_ t); | extern void accept_report(uint32_t, uint32_t, char *, size_t, uint32_ t); | |||
extern struct rtentry * determine_route(uint32_t src); | extern struct rtentry *determine_route(uint32_t src); | |||
extern struct rtentry *route_iter(struct rtentry **rt); | ||||
extern void report(int, vifi_t, uint32_t); | extern void report(int, vifi_t, uint32_t); | |||
extern void report_to_all_neighbors(int); | extern void report_to_all_neighbors(int); | |||
extern int report_next_chunk(void); | extern int report_next_chunk(void); | |||
extern void add_vif_to_routes(vifi_t); | extern void add_vif_to_routes(vifi_t); | |||
extern void delete_vif_from_routes(vifi_t); | extern void delete_vif_from_routes(vifi_t); | |||
extern void add_neighbor_to_routes(vifi_t, uint32_t); | extern void add_neighbor_to_routes(vifi_t, uint32_t); | |||
extern void delete_neighbor_from_routes(uint32_t, vifi_t, uint32_t); | extern void delete_neighbor_from_routes(uint32_t, vifi_t, uint32_t); | |||
extern void dump_routes(FILE *, int); | extern void dump_routes(FILE *, int); | |||
/* vif.c */ | /* vif.c */ | |||
skipping to change at line 427 | skipping to change at line 417 | |||
extern void k_join(uint32_t, uint32_t); | extern void k_join(uint32_t, uint32_t); | |||
extern void k_leave(uint32_t, uint32_t); | extern void k_leave(uint32_t, uint32_t); | |||
extern void k_init_dvmrp(void); | extern void k_init_dvmrp(void); | |||
extern void k_stop_dvmrp(void); | extern void k_stop_dvmrp(void); | |||
extern void k_add_vif(vifi_t, struct uvif *); | extern void k_add_vif(vifi_t, struct uvif *); | |||
extern void k_del_vif(vifi_t, struct uvif *); | extern void k_del_vif(vifi_t, struct uvif *); | |||
extern void k_add_rg(uint32_t, struct gtable *); | extern void k_add_rg(uint32_t, struct gtable *); | |||
extern int k_del_rg(uint32_t, struct gtable *); | extern int k_del_rg(uint32_t, struct gtable *); | |||
extern int k_get_version(void); | extern int k_get_version(void); | |||
#ifdef RSRR | ||||
/* rsrr.c */ | ||||
extern void rsrr_init(void); | ||||
extern void rsrr_clean(void); | ||||
extern void rsrr_cache_send(struct gtable *, int); | ||||
extern void rsrr_cache_clean(struct gtable *); | ||||
#endif | ||||
#ifndef HAVE_STRLCPY | #ifndef HAVE_STRLCPY | |||
extern size_t strlcpy(char *dst, const char *src, size_t siz); | extern size_t strlcpy(char *dst, const char *src, size_t siz); | |||
#endif | #endif | |||
#ifndef HAVE_STRLCAT | #ifndef HAVE_STRLCAT | |||
extern size_t strlcat(char *dst, const char *src, size_t siz); | extern size_t strlcat(char *dst, const char *src, size_t siz); | |||
#endif | #endif | |||
#ifndef HAVE_STRTONUM | #ifndef HAVE_STRTONUM | |||
extern long long strtonum(const char *numstr, long long minval, long long maxval, const char **errstrp); | extern long long strtonum(const char *numstr, long long minval, long long maxval, const char **errstrp); | |||
End of changes. 5 change blocks. | ||||
21 lines changed or deleted | 3 lines changed or added |