Merge branch 'stable/3.0'

[mirror_frr.git] / ospf6d / ospf6_lsa.h

diff --git a/ospf6d/ospf6_lsa.h b/ospf6d/ospf6_lsa.h
index aed89df29f8925e4df9486261f9d7ecb74b76e2a..36cf5598681eb7f09af04876e719c2d2fdcf4441 100644 (file)
--- a/ospf6d/ospf6_lsa.h
+++ b/ospf6d/ospf6_lsa.h
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the 
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
- * Boston, MA 02111-1307, USA.  
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef OSPF6_LSA_H
@@ -141,6 +140,7 @@ struct ospf6_lsa
 #define OSPF6_LSA_FLOODBACK  0x02
 #define OSPF6_LSA_DUPLICATE  0x04
 #define OSPF6_LSA_IMPLIEDACK 0x08
+#define OSPF6_LSA_UNAPPROVED 0x10
 #define OSPF6_LSA_SEQWRAPPED 0x20
 
 struct ospf6_lsa_handler
@@ -157,12 +157,14 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define OSPF6_LSA_IS_KNOWN(type) \
   (ospf6_get_lsa_handler (type) != &unknown_handler ? 1 : 0)
 
+extern vector ospf6_lsa_handler_vector;
+
 /* Macro for LSA Origination */
 /* addr is (struct prefix *) */
 #define CONTINUE_IF_ADDRESS_LINKLOCAL(debug,addr)      \
   if (IN6_IS_ADDR_LINKLOCAL (&(addr)->u.prefix6))      \
     {                                                  \
-      char buf[64];                                    \
+      char buf[PREFIX2STR_BUFFER];                     \
       prefix2str (addr, buf, sizeof (buf));            \
       if (debug)                                       \
         zlog_debug ("Filter out Linklocal: %s", buf);  \
@@ -172,7 +174,7 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define CONTINUE_IF_ADDRESS_UNSPECIFIED(debug,addr)    \
   if (IN6_IS_ADDR_UNSPECIFIED (&(addr)->u.prefix6))    \
     {                                                  \
-      char buf[64];                                    \
+      char buf[PREFIX2STR_BUFFER];                     \
       prefix2str (addr, buf, sizeof (buf));            \
       if (debug)                                       \
         zlog_debug ("Filter out Unspecified: %s", buf);\
@@ -182,7 +184,7 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define CONTINUE_IF_ADDRESS_LOOPBACK(debug,addr)       \
   if (IN6_IS_ADDR_LOOPBACK (&(addr)->u.prefix6))       \
     {                                                  \
-      char buf[64];                                    \
+      char buf[PREFIX2STR_BUFFER];                     \
       prefix2str (addr, buf, sizeof (buf));            \
       if (debug)                                       \
         zlog_debug ("Filter out Loopback: %s", buf);   \
@@ -192,7 +194,7 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define CONTINUE_IF_ADDRESS_V4COMPAT(debug,addr)       \
   if (IN6_IS_ADDR_V4COMPAT (&(addr)->u.prefix6))       \
     {                                                  \
-      char buf[64];                                    \
+      char buf[PREFIX2STR_BUFFER];                     \
       prefix2str (addr, buf, sizeof (buf));            \
       if (debug)                                       \
         zlog_debug ("Filter out V4Compat: %s", buf);   \
@@ -202,14 +204,14 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define CONTINUE_IF_ADDRESS_V4MAPPED(debug,addr)       \
   if (IN6_IS_ADDR_V4MAPPED (&(addr)->u.prefix6))       \
     {                                                  \
-      char buf[64];                                    \
+      char buf[PREFIX2STR_BUFFER];                     \
       prefix2str (addr, buf, sizeof (buf));            \
       if (debug)                                       \
         zlog_debug ("Filter out V4Mapped: %s", buf);   \
       continue;                                        \
     }
 
-\f
+
 /* Function Prototypes */
 extern const char *ospf6_lstype_name (u_int16_t type);
 extern const char *ospf6_lstype_short_name (u_int16_t type);