diff options
| -rw-r--r-- | lib/ipv6.h | 6 | ||||
| -rw-r--r-- | proto/ospf/config.Y | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -31,7 +31,11 @@ typedef struct ipv6_addr { #define IPA_NONE _MI(0,0,0,0) -#define ipa_equal(x,y) (!memcmp(&(x),&(y),sizeof(ip_addr))) +#define ipa_equal(x,y) ({ ip_addr _a=(x), _b=(y); \ + _I0(_a) == _I0(_b) && \ + _I1(_a) == _I1(_b) && \ + _I2(_a) == _I2(_b) && \ + _I3(_a) == _I3(_b); }) #define ipa_nonzero(x) ({ ip_addr _a=(x); (_I0(_a) || _I1(_a) || _I2(_a) || _I3(_a)); }) #define ipa_and(x,y) ({ ip_addr _a=(x), _b=(y); \ _MI(_I0(_a) & _I0(_b), \ diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 0f688a7e..77ca26cf 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -104,7 +104,7 @@ ospf_stubnet: ospf_stubnet_start: prefix { - this_stubnet = cfg_allocz(sizeof(struct stubnet_config)); + this_stubnet = cfg_allocz(sizeof(struct ospf_stubnet_config)); add_tail(&this_area->stubnet_list, NODE this_stubnet); this_stubnet->px = $1; this_stubnet->cost = COST_D; |