diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
| commit | 406aadbf8ec3605115ba9a83d4994c2b61d0f5b3 (patch) | |
| tree | 5d51e649569435ffa45591edededeba58c9d4b9a /lib/zebra.h | |
| parent | 2d3b742ab0c15303e008cd83f15bea869107fab9 (diff) | |
| parent | 6cf8c261d41624992f55b195aa52f8867c6833c7 (diff) | |
| download | quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.bz2 quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.xz | |
Merge remote branch 'qpimd/pim' into merged/pimd
Conflicts:
configure.ac
lib/zebra.h
vtysh/vtysh.c
Diffstat (limited to 'lib/zebra.h')
| -rw-r--r-- | lib/zebra.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/zebra.h b/lib/zebra.h index b580934c..83f04294 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -1,5 +1,6 @@ /* Zebra common header. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Kunihiro Ishiguro + Portions Copyright (c) 2008 Everton da Silva Marques <everton.marques@gmail.com> This file is part of GNU Zebra. @@ -421,7 +422,8 @@ struct in_pktinfo #define ZEBRA_ROUTER_ID_ADD 20 #define ZEBRA_ROUTER_ID_DELETE 21 #define ZEBRA_ROUTER_ID_UPDATE 22 -#define ZEBRA_MESSAGE_MAX 23 +#define ZEBRA_IPV4_NEXTHOP_LOOKUP_V2 23 +#define ZEBRA_MESSAGE_MAX 24 /* Marker value used in new Zserv, in the byte location corresponding * the command value in the old zserv header. To allow old and new |