diff options
| author | Paul Jakma <paul@jakma.org> | 2015-10-28 14:25:06 +0000 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2015-10-28 14:25:06 +0000 |
| commit | 283596fd6d49a5b2861a6923db9a88628ef0eca4 (patch) | |
| tree | 1b461a1fea8840efaafd1250f729831be91fea9f /bgpd | |
| parent | be62b17c736ea06181f2788e3011066830555610 (diff) | |
| parent | fc1c114aab24fe47bc6a1976c1c602d507fa4e69 (diff) | |
| download | quagga-283596fd6d49a5b2861a6923db9a88628ef0eca4.tar.bz2 quagga-283596fd6d49a5b2861a6923db9a88628ef0eca4.tar.xz | |
Merge 'patch-tracking/4/proposed/netdef-solaris' into accepted
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_attr.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_snmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index d413e5b2..ef19bc43 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -1817,7 +1817,7 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size, /* same goes for as4_aggregator */ struct aspath *as4_path = NULL; as_t as4_aggregator = 0; - struct in_addr as4_aggregator_addr = { 0 }; + struct in_addr as4_aggregator_addr = { .s_addr = 0 }; /* Initialize bitmap. */ memset (seen, 0, BGP_ATTR_BITMAP_SIZE); diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 0f4aeec8..6a578347 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -121,7 +121,7 @@ oid bgp_oid [] = { BGP4MIB }; oid bgp_trap_oid [] = { BGP4MIB, 0 }; /* IP address 0.0.0.0. */ -static struct in_addr bgp_empty_addr = {0}; +static struct in_addr bgp_empty_addr = { .s_addr = 0 }; /* Hook functions. */ static u_char *bgpVersion (struct variable *, oid [], size_t *, int, |