diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 19:43:38 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 19:48:38 +0100 |
| commit | 53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1 (patch) | |
| tree | d43e2f4f851f368dcc943a9b30e73ff603ea5bc1 /ripd/ripd.h | |
| parent | Merge branch 'stable/2.0' (diff) | |
| parent | build: number sections in COMMUNITY.md HTML (diff) | |
| download | frr-53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1.tar.xz frr-53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1.zip | |
Merge branch 'stable/2.0'
Conflicts:
bgpd/bgp_route.c
lib/if.c
ripd/rip_interface.c
zebra/interface.c
zebra/zebra_vty.c
Diffstat (limited to 'ripd/ripd.h')
| -rw-r--r-- | ripd/ripd.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ripd/ripd.h b/ripd/ripd.h index 1cc46ff31..cd4d560af 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -258,6 +258,9 @@ struct rip_interface int ri_send; int ri_receive; + /* RIPv2 broadcast mode */ + int v2_broadcast; + /* RIPv2 authentication type. */ int auth_type; @@ -347,6 +350,7 @@ struct rip_md5_data #define RI_RIP_VERSION_1 1 #define RI_RIP_VERSION_2 2 #define RI_RIP_VERSION_1_AND_2 3 +#define RI_RIP_VERSION_NONE 4 /* N.B. stuff will break if (RIPv1 != RI_RIP_VERSION_1) || (RIPv2 != RI_RIP_VERSION_2) */ @@ -369,14 +373,7 @@ enum rip_event } while (0) /* Macro for timer turn off. */ -#define RIP_TIMER_OFF(X) \ - do { \ - if (X) \ - { \ - thread_cancel (X); \ - (X) = NULL; \ - } \ - } while (0) +#define RIP_TIMER_OFF(X) THREAD_TIMER_OFF(X) /* Prototypes. */ extern void rip_init (void); |