diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
| commit | 0072d11f3431165240656edf6ade473554b8747e (patch) | |
| tree | 6c53bbbf0d3a4a3ad70846aae50995dc184cc5a5 /proto/rip/rip.h | |
| parent | 2e95d269d6bd42372d3273264e14775242b0744d (diff) | |
| parent | db9153e216b6f1847ac9cdf170b1d14c04552e41 (diff) | |
Merge branch 'ballygarvan' into HEAD
Replacing the old 3.0-alpha0 cork mechanism with another one inside the
routing table. This version should be simpler and also quite clear what
it does, why and when.
Diffstat (limited to 'proto/rip/rip.h')
| -rw-r--r-- | proto/rip/rip.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/proto/rip/rip.h b/proto/rip/rip.h index f8713c4a..a01f8d3b 100644 --- a/proto/rip/rip.h +++ b/proto/rip/rip.h @@ -16,7 +16,7 @@ #include "nest/cli.h" #include "nest/iface.h" #include "nest/protocol.h" -#include "nest/route.h" +#include "nest/rt.h" #include "nest/password.h" #include "nest/locks.h" #include "nest/bfd.h" @@ -195,10 +195,6 @@ struct rip_rte #define RIP_ENTRY_VALID 1 /* Valid outgoing route */ #define RIP_ENTRY_STALE 2 /* Stale outgoing route, waiting for GC */ -#define EA_RIP_METRIC EA_CODE(PROTOCOL_RIP, 0) -#define EA_RIP_TAG EA_CODE(PROTOCOL_RIP, 1) -#define EA_RIP_FROM EA_CODE(PROTOCOL_RIP, 2) - static inline int rip_is_v2(struct rip_proto *p) { return p->rip2; } |