ef738c2300
CVE-2010-1674 null pointer deref with malformed BGP Extended Communities CVE-2010-1675 BGP session reset with malformed AS-path - install info documentation - patches added: build fixes from upstream
54 lines
1.7 KiB
Plaintext
54 lines
1.7 KiB
Plaintext
$OpenBSD: patch-ospfd_ospf_opaque_c,v 1.1 2011/03/26 12:00:53 sthen Exp $
|
|
|
|
ospfd: Compile fix for opaque support
|
|
http://code.quagga.net/cgi-bin/gitweb.cgi?p=quagga.git;a=commitdiff;h=d71ea65270408a45e4bec036671ec73b24b994b4
|
|
|
|
--- ospfd/ospf_opaque.c.orig Mon Mar 21 09:43:52 2011
|
|
+++ ospfd/ospf_opaque.c Sat Mar 26 11:18:46 2011
|
|
@@ -251,7 +251,7 @@ struct ospf_opaque_functab
|
|
void (* config_write_debug )(struct vty *vty);
|
|
void (* show_opaque_info )(struct vty *vty, struct ospf_lsa *lsa);
|
|
int (* lsa_originator)(void *arg);
|
|
- void (* lsa_refresher )(struct ospf_lsa *lsa);
|
|
+ struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa);
|
|
int (* new_lsa_hook)(struct ospf_lsa *lsa);
|
|
int (* del_lsa_hook)(struct ospf_lsa *lsa);
|
|
};
|
|
@@ -354,7 +354,7 @@ ospf_register_opaque_functab (
|
|
void (* config_write_debug )(struct vty *vty),
|
|
void (* show_opaque_info )(struct vty *vty, struct ospf_lsa *lsa),
|
|
int (* lsa_originator)(void *arg),
|
|
- void (* lsa_refresher )(struct ospf_lsa *lsa),
|
|
+ struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
|
|
int (* new_lsa_hook)(struct ospf_lsa *lsa),
|
|
int (* del_lsa_hook)(struct ospf_lsa *lsa))
|
|
{
|
|
@@ -1608,12 +1608,13 @@ out:
|
|
return new;
|
|
}
|
|
|
|
-void
|
|
+struct ospf_lsa *
|
|
ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
|
|
{
|
|
struct ospf *ospf;
|
|
struct ospf_opaque_functab *functab;
|
|
-
|
|
+ struct ospf_lsa *new = NULL;
|
|
+
|
|
ospf = ospf_lookup ();
|
|
|
|
if ((functab = ospf_opaque_functab_lookup (lsa)) == NULL
|
|
@@ -1633,9 +1634,9 @@ ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
|
|
ospf_lsa_flush (ospf, lsa);
|
|
}
|
|
else
|
|
- (* functab->lsa_refresher)(lsa);
|
|
+ new = (* functab->lsa_refresher)(lsa);
|
|
|
|
- return;
|
|
+ return new;
|
|
}
|
|
|
|
/*------------------------------------------------------------------------*
|