diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-04 14:03:14 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-04 14:05:39 +0100 |
| commit | 80e71dcd1fffe1126954d30c13897d90512329fa (patch) | |
| tree | 4b09cb0c75cbcb8d4c44fdc2a95514a84064ae03 | |
| parent | doc: Fixup quagga -> frr (diff) | |
| download | frr-80e71dcd1fffe1126954d30c13897d90512329fa.tar.xz frr-80e71dcd1fffe1126954d30c13897d90512329fa.zip | |
lib: Update ZAPI to version 4 and HEADER_MARKER to 254
Update the ZEBRA_HEADER_MARKER to 254. This will differentiate
ourselves from Quagga. Zebra should not listen to people not
properly using the right programs now.
Update the ZAPI version number to 4.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | doc/protocol.texi | 7 | ||||
| -rw-r--r-- | lib/zclient.h | 2 | ||||
| -rw-r--r-- | lib/zebra.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/protocol.texi b/doc/protocol.texi index f2c8da430..7e8a96dc5 100644 --- a/doc/protocol.texi +++ b/doc/protocol.texi @@ -25,8 +25,11 @@ enough to allow for future extensions to done compatibly through seperate commands. Version 0 is used by all versions of GNU Zebra as of this writing, and -versions of Quagga up to and including Quagga 0.98. Version 1 will be -used as of Quagga 1.0. Version 2 will be used as of Frr 2.0. +versions of Quagga up to and including Quagga 0.98. Version 2 was created +for 0.99.21 of Quagga. Version 3 designates VRF compatibility and was +released in 1.0. Version 4 will be used as of Frr 2.0 to indicate that +we are a different Routing Suite now and to hopefully prevent accidental +Quagga <-> FRR issues. @appendixsection Zebra Protocol Definition @appendixsubsec Zebra Protocol Header (version 0) diff --git a/lib/zclient.h b/lib/zclient.h index 7ea5bc963..4312cdc83 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -123,7 +123,7 @@ struct zserv_header * always set to 255 in new zserv. */ uint8_t version; -#define ZSERV_VERSION 3 +#define ZSERV_VERSION 4 vrf_id_t vrf_id; uint16_t command; }; diff --git a/lib/zebra.h b/lib/zebra.h index a67713c30..420f23717 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -411,7 +411,7 @@ typedef enum { * the command value in the old zserv header. To allow old and new * Zserv headers to be distinguished from each other. */ -#define ZEBRA_HEADER_MARKER 255 +#define ZEBRA_HEADER_MARKER 254 /* Zebra route's types are defined in route_types.h */ #include "route_types.h" |