diff options
author | Olivier Dugeon <olivier.dugeon@orange.com> | 2018-01-29 17:58:53 +0100 |
---|---|---|
committer | Olivier Dugeon <olivier.dugeon@orange.com> | 2018-01-29 17:58:53 +0100 |
commit | 7743f2f8c00ed2541454a806c1dc55257e06c7a5 (patch) | |
tree | 535706c0cba106a9579ed990156be19934c97f3d /ospfd/ospf_ext.h | |
parent | OSPFD: Set Segment Routing patch conform to C99 (diff) | |
download | frr-7743f2f8c00ed2541454a806c1dc55257e06c7a5.tar.xz frr-7743f2f8c00ed2541454a806c1dc55257e06c7a5.zip |
OSPFd: Update Segment Routing PR following review
Following various review, following files have been modfied:
- All: Change u_intXX_t typedef to standard uintXX_t types
- doc/OSPF-SR.rst: Update doc in particular the Linux Kernel configuration
section
- doc/ospfd.texi: Update CLI
- ospfd/ospf_dump.[c,h]: Add new 'debug ospf sr' when performing 'sh run'
- ospfd/ospf_ext.[c, h]: Various bug corrections notably to handle flooding of
Extended Prefix at startup. iFix TLVs size for LAN Adjacency.
Update Licence as per Community.md
- ospfd/ospf_opaque.c: Add proper termination function call to remove MPLS entries
- ospfd/ospf_ri.[c,h]: Bug corrections
- ospfd/ospf_sr.[c,h]: Various bug corrections, notably to determine the nexthop
SR Node. Add support to 'no-php-flag'.
Update Licence as per Community.md
- ospfd/ospfd.c: Add call to 'ospf_opaque_term()'
Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'ospfd/ospf_ext.h')
-rw-r--r-- | ospfd/ospf_ext.h | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/ospfd/ospf_ext.h b/ospfd/ospf_ext.h index 318a9821f..130faf671 100644 --- a/ospfd/ospf_ext.h +++ b/ospfd/ospf_ext.h @@ -4,27 +4,24 @@ * * Module name: Extended Prefix/Link Opaque LSA header definition * - * Author: Anselme Sawadogo <anselmesawadogo@gmail.com> * Author: Olivier Dugeon <olivier.dugeon@orange.com> + * Author: Anselme Sawadogo <anselmesawadogo@gmail.com> * - * Copyright (C) 2016 - 2017 Orange Labs http://www.orange.com - * - * This file is part of FRR. + * Copyright (C) 2016 - 2018 Orange Labs http://www.orange.com * - * FRR is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * - * FRR is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with FRR; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; see the file COPYING; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _FRR_OSPF_EXT_PREF_H_ @@ -42,7 +39,7 @@ * * * Type: IANA has assigned '7' for Extended Prefix Opaque LSA - * and '8' for Extended Link Opaque LSA + * and '8' for Extended Link Opaque LSA * Instance: User may select arbitrary 24-bit values to identify * different instances of Extended Prefix/Link Opaque LSA * @@ -71,7 +68,7 @@ /* Global use constant numbers */ -#define MAX_LEGAL_EXT_INSTANCE_NUM (0xffff) +#define MAX_LEGAL_EXT_INSTANCE_NUM (0xffff) #define LEGAL_EXT_INSTANCE_RANGE(i) (0 <= (i) && (i) <= 0xffff) /* Flags to manage Extended Link/Prefix Opaque LSA */ @@ -94,8 +91,10 @@ #define EXT_TLV_PREF_ROUTE_AS_EXT 5 #define EXT_TLV_PREF_ROUTE_NSSA_EXT 7 -/* Extended Prefix and Extended Prefix Range TLVs' - * Address family flag for IPv4 */ +/* + * Extended Prefix and Extended Prefix Range TLVs' + * Address family flag for IPv4 + */ #define EXT_TLV_PREF_AF_IPV4 0 /* Extended Prefix TLV Flags */ @@ -146,8 +145,10 @@ struct ospf_ext_lp { /* Flags to manage this Extended Prefix/Link Opaque LSA */ uint32_t flags; - /* Scope is area Opaque Type 10 or AS Opaque LSA Type 11 for - * Extended Prefix and area Opaque Type 10 for Extended Link */ + /* + * Scope is area Opaque Type 10 or AS Opaque LSA Type 11 for + * Extended Prefix and area Opaque Type 10 for Extended Link + */ uint8_t scope; /* area pointer if flooding is Type 10 Null if flooding is AS scope */ @@ -190,7 +191,9 @@ struct ext_itf { /* Prototypes. */ extern int ospf_ext_init(void); extern void ospf_ext_term(void); -extern void ospf_ext_update_sr(bool); -extern int ospf_ext_schedule_prefix_index(struct interface *, uint32_t, - struct prefix_ipv4 *); +extern void ospf_ext_update_sr(bool enable); +extern int ospf_ext_schedule_prefix_index(struct interface *ifp, + uint32_t index, + struct prefix_ipv4 *p, + uint8_t flags); #endif /* _FRR_OSPF_EXT_PREF_H_ */ |