diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
| commit | f9956b9524ddafdb9d0cec042213eaa8229aad8c (patch) | |
| tree | bf362c892837ef3f5a6a4d4265eb18e1b47ccf33 /ospf6d/ospf6_lsa.c | |
| parent | 9470cb2c32eab220f796b1438b787528272cbe84 (diff) | |
| download | quagga-ex15p.tar.bz2 quagga-ex15p.tar.xz | |
Bring "ex" version up to date with 0.99.18ex15p
Release: 0.99.18ex15p -- Pipework Branch
Also fixes issue with unknown attributes -- does not release them prematurely.
Contains the "bgpd: New show commands for improved view and address family
support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'ospf6d/ospf6_lsa.c')
| -rw-r--r-- | ospf6d/ospf6_lsa.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 0b571bf4..9643e04d 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -14,9 +14,9 @@ * 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. + * 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. */ #include <zebra.h> @@ -573,7 +573,7 @@ ospf6_lsa_unlock (struct ospf6_lsa *lsa) ospf6_lsa_delete (lsa); } - + /* ospf6 lsa expiry */ int ospf6_lsa_expire (struct thread *thread) @@ -660,7 +660,7 @@ ospf6_lsa_refresh (struct thread *thread) return 0; } - + /* enhanced Fletcher checksum algorithm, RFC1008 7.2 */ #define MODX 4102 @@ -712,12 +712,17 @@ ospf6_lsa_init (void) ospf6_install_lsa_handler (&unknown_handler); } - +void +ospf6_lsa_terminate (void) +{ + vector_free (ospf6_lsa_handler_vector); +} + static char * ospf6_lsa_handler_name (struct ospf6_lsa_handler *h) { static char buf[64]; - unsigned int i; + unsigned int i; unsigned int size = strlen (h->name); if (!strcmp(h->name, "Unknown") && @@ -867,10 +872,10 @@ DEFUN (no_debug_ospf6_lsa_type, return CMD_SUCCESS; } -struct cmd_command debug_ospf6_lsa_type_cmd; -struct cmd_command debug_ospf6_lsa_type_detail_cmd; -struct cmd_command no_debug_ospf6_lsa_type_cmd; -struct cmd_command no_debug_ospf6_lsa_type_detail_cmd; +struct cmd_element debug_ospf6_lsa_type_cmd; +struct cmd_element debug_ospf6_lsa_type_detail_cmd; +struct cmd_element no_debug_ospf6_lsa_type_cmd; +struct cmd_element no_debug_ospf6_lsa_type_detail_cmd; void install_element_ospf6_debug_lsa (void) |