Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/quagga/patches/30-ospfd-nssa-asbr.patch
author Milan Jurik <Milan.Jurik@oracle.com>
Wed, 30 Nov 2011 06:39:13 -0800
changeset 604 c25824a87b1f
parent 417 7c10b5cba79b
permissions -rw-r--r--
6674902 a lot of superfluous calls to clock_gettime if timed events is not used 6867692 libevent version needs to be updated to 1.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
417
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     1
 
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     2
 
index 24c3d29..bb0e908 100644
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     3
 
--- ospfd/ChangeLog
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     4
 
+++ ospfd/ChangeLog
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     5
 
@@ -1,3 +1,8 @@
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     6
 
+2007-08-06 Paul Jakma <[email protected]>
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     7
 
+
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     8
 
+	* ospf_lsa.c: (router_lsa_flags) Bug #331, NSSA regression caused
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
     9
 
+	  caused ASBRs to not advertise E-bit into NSSA areas.
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    10
 
+
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    11
 
 2007-05-09 Milan Kocian <[email protected]>
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    12
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    13
 
 	* ospf_vty.c: Fix commands: 'ip ospf authentication A.B.C.D',
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    14
 
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    15
 
index b9a70a6..243928f 100644
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    16
 
--- ospfd/ospf_lsa.c
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    17
 
+++ ospfd/ospf_lsa.c
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    18
 
@@ -437,8 +437,7 @@ router_lsa_flags (struct ospf_area *area)
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    19
 
 	SET_FLAG (flags, ROUTER_LSA_SHORTCUT);
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    20
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    21
 
   /* ASBR can't exit in stub area. */
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    22
 
-  if (area->external_routing == OSPF_AREA_STUB
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    23
 
-      || area->external_routing == OSPF_AREA_NSSA)
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    24
 
+  if (area->external_routing == OSPF_AREA_STUB)
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    25
 
     UNSET_FLAG (flags, ROUTER_LSA_EXTERNAL);
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    26
 
   /* If ASBR set External flag */
7c10b5cba79b 7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff changeset 
    27
 
   else if (IS_OSPF_ASBR (area->ospf))
upstream/oracle/userland-gate