ospfd: Update Traffic Engineering support
These patches update original code to RFC3630 (OSPF-TE) and add support of
RFC5392 (Inter-AS v2) & RFC7471 (TE metric extensions) and partial support
of RFC6827 (ASON - GMPLS).
* ospfd/ospf_dump.[c,h]: Add new dump functions for Traffic Engineering
* ospfd/ospf_opaque.[c,h]: Add new TLV code points for RFC5392
* ospfd/ospf_packet.c: Update checking of OSPF_OPTION
* ospfd/ospf_vty.[c,h]: Update ospf_str2area_id
* ospfd/ospf_zebra.c: Add new function ospf_interface_link_params() to get
Link Parameters information from the interface to populate Traffic
Engineering metrics
* ospfd/ospfd.[c,h]: Update OSPF_OPTION flags (T -> MT and new DN)
* ospfd/ospf_te.[c,h]: Major modifications to update the code to new
link parameters structure and new RFCs
Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index fb43210..66cc294 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -133,6 +133,7 @@
unsigned long conf_debug_ospf_lsa = 0;
unsigned long conf_debug_ospf_zebra = 0;
unsigned long conf_debug_ospf_nssa = 0;
+unsigned long conf_debug_ospf_te = 0;
/* Enable debug option variables -- valid only session. */
unsigned long term_debug_ospf_packet[5] = {0, 0, 0, 0, 0};
@@ -142,7 +143,7 @@
unsigned long term_debug_ospf_lsa = 0;
unsigned long term_debug_ospf_zebra = 0;
unsigned long term_debug_ospf_nssa = 0;
-
+unsigned long term_debug_ospf_te = 0;
const char *
@@ -328,13 +329,14 @@
{
static char buf[OSPF_OPTION_STR_MAXLEN];
- snprintf (buf, OSPF_OPTION_STR_MAXLEN, "*|%s|%s|%s|%s|%s|%s|*",
+ snprintf (buf, OSPF_OPTION_STR_MAXLEN, "*|%s|%s|%s|%s|%s|%s|%s",
(options & OSPF_OPTION_O) ? "O" : "-",
(options & OSPF_OPTION_DC) ? "DC" : "-",
(options & OSPF_OPTION_EA) ? "EA" : "-",
(options & OSPF_OPTION_NP) ? "N/P" : "-",
(options & OSPF_OPTION_MC) ? "MC" : "-",
- (options & OSPF_OPTION_E) ? "E" : "-");
+ (options & OSPF_OPTION_E) ? "E" : "-",
+ (options & OSPF_OPTION_MT) ? "M/T" : "-");
return buf;
}
@@ -1426,6 +1428,32 @@
return CMD_SUCCESS;
}
+DEFUN (debug_ospf_te,
+ debug_ospf_te_cmd,
+ "debug ospf te",
+ DEBUG_STR
+ OSPF_STR
+ "OSPF-TE information\n")
+{
+ if (vty->node == CONFIG_NODE)
+ CONF_DEBUG_ON (te, TE);
+ TERM_DEBUG_ON (te, TE);
+ return CMD_SUCCESS;
+}
+
+DEFUN (no_debug_ospf_te,
+ no_debug_ospf_te_cmd,
+ "no debug ospf te",
+ NO_STR
+ DEBUG_STR
+ OSPF_STR
+ "OSPF-TE information\n")
+{
+ if (vty->node == CONFIG_NODE)
+ CONF_DEBUG_OFF (te, TE);
+ TERM_DEBUG_OFF (te, TE);
+ return CMD_SUCCESS;
+}
DEFUN (show_debugging_ospf,
show_debugging_ospf_cmd,
@@ -1673,6 +1701,7 @@
install_element (ENABLE_NODE, &debug_ospf_zebra_cmd);
install_element (ENABLE_NODE, &debug_ospf_event_cmd);
install_element (ENABLE_NODE, &debug_ospf_nssa_cmd);
+ install_element (ENABLE_NODE, &debug_ospf_te_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_detail_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_packet_all_cmd);
@@ -1686,6 +1715,7 @@
install_element (ENABLE_NODE, &no_debug_ospf_zebra_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_event_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_nssa_cmd);
+ install_element (ENABLE_NODE, &no_debug_ospf_te_cmd);
install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_detail_cmd);
install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_cmd);
@@ -1700,6 +1730,7 @@
install_element (CONFIG_NODE, &debug_ospf_zebra_cmd);
install_element (CONFIG_NODE, &debug_ospf_event_cmd);
install_element (CONFIG_NODE, &debug_ospf_nssa_cmd);
+ install_element (CONFIG_NODE, &debug_ospf_te_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_detail_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_packet_all_cmd);
@@ -1713,4 +1744,5 @@
install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_event_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_nssa_cmd);
+ install_element (CONFIG_NODE, &no_debug_ospf_te_cmd);
}
diff --git a/ospfd/ospf_dump.h b/ospfd/ospf_dump.h
index a2d5e8b..f843df0 100644
--- a/ospfd/ospf_dump.h
+++ b/ospfd/ospf_dump.h
@@ -57,6 +57,7 @@
#define OSPF_DEBUG_EVENT 0x01
#define OSPF_DEBUG_NSSA 0x02
+#define OSPF_DEBUG_TE 0x04
/* Macro for setting debug option. */
#define CONF_DEBUG_PACKET_ON(a, b) conf_debug_ospf_packet[a] |= (b)
@@ -98,6 +99,8 @@
#define IS_DEBUG_OSPF_NSSA IS_DEBUG_OSPF(nssa,NSSA)
+#define IS_DEBUG_OSPF_TE IS_DEBUG_OSPF(te,TE)
+
#define IS_CONF_DEBUG_OSPF_PACKET(a, b) \
(conf_debug_ospf_packet[a] & OSPF_DEBUG_ ## b)
#define IS_CONF_DEBUG_OSPF(a, b) \
@@ -119,6 +122,7 @@
extern unsigned long term_debug_ospf_lsa;
extern unsigned long term_debug_ospf_zebra;
extern unsigned long term_debug_ospf_nssa;
+extern unsigned long term_debug_ospf_te;
/* Message Strings. */
extern char *ospf_lsa_type_str[];
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 988a2e5..6b069c8 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -213,6 +213,9 @@
case OPAQUE_TYPE_GRACE_LSA:
name = "Grace-LSA";
break;
+ case OPAQUE_TYPE_INTER_AS_LSA:
+ name = "Inter-AS TE-v2 LSA";
+ break;
default:
if (OPAQUE_TYPE_RANGE_UNASSIGNED (opaque_type))
name = "Unassigned";
@@ -1973,6 +1976,7 @@
struct opaque_info_per_type *oipt;
struct opaque_info_per_id *oipi;
struct ospf_lsa *lsa;
+ struct ospf *top;
int delay;
if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
@@ -2004,7 +2008,10 @@
ospf_ls_retransmit_delete_nbr_area (lsa->area, lsa);
break;
case OSPF_OPAQUE_AS_LSA:
- ospf_ls_retransmit_delete_nbr_as (lsa0->area->ospf, lsa);
+ top = ospf_lookup ();
+ if ((lsa0->area != NULL) && (lsa0->area->ospf != NULL))
+ top = lsa0->area->ospf;
+ ospf_ls_retransmit_delete_nbr_as (top, lsa);
break;
default:
zlog_warn ("ospf_opaque_lsa_refresh_schedule: Unexpected LSA-type(%u)", lsa->data->type);
@@ -2049,6 +2056,9 @@
struct opaque_info_per_type *oipt;
struct opaque_info_per_id *oipi;
struct ospf_lsa *lsa;
+ struct ospf *top;
+
+ top = ospf_lookup ();
if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
|| (oipi = lookup_opaque_info_by_id (oipt, lsa0)) == NULL)
@@ -2072,7 +2082,9 @@
ospf_ls_retransmit_delete_nbr_area (lsa->area, lsa);
break;
case OSPF_OPAQUE_AS_LSA:
- ospf_ls_retransmit_delete_nbr_as (lsa0->area->ospf, lsa);
+ if ((lsa0->area != NULL) && (lsa0->area->ospf != NULL))
+ top = lsa0->area->ospf;
+ ospf_ls_retransmit_delete_nbr_as (top, lsa);
break;
default:
zlog_warn ("ospf_opaque_lsa_flush_schedule: Unexpected LSA-type(%u)", lsa->data->type);
@@ -2096,7 +2108,7 @@
zlog_debug ("Schedule Type-%u Opaque-LSA to FLUSH: [opaque-type=%u, opaque-id=%x]", lsa->data->type, GET_OPAQUE_TYPE (ntohl (lsa->data->id.s_addr)), GET_OPAQUE_ID (ntohl (lsa->data->id.s_addr)));
/* This lsa will be flushed and removed eventually. */
- ospf_lsa_flush (lsa0->area->ospf, lsa);
+ ospf_lsa_flush (top, lsa);
out:
return;
diff --git a/ospfd/ospf_opaque.h b/ospfd/ospf_opaque.h
index 2affa91..2ac9b41 100644
--- a/ospfd/ospf_opaque.h
+++ b/ospfd/ospf_opaque.h
@@ -60,6 +60,10 @@
#define OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA 1
#define OPAQUE_TYPE_SYCAMORE_OPTICAL_TOPOLOGY_DESC 2
#define OPAQUE_TYPE_GRACE_LSA 3
+#define OPAQUE_TYPE_L1VPN_LSA 5
+#define OPAQUE_TYPE_ROUTER_INFORMATION_LSA 4
+#define OPAQUE_TYPE_INTER_AS_LSA 6
+#define OPAQUE_TYPE_MAX 6
/* Followings types are proposed in internet-draft documents. */
#define OPAQUE_TYPE_8021_QOSPF 129
@@ -70,7 +74,7 @@
#define OPAQUE_TYPE_WILDCARD 0
#define OPAQUE_TYPE_RANGE_UNASSIGNED(type) \
- ( 4 <= (type) && (type) <= 127)
+ ( OPAQUE_TYPE_MAX <= (type) && (type) <= 127)
#define OPAQUE_TYPE_RANGE_RESERVED(type) \
(127 < (type) && (type) <= 255)
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 25f70bb..b997f1b 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -882,7 +882,7 @@
/* Compare options. */
#define REJECT_IF_TBIT_ON 1 /* XXX */
#ifdef REJECT_IF_TBIT_ON
- if (CHECK_FLAG (hello->options, OSPF_OPTION_T))
+ if (CHECK_FLAG (hello->options, OSPF_OPTION_MT))
{
/*
* This router does not support non-zero TOS.
@@ -1231,7 +1231,7 @@
}
#ifdef REJECT_IF_TBIT_ON
- if (CHECK_FLAG (dd->options, OSPF_OPTION_T))
+ if (CHECK_FLAG (dd->options, OSPF_OPTION_MT))
{
/*
* In Hello protocol, optional capability must have checked
diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index e750933..47771a1 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -1,8 +1,11 @@
/*
- * This is an implementation of draft-katz-yeung-ospf-traffic-06.txt
+ * This is an implementation of RFC3630
* Copyright (C) 2001 KDD R&D Laboratories, Inc.
* http://www.kddlabs.co.jp/
*
+ * Copyright (C) 2012 Orange Labs
+ * http://www.orange.com
+ *
* This file is part of GNU Zebra.
*
* GNU Zebra is free software; you can redistribute it and/or modify it
@@ -21,10 +24,11 @@
* 02111-1307, USA.
*/
-/***** MTYPE definition is not reflected to "memory.h" yet. *****/
-#define MTYPE_OSPF_MPLS_TE_LINKPARAMS MTYPE_TMP
+/* Add support of RFC7471 */
+/* Add support of RFC5392, RFC6827 */
#include <zebra.h>
+#include <math.h>
#include "linklist.h"
#include "prefix.h"
@@ -56,81 +60,35 @@
#include "ospfd/ospf_ase.h"
#include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_te.h"
-
-/* Following structure are internal use only. */
-struct ospf_mpls_te
-{
- enum { disabled, enabled } status;
-
- /* List elements are zebra-interfaces (ifp), not ospf-interfaces (oi). */
- struct list *iflist;
-
- /* Store Router-TLV in network byte order. */
- struct te_tlv_router_addr router_addr;
-};
-
-struct mpls_te_link
-{
- /*
- * According to MPLS-TE (draft) specification, 24-bit Opaque-ID field
- * is subdivided into 8-bit "unused" field and 16-bit "instance" field.
- * In this implementation, each Link-TLV has its own instance.
- */
- u_int32_t instance;
-
- /* Reference pointer to a Zebra-interface. */
- struct interface *ifp;
-
- /* Area info in which this MPLS-TE link belongs to. */
- struct ospf_area *area;
-
- /* Flags to manage this link parameters. */
- u_int32_t flags;
-#define LPFLG_LOOKUP_DONE 0x1
-#define LPFLG_LSA_ENGAGED 0x2
-#define LPFLG_LSA_FORCED_REFRESH 0x4
-
- /* Store Link-TLV in network byte order. */
- struct te_tlv_link link_header;
- struct te_link_subtlv_link_type link_type;
- struct te_link_subtlv_link_id link_id;
- struct te_link_subtlv_lclif_ipaddr *lclif_ipaddr;
- struct te_link_subtlv_rmtif_ipaddr *rmtif_ipaddr;
- struct te_link_subtlv_te_metric te_metric;
- struct te_link_subtlv_max_bw max_bw;
- struct te_link_subtlv_max_rsv_bw max_rsv_bw;
- struct te_link_subtlv_unrsv_bw unrsv_bw;
- struct te_link_subtlv_rsc_clsclr rsc_clsclr;
-};
+#include "ospfd/ospf_vty.h"
/*
* Global variable to manage Opaque-LSA/MPLS-TE on this node.
* Note that all parameter values are stored in network byte order.
*/
-static struct ospf_mpls_te OspfMplsTE;
+struct ospf_mpls_te OspfMplsTE;
-enum oifstate {
+const char *mode2text[] = { "Disable", "AS", "Area", "Emulate" };
+
+enum oifstate
+{
OI_ANY, OI_DOWN, OI_UP
};
-enum sched_opcode {
- REORIGINATE_PER_AREA, REFRESH_THIS_LSA, FLUSH_THIS_LSA
-};
-
/*------------------------------------------------------------------------*
* Followings are initialize/terminate functions for MPLS-TE handling.
*------------------------------------------------------------------------*/
static int ospf_mpls_te_new_if (struct interface *ifp);
static int ospf_mpls_te_del_if (struct interface *ifp);
-static void ospf_mpls_te_ism_change (struct ospf_interface *oi, int old_status);
+static void ospf_mpls_te_ism_change (struct ospf_interface *oi,
+ int old_status);
static void ospf_mpls_te_nsm_change (struct ospf_neighbor *nbr, int old_status);
static void ospf_mpls_te_config_write_router (struct vty *vty);
-static void ospf_mpls_te_config_write_if (struct vty *vty, struct interface *ifp);
static void ospf_mpls_te_show_info (struct vty *vty, struct ospf_lsa *lsa);
-static int ospf_mpls_te_lsa_originate (void *arg);
+static int ospf_mpls_te_lsa_originate_area (void *arg);
+static int ospf_mpls_te_lsa_originate_as (void *arg);
static struct ospf_lsa *ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa);
-static void ospf_mpls_te_lsa_schedule (struct mpls_te_link *lp, enum sched_opcode);
static void del_mpls_te_link (void *val);
static void ospf_mpls_te_register_vty (void);
@@ -148,21 +106,22 @@
ospf_mpls_te_ism_change,
ospf_mpls_te_nsm_change,
ospf_mpls_te_config_write_router,
- ospf_mpls_te_config_write_if,
+ NULL,/*ospf_mpls_te_config_write_if */
NULL,/* ospf_mpls_te_config_write_debug */
ospf_mpls_te_show_info,
- ospf_mpls_te_lsa_originate,
+ ospf_mpls_te_lsa_originate_area,
ospf_mpls_te_lsa_refresh,
NULL,/* ospf_mpls_te_new_lsa_hook */
NULL /* ospf_mpls_te_del_lsa_hook */);
if (rc != 0)
{
- zlog_warn ("ospf_mpls_te_init: Failed to register functions");
+ zlog_warn ("ospf_mpls_te_init: Failed to register Traffic Engineering functions");
goto out;
}
memset (&OspfMplsTE, 0, sizeof (struct ospf_mpls_te));
OspfMplsTE.status = disabled;
+ OspfMplsTE.inter_as = Disable;
OspfMplsTE.iflist = list_new ();
OspfMplsTE.iflist->del = del_mpls_te_link;
@@ -172,16 +131,75 @@
return rc;
}
+/* Additional register for RFC5392 support */
+static int
+ospf_mpls_te_register (enum inter_as_mode mode)
+{
+ int rc;
+ u_int8_t scope;
+
+ if (OspfMplsTE.inter_as != Disable)
+ return 0;
+
+ if (mode == AS)
+ scope = OSPF_OPAQUE_AS_LSA;
+ else
+ scope = OSPF_OPAQUE_AREA_LSA;
+
+ rc = ospf_register_opaque_functab (scope,
+ OPAQUE_TYPE_INTER_AS_LSA,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ ospf_mpls_te_show_info,
+ ospf_mpls_te_lsa_originate_as,
+ ospf_mpls_te_lsa_refresh, NULL, NULL);
+
+ if (rc != 0)
+ {
+ zlog_warn ("ospf_router_info_init: Failed to register Inter-AS functions");
+ return rc;
+ }
+
+ return 0;
+}
+
+static int
+ospf_mpls_te_unregister ()
+{
+ u_int8_t scope;
+
+ if (OspfMplsTE.inter_as == Disable)
+ return 0;
+
+ if (OspfMplsTE.inter_as == AS)
+ scope = OSPF_OPAQUE_AS_LSA;
+ else
+ scope = OSPF_OPAQUE_AREA_LSA;
+
+ ospf_delete_opaque_functab (scope, OPAQUE_TYPE_INTER_AS_LSA);
+
+ return 0;
+
+}
+
void
ospf_mpls_te_term (void)
{
list_delete (OspfMplsTE.iflist);
-
OspfMplsTE.iflist = NULL;
- OspfMplsTE.status = disabled;
ospf_delete_opaque_functab (OSPF_OPAQUE_AREA_LSA,
OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA);
+ OspfMplsTE.status = disabled;
+
+ ospf_mpls_te_unregister ();
+ OspfMplsTE.inter_as = Disable;
+
return;
}
@@ -192,11 +210,11 @@
static void
del_mpls_te_link (void *val)
{
- XFREE (MTYPE_OSPF_MPLS_TE_LINKPARAMS, val);
+ XFREE (MTYPE_OSPF_MPLS_TE, val);
return;
}
-static u_int32_t
+u_int32_t
get_mpls_te_instance_value (void)
{
static u_int32_t seqno = 0;
@@ -274,9 +292,9 @@
}
static void
-ospf_mpls_te_foreach_area (
- void (*func)(struct mpls_te_link *lp, enum sched_opcode),
- enum sched_opcode sched_opcode)
+ospf_mpls_te_foreach_area (void (*func)
+ (struct mpls_te_link * lp, opcode_t sched_opcode),
+ opcode_t sched_opcode)
{
struct listnode *node, *nnode;
struct listnode *node2;
@@ -285,10 +303,12 @@
for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
{
+ /* Skip Inter-AS TEv2 Links */
+ if (IS_INTER_AS (lp->type))
+ continue;
if ((area = lp->area) == NULL)
continue;
- if (lp->flags & LPFLG_LOOKUP_DONE)
- continue;
+ if CHECK_FLAG (lp->flags, LPFLG_LOOKUP_DONE) continue;
if (func != NULL)
(* func)(lp, sched_opcode);
@@ -297,12 +317,12 @@
if ((lp = listgetdata (node2)) != NULL)
if (lp->area != NULL)
if (IPV4_ADDR_SAME (&lp->area->area_id, &area->area_id))
- lp->flags |= LPFLG_LOOKUP_DONE;
+ SET_FLAG (lp->flags, LPFLG_LOOKUP_DONE);
}
for (ALL_LIST_ELEMENTS_RO (OspfMplsTE.iflist, node, lp))
if (lp->area != NULL)
- lp->flags &= ~LPFLG_LOOKUP_DONE;
+ UNSET_FLAG (lp->flags, LPFLG_LOOKUP_DONE);
return;
}
@@ -311,7 +331,7 @@
set_mpls_te_router_addr (struct in_addr ipv4)
{
OspfMplsTE.router_addr.header.type = htons (TE_TLV_ROUTER_ADDR);
- OspfMplsTE.router_addr.header.length = htons (sizeof (ipv4));
+ OspfMplsTE.router_addr.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
OspfMplsTE.router_addr.value = ipv4;
return;
}
@@ -319,7 +339,6 @@
static void
set_linkparams_link_header (struct mpls_te_link *lp)
{
- struct te_tlv_header *tlvh;
u_int16_t length = 0;
/* TE_LINK_SUBTLV_LINK_TYPE */
@@ -331,14 +350,12 @@
length += TLV_SIZE (&lp->link_id.header);
/* TE_LINK_SUBTLV_LCLIF_IPADDR */
- if ((tlvh = (struct te_tlv_header *) lp->lclif_ipaddr) != NULL
- && ntohs (tlvh->type) != 0)
- length += TLV_SIZE (tlvh);
+ if (lp->lclif_ipaddr.header.type != 0)
+ length += TLV_SIZE (&lp->lclif_ipaddr.header);
/* TE_LINK_SUBTLV_RMTIF_IPADDR */
- if ((tlvh = (struct te_tlv_header *) lp->rmtif_ipaddr) != NULL
- && ntohs (tlvh->type) != 0)
- length += TLV_SIZE (tlvh);
+ if (lp->rmtif_ipaddr.header.type != 0)
+ length += TLV_SIZE (&lp->rmtif_ipaddr.header);
/* TE_LINK_SUBTLV_TE_METRIC */
if (ntohs (lp->te_metric.header.type) != 0)
@@ -360,6 +377,50 @@
if (ntohs (lp->rsc_clsclr.header.type) != 0)
length += TLV_SIZE (&lp->rsc_clsclr.header);
+ /* TE_LINK_SUBTLV_LLRI */
+ if (ntohs (lp->llri.header.type) != 0)
+ length += TLV_SIZE (&lp->llri.header);
+
+ /* TE_LINK_SUBTLV_RIP */
+ if (ntohs (lp->rip.header.type) != 0)
+ length += TLV_SIZE (&lp->rip.header);
+
+ /* TE_LINK_SUBTLV_RAS */
+ if (ntohs (lp->ras.header.type) != 0)
+ length += TLV_SIZE (&lp->ras.header);
+
+ /* TE_LINK_SUBTLV_LRRID */
+ if (ntohs (lp->lrrid.header.type) != 0)
+ length += TLV_SIZE (&lp->lrrid.header);
+
+ /* TE_LINK_SUBTLV_AV_DELAY */
+ if (ntohs (lp->av_delay.header.type) != 0)
+ length += TLV_SIZE (&lp->av_delay.header);
+
+ /* TE_LINK_SUBTLV_MM_DELAY */
+ if (ntohs (lp->mm_delay.header.type) != 0)
+ length += TLV_SIZE (&lp->mm_delay.header);
+
+ /* TE_LINK_SUBTLV_DELAY_VAR */
+ if (ntohs (lp->delay_var.header.type) != 0)
+ length += TLV_SIZE (&lp->delay_var.header);
+
+ /* TE_LINK_SUBTLV_PKT_LOSS */
+ if (ntohs (lp->pkt_loss.header.type) != 0)
+ length += TLV_SIZE (&lp->pkt_loss.header);
+
+ /* TE_LINK_SUBTLV_RES_BW */
+ if (ntohs (lp->res_bw.header.type) != 0)
+ length += TLV_SIZE (&lp->res_bw.header);
+
+ /* TE_LINK_SUBTLV_AVA_BW */
+ if (ntohs (lp->ava_bw.header.type) != 0)
+ length += TLV_SIZE (&lp->ava_bw.header);
+
+ /* TE_LINK_SUBTLV_USE_BW */
+ if (ntohs (lp->use_bw.header.type) != 0)
+ length += TLV_SIZE (&lp->use_bw.header);
+
lp->link_header.header.type = htons (TE_TLV_LINK);
lp->link_header.header.length = htons (length);
@@ -370,7 +431,7 @@
set_linkparams_link_type (struct ospf_interface *oi, struct mpls_te_link *lp)
{
lp->link_type.header.type = htons (TE_LINK_SUBTLV_LINK_TYPE);
- lp->link_type.header.length = htons (sizeof (lp->link_type.link_type.value));
+ lp->link_type.header.length = htons (TE_LINK_SUBTLV_TYPE_SIZE);
switch (oi->type)
{
@@ -396,7 +457,7 @@
int done = 0;
lp->link_id.header.type = htons (TE_LINK_SUBTLV_LINK_ID);
- lp->link_id.header.length = htons (sizeof (lp->link_id.value));
+ lp->link_id.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
/*
* The Link ID is identical to the contents of the Link ID field
@@ -406,8 +467,7 @@
{
case OSPF_IFTYPE_POINTOPOINT:
/* Take the router ID of the neighbor. */
- if ((nbr = ospf_nbr_lookup_ptop (oi))
- && nbr->state == NSM_Full)
+ if ((nbr = ospf_nbr_lookup_ptop (oi)) && nbr->state == NSM_Full)
{
lp->link_id.value = nbr->router_id;
done = 1;
@@ -443,10 +503,30 @@
}
static void
+set_linkparams_lclif_ipaddr (struct mpls_te_link *lp, struct in_addr lclif)
+{
+
+ lp->lclif_ipaddr.header.type = htons (TE_LINK_SUBTLV_LCLIF_IPADDR);
+ lp->lclif_ipaddr.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->lclif_ipaddr.value[0] = lclif;
+ return;
+}
+
+static void
+set_linkparams_rmtif_ipaddr (struct mpls_te_link *lp, struct in_addr rmtif)
+{
+
+ lp->rmtif_ipaddr.header.type = htons (TE_LINK_SUBTLV_RMTIF_IPADDR);
+ lp->rmtif_ipaddr.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->rmtif_ipaddr.value[0] = rmtif;
+ return;
+}
+
+static void
set_linkparams_te_metric (struct mpls_te_link *lp, u_int32_t te_metric)
{
lp->te_metric.header.type = htons (TE_LINK_SUBTLV_TE_METRIC);
- lp->te_metric.header.length = htons (sizeof (lp->te_metric.value));
+ lp->te_metric.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
lp->te_metric.value = htonl (te_metric);
return;
}
@@ -455,7 +535,7 @@
set_linkparams_max_bw (struct mpls_te_link *lp, float fp)
{
lp->max_bw.header.type = htons (TE_LINK_SUBTLV_MAX_BW);
- lp->max_bw.header.length = htons (sizeof (lp->max_bw.value));
+ lp->max_bw.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
lp->max_bw.value = htonf (fp);
return;
}
@@ -464,7 +544,7 @@
set_linkparams_max_rsv_bw (struct mpls_te_link *lp, float fp)
{
lp->max_rsv_bw.header.type = htons (TE_LINK_SUBTLV_MAX_RSV_BW);
- lp->max_rsv_bw.header.length = htons (sizeof (lp->max_rsv_bw.value));
+ lp->max_rsv_bw.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
lp->max_rsv_bw.value = htonf (fp);
return;
}
@@ -474,7 +554,7 @@
{
/* Note that TLV-length field is the size of array. */
lp->unrsv_bw.header.type = htons (TE_LINK_SUBTLV_UNRSV_BW);
- lp->unrsv_bw.header.length = htons (sizeof (lp->unrsv_bw.value));
+ lp->unrsv_bw.header.length = htons (TE_LINK_SUBTLV_UNRSV_SIZE);
lp->unrsv_bw.value [priority] = htonf (fp);
return;
}
@@ -483,21 +563,283 @@
set_linkparams_rsc_clsclr (struct mpls_te_link *lp, u_int32_t classcolor)
{
lp->rsc_clsclr.header.type = htons (TE_LINK_SUBTLV_RSC_CLSCLR);
- lp->rsc_clsclr.header.length = htons (sizeof (lp->rsc_clsclr.value));
+ lp->rsc_clsclr.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
lp->rsc_clsclr.value = htonl (classcolor);
return;
}
static void
+set_linkparams_inter_as (struct mpls_te_link *lp, struct in_addr addr,
+ u_int32_t as)
+{
+
+ /* Set the Remote ASBR IP address and then the associated AS number */
+ lp->rip.header.type = htons (TE_LINK_SUBTLV_RIP);
+ lp->rip.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->rip.value = addr;
+
+ lp->ras.header.type = htons (TE_LINK_SUBTLV_RAS);
+ lp->ras.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->ras.value = htonl (as);
+}
+
+static void
+unset_linkparams_inter_as (struct mpls_te_link *lp)
+{
+
+ /* Reset the Remote ASBR IP address and then the associated AS number */
+ lp->rip.header.type = htons (0);
+ lp->rip.header.length = htons (0);
+ lp->rip.value.s_addr = htonl (0);
+
+ lp->ras.header.type = htons (0);
+ lp->ras.header.length = htons (0);
+ lp->ras.value = htonl (0);
+}
+
+void
+set_linkparams_llri (struct mpls_te_link *lp, u_int32_t local,
+ u_int32_t remote)
+{
+
+ lp->llri.header.type = htons (TE_LINK_SUBTLV_LLRI);
+ lp->llri.header.length = htons (TE_LINK_SUBTLV_LLRI_SIZE);
+ lp->llri.local = htonl (local);
+ lp->llri.remote = htonl (remote);
+}
+
+void
+set_linkparams_lrrid (struct mpls_te_link *lp, struct in_addr local,
+ struct in_addr remote)
+{
+
+ lp->lrrid.header.type = htons (TE_LINK_SUBTLV_LRRID);
+ lp->lrrid.header.length = htons (TE_LINK_SUBTLV_LRRID_SIZE);
+ lp->lrrid.local.s_addr = local.s_addr;
+ lp->lrrid.remote.s_addr = remote.s_addr;
+}
+
+static void
+set_linkparams_av_delay (struct mpls_te_link *lp, u_int32_t delay, u_char anormal)
+{
+ u_int32_t tmp;
+ /* Note that TLV-length field is the size of array. */
+ lp->av_delay.header.type = htons (TE_LINK_SUBTLV_AV_DELAY);
+ lp->av_delay.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ tmp = delay & TE_EXT_MASK;
+ if (anormal)
+ tmp |= TE_EXT_ANORMAL;
+ lp->av_delay.value = htonl (tmp);
+ return;
+}
+
+static void
+set_linkparams_mm_delay (struct mpls_te_link *lp, u_int32_t low, u_int32_t high, u_char anormal)
+{
+ u_int32_t tmp;
+ /* Note that TLV-length field is the size of array. */
+ lp->mm_delay.header.type = htons (TE_LINK_SUBTLV_MM_DELAY);
+ lp->mm_delay.header.length = htons (TE_LINK_SUBTLV_MM_DELAY_SIZE);
+ tmp = low & TE_EXT_MASK;
+ if (anormal)
+ tmp |= TE_EXT_ANORMAL;
+ lp->mm_delay.low = htonl (tmp);
+ lp->mm_delay.high = htonl (high);
+ return;
+}
+
+static void
+set_linkparams_delay_var (struct mpls_te_link *lp, u_int32_t jitter)
+{
+ /* Note that TLV-length field is the size of array. */
+ lp->delay_var.header.type = htons (TE_LINK_SUBTLV_DELAY_VAR);
+ lp->delay_var.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->delay_var.value = htonl (jitter & TE_EXT_MASK);
+ return;
+}
+
+static void
+set_linkparams_pkt_loss (struct mpls_te_link *lp, u_int32_t loss, u_char anormal)
+{
+ u_int32_t tmp;
+ /* Note that TLV-length field is the size of array. */
+ lp->pkt_loss.header.type = htons (TE_LINK_SUBTLV_PKT_LOSS);
+ lp->pkt_loss.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ tmp = loss & TE_EXT_MASK;
+ if (anormal)
+ tmp |= TE_EXT_ANORMAL;
+ lp->pkt_loss.value = htonl (tmp);
+ return;
+}
+
+static void
+set_linkparams_res_bw (struct mpls_te_link *lp, float fp)
+{
+ /* Note that TLV-length field is the size of array. */
+ lp->res_bw.header.type = htons (TE_LINK_SUBTLV_RES_BW);
+ lp->res_bw.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->res_bw.value = htonf (fp);
+ return;
+}
+
+static void
+set_linkparams_ava_bw (struct mpls_te_link *lp, float fp)
+{
+ /* Note that TLV-length field is the size of array. */
+ lp->ava_bw.header.type = htons (TE_LINK_SUBTLV_AVA_BW);
+ lp->ava_bw.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->ava_bw.value = htonf (fp);
+ return;
+}
+
+static void
+set_linkparams_use_bw (struct mpls_te_link *lp, float fp)
+{
+ /* Note that TLV-length field is the size of array. */
+ lp->use_bw.header.type = htons (TE_LINK_SUBTLV_USE_BW);
+ lp->use_bw.header.length = htons (TE_LINK_SUBTLV_DEF_SIZE);
+ lp->use_bw.value = htonf (fp);
+ return;
+}
+
+/* Update TE parameters from Interface */
+static void
+update_linkparams(struct mpls_te_link *lp)
+{
+ int i;
+ struct interface *ifp;
+
+ /* Get the Interface structure */
+ if ((ifp = lp->ifp) == NULL)
+ {
+ zlog_warn("OSPF MPLS-TE: Abort update TE parameters: no interface associated to Link Parameters");
+ return;
+ }
+ if (!HAS_LINK_PARAMS(ifp))
+ {
+ zlog_warn("OSPF MPLS-TE: Abort update TE parameters: no Link Parameters for interface");
+ return;
+ }
+
+ /* RFC3630 metrics */
+ if (IS_PARAM_SET(ifp->link_params, LP_ADM_GRP))
+ set_linkparams_rsc_clsclr (lp, ifp->link_params->admin_grp);
+ else
+ TLV_TYPE(lp->rsc_clsclr) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_MAX_BW))
+ set_linkparams_max_bw (lp, ifp->link_params->max_bw);
+ else
+ TLV_TYPE(lp->max_bw) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_MAX_RSV_BW))
+ set_linkparams_max_rsv_bw (lp, ifp->link_params->max_rsv_bw);
+ else
+ TLV_TYPE(lp->max_rsv_bw) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_UNRSV_BW))
+ for (i = 0; i < MAX_CLASS_TYPE; i++)
+ set_linkparams_unrsv_bw (lp, i, ifp->link_params->unrsv_bw[i]);
+ else
+ TLV_TYPE(lp->unrsv_bw) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_TE))
+ set_linkparams_te_metric(lp, ifp->link_params->te_metric);
+ else
+ TLV_TYPE(lp->te_metric) = 0;
+
+ /* TE metric Extensions */
+ if (IS_PARAM_SET(ifp->link_params, LP_DELAY))
+ set_linkparams_av_delay(lp, ifp->link_params->av_delay, 0);
+ else
+ TLV_TYPE(lp->av_delay) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_MM_DELAY))
+ set_linkparams_mm_delay(lp, ifp->link_params->min_delay, ifp->link_params->max_delay, 0);
+ else
+ TLV_TYPE(lp->mm_delay) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_DELAY_VAR))
+ set_linkparams_delay_var(lp, ifp->link_params->delay_var);
+ else
+ TLV_TYPE(lp->delay_var) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_PKT_LOSS))
+ set_linkparams_pkt_loss(lp, ifp->link_params->pkt_loss, 0);
+ else
+ TLV_TYPE(lp->pkt_loss) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_RES_BW))
+ set_linkparams_res_bw(lp, ifp->link_params->res_bw);
+ else
+ TLV_TYPE(lp->res_bw) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_AVA_BW))
+ set_linkparams_ava_bw(lp, ifp->link_params->ava_bw);
+ else
+ TLV_TYPE(lp->ava_bw) = 0;
+
+ if (IS_PARAM_SET(ifp->link_params, LP_USE_BW))
+ set_linkparams_use_bw(lp, ifp->link_params->use_bw);
+ else
+ TLV_TYPE(lp->use_bw) = 0;
+
+ /* RFC5392 */
+ if (IS_PARAM_SET(ifp->link_params, LP_RMT_AS))
+ {
+ /* Flush LSA if it engaged and was previously a STD_TE one */
+ if (IS_STD_TE(lp->type) && CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED))
+ {
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug("OSPF MPLS-TE Update IF: Switch from Standard LSA to INTER-AS for %s[%d/%d]",
+ ifp->name, lp->flags, lp->type);
+
+ ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
+ /* Then, switch it to INTER-AS */
+ if (OspfMplsTE.inter_as == AS)
+ lp->flags = INTER_AS | FLOOD_AS;
+ else
+ {
+ lp->flags = INTER_AS | FLOOD_AREA;
+ lp->area = ospf_area_lookup_by_area_id (ospf_lookup(), OspfMplsTE.interas_areaid);
+ }
+ }
+ set_linkparams_inter_as(lp, ifp->link_params->rmt_ip, ifp->link_params->rmt_as);
+ }
+ else
+ {
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug("OSPF MPLS-TE Update IF: Switch from INTER-AS LSA to Standard for %s[%d/%d]",
+ ifp->name, lp->flags, lp->type);
+
+ /* reset inter-as TE params */
+ /* Flush LSA if it engaged and was previously an INTER_AS one */
+ if (IS_INTER_AS(lp->type) && CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED))
+ {
+ ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
+ /* Then, switch it to Standard TE */
+ lp->flags = STD_TE | FLOOD_AREA;
+ }
+ unset_linkparams_inter_as (lp);
+ }
+}
+
+static void
initialize_linkparams (struct mpls_te_link *lp)
{
struct interface *ifp = lp->ifp;
struct ospf_interface *oi;
- float fval;
- int i;
+
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug("MPLS-TE(initialize_linkparams) Initialize Link Parameters for interface %s",
+ ifp->name);
if ((oi = lookup_oi_by_ifp (ifp, NULL, OI_ANY)) == NULL)
- return;
+ {
+ zlog_warn("MPLS-TE(initialize_linkparams) Could not find corresponding OSPF Interface for %s",
+ ifp->name);
+ return;
+ }
/*
* Try to set initial values those can be derived from
@@ -505,18 +847,19 @@
*/
set_linkparams_link_type (oi, lp);
- /*
- * Linux and *BSD kernel holds bandwidth parameter as an "int" type.
- * We may have to reconsider, if "ifp->bandwidth" type changes to float.
- */
- fval = (float)((ifp->bandwidth ? ifp->bandwidth
- : OSPF_DEFAULT_BANDWIDTH) * 1000 / 8);
+ /* Set local IP addr */
+ set_linkparams_lclif_ipaddr (lp, oi->address->u.prefix4);
- set_linkparams_max_bw (lp, fval);
- set_linkparams_max_rsv_bw (lp, fval);
+ /* Set Remote IP addr if Point to Point Interface */
+ if (oi->type == LINK_TYPE_SUBTLV_VALUE_PTP)
+ {
+ struct prefix *pref = CONNECTED_PREFIX(oi->connected);
+ if (pref != NULL)
+ set_linkparams_rmtif_ipaddr(lp, pref->u.prefix4);
+ }
- for (i = 0; i < 8; i++)
- set_linkparams_unrsv_bw (lp, i, fval);
+ /* Keep Area information in combination with link parameters. */
+ lp->area = oi->area;
return;
}
@@ -527,13 +870,22 @@
int rc = 0;
if (ntohs (OspfMplsTE.router_addr.header.type) == 0)
+ {
+ zlog_warn ("MPLS-TE(is_mandated_params_set) Missing Router Address");
goto out;
+ }
if (ntohs (lp->link_type.header.type) == 0)
+ {
+ zlog_warn ("MPLS-TE(is_mandated_params_set) Missing Link Type");
goto out;
+ }
- if (ntohs (lp->link_id.header.type) == 0)
+ if (!IS_INTER_AS (lp->type) && (ntohs (lp->link_id.header.type) == 0))
+ {
+ zlog_warn ("MPLS-TE(is_mandated_params_set) Missing Link ID");
goto out;
+ }
rc = 1;
out:
@@ -550,6 +902,10 @@
struct mpls_te_link *new;
int rc = -1;
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug ("MPLS-TE(ospf_mpls_te_new_if) Add new %s interface %s to MPLS-TE list",
+ ifp->link_params ? "Active" : "Inactive", ifp->name);
+
if (lookup_linkparams_by_ifp (ifp) != NULL)
{
zlog_warn ("ospf_mpls_te_new_if: ifp(%p) already in use?", (void *)ifp);
@@ -557,23 +913,33 @@
goto out;
}
- new = XCALLOC (MTYPE_OSPF_MPLS_TE_LINKPARAMS,
- sizeof (struct mpls_te_link));
+ new = XCALLOC (MTYPE_OSPF_MPLS_TE, sizeof (struct mpls_te_link));
if (new == NULL)
{
zlog_warn ("ospf_mpls_te_new_if: XMALLOC: %s", safe_strerror (errno));
goto out;
}
- new->area = NULL;
- new->flags = 0;
new->instance = get_mpls_te_instance_value ();
new->ifp = ifp;
+ /* By default TE-Link is RFC3630 compatible flooding in Area and not active */
+ /* This default behavior will be adapted with call to ospf_mpls_te_update_if() */
+ new->type = STD_TE | FLOOD_AREA;
+ new->flags = LPFLG_LSA_INACTIVE;
- initialize_linkparams (new);
+ /* Initialize Link Parameters from Interface */
+ initialize_linkparams(new);
+ /* Set TE Parameters from Interface */
+ update_linkparams(new);
+
+ /* Add Link Parameters structure to the list */
listnode_add (OspfMplsTE.iflist, new);
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug("OSPF MPLS-TE New IF: Add new LP context for %s[%d/%d]",
+ ifp->name, new->flags, new->type);
+
/* Schedule Opaque-LSA refresh. *//* XXX */
rc = 0;
@@ -598,7 +964,7 @@
if (listcount (iflist) == 0)
iflist->head = iflist->tail = NULL;
- XFREE (MTYPE_OSPF_MPLS_TE_LINKPARAMS, lp);
+ XFREE (MTYPE_OSPF_MPLS_TE, lp);
}
/* Schedule Opaque-LSA refresh. *//* XXX */
@@ -608,6 +974,56 @@
return rc;
}
+/* Main initialization / update function of the MPLS TE Link context */
+
+/* Call when interface TE Link parameters are modified */
+void
+ospf_mpls_te_update_if (struct interface *ifp)
+{
+ struct mpls_te_link *lp;
+
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug ("OSPF MPLS-TE: Update LSA parameters for interface %s [%s]",
+ ifp->name, HAS_LINK_PARAMS(ifp) ? "ON" : "OFF");
+
+ /* Get Link context from interface */
+ if ((lp = lookup_linkparams_by_ifp(ifp)) == NULL)
+ {
+ zlog_warn ("OSPF MPLS-TE Update: Did not find Link Parameters context for interface %s", ifp->name);
+ return;
+ }
+
+ /* Fulfill MPLS-TE Link TLV from Interface TE Link parameters */
+ if (HAS_LINK_PARAMS(ifp))
+ {
+ SET_FLAG (lp->flags, LPFLG_LSA_ACTIVE);
+
+ /* Update TE parameters */
+ update_linkparams(lp);
+
+ /* Finally Re-Originate or Refresh Opaque LSA if MPLS_TE is enabled */
+ if (OspfMplsTE.status == enabled)
+ if (lp->area != NULL)
+ {
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
+ ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
+ else
+ ospf_mpls_te_lsa_schedule (lp, REORIGINATE_THIS_LSA);
+ }
+ }
+ else
+ {
+ /* If MPLS TE is disable on this interface, flush LSA if it is already engaged */
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
+ ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
+ else
+ /* Reset Activity flag */
+ lp->flags = LPFLG_LSA_INACTIVE;
+ }
+
+ return;
+}
+
static void
ospf_mpls_te_ism_change (struct ospf_interface *oi, int old_state)
{
@@ -620,10 +1036,10 @@
zlog_warn ("ospf_mpls_te_ism_change: Cannot get linkparams from OI(%s)?", IF_NAME (oi));
goto out;
}
+
if (oi->area == NULL || oi->area->ospf == NULL)
{
- zlog_warn ("ospf_mpls_te_ism_change: Cannot refer to OSPF from OI(%s)?",
-IF_NAME (oi));
+ zlog_warn ("ospf_mpls_te_ism_change: Cannot refer to OSPF from OI(%s)?", IF_NAME (oi));
goto out;
}
#ifdef notyet
@@ -632,13 +1048,17 @@
|| (lp->area != NULL && oi->area == NULL))
{
/* How should we consider this case? */
- zlog_warn ("MPLS-TE: Area for OI(%s) has changed to [%s], flush previous LSAs", IF_NAME (oi), oi->area ? inet_ntoa (oi->area->area_id) : "N/A");
+ zlog_warn ("MPLS-TE: Area for OI(%s) has changed to [%s], flush previous LSAs",
+ IF_NAME (oi), oi->area ? inet_ntoa (oi->area->area_id) : "N/A");
ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
}
#endif
- /* Keep Area information in conbination with linkparams. */
+ /* Keep Area information in combination with linkparams. */
lp->area = oi->area;
+ /* Keep interface MPLS-TE status */
+ lp->flags = HAS_LINK_PARAMS(oi->ifp);
+
switch (oi->state)
{
case ISM_PointToPoint:
@@ -648,37 +1068,53 @@
old_type = lp->link_type;
old_id = lp->link_id;
+ /* Set Link type, Link ID, Local and Remote IP addr */
set_linkparams_link_type (oi, lp);
set_linkparams_link_id (oi, lp);
+ set_linkparams_lclif_ipaddr (lp, oi->address->u.prefix4);
+ if (oi->type == LINK_TYPE_SUBTLV_VALUE_PTP)
+ {
+ struct prefix *pref = CONNECTED_PREFIX(oi->connected);
+ if (pref != NULL)
+ set_linkparams_rmtif_ipaddr(lp, pref->u.prefix4);
+ }
+
+ /* Update TE parameters */
+ update_linkparams(lp);
+
+ /* Try to Schedule LSA */
if ((ntohs (old_type.header.type) != ntohs (lp->link_type.header.type)
|| old_type.link_type.value != lp->link_type.link_type.value)
|| (ntohs (old_id.header.type) != ntohs (lp->link_id.header.type)
- || ntohl (old_id.value.s_addr) != ntohl (lp->link_id.value.s_addr)))
+ || ntohl (old_id.value.s_addr) !=
+ ntohl (lp->link_id.value.s_addr)))
{
- if (lp->flags & LPFLG_LSA_ENGAGED)
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
+ ospf_mpls_te_lsa_schedule (lp, REORIGINATE_THIS_LSA);
+
}
break;
default:
lp->link_type.header.type = htons (0);
lp->link_id.header.type = htons (0);
- if (lp->flags & LPFLG_LSA_ENGAGED)
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
break;
}
out:
return;
+
}
static void
ospf_mpls_te_nsm_change (struct ospf_neighbor *nbr, int old_state)
{
- /* So far, nothing to do here. */
+ /* Nothing to do here */
return;
}
@@ -706,106 +1142,10 @@
}
static void
-build_link_subtlv_link_type (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->link_type.header;
- if (ntohs (tlvh->type) != 0)
+build_link_subtlv (struct stream *s, struct te_tlv_header *tlvh)
{
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-static void
-build_link_subtlv_link_id (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->link_id.header;
- if (ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_lclif_ipaddr (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = (struct te_tlv_header *) lp->lclif_ipaddr;
- if (tlvh != NULL && ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_rmtif_ipaddr (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = (struct te_tlv_header *) lp->rmtif_ipaddr;
- if (tlvh != NULL && ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_te_metric (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->te_metric.header;
- if (ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_max_bw (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->max_bw.header;
- if (ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_max_rsv_bw (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->max_rsv_bw.header;
- if (ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_unrsv_bw (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->unrsv_bw.header;
- if (ntohs (tlvh->type) != 0)
- {
- build_tlv_header (s, tlvh);
- stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
- }
- return;
-}
-
-static void
-build_link_subtlv_rsc_clsclr (struct stream *s, struct mpls_te_link *lp)
-{
- struct te_tlv_header *tlvh = &lp->rsc_clsclr.header;
- if (ntohs (tlvh->type) != 0)
+ if ((tlvh != NULL) && (ntohs (tlvh->type) != 0))
{
build_tlv_header (s, tlvh);
stream_put (s, tlvh+1, TLV_BODY_SIZE (tlvh));
@@ -819,15 +1159,27 @@
set_linkparams_link_header (lp);
build_tlv_header (s, &lp->link_header.header);
- build_link_subtlv_link_type (s, lp);
- build_link_subtlv_link_id (s, lp);
- build_link_subtlv_lclif_ipaddr (s, lp);
- build_link_subtlv_rmtif_ipaddr (s, lp);
- build_link_subtlv_te_metric (s, lp);
- build_link_subtlv_max_bw (s, lp);
- build_link_subtlv_max_rsv_bw (s, lp);
- build_link_subtlv_unrsv_bw (s, lp);
- build_link_subtlv_rsc_clsclr (s, lp);
+ build_link_subtlv (s, &lp->link_type.header);
+ build_link_subtlv (s, &lp->link_id.header);
+ build_link_subtlv (s, &lp->lclif_ipaddr.header);
+ build_link_subtlv (s, &lp->rmtif_ipaddr.header);
+ build_link_subtlv (s, &lp->te_metric.header);
+ build_link_subtlv (s, &lp->max_bw.header);
+ build_link_subtlv (s, &lp->max_rsv_bw.header);
+ build_link_subtlv (s, &lp->unrsv_bw.header);
+ build_link_subtlv (s, &lp->rsc_clsclr.header);
+ build_link_subtlv (s, &lp->lrrid.header);
+ build_link_subtlv (s, &lp->llri.header);
+ build_link_subtlv (s, &lp->rip.header);
+ build_link_subtlv (s, &lp->ras.header);
+ build_link_subtlv (s, &lp->av_delay.header);
+ build_link_subtlv (s, &lp->mm_delay.header);
+ build_link_subtlv (s, &lp->delay_var.header);
+ build_link_subtlv (s, &lp->pkt_loss.header);
+ build_link_subtlv (s, &lp->res_bw.header);
+ build_link_subtlv (s, &lp->ava_bw.header);
+ build_link_subtlv (s, &lp->res_bw.header);
+
return;
}
@@ -856,7 +1208,7 @@
struct stream *s;
struct lsa_header *lsah;
struct ospf_lsa *new = NULL;
- u_char options, lsa_type;
+ u_char options, lsa_type = 0;
struct in_addr lsa_id;
u_int32_t tmp;
u_int16_t length;
@@ -869,19 +1221,42 @@
}
lsah = (struct lsa_header *) STREAM_DATA (s);
- options = LSA_OPTIONS_GET (area);
- options |= LSA_OPTIONS_NSSA_GET (area);
- options |= OSPF_OPTION_O; /* Don't forget this :-) */
+ options = OSPF_OPTION_O; /* Don't forget this :-) */
- lsa_type = OSPF_OPAQUE_AREA_LSA;
- tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA, lp->instance);
- lsa_id.s_addr = htonl (tmp);
+ /* Set opaque-LSA header fields depending of the type of RFC */
+ if (IS_INTER_AS (lp->type))
+ {
+ if IS_FLOOD_AS (lp->type)
+ {
+ options |= OSPF_OPTION_E; /* Enable AS external as we flood Inter-AS with Opaque Type 11 */
+ lsa_type = OSPF_OPAQUE_AS_LSA;
+ }
+ else
+ {
+ options |= LSA_OPTIONS_GET (area); /* Get area default option */
+ options |= LSA_OPTIONS_NSSA_GET (area);
+ lsa_type = OSPF_OPAQUE_AREA_LSA;
+ }
+ tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_INTER_AS_LSA, lp->instance);
+ lsa_id.s_addr = htonl (tmp);
+
+ struct ospf *top = ospf_lookup ();
+
+ lsa_header_set (s, options, lsa_type, lsa_id, top->router_id);
+ }
+ else
+ {
+ options |= LSA_OPTIONS_GET (area); /* Get area default option */
+ options |= LSA_OPTIONS_NSSA_GET (area);
+ lsa_type = OSPF_OPAQUE_AREA_LSA;
+ tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA, lp->instance);
+ lsa_id.s_addr = htonl (tmp);
+ lsa_header_set (s, options, lsa_type, lsa_id, area->ospf->router_id);
+ }
if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
- zlog_debug ("LSA[Type%d:%s]: Create an Opaque-LSA/MPLS-TE instance", lsa_type, inet_ntoa (lsa_id));
-
- /* Set opaque-LSA header fields. */
- lsa_header_set (s, options, lsa_type, lsa_id, area->ospf->router_id);
+ zlog_debug ("LSA[Type%d:%s]: Create an Opaque-LSA/MPLS-TE instance",
+ lsa_type, inet_ntoa (lsa_id));
/* Set opaque-LSA body fields. */
ospf_mpls_te_lsa_body_set (s, lp);
@@ -936,9 +1311,8 @@
goto out;
}
- /* Now this linkparameter entry has associated LSA. */
- lp->flags |= LPFLG_LSA_ENGAGED;
-
+ /* Now this link-parameter entry has associated LSA. */
+ SET_FLAG (lp->flags, LPFLG_LSA_ENGAGED);
/* Update new LSA origination count. */
area->ospf->lsa_originate_count++;
@@ -949,7 +1323,8 @@
{
char area_id[INET_ADDRSTRLEN];
strcpy (area_id, inet_ntoa (area->area_id));
- zlog_debug ("LSA[Type%d:%s]: Originate Opaque-LSA/MPLS-TE: Area(%s), Link(%s)", new->data->type, inet_ntoa (new->data->id), area_id, lp->ifp->name);
+ zlog_debug ("LSA[Type%d:%s]: Originate Opaque-LSA/MPLS-TE: Area(%s), Link(%s)",
+ new->data->type, inet_ntoa (new->data->id), area_id, lp->ifp->name);
ospf_lsa_header_dump (new->data);
}
@@ -959,7 +1334,7 @@
}
static int
-ospf_mpls_te_lsa_originate (void *arg)
+ospf_mpls_te_lsa_originate_area (void *arg)
{
struct ospf_area *area = (struct ospf_area *) arg;
struct listnode *node, *nnode;
@@ -968,34 +1343,44 @@
if (OspfMplsTE.status == disabled)
{
- zlog_info ("ospf_mpls_te_lsa_originate: MPLS-TE is disabled now.");
+ zlog_info ("ospf_mpls_te_lsa_originate_area: MPLS-TE is disabled now.");
rc = 0; /* This is not an error case. */
goto out;
}
for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
{
+ /* Process only enabled LSA with area scope flooding */
+ if (!CHECK_FLAG (lp->flags, LPFLG_LSA_ACTIVE) || IS_FLOOD_AS (lp->type))
+ continue;
+
if (lp->area == NULL)
continue;
+
if (! IPV4_ADDR_SAME (&lp->area->area_id, &area->area_id))
continue;
- if (lp->flags & LPFLG_LSA_ENGAGED)
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
{
- if (lp->flags & LPFLG_LSA_FORCED_REFRESH)
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_FORCED_REFRESH)
{
- lp->flags &= ~LPFLG_LSA_FORCED_REFRESH;
+ UNSET_FLAG (lp->flags, LPFLG_LSA_FORCED_REFRESH);
+ zlog_warn ("OSPF MPLS-TE (ospf_mpls_te_lsa_originate_area): Refresh instead of Originate");
ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
}
continue;
}
if (! is_mandated_params_set (lp))
{
- zlog_warn ("ospf_mpls_te_lsa_originate: Link(%s) lacks some mandated MPLS-TE parameters.", lp->ifp ? lp->ifp->name : "?");
+ zlog_warn ("ospf_mpls_te_lsa_originate_area: Link(%s) lacks some mandated MPLS-TE parameters.",
+ lp->ifp ? lp->ifp->name : "?");
continue;
}
/* Ok, let's try to originate an LSA for this area and Link. */
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug ("MPLS-TE(ospf_mpls_te_lsa_originate_area) Let's finally reoriginate the LSA %d through the Area %s for Link %s",
+ lp->instance, inet_ntoa (area->area_id), lp->ifp ? lp->ifp->name : "?");
if (ospf_mpls_te_lsa_originate1 (area, lp) != 0)
goto out;
}
@@ -1005,11 +1390,112 @@
return rc;
}
+static int
+ospf_mpls_te_lsa_originate2 (struct ospf *top, struct mpls_te_link *lp)
+{
+ struct ospf_lsa *new;
+ int rc = -1;
+
+ /* Create new Opaque-LSA/Inter-AS instance. */
+ if ((new = ospf_mpls_te_lsa_new (NULL, lp)) == NULL)
+ {
+ zlog_warn ("ospf_mpls_te_lsa_originate2: ospf_router_info_lsa_new() ?");
+ goto out;
+ }
+
+ /* Install this LSA into LSDB. */
+ if (ospf_lsa_install (top, NULL /*oi */ , new) == NULL)
+ {
+ zlog_warn ("ospf_mpls_te_lsa_originate2: ospf_lsa_install() ?");
+ ospf_lsa_unlock (&new);
+ goto out;
+ }
+
+ /* Now this Router Info parameter entry has associated LSA. */
+ SET_FLAG (lp->flags, LPFLG_LSA_ENGAGED);
+ /* Update new LSA origination count. */
+ top->lsa_originate_count++;
+
+ /* Flood new LSA through AS. */
+ ospf_flood_through_as (top, NULL /*nbr */ , new);
+
+ if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
+ {
+ zlog_debug ("LSA[Type%d:%s]: Originate Opaque-LSA/MPLS-TE Inter-AS",
+ new->data->type, inet_ntoa (new->data->id));
+ ospf_lsa_header_dump (new->data);
+ }
+
+ rc = 0;
+out:return rc;
+}
+
+static int
+ospf_mpls_te_lsa_originate_as (void *arg)
+{
+ struct ospf *top;
+ struct ospf_area *area;
+ struct listnode *node, *nnode;
+ struct mpls_te_link *lp;
+ int rc = -1;
+
+ if ((OspfMplsTE.status == disabled) || (OspfMplsTE.inter_as == Disable))
+ {
+ zlog_info
+ ("ospf_mpls_te_lsa_originate_as: MPLS-TE Inter-AS is disabled for now.");
+ rc = 0; /* This is not an error case. */
+ goto out;
+ }
+
+ for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
+ {
+ /* Process only enabled INTER_AS Links or Pseudo-Links */
+ if (!CHECK_FLAG (lp->flags, LPFLG_LSA_ACTIVE) || !IS_INTER_AS (lp->type))
+ continue;
+
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
+ {
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_FORCED_REFRESH)
+ {
+ UNSET_FLAG (lp->flags, LPFLG_LSA_FORCED_REFRESH);
+ ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
+ }
+ continue;
+ }
+ if (!is_mandated_params_set (lp))
+ {
+ zlog_warn ("ospf_mpls_te_lsa_originate_as: Link(%s) lacks some mandated MPLS-TE parameters.",
+ lp->ifp ? lp->ifp->name : "?");
+ continue;
+ }
+
+ /* Ok, let's try to originate an LSA for this AS and Link. */
+ if (IS_DEBUG_OSPF_TE)
+ zlog_debug ("MPLS-TE(ospf_mpls_te_lsa_originate_as) Let's finally re-originate the Inter-AS LSA %d through the %s for Link %s",
+ lp->instance, IS_FLOOD_AS (lp->type) ? "AS" : "Area", lp->ifp ? lp->ifp->name : "Unknown");
+
+ if (IS_FLOOD_AS (lp->type))
+ {
+ top = (struct ospf *) arg;
+ rc = ospf_mpls_te_lsa_originate2 (top, lp);
+ }
+ else
+ {
+ area = (struct ospf_area *) arg;
+ rc = ospf_mpls_te_lsa_originate1 (area, lp);
+ }
+ }
+
+ rc = 0;
+out:return rc;
+}
+
static struct ospf_lsa *
ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa)
{
struct mpls_te_link *lp;
struct ospf_area *area = lsa->area;
+ struct ospf *top;
struct ospf_lsa *new = NULL;
if (OspfMplsTE.status == disabled)
@@ -1029,11 +1515,18 @@
lsa->data->ls_age = htons (OSPF_LSA_MAXAGE); /* Flush it anyway. */
}
+ /* Check if lp was not disable in the interval */
+ if (!CHECK_FLAG (lp->flags, LPFLG_LSA_ACTIVE))
+ {
+ zlog_warn ("ospf_mpls_te_lsa_refresh: lp was disabled: Flush it!");
+ lsa->data->ls_age = htons (OSPF_LSA_MAXAGE); /* Flush it anyway. */
+ }
+
/* If the lsa's age reached to MaxAge, start flushing procedure. */
if (IS_LSA_MAXAGE (lsa))
{
if (lp)
- lp->flags &= ~LPFLG_LSA_ENGAGED;
+ UNSET_FLAG (lp->flags, LPFLG_LSA_ENGAGED);
ospf_opaque_lsa_flush_schedule (lsa);
goto out;
}
@@ -1048,15 +1541,24 @@
/* Install this LSA into LSDB. */
/* Given "lsa" will be freed in the next function. */
- if (ospf_lsa_install (area->ospf, NULL/*oi*/, new) == NULL)
+ /* As area could be NULL i.e. when using OPAQUE_LSA_AS, we prefer to use ospf_lookup() to get ospf instance */
+ if (area)
+ top = area->ospf;
+ else
+ top = ospf_lookup ();
+
+ if (ospf_lsa_install (top, NULL /*oi */ , new) == NULL)
{
zlog_warn ("ospf_mpls_te_lsa_refresh: ospf_lsa_install() ?");
ospf_lsa_unlock (&new);
goto out;
}
- /* Flood updated LSA through area. */
- ospf_flood_through_area (area, NULL/*nbr*/, new);
+ /* Flood updated LSA through AS or Area depending of the RFC of the link */
+ if (IS_FLOOD_AS (lp->type))
+ ospf_flood_through_as (top, NULL, new);
+ else
+ ospf_flood_through_area (area, NULL/*nbr*/, new);
/* Debug logging. */
if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
@@ -1070,34 +1572,80 @@
return new;
}
-static void
-ospf_mpls_te_lsa_schedule (struct mpls_te_link *lp,
- enum sched_opcode opcode)
+void
+ospf_mpls_te_lsa_schedule (struct mpls_te_link *lp, opcode_t opcode)
{
struct ospf_lsa lsa;
struct lsa_header lsah;
+ struct ospf *top;
u_int32_t tmp;
memset (&lsa, 0, sizeof (lsa));
memset (&lsah, 0, sizeof (lsah));
+ top = ospf_lookup ();
+
+ /* Check if the pseudo link is ready to flood */
+ if (!(CHECK_FLAG (lp->flags, LPFLG_LSA_ACTIVE))
+ || !(IS_FLOOD_AREA (lp->type) || IS_FLOOD_AS (lp->type))) {
+ return;
+ }
lsa.area = lp->area;
lsa.data = &lsah;
- lsah.type = OSPF_OPAQUE_AREA_LSA;
- tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA, lp->instance);
- lsah.id.s_addr = htonl (tmp);
+ if (IS_FLOOD_AS (lp->type))
+ {
+ lsah.type = OSPF_OPAQUE_AS_LSA;
+ tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_INTER_AS_LSA, lp->instance);
+ lsah.id.s_addr = htonl (tmp);
+ }
+ else
+ {
+ lsah.type = OSPF_OPAQUE_AREA_LSA;
+ if (IS_INTER_AS (lp->type))
+ {
+ /* Set the area context if not know */
+ if (lp->area == NULL)
+ lp->area = ospf_area_lookup_by_area_id (top, OspfMplsTE.interas_areaid);
+ /* Unable to set the area context. Abort! */
+ if (lp->area == NULL)
+ {
+ zlog_warn ("MPLS-TE(ospf_mpls_te_lsa_schedule) Area context is null. Abort !");
+ return;
+ }
+ tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_INTER_AS_LSA, lp->instance);
+ }
+ else
+ tmp = SET_OPAQUE_LSID (OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA, lp->instance);
+ lsah.id.s_addr = htonl (tmp);
+ }
switch (opcode)
{
- case REORIGINATE_PER_AREA:
- ospf_opaque_lsa_reoriginate_schedule ((void *) lp->area,
- OSPF_OPAQUE_AREA_LSA, OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA);
+ case REORIGINATE_THIS_LSA:
+ if (IS_FLOOD_AS (lp->type))
+ {
+ ospf_opaque_lsa_reoriginate_schedule ((void *) top, OSPF_OPAQUE_AS_LSA,
+ OPAQUE_TYPE_INTER_AS_LSA);
+ break;
+ }
+
+ if (IS_FLOOD_AREA (lp->type))
+ {
+ if (IS_INTER_AS (lp->type))
+ ospf_opaque_lsa_reoriginate_schedule ((void *) lp->area, OSPF_OPAQUE_AREA_LSA,
+ OPAQUE_TYPE_INTER_AS_LSA);
+ else
+ ospf_opaque_lsa_reoriginate_schedule ((void *) lp->area, OSPF_OPAQUE_AREA_LSA,
+ OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA);
+ break;
+ }
break;
case REFRESH_THIS_LSA:
ospf_opaque_lsa_refresh_schedule (&lsa);
break;
case FLUSH_THIS_LSA:
- lp->flags &= ~LPFLG_LSA_ENGAGED;
+ /* Reset Activity flag */
+ lp->flags = LPFLG_LSA_INACTIVE;
ospf_opaque_lsa_flush_schedule (&lsa);
break;
default:
@@ -1108,6 +1656,7 @@
return;
}
+
/*------------------------------------------------------------------------*
* Followings are vty session control functions.
*------------------------------------------------------------------------*/
@@ -1118,7 +1667,8 @@
struct te_tlv_router_addr *top = (struct te_tlv_router_addr *) tlvh;
if (vty != NULL)
- vty_out (vty, " Router-Address: %s%s", inet_ntoa (top->value), VTY_NEWLINE);
+ vty_out (vty, " Router-Address: %s%s", inet_ntoa (top->value),
+ VTY_NEWLINE);
else
zlog_debug (" Router-Address: %s", inet_ntoa (top->value));
@@ -1131,7 +1681,8 @@
struct te_tlv_link *top = (struct te_tlv_link *) tlvh;
if (vty != NULL)
- vty_out (vty, " Link: %u octets of data%s", ntohs (top->header.length), VTY_NEWLINE);
+ vty_out (vty, " Link: %u octets of data%s", ntohs (top->header.length),
+ VTY_NEWLINE);
else
zlog_debug (" Link: %u octets of data", ntohs (top->header.length));
@@ -1158,7 +1709,8 @@
}
if (vty != NULL)
- vty_out (vty, " Link-Type: %s (%u)%s", cp, top->link_type.value, VTY_NEWLINE);
+ vty_out (vty, " Link-Type: %s (%u)%s", cp, top->link_type.value,
+ VTY_NEWLINE);
else
zlog_debug (" Link-Type: %s (%u)", cp, top->link_type.value);
@@ -1180,7 +1732,8 @@
}
static u_int16_t
-show_vty_link_subtlv_lclif_ipaddr (struct vty *vty, struct te_tlv_header *tlvh)
+show_vty_link_subtlv_lclif_ipaddr (struct vty *vty,
+ struct te_tlv_header *tlvh)
{
struct te_link_subtlv_lclif_ipaddr *top;
int i, n;
@@ -1196,7 +1749,8 @@
for (i = 0; i < n; i++)
{
if (vty != NULL)
- vty_out (vty, " #%d: %s%s", i, inet_ntoa (top->value[i]), VTY_NEWLINE);
+ vty_out (vty, " #%d: %s%s", i, inet_ntoa (top->value[i]),
+ VTY_NEWLINE);
else
zlog_debug (" #%d: %s", i, inet_ntoa (top->value[i]));
}
@@ -1204,7 +1758,8 @@
}
static u_int16_t
-show_vty_link_subtlv_rmtif_ipaddr (struct vty *vty, struct te_tlv_header *tlvh)
+show_vty_link_subtlv_rmtif_ipaddr (struct vty *vty,
+ struct te_tlv_header *tlvh)
{
struct te_link_subtlv_rmtif_ipaddr *top;
int i, n;
@@ -1219,7 +1774,8 @@
for (i = 0; i < n; i++)
{
if (vty != NULL)
- vty_out (vty, " #%d: %s%s", i, inet_ntoa (top->value[i]), VTY_NEWLINE);
+ vty_out (vty, " #%d: %s%s", i, inet_ntoa (top->value[i]),
+ VTY_NEWLINE);
else
zlog_debug (" #%d: %s", i, inet_ntoa (top->value[i]));
}
@@ -1233,9 +1789,11 @@
top = (struct te_link_subtlv_te_metric *) tlvh;
if (vty != NULL)
- vty_out (vty, " Traffic Engineering Metric: %u%s", (u_int32_t) ntohl (top->value), VTY_NEWLINE);
+ vty_out (vty, " Traffic Engineering Metric: %u%s",
+ (u_int32_t) ntohl (top->value), VTY_NEWLINE);
else
- zlog_debug (" Traffic Engineering Metric: %u", (u_int32_t) ntohl (top->value));
+ zlog_debug (" Traffic Engineering Metric: %u",
+ (u_int32_t) ntohl (top->value));
return TLV_SIZE (tlvh);
}
@@ -1267,7 +1825,8 @@
fval = ntohf (top->value);
if (vty != NULL)
- vty_out (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)%s", fval, VTY_NEWLINE);
+ vty_out (vty, " Maximum Reservable Bandwidth: %g (Bytes/sec)%s", fval,
+ VTY_NEWLINE);
else
zlog_debug (" Maximum Reservable Bandwidth: %g (Bytes/sec)", fval);
@@ -1278,17 +1837,25 @@
show_vty_link_subtlv_unrsv_bw (struct vty *vty, struct te_tlv_header *tlvh)
{
struct te_link_subtlv_unrsv_bw *top;
- float fval;
+ float fval1, fval2;
int i;
top = (struct te_link_subtlv_unrsv_bw *) tlvh;
- for (i = 0; i < 8; i++)
+ if (vty != NULL)
+ vty_out (vty, " Unreserved Bandwidth per Class Type in Byte/s:%s", VTY_NEWLINE);
+ else
+ zlog_debug (" Unreserved Bandwidth per Class Type in Byte/s:");
+ for (i = 0; i < MAX_CLASS_TYPE; i+=2)
{
- fval = ntohf (top->value[i]);
+ fval1 = ntohf (top->value[i]);
+ fval2 = ntohf (top->value[i+1]);
+
if (vty != NULL)
- vty_out (vty, " Unreserved Bandwidth (pri %d): %g (Bytes/sec)%s", i, fval, VTY_NEWLINE);
+ vty_out(vty, " [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)%s",
+ i, fval1, i+1, fval2, VTY_NEWLINE);
else
- zlog_debug (" Unreserved Bandwidth (pri %d): %g (Bytes/sec)", i, fval);
+ zlog_debug (" [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)",
+ i, fval1, i+1, fval2);
}
return TLV_SIZE (tlvh);
@@ -1301,9 +1868,230 @@
top = (struct te_link_subtlv_rsc_clsclr *) tlvh;
if (vty != NULL)
- vty_out (vty, " Resource class/color: 0x%x%s", (u_int32_t) ntohl (top->value), VTY_NEWLINE);
+ vty_out (vty, " Resource class/color: 0x%x%s",
+ (u_int32_t) ntohl (top->value), VTY_NEWLINE);
else
- zlog_debug (" Resource Class/Color: 0x%x", (u_int32_t) ntohl (top->value));
+ zlog_debug (" Resource Class/Color: 0x%x",
+ (u_int32_t) ntohl (top->value));
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_lrrid (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_lrrid *top;
+
+ top = (struct te_link_subtlv_lrrid *) tlvh;
+
+ if (vty != NULL)
+ {
+ vty_out (vty, " Local TE Router ID: %s%s", inet_ntoa (top->local),
+ VTY_NEWLINE);
+ vty_out (vty, " Remote TE Router ID: %s%s", inet_ntoa (top->remote),
+ VTY_NEWLINE);
+ }
+ else
+ {
+ zlog_debug (" Local TE Router ID: %s", inet_ntoa (top->local));
+ zlog_debug (" Remote TE Router ID: %s", inet_ntoa (top->remote));
+ }
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_llri (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_llri *top;
+
+ top = (struct te_link_subtlv_llri *) tlvh;
+
+ if (vty != NULL)
+ {
+ vty_out (vty, " Link Local ID: %d%s", (u_int32_t) ntohl (top->local),
+ VTY_NEWLINE);
+ vty_out (vty, " Link Remote ID: %d%s", (u_int32_t) ntohl (top->remote),
+ VTY_NEWLINE);
+ }
+ else
+ {
+ zlog_debug (" Link Local ID: %d", (u_int32_t) ntohl (top->local));
+ zlog_debug (" Link Remote ID: %d", (u_int32_t) ntohl (top->remote));
+ }
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_rip (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_rip *top;
+
+ top = (struct te_link_subtlv_rip *) tlvh;
+
+ if (vty != NULL)
+ vty_out (vty, " Inter-AS TE Remote ASBR IP address: %s%s",
+ inet_ntoa (top->value), VTY_NEWLINE);
+ else
+ zlog_debug (" Inter-AS TE Remote ASBR IP address: %s",
+ inet_ntoa (top->value));
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_ras (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_ras *top;
+
+ top = (struct te_link_subtlv_ras *) tlvh;
+
+ if (vty != NULL)
+ vty_out (vty, " Inter-AS TE Remote AS number: %u%s", ntohl (top->value),
+ VTY_NEWLINE);
+ else
+ zlog_debug (" Inter-AS TE Remote AS number: %u", ntohl (top->value));
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_av_delay (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_av_delay *top;
+ u_int32_t delay;
+ u_int32_t anomalous;
+
+ top = (struct te_link_subtlv_av_delay *) tlvh;
+ delay = (u_int32_t) ntohl (top->value) & TE_EXT_MASK;
+ anomalous = (u_int32_t) ntohl (top->value) & TE_EXT_ANORMAL;
+
+ if (vty != NULL)
+ vty_out (vty, " %s Average Link Delay: %d (micro-sec)%s",
+ anomalous ? "Anomalous" : "Normal", delay, VTY_NEWLINE);
+ else
+ zlog_debug (" %s Average Link Delay: %d (micro-sec)",
+ anomalous ? "Anomalous" : "Normal", delay);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_mm_delay (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_mm_delay *top;
+ u_int32_t low, high;
+ u_int32_t anomalous;
+
+ top = (struct te_link_subtlv_mm_delay *) tlvh;
+ low = (u_int32_t) ntohl (top->low) & TE_EXT_MASK;
+ anomalous = (u_int32_t) ntohl (top->low) & TE_EXT_ANORMAL;
+ high = (u_int32_t) ntohl (top->high);
+
+ if (vty != NULL)
+ vty_out (vty, " %s Min/Max Link Delay: %d/%d (micro-sec)%s",
+ anomalous ? "Anomalous" : "Normal", low, high, VTY_NEWLINE);
+ else
+ zlog_debug (" %s Min/Max Link Delay: %d/%d (micro-sec)",
+ anomalous ? "Anomalous" : "Normal", low, high);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_delay_var (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_delay_var *top;
+ u_int32_t jitter;
+
+ top = (struct te_link_subtlv_delay_var *) tlvh;
+ jitter = (u_int32_t) ntohl (top->value) & TE_EXT_MASK;
+
+ if (vty != NULL)
+ vty_out (vty, " Delay Variation: %d (micro-sec)%s", jitter, VTY_NEWLINE);
+ else
+ zlog_debug (" Delay Variation: %d (micro-sec)", jitter);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_pkt_loss (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_pkt_loss *top;
+ u_int32_t loss;
+ u_int32_t anomalous;
+ float fval;
+
+ top = (struct te_link_subtlv_pkt_loss *) tlvh;
+ loss = (u_int32_t) ntohl (top->value) & TE_EXT_MASK;
+ fval = (float) (loss * LOSS_PRECISION);
+ anomalous = (u_int32_t) ntohl (top->value) & TE_EXT_ANORMAL;
+
+ if (vty != NULL)
+ vty_out (vty, " %s Link Loss: %g (%%)%s", anomalous ? "Anomalous" : "Normal",
+ fval, VTY_NEWLINE);
+ else
+ zlog_debug (" %s Link Loss: %g (%%)", anomalous ? "Anomalous" : "Normal",
+ fval);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_res_bw (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_res_bw *top;
+ float fval;
+
+ top = (struct te_link_subtlv_res_bw *) tlvh;
+ fval = ntohf (top->value);
+
+ if (vty != NULL)
+ vty_out (vty, " Unidirectional Residual Bandwidth: %g (Bytes/sec)%s",
+ fval, VTY_NEWLINE);
+ else
+ zlog_debug (" Unidirectional Residual Bandwidth: %g (Bytes/sec)",
+ fval);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_ava_bw (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_ava_bw *top;
+ float fval;
+
+ top = (struct te_link_subtlv_ava_bw *) tlvh;
+ fval = ntohf (top->value);
+
+ if (vty != NULL)
+ vty_out (vty, " Unidirectional Available Bandwidth: %g (Bytes/sec)%s",
+ fval, VTY_NEWLINE);
+ else
+ zlog_debug (" Unidirectional Available Bandwidth: %g (Bytes/sec)",
+ fval);
+
+ return TLV_SIZE (tlvh);
+}
+
+static u_int16_t
+show_vty_link_subtlv_use_bw (struct vty *vty, struct te_tlv_header *tlvh)
+{
+ struct te_link_subtlv_use_bw *top;
+ float fval;
+
+ top = (struct te_link_subtlv_use_bw *) tlvh;
+ fval = ntohf (top->value);
+
+ if (vty != NULL)
+ vty_out (vty, " Unidirectional Utilized Bandwidth: %g (Bytes/sec)%s",
+ fval, VTY_NEWLINE);
+ else
+ zlog_debug (" Unidirectional Utilized Bandwidth: %g (Bytes/sec)",
+ fval);
return TLV_SIZE (tlvh);
}
@@ -1312,9 +2100,11 @@
show_vty_unknown_tlv (struct vty *vty, struct te_tlv_header *tlvh)
{
if (vty != NULL)
- vty_out (vty, " Unknown TLV: [type(0x%x), length(0x%x)]%s", ntohs (tlvh->type), ntohs (tlvh->length), VTY_NEWLINE);
+ vty_out (vty, " Unknown TLV: [type(0x%x), length(0x%x)]%s",
+ ntohs (tlvh->type), ntohs (tlvh->length), VTY_NEWLINE);
else
- zlog_debug (" Unknown TLV: [type(0x%x), length(0x%x)]", ntohs (tlvh->type), ntohs (tlvh->length));
+ zlog_debug (" Unknown TLV: [type(0x%x), length(0x%x)]",
+ ntohs (tlvh->type), ntohs (tlvh->length));
return TLV_SIZE (tlvh);
}
@@ -1358,6 +2148,39 @@
case TE_LINK_SUBTLV_RSC_CLSCLR:
sum += show_vty_link_subtlv_rsc_clsclr (vty, tlvh);
break;
+ case TE_LINK_SUBTLV_LRRID:
+ sum += show_vty_link_subtlv_lrrid (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_LLRI:
+ sum += show_vty_link_subtlv_llri (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_RIP:
+ sum += show_vty_link_subtlv_rip (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_RAS:
+ sum += show_vty_link_subtlv_ras (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_AV_DELAY:
+ sum += show_vty_link_subtlv_av_delay (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_MM_DELAY:
+ sum += show_vty_link_subtlv_mm_delay (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_DELAY_VAR:
+ sum += show_vty_link_subtlv_delay_var (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_PKT_LOSS:
+ sum += show_vty_link_subtlv_pkt_loss (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_RES_BW:
+ sum += show_vty_link_subtlv_res_bw (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_AVA_BW:
+ sum += show_vty_link_subtlv_ava_bw (vty, tlvh);
+ break;
+ case TE_LINK_SUBTLV_USE_BW:
+ sum += show_vty_link_subtlv_use_bw (vty, tlvh);
+ break;
default:
sum += show_vty_unknown_tlv (vty, tlvh);
break;
@@ -1411,49 +2234,20 @@
static void
ospf_mpls_te_config_write_router (struct vty *vty)
{
+
if (OspfMplsTE.status == enabled)
{
- vty_out (vty, " mpls-te%s", VTY_NEWLINE);
+ vty_out (vty, " mpls-te on%s", VTY_NEWLINE);
vty_out (vty, " mpls-te router-address %s%s",
inet_ntoa (OspfMplsTE.router_addr.value), VTY_NEWLINE);
}
- return;
-}
-static void
-ospf_mpls_te_config_write_if (struct vty *vty, struct interface *ifp)
-{
- struct mpls_te_link *lp;
+ if (OspfMplsTE.inter_as == AS)
+ vty_out (vty, " mpls-te inter-as as%s", VTY_NEWLINE);
+ if (OspfMplsTE.inter_as == Area)
+ vty_out (vty, " mpls-te inter-as area %s %s",
+ inet_ntoa (OspfMplsTE.interas_areaid), VTY_NEWLINE);
- if ((OspfMplsTE.status == enabled)
- && (! if_is_loopback (ifp) && if_is_up (ifp) && ospf_oi_count (ifp) > 0)
- && ((lp = lookup_linkparams_by_ifp (ifp)) != NULL))
- {
- float fval;
- int i;
-
- vty_out (vty, " mpls-te link metric %u%s",
- (u_int32_t) ntohl (lp->te_metric.value), VTY_NEWLINE);
-
- fval = ntohf (lp->max_bw.value);
- if (fval >= MPLS_TE_MINIMUM_BANDWIDTH)
- vty_out (vty, " mpls-te link max-bw %g%s", fval, VTY_NEWLINE);
-
- fval = ntohf (lp->max_rsv_bw.value);
- if (fval >= MPLS_TE_MINIMUM_BANDWIDTH)
- vty_out (vty, " mpls-te link max-rsv-bw %g%s", fval, VTY_NEWLINE);
-
- for (i = 0; i < 8; i++)
- {
- fval = ntohf (lp->unrsv_bw.value[i]);
- if (fval >= MPLS_TE_MINIMUM_BANDWIDTH)
- vty_out (vty, " mpls-te link unrsv-bw %d %g%s",
- i, fval, VTY_NEWLINE);
- }
-
- vty_out (vty, " mpls-te link rsc-clsclr 0x%x%s",
- (u_int32_t) ntohl (lp->rsc_clsclr.value), VTY_NEWLINE);
- }
return;
}
@@ -1461,13 +2255,13 @@
* Followings are vty command functions.
*------------------------------------------------------------------------*/
-DEFUN (mpls_te,
- mpls_te_cmd,
- "mpls-te",
- "Configure MPLS-TE parameters\n"
+DEFUN (ospf_mpls_te_on,
+ ospf_mpls_te_on_cmd,
+ "mpls-te on",
+ MPLS_TE_STR
"Enable the MPLS-TE functionality\n")
{
- struct listnode *node, *nnode;
+ struct listnode *node;
struct mpls_te_link *lp;
if (OspfMplsTE.status == enabled)
@@ -1478,31 +2272,28 @@
OspfMplsTE.status = enabled;
- /*
- * Following code is intended to handle two cases;
- *
- * 1) MPLS-TE was disabled at startup time, but now become enabled.
- * 2) MPLS-TE was once enabled then disabled, and now enabled again.
- */
- for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
- initialize_linkparams (lp);
+ /* Reoriginate RFC3630 & RFC6827 Links */
+ ospf_mpls_te_foreach_area (ospf_mpls_te_lsa_schedule, REORIGINATE_THIS_LSA);
- ospf_mpls_te_foreach_area (ospf_mpls_te_lsa_schedule, REORIGINATE_PER_AREA);
+ /* Reoriginate LSA if INTER-AS is always on */
+ if (OspfMplsTE.inter_as != Disable)
+ {
+ for (ALL_LIST_ELEMENTS_RO (OspfMplsTE.iflist, node, lp))
+ {
+ if (IS_INTER_AS (lp->type))
+ {
+ ospf_mpls_te_lsa_schedule (lp, REORIGINATE_THIS_LSA);
+ }
+ }
+ }
return CMD_SUCCESS;
}
-ALIAS (mpls_te,
- mpls_te_on_cmd,
- "mpls-te on",
- "Configure MPLS-TE parameters\n"
- "Enable the MPLS-TE functionality\n")
-
-DEFUN (no_mpls_te,
- no_mpls_te_cmd,
+DEFUN (no_ospf_mpls_te,
+ no_ospf_mpls_te_cmd,
"no mpls-te",
NO_STR
- "Configure MPLS-TE parameters\n"
"Disable the MPLS-TE functionality\n")
{
struct listnode *node, *nnode;
@@ -1517,17 +2308,16 @@
OspfMplsTE.status = disabled;
for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
- if (lp->area != NULL)
- if (lp->flags & LPFLG_LSA_ENGAGED)
+ if CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED)
ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
return CMD_SUCCESS;
}
-DEFUN (mpls_te_router_addr,
- mpls_te_router_addr_cmd,
+DEFUN (ospf_mpls_te_router_addr,
+ ospf_mpls_te_router_addr_cmd,
"mpls-te router-address A.B.C.D",
- "MPLS-TE specific commands\n"
+ MPLS_TE_STR
"Stable IP address of the advertising router\n"
"MPLS-TE router address in IPv4 address format\n")
{
@@ -1554,10 +2344,10 @@
for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
{
- if (lp->area == NULL)
+ if ((lp->area == NULL) || IS_FLOOD_AS (lp->type))
continue;
- if ((lp->flags & LPFLG_LSA_ENGAGED) == 0)
+ if (!CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED))
{
need_to_reoriginate = 1;
break;
@@ -1566,247 +2356,151 @@
for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
{
- if (lp->area == NULL)
+ if ((lp->area == NULL) || IS_FLOOD_AS (lp->type))
continue;
if (need_to_reoriginate)
- lp->flags |= LPFLG_LSA_FORCED_REFRESH;
+ SET_FLAG (lp->flags, LPFLG_LSA_FORCED_REFRESH);
else
ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
}
if (need_to_reoriginate)
- ospf_mpls_te_foreach_area (
- ospf_mpls_te_lsa_schedule, REORIGINATE_PER_AREA);
+ ospf_mpls_te_foreach_area (ospf_mpls_te_lsa_schedule, REORIGINATE_THIS_LSA);
}
out:
return CMD_SUCCESS;
}
-DEFUN (mpls_te_link_metric,
- mpls_te_link_metric_cmd,
- "mpls-te link metric <0-4294967295>",
- "MPLS-TE specific commands\n"
- "Configure MPLS-TE link parameters\n"
- "Link metric for MPLS-TE purpose\n"
- "Metric\n")
+static int
+set_inter_as_mode (struct vty *vty, const char *mode_name,
+ const char *area_id)
{
- struct interface *ifp = (struct interface *) vty->index;
+ enum inter_as_mode mode;
+ struct listnode *node;
struct mpls_te_link *lp;
- u_int32_t value;
+ int format;
- if ((lp = lookup_linkparams_by_ifp (ifp)) == NULL)
+ if (OspfMplsTE.status == enabled)
{
- vty_out (vty, "mpls_te_link_metric: Something wrong!%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
- value = strtoul (argv[0], NULL, 10);
+ /* Read and Check inter_as mode */
+ if (strcmp (mode_name, "as") == 0)
+ mode = AS;
+ else if (strcmp (mode_name, "area") == 0)
+ {
+ mode = Area;
+ VTY_GET_OSPF_AREA_ID (OspfMplsTE.interas_areaid, format, area_id);
+ }
+ else
+ {
+ vty_out (vty, "Unknown mode. Please choose between as or area%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
- if (ntohs (lp->te_metric.header.type) == 0
- || ntohl (lp->te_metric.value) != value)
- {
- set_linkparams_te_metric (lp, value);
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("MPLS-TE: Inter-AS enable with %s flooding support",
+ mode2text[mode]);
- if (OspfMplsTE.status == enabled)
- if (lp->area != NULL)
- {
- if (lp->flags & LPFLG_LSA_ENGAGED)
- ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
- else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
- }
+ /* Register new callbacks regarding the flooding scope (AS or Area) */
+ if (ospf_mpls_te_register (mode) < 0)
+ {
+ vty_out (vty, "Internal error: Unable to register Inter-AS functions%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ /* Enable mode and re-originate LSA if needed */
+ if ((OspfMplsTE.inter_as == Disable) && (mode != OspfMplsTE.inter_as))
+ {
+ OspfMplsTE.inter_as = mode;
+ /* Re-originate all InterAS-TEv2 LSA */
+ for (ALL_LIST_ELEMENTS_RO (OspfMplsTE.iflist, node, lp))
+ {
+ if (IS_INTER_AS (lp->type))
+ {
+ if (mode == AS)
+ lp->type |= FLOOD_AS;
+ else
+ lp->type |= FLOOD_AREA;
+ ospf_mpls_te_lsa_schedule (lp, REORIGINATE_THIS_LSA);
+ }
+ }
+ }
+ else
+ {
+ vty_out (vty, "Please change Inter-AS support to disable first before going to mode %s%s",
+ mode2text[mode], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
}
return CMD_SUCCESS;
}
-DEFUN (mpls_te_link_maxbw,
- mpls_te_link_maxbw_cmd,
- "mpls-te link max-bw BANDWIDTH",
- "MPLS-TE specific commands\n"
- "Configure MPLS-TE link parameters\n"
- "Maximum bandwidth that can be used\n"
- "Bytes/second (IEEE floating point format)\n")
+DEFUN (ospf_mpls_te_inter_as_as,
+ ospf_mpls_te_inter_as_cmd,
+ "mpls-te inter-as as",
+ MPLS_TE_STR
+ "Configure MPLS-TE Inter-AS support\n"
+ "AS native mode self originate INTER_AS LSA with Type 11 (as flooding scope)\n")
{
- struct interface *ifp = (struct interface *) vty->index;
+ return set_inter_as_mode (vty, "as", "");
+}
+
+DEFUN (ospf_mpls_te_inter_as_area,
+ ospf_mpls_te_inter_as_area_cmd,
+ "mpls-te inter-as area (A.B.C.D|<0-4294967295>)",
+ MPLS_TE_STR
+ "Configure MPLS-TE Inter-AS support\n"
+ "AREA native mode self originate INTER_AS LSA with Type 10 (area flooding scope)\n"
+ "OSPF area ID in IP format\n"
+ "OSPF area ID as decimal value\n")
+{
+ return set_inter_as_mode (vty, "area", argv[0]);
+}
+
+DEFUN (no_ospf_mpls_te_inter_as,
+ no_ospf_mpls_te_inter_as_cmd,
+ "no mpls-te inter-as",
+ NO_STR
+ MPLS_TE_STR
+ "Disable MPLS-TE Inter-AS support\n")
+{
+
+ struct listnode *node, *nnode;
struct mpls_te_link *lp;
- float f1, f2;
- if ((lp = lookup_linkparams_by_ifp (ifp)) == NULL)
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("MPLS-TE: Inter-AS support OFF");
+
+ if ((OspfMplsTE.status == enabled) && (OspfMplsTE.inter_as != Disable))
{
- vty_out (vty, "mpls_te_link_maxbw: Something wrong!%s", VTY_NEWLINE);
- return CMD_WARNING;
+ OspfMplsTE.inter_as = Disable;
+ /* Flush all Inter-AS LSA */
+ for (ALL_LIST_ELEMENTS (OspfMplsTE.iflist, node, nnode, lp))
+ if (IS_INTER_AS (lp->type) && CHECK_FLAG (lp->flags, LPFLG_LSA_ENGAGED))
+ ospf_mpls_te_lsa_schedule (lp, FLUSH_THIS_LSA);
}
- f1 = ntohf (lp->max_bw.value);
- if (sscanf (argv[0], "%g", &f2) != 1)
- {
- vty_out (vty, "mpls_te_link_maxbw: fscanf: %s%s", safe_strerror (errno), VTY_NEWLINE);
- return CMD_WARNING;
- }
+ /* Deregister the Callbacks for Inter-AS suport */
+ ospf_mpls_te_unregister ();
- if (ntohs (lp->max_bw.header.type) == 0
- || f1 != f2)
- {
- set_linkparams_max_bw (lp, f2);
-
- if (OspfMplsTE.status == enabled)
- if (lp->area != NULL)
- {
- if (lp->flags & LPFLG_LSA_ENGAGED)
- ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
- else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
- }
- }
return CMD_SUCCESS;
}
-DEFUN (mpls_te_link_max_rsv_bw,
- mpls_te_link_max_rsv_bw_cmd,
- "mpls-te link max-rsv-bw BANDWIDTH",
- "MPLS-TE specific commands\n"
- "Configure MPLS-TE link parameters\n"
- "Maximum bandwidth that may be reserved\n"
- "Bytes/second (IEEE floating point format)\n")
-{
- struct interface *ifp = (struct interface *) vty->index;
- struct mpls_te_link *lp;
- float f1, f2;
-
- if ((lp = lookup_linkparams_by_ifp (ifp)) == NULL)
- {
- vty_out (vty, "mpls_te_link_max_rsv_bw: Something wrong!%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- f1 = ntohf (lp->max_rsv_bw.value);
- if (sscanf (argv[0], "%g", &f2) != 1)
- {
- vty_out (vty, "mpls_te_link_max_rsv_bw: fscanf: %s%s", safe_strerror (errno), VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- if (ntohs (lp->max_rsv_bw.header.type) == 0
- || f1 != f2)
- {
- set_linkparams_max_rsv_bw (lp, f2);
-
- if (OspfMplsTE.status == enabled)
- if (lp->area != NULL)
- {
- if (lp->flags & LPFLG_LSA_ENGAGED)
- ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
- else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
- }
- }
- return CMD_SUCCESS;
-}
-
-DEFUN (mpls_te_link_unrsv_bw,
- mpls_te_link_unrsv_bw_cmd,
- "mpls-te link unrsv-bw <0-7> BANDWIDTH",
- "MPLS-TE specific commands\n"
- "Configure MPLS-TE link parameters\n"
- "Unreserved bandwidth at each priority level\n"
- "Priority\n"
- "Bytes/second (IEEE floating point format)\n")
-{
- struct interface *ifp = (struct interface *) vty->index;
- struct mpls_te_link *lp;
- int priority;
- float f1, f2;
-
- if ((lp = lookup_linkparams_by_ifp (ifp)) == NULL)
- {
- vty_out (vty, "mpls_te_link_unrsv_bw: Something wrong!%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- /* We don't have to consider about range check here. */
- if (sscanf (argv[0], "%d", &priority) != 1)
- {
- vty_out (vty, "mpls_te_link_unrsv_bw: fscanf: %s%s", safe_strerror (errno), VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- f1 = ntohf (lp->unrsv_bw.value [priority]);
- if (sscanf (argv[1], "%g", &f2) != 1)
- {
- vty_out (vty, "mpls_te_link_unrsv_bw: fscanf: %s%s", safe_strerror (errno), VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- if (ntohs (lp->unrsv_bw.header.type) == 0
- || f1 != f2)
- {
- set_linkparams_unrsv_bw (lp, priority, f2);
-
- if (OspfMplsTE.status == enabled)
- if (lp->area != NULL)
- {
- if (lp->flags & LPFLG_LSA_ENGAGED)
- ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
- else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
- }
- }
- return CMD_SUCCESS;
-}
-
-DEFUN (mpls_te_link_rsc_clsclr,
- mpls_te_link_rsc_clsclr_cmd,
- "mpls-te link rsc-clsclr BITPATTERN",
- "MPLS-TE specific commands\n"
- "Configure MPLS-TE link parameters\n"
- "Administrative group membership\n"
- "32-bit Hexadecimal value (ex. 0xa1)\n")
-{
- struct interface *ifp = (struct interface *) vty->index;
- struct mpls_te_link *lp;
- unsigned long value;
-
- if ((lp = lookup_linkparams_by_ifp (ifp)) == NULL)
- {
- vty_out (vty, "mpls_te_link_rsc_clsclr: Something wrong!%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- if (sscanf (argv[0], "0x%lx", &value) != 1)
- {
- vty_out (vty, "mpls_te_link_rsc_clsclr: fscanf: %s%s", safe_strerror (errno), VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- if (ntohs (lp->rsc_clsclr.header.type) == 0
- || ntohl (lp->rsc_clsclr.value) != value)
- {
- set_linkparams_rsc_clsclr (lp, value);
-
- if (OspfMplsTE.status == enabled)
- if (lp->area != NULL)
- {
- if (lp->flags & LPFLG_LSA_ENGAGED)
- ospf_mpls_te_lsa_schedule (lp, REFRESH_THIS_LSA);
- else
- ospf_mpls_te_lsa_schedule (lp, REORIGINATE_PER_AREA);
- }
- }
- return CMD_SUCCESS;
-}
-
-DEFUN (show_mpls_te_router,
- show_mpls_te_router_cmd,
- "show mpls-te router",
+DEFUN (show_ip_ospf_mpls_te_router,
+ show_ip_ospf_mpls_te_router_cmd,
+ "show ip ospf mpls-te router",
SHOW_STR
+ IP_STR
+ OSPF_STR
"MPLS-TE information\n"
- "Router information\n")
+ "MPLS-TE Router parameters\n")
{
if (OspfMplsTE.status == enabled)
{
- vty_out (vty, "--- MPLS-TE router parameters ---%s",
- VTY_NEWLINE);
+ vty_out (vty, "--- MPLS-TE router parameters ---%s", VTY_NEWLINE);
if (ntohs (OspfMplsTE.router_addr.header.type) != 0)
show_vty_router_addr (vty, &OspfMplsTE.router_addr.header);
@@ -1820,29 +2514,73 @@
show_mpls_te_link_sub (struct vty *vty, struct interface *ifp)
{
struct mpls_te_link *lp;
- struct te_tlv_header *tlvh;
- if ((OspfMplsTE.status == enabled)
- && (! if_is_loopback (ifp) && if_is_up (ifp) && ospf_oi_count (ifp) > 0)
- && ((lp = lookup_linkparams_by_ifp (ifp)) != NULL))
+ if ((OspfMplsTE.status == enabled)
+ && HAS_LINK_PARAMS(ifp)
+ && !if_is_loopback (ifp)
+ && if_is_up (ifp)
+ && ((lp = lookup_linkparams_by_ifp (ifp)) != NULL))
{
+ /* Continue only if interface is not passive or support Inter-AS TEv2 */
+ if (!(ospf_oi_count (ifp) > 0))
+ {
+ if (IS_INTER_AS (lp->type))
+ {
+ vty_out (vty, "-- Inter-AS TEv2 link parameters for %s --%s",
+ ifp->name, VTY_NEWLINE);
+ }
+ else
+ {
+ /* MPLS-TE is not activate on this interface */
+ /* or this interface is passive and Inter-AS TEv2 is not activate */
+ vty_out (vty, " %s: MPLS-TE is disabled on this interface%s",
+ ifp->name, VTY_NEWLINE);
+ return;
+ }
+ }
+ else
+ {
vty_out (vty, "-- MPLS-TE link parameters for %s --%s",
ifp->name, VTY_NEWLINE);
+ }
- show_vty_link_subtlv_link_type (vty, &lp->link_type.header);
- show_vty_link_subtlv_link_id (vty, &lp->link_id.header);
-
- if ((tlvh = (struct te_tlv_header *) lp->lclif_ipaddr) != NULL)
- show_vty_link_subtlv_lclif_ipaddr (vty, tlvh);
- if ((tlvh = (struct te_tlv_header *) lp->rmtif_ipaddr) != NULL)
- show_vty_link_subtlv_rmtif_ipaddr (vty, tlvh);
-
- show_vty_link_subtlv_te_metric (vty, &lp->te_metric.header);
-
- show_vty_link_subtlv_max_bw (vty, &lp->max_bw.header);
- show_vty_link_subtlv_max_rsv_bw (vty, &lp->max_rsv_bw.header);
- show_vty_link_subtlv_unrsv_bw (vty, &lp->unrsv_bw.header);
- show_vty_link_subtlv_rsc_clsclr (vty, &lp->rsc_clsclr.header);
+ if (TLV_TYPE(lp->link_type) != 0)
+ show_vty_link_subtlv_link_type (vty, &lp->link_type.header);
+ if (TLV_TYPE(lp->link_id) != 0)
+ show_vty_link_subtlv_link_id (vty, &lp->link_id.header);
+ if (TLV_TYPE(lp->lclif_ipaddr) != 0)
+ show_vty_link_subtlv_lclif_ipaddr (vty, &lp->lclif_ipaddr.header);
+ if (TLV_TYPE(lp->rmtif_ipaddr) != 0)
+ show_vty_link_subtlv_rmtif_ipaddr (vty, &lp->rmtif_ipaddr.header);
+ if (TLV_TYPE(lp->rip) != 0)
+ show_vty_link_subtlv_rip (vty, &lp->rip.header);
+ if (TLV_TYPE(lp->ras) != 0)
+ show_vty_link_subtlv_ras (vty, &lp->ras.header);
+ if (TLV_TYPE(lp->te_metric) != 0)
+ show_vty_link_subtlv_te_metric (vty, &lp->te_metric.header);
+ if (TLV_TYPE(lp->max_bw) != 0)
+ show_vty_link_subtlv_max_bw (vty, &lp->max_bw.header);
+ if (TLV_TYPE(lp->max_rsv_bw) != 0)
+ show_vty_link_subtlv_max_rsv_bw (vty, &lp->max_rsv_bw.header);
+ if (TLV_TYPE(lp->unrsv_bw) != 0)
+ show_vty_link_subtlv_unrsv_bw (vty, &lp->unrsv_bw.header);
+ if (TLV_TYPE(lp->rsc_clsclr) != 0)
+ show_vty_link_subtlv_rsc_clsclr (vty, &lp->rsc_clsclr.header);
+ if (TLV_TYPE(lp->av_delay) != 0)
+ show_vty_link_subtlv_av_delay (vty, &lp->av_delay.header);
+ if (TLV_TYPE(lp->mm_delay) != 0)
+ show_vty_link_subtlv_mm_delay (vty, &lp->mm_delay.header);
+ if (TLV_TYPE(lp->delay_var) != 0)
+ show_vty_link_subtlv_delay_var (vty, &lp->delay_var.header);
+ if (TLV_TYPE(lp->pkt_loss) != 0)
+ show_vty_link_subtlv_pkt_loss (vty, &lp->pkt_loss.header);
+ if (TLV_TYPE(lp->res_bw) != 0)
+ show_vty_link_subtlv_res_bw (vty, &lp->res_bw.header);
+ if (TLV_TYPE(lp->ava_bw) != 0)
+ show_vty_link_subtlv_ava_bw (vty, &lp->ava_bw.header);
+ if (TLV_TYPE(lp->use_bw) != 0)
+ show_vty_link_subtlv_use_bw (vty, &lp->use_bw.header);
+ vty_out (vty, "---------------%s%s", VTY_NEWLINE, VTY_NEWLINE);
}
else
{
@@ -1853,10 +2591,12 @@
return;
}
-DEFUN (show_mpls_te_link,
- show_mpls_te_link_cmd,
- "show mpls-te interface [INTERFACE]",
+DEFUN (show_ip_ospf_mpls_te_link,
+ show_ip_ospf_mpls_te_link_cmd,
+ "show ip ospf mpls-te interface [INTERFACE]",
SHOW_STR
+ IP_STR
+ OSPF_STR
"MPLS-TE information\n"
"Interface information\n"
"Interface name\n")
@@ -1885,19 +2625,15 @@
static void
ospf_mpls_te_register_vty (void)
{
- install_element (VIEW_NODE, &show_mpls_te_router_cmd);
- install_element (VIEW_NODE, &show_mpls_te_link_cmd);
+ install_element (VIEW_NODE, &show_ip_ospf_mpls_te_router_cmd);
+ install_element (VIEW_NODE, &show_ip_ospf_mpls_te_link_cmd);
- install_element (OSPF_NODE, &mpls_te_cmd);
- install_element (OSPF_NODE, &no_mpls_te_cmd);
- install_element (OSPF_NODE, &mpls_te_on_cmd);
- install_element (OSPF_NODE, &mpls_te_router_addr_cmd);
-
- install_element (INTERFACE_NODE, &mpls_te_link_metric_cmd);
- install_element (INTERFACE_NODE, &mpls_te_link_maxbw_cmd);
- install_element (INTERFACE_NODE, &mpls_te_link_max_rsv_bw_cmd);
- install_element (INTERFACE_NODE, &mpls_te_link_unrsv_bw_cmd);
- install_element (INTERFACE_NODE, &mpls_te_link_rsc_clsclr_cmd);
+ install_element (OSPF_NODE, &ospf_mpls_te_on_cmd);
+ install_element (OSPF_NODE, &no_ospf_mpls_te_cmd);
+ install_element (OSPF_NODE, &ospf_mpls_te_router_addr_cmd);
+ install_element (OSPF_NODE, &ospf_mpls_te_inter_as_cmd);
+ install_element (OSPF_NODE, &ospf_mpls_te_inter_as_area_cmd);
+ install_element (OSPF_NODE, &no_ospf_mpls_te_inter_as_cmd);
return;
}
diff --git a/ospfd/ospf_te.h b/ospfd/ospf_te.h
index 863d8ba..8bb77c4 100644
--- a/ospfd/ospf_te.h
+++ b/ospfd/ospf_te.h
@@ -1,8 +1,11 @@
/*
- * This is an implementation of draft-katz-yeung-ospf-traffic-06.txt
+ * This is an implementation of RFC3630, RFC5392 & RFC6827
* Copyright (C) 2001 KDD R&D Laboratories, Inc.
* http://www.kddlabs.co.jp/
*
+ * Copyright (C) 2012 Orange Labs
+ * http://www.orange.com
+ *
* This file is part of GNU Zebra.
*
* GNU Zebra is free software; you can redistribute it and/or modify it
@@ -21,6 +24,10 @@
* 02111-1307, USA.
*/
+/* Add support of RFC7471 */
+/* Add support of RFC5392 */
+/* Add support of RFC6827 (partial) */
+
#ifndef _ZEBRA_OSPF_MPLS_TE_H
#define _ZEBRA_OSPF_MPLS_TE_H
@@ -42,6 +49,7 @@
*/
#define MAX_LEGAL_TE_INSTANCE_NUM (0xffff)
+#define LEGAL_TE_INSTANCE_RANGE(i) (0 <= (i) && (i) <= 0xffff)
/*
* 24 16 8 0
@@ -62,6 +70,31 @@
* +--------+--------+--------+--------+ ---
*/
+/* Following define the type of TE link regarding the various RFC */
+#define STD_TE 0x01
+#define GMPLS 0x02
+#define INTER_AS 0x04
+#define PSEUDO_TE 0x08
+#define FLOOD_AREA 0x10
+#define FLOOD_AS 0x20
+#define EMULATED 0x80
+
+#define IS_STD_TE(x) (x & STD_TE)
+#define IS_PSEUDO_TE(x) (x & PSEUDO_TE)
+#define IS_INTER_AS(x) (x & INTER_AS)
+#define IS_EMULATED(x) (x & EMULATED)
+#define IS_FLOOD_AREA(x) (x & FLOOD_AREA)
+#define IS_FLOOD_AS(x) (x & FLOOD_AS)
+#define IS_INTER_AS_EMU(x) (x & INTER_AS & EMULATED)
+#define IS_INTER_AS_AS(x) (x & INTER_AS & FLOOD_AS)
+
+/* Flags to manage TE Link LSA */
+#define LPFLG_LSA_INACTIVE 0x0
+#define LPFLG_LSA_ACTIVE 0x1
+#define LPFLG_LSA_ENGAGED 0x2
+#define LPFLG_LOOKUP_DONE 0x4
+#define LPFLG_LSA_FORCED_REFRESH 0x8
+
/*
* Following section defines TLV (tag, length, value) structures,
* used for Traffic Engineering.
@@ -87,10 +120,18 @@
#define TLV_HDR_NEXT(tlvh) \
(struct te_tlv_header *)((char *)(tlvh) + TLV_SIZE(tlvh))
+#define TLV_HDR_SUBTLV(tlvh) \
+ (struct te_tlv_header *)((char *)(tlvh) + TLV_HDR_SIZE)
+
+#define TLV_TYPE(tlvh) tlvh.header.type
+#define TLV_LEN(tlvh) tlvh.header.length
+#define TLV_HDR(tlvh) tlvh.header
+
+
/*
* Following section defines TLV body parts.
*/
-/* Router Address TLV *//* Mandatory */
+/* Router Address TLV */ /* Mandatory */
#define TE_TLV_ROUTER_ADDR 1
struct te_tlv_router_addr
{
@@ -106,12 +147,16 @@
/* A set of link-sub-TLVs will follow. */
};
-/* Link Type Sub-TLV *//* Mandatory */
-#define TE_LINK_SUBTLV_LINK_TYPE 1
+#define TE_LINK_SUBTLV_DEF_SIZE 4
+
+/* Link Type Sub-TLV */ /* Mandatory */
+#define TE_LINK_SUBTLV_LINK_TYPE 1
+#define TE_LINK_SUBTLV_TYPE_SIZE 1
struct te_link_subtlv_link_type
{
struct te_tlv_header header; /* Value length is 1 octet. */
- struct {
+ struct
+ {
#define LINK_TYPE_SUBTLV_VALUE_PTP 1
#define LINK_TYPE_SUBTLV_VALUE_MA 2
u_char value;
@@ -119,75 +164,303 @@
} link_type;
};
-/* Link Sub-TLV: Link ID *//* Mandatory */
-#define TE_LINK_SUBTLV_LINK_ID 2
+/* Link Sub-TLV: Link ID */ /* Mandatory */
+#define TE_LINK_SUBTLV_LINK_ID 2
struct te_link_subtlv_link_id
{
struct te_tlv_header header; /* Value length is 4 octets. */
struct in_addr value; /* Same as router-lsa's link-id. */
};
-/* Link Sub-TLV: Local Interface IP Address *//* Optional */
-#define TE_LINK_SUBTLV_LCLIF_IPADDR 3
+/* Link Sub-TLV: Local Interface IP Address */ /* Optional */
+#define TE_LINK_SUBTLV_LCLIF_IPADDR 3
struct te_link_subtlv_lclif_ipaddr
{
struct te_tlv_header header; /* Value length is 4 x N octets. */
struct in_addr value[1]; /* Local IP address(es). */
};
-/* Link Sub-TLV: Remote Interface IP Address *//* Optional */
-#define TE_LINK_SUBTLV_RMTIF_IPADDR 4
+/* Link Sub-TLV: Remote Interface IP Address */ /* Optional */
+#define TE_LINK_SUBTLV_RMTIF_IPADDR 4
struct te_link_subtlv_rmtif_ipaddr
{
struct te_tlv_header header; /* Value length is 4 x N octets. */
struct in_addr value[1]; /* Neighbor's IP address(es). */
};
-/* Link Sub-TLV: Traffic Engineering Metric *//* Optional */
-#define TE_LINK_SUBTLV_TE_METRIC 5
+/* Link Sub-TLV: Traffic Engineering Metric */ /* Optional */
+#define TE_LINK_SUBTLV_TE_METRIC 5
struct te_link_subtlv_te_metric
{
struct te_tlv_header header; /* Value length is 4 octets. */
u_int32_t value; /* Link metric for TE purpose. */
};
-/* Link Sub-TLV: Maximum Bandwidth *//* Optional */
-#define TE_LINK_SUBTLV_MAX_BW 6
+/* Link Sub-TLV: Maximum Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_MAX_BW 6
struct te_link_subtlv_max_bw
{
struct te_tlv_header header; /* Value length is 4 octets. */
float value; /* bytes/sec */
};
-/* Link Sub-TLV: Maximum Reservable Bandwidth *//* Optional */
-#define TE_LINK_SUBTLV_MAX_RSV_BW 7
+/* Link Sub-TLV: Maximum Reservable Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_MAX_RSV_BW 7
struct te_link_subtlv_max_rsv_bw
{
struct te_tlv_header header; /* Value length is 4 octets. */
float value; /* bytes/sec */
};
-/* Link Sub-TLV: Unreserved Bandwidth *//* Optional */
-#define TE_LINK_SUBTLV_UNRSV_BW 8
+/* Link Sub-TLV: Unreserved Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_UNRSV_BW 8
+#define TE_LINK_SUBTLV_UNRSV_SIZE 32
struct te_link_subtlv_unrsv_bw
{
struct te_tlv_header header; /* Value length is 32 octets. */
- float value[8]; /* One for each priority level. */
+ float value[MAX_CLASS_TYPE]; /* One for each priority level. */
};
-/* Link Sub-TLV: Resource Class/Color *//* Optional */
-#define TE_LINK_SUBTLV_RSC_CLSCLR 9
+/* Link Sub-TLV: Resource Class/Color */ /* Optional */
+#define TE_LINK_SUBTLV_RSC_CLSCLR 9
struct te_link_subtlv_rsc_clsclr
{
struct te_tlv_header header; /* Value length is 4 octets. */
u_int32_t value; /* Admin. group membership. */
};
-/* Here are "non-official" architechtual constants. */
+/* For RFC6827 */
+/* Local and Remote TE Router ID */
+#define TE_LINK_SUBTLV_LRRID 10
+#define TE_LINK_SUBTLV_LRRID_SIZE 8
+struct te_link_subtlv_lrrid
+{
+ struct te_tlv_header header; /* Value length is 8 octets. */
+ struct in_addr local; /* Local TE Router Identifier */
+ struct in_addr remote; /* Remote TE Router Identifier */
+};
+
+/* RFC4203: Link Local/Remote Identifiers */
+#define TE_LINK_SUBTLV_LLRI 11
+#define TE_LINK_SUBTLV_LLRI_SIZE 8
+struct te_link_subtlv_llri
+{
+ struct te_tlv_header header; /* Value length is 8 octets. */
+ u_int32_t local; /* Link Local Identifier */
+ u_int32_t remote; /* Link Remote Identifier */
+};
+
+/* Inter-RA Export Upward sub-TLV (12) and Inter-RA Export Downward sub-TLV (13) (RFC6827bis) are not yet supported */
+/* SUBTLV 14-16 (RFC4203) are not yet supported */
+/* Bandwidth Constraints sub-TLV (17) (RFC4124) is not yet supported */
+/* SUBLV 18-20 are for OSPFv6 TE (RFC5329). see ospf6d */
+
+/* For RFC 5392 */
+/* Remote AS Number sub-TLV */
+#define TE_LINK_SUBTLV_RAS 21
+struct te_link_subtlv_ras
+{
+ struct te_tlv_header header; /* Value length is 4 octets. */
+ u_int32_t value; /* Remote AS number */
+};
+
+/* IPv4 Remote ASBR ID Sub-TLV */
+#define TE_LINK_SUBTLV_RIP 22
+struct te_link_subtlv_rip
+{
+ struct te_tlv_header header; /* Value length is 4 octets. */
+ struct in_addr value; /* Remote ASBR IP address */
+};
+
+/* SUBTLV 24 is IPv6 Remote ASBR ID (RFC5392). see ospf6d */
+
+/* SUBTLV 23 (RFC5330) and 25 (RFC6001) are not yet supported */
+
+/* SUBTLV 26 (RFC7308) is not yet supported */
+
+/* RFC7471 */
+/* Link Sub-TLV: Average Link Delay */ /* Optional */
+#define TE_LINK_SUBTLV_AV_DELAY 27
+struct te_link_subtlv_av_delay
+{
+ struct te_tlv_header header; /* Value length is 4 bytes. */
+ u_int32_t value; /* delay in micro-seconds only 24 bits => 0 ... 16777215
+ with Anomalous Bit as Upper most bit */
+};
+
+/* Link Sub-TLV: Low/High Link Delay */
+#define TE_LINK_SUBTLV_MM_DELAY 28
+#define TE_LINK_SUBTLV_MM_DELAY_SIZE 8
+struct te_link_subtlv_mm_delay
+{
+ struct te_tlv_header header; /* Value length is 8 bytes. */
+ u_int32_t low; /* low delay in micro-seconds only 24 bits => 0 ... 16777215
+ with Anomalous Bit (A) as Upper most bit */
+ u_int32_t high; /* high delay in micro-seconds only 24 bits => 0 ... 16777215 */
+};
+
+/* Link Sub-TLV: Link Delay Variation i.e. Jitter */
+#define TE_LINK_SUBTLV_DELAY_VAR 29
+struct te_link_subtlv_delay_var
+{
+ struct te_tlv_header header; /* Value length is 4 bytes. */
+ u_int32_t value; /* interval in micro-seconds only 24 bits => 0 ... 16777215 */
+};
+
+/* Link Sub-TLV: Routine Unidirectional Link Packet Loss */
+#define TE_LINK_SUBTLV_PKT_LOSS 30
+struct te_link_subtlv_pkt_loss
+{
+ struct te_tlv_header header; /* Value length is 4 bytes. */
+ u_int32_t value; /* in percentage of total traffic only 24 bits (2^24 - 2)
+ with Anomalous Bit as Upper most bit */
+};
+
+/* Link Sub-TLV: Unidirectional Residual Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_RES_BW 31
+struct te_link_subtlv_res_bw
+{
+ struct te_tlv_header header; /* Value length is 4 bytes. */
+ float value; /* bandwidth in IEEE floating point format with units in bytes per second */
+};
+
+/* Link Sub-TLV: Unidirectional Available Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_AVA_BW 32
+struct te_link_subtlv_ava_bw
+{
+ struct te_tlv_header header; /* Value length is 4 octets. */
+ float value; /* bandwidth in IEEE floating point format with units in bytes per second */
+};
+
+/* Link Sub-TLV: Unidirectional Utilized Bandwidth */ /* Optional */
+#define TE_LINK_SUBTLV_USE_BW 33
+struct te_link_subtlv_use_bw
+{
+ struct te_tlv_header header; /* Value length is 4 octets. */
+ float value; /* bandwidth in IEEE floating point format with units in bytes per second */
+};
+
+#define TE_LINK_SUBTLV_MAX 34 /* Last SUBTLV + 1 */
+
+/* Here are "non-official" architectural constants. */
#define MPLS_TE_MINIMUM_BANDWIDTH 1.0 /* Reasonable? *//* XXX */
+/* Following declaration concerns the MPLS-TE and LINk-TE management */
+typedef enum _opcode_t
+{ REORIGINATE_THIS_LSA, REFRESH_THIS_LSA, FLUSH_THIS_LSA } opcode_t;
+
+typedef enum _status_t
+{ disabled, enabled } status_t;
+
+/* Mode for Inter-AS Opaque-LSA */
+enum inter_as_mode { Disable, AS, Area };
+
+struct te_link_subtlv
+{
+ struct te_tlv_header header;
+ union
+ {
+ u_int32_t link_type;
+ struct in_addr link_id;
+ struct in_addr lclif;
+ struct in_addr rmtif;
+ u_int32_t te_metric;
+ float max_bw;
+ float max_rsv_bw;
+ float unrsv[8];
+ u_int32_t rsc_clsclr;
+ u_int32_t llri[2];
+ u_int32_t ras;
+ struct in_addr rip;
+ struct in_addr lrrid[2];
+ u_int32_t av_delay;
+ u_int32_t mm_delay;
+ u_int32_t delay_var;
+ u_int32_t pkt_loss;
+ float res_bw;
+ float ava_bw;
+ float use_bw;
+ } value;
+};
+
+/* Following structure are internal use only. */
+struct ospf_mpls_te
+{
+ /* Status of MPLS-TE: enable or disbale */
+ status_t status;
+
+ /* RFC5392 */
+ enum inter_as_mode inter_as;
+ struct in_addr interas_areaid;
+
+ /* List elements are zebra-interfaces (ifp), not ospf-interfaces (oi). */
+ struct list *iflist;
+
+ /* Store Router-TLV in network byte order. */
+ struct te_tlv_router_addr router_addr;
+};
+
+struct mpls_te_link
+{
+ /*
+ * According to MPLS-TE (draft) specification, 24-bit Opaque-ID field
+ * is subdivided into 8-bit "unused" field and 16-bit "instance" field.
+ * In this implementation, each Link-TLV has its own instance.
+ */
+ u_int32_t instance;
+
+ /* Reference pointer to a Zebra-interface. */
+ struct interface *ifp;
+
+ /* Area info in which this MPLS-TE link belongs to. */
+ struct ospf_area *area;
+
+ /* Flags to manage this link parameters. */
+ u_int32_t flags;
+
+ /* Type of MPLS-TE link: RFC3630, RFC5392, RFC5392 emulated, RFC6827 */
+ u_int8_t type;
+
+ /* Store Link-TLV in network byte order. */
+ /* RFC3630 & RFC6827 / RFC 6827 */
+ struct te_tlv_link link_header;
+ struct te_link_subtlv_link_type link_type;
+ struct te_link_subtlv_link_id link_id;
+ struct te_link_subtlv_lclif_ipaddr lclif_ipaddr;
+ struct te_link_subtlv_rmtif_ipaddr rmtif_ipaddr;
+ struct te_link_subtlv_te_metric te_metric;
+ struct te_link_subtlv_max_bw max_bw;
+ struct te_link_subtlv_max_rsv_bw max_rsv_bw;
+ struct te_link_subtlv_unrsv_bw unrsv_bw;
+ struct te_link_subtlv_rsc_clsclr rsc_clsclr;
+ /* RFC4203 */
+ struct te_link_subtlv_llri llri;
+ /* RFC5392 */
+ struct te_link_subtlv_ras ras;
+ struct te_link_subtlv_rip rip;
+ /* RFC6827 */
+ struct te_link_subtlv_lrrid lrrid;
+ /* RFC7471 */
+ struct te_link_subtlv_av_delay av_delay;
+ struct te_link_subtlv_mm_delay mm_delay;
+ struct te_link_subtlv_delay_var delay_var;
+ struct te_link_subtlv_pkt_loss pkt_loss;
+ struct te_link_subtlv_res_bw res_bw;
+ struct te_link_subtlv_ava_bw ava_bw;
+ struct te_link_subtlv_use_bw use_bw;
+
+ struct in_addr adv_router;
+ struct in_addr id;
+};
+
/* Prototypes. */
extern int ospf_mpls_te_init (void);
extern void ospf_mpls_te_term (void);
+extern struct ospf_mpls_te *get_ospf_mpls_te (void);
+extern void ospf_mpls_te_update_if (struct interface *);
+extern void ospf_mpls_te_lsa_schedule (struct mpls_te_link *, opcode_t);
+extern u_int32_t get_mpls_te_instance_value (void);
+extern void set_linkparams_llri (struct mpls_te_link *, u_int32_t, u_int32_t);
+extern void set_linkparams_lrrid (struct mpls_te_link *, struct in_addr, struct in_addr);
#endif /* _ZEBRA_OSPF_MPLS_TE_H */
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index dec7095..f0b8505 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -63,7 +63,7 @@
/* Utility functions. */
-static int
+int
ospf_str2area_id (const char *str, struct in_addr *area_id, int *format)
{
char *endptr = NULL;
diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h
index da0ed1c..0602fec 100644
--- a/ospfd/ospf_vty.h
+++ b/ospfd/ospf_vty.h
@@ -53,5 +53,6 @@
/* Prototypes. */
extern void ospf_vty_init (void);
extern void ospf_vty_show_init (void);
+extern int ospf_str2area_id (const char *, struct in_addr *, int *);
#endif /* _QUAGGA_OSPF_VTY_H */
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 8940455..3e35979 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -48,6 +48,7 @@
#ifdef HAVE_SNMP
#include "ospfd/ospf_snmp.h"
#endif /* HAVE_SNMP */
+#include "ospfd/ospf_te.h"
/* Zebra structure to hold current status. */
struct zclient *zclient = NULL;
@@ -326,6 +327,24 @@
return 0;
}
+static int
+ospf_interface_link_params (int command, struct zclient *zclient,
+ zebra_size_t length)
+{
+ struct interface *ifp;
+
+ ifp = zebra_interface_link_params_read (zclient->ibuf);
+
+ if (ifp == NULL)
+ return 0;
+
+ /* Update TE TLV */
+ ospf_mpls_te_update_if (ifp);
+
+ return 0;
+}
+
+
void
ospf_zebra_add (struct prefix_ipv4 *p, struct ospf_route *or)
{
@@ -1319,6 +1338,8 @@
zclient->interface_down = ospf_interface_state_down;
zclient->interface_address_add = ospf_interface_address_add;
zclient->interface_address_delete = ospf_interface_address_delete;
+ zclient->interface_link_params = ospf_interface_link_params;
+
zclient->ipv4_route_add = ospf_zebra_read_ipv4;
zclient->ipv4_route_delete = ospf_zebra_read_ipv4;
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index cc76e9e..a01af60 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -255,7 +255,7 @@
if (listcount (om->ospf) == 0)
return NULL;
- return listgetdata (listhead (om->ospf));
+ return listgetdata ((struct listnode *)listhead (om->ospf));
}
static int
diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h
index 098fc5f..508f623 100644
--- a/ospfd/ospfd.h
+++ b/ospfd/ospfd.h
@@ -59,13 +59,14 @@
#define OSPF_AUTH_CMD_NOTSEEN -2
/* OSPF options. */
-#define OSPF_OPTION_T 0x01 /* TOS. */
+#define OSPF_OPTION_MT 0x01 /* M/T */
#define OSPF_OPTION_E 0x02
#define OSPF_OPTION_MC 0x04
#define OSPF_OPTION_NP 0x08
#define OSPF_OPTION_EA 0x10
#define OSPF_OPTION_DC 0x20
#define OSPF_OPTION_O 0x40
+#define OSPF_OPTION_DN 0x80
/* OSPF Database Description flags. */
#define OSPF_DD_FLAG_MS 0x01