diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-02-06 08:49:02 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-02-06 09:00:12 +0200 |
| commit | 975a328e2eb3d1bea5fbc3c232580dd4739d59f0 (patch) | |
| tree | 587e51ff3bbf8dc368ecd1c414615d19ff5139ae /pimd/pim_igmp_mtrace.c | |
| parent | 85c58de7732d72d063efc930708fca7302ccf8a1 (diff) | |
*: Replace s_addr 0 => INADDR_ANY
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'pimd/pim_igmp_mtrace.c')
| -rw-r--r-- | pimd/pim_igmp_mtrace.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c index 695d04c7c2..309b8c1495 100644 --- a/pimd/pim_igmp_mtrace.c +++ b/pimd/pim_igmp_mtrace.c @@ -68,7 +68,7 @@ static bool mtrace_fwd_info_weak(struct pim_instance *pim, struct in_addr nh_addr; char nexthop_str[INET_ADDRSTRLEN]; - nh_addr.s_addr = 0; + nh_addr.s_addr = INADDR_ANY; memset(&nexthop, 0, sizeof(nexthop)); @@ -123,7 +123,7 @@ static bool mtrace_fwd_info(struct pim_instance *pim, up = pim_upstream_find(pim, &sg); if (!up) { - sg.src.s_addr = 0; + sg.src.s_addr = INADDR_ANY; up = pim_upstream_find(pim, &sg); } @@ -160,7 +160,7 @@ static bool mtrace_fwd_info(struct pim_instance *pim, rspp->rtg_proto = MTRACE_RTG_PROTO_PIM; /* 6.2.2. 4. Fill in ... S, and Src Mask */ - if (sg.src.s_addr) { + if (sg.src.s_addr != INADDR_ANY) { rspp->s = 1; rspp->src_mask = MTRACE_SRC_MASK_SOURCE; } else { @@ -181,9 +181,9 @@ static void mtrace_rsp_set_fwd_code(struct igmp_mtrace_rsp *mtrace_rspp, static void mtrace_rsp_init(struct igmp_mtrace_rsp *mtrace_rspp) { mtrace_rspp->arrival = 0; - mtrace_rspp->incoming.s_addr = 0; - mtrace_rspp->outgoing.s_addr = 0; - mtrace_rspp->prev_hop.s_addr = 0; + mtrace_rspp->incoming.s_addr = INADDR_ANY; + mtrace_rspp->outgoing.s_addr = INADDR_ANY; + mtrace_rspp->prev_hop.s_addr = INADDR_ANY; mtrace_rspp->in_count = htonl(MTRACE_UNKNOWN_COUNT); mtrace_rspp->out_count = htonl(MTRACE_UNKNOWN_COUNT); mtrace_rspp->total = htonl(MTRACE_UNKNOWN_COUNT); @@ -779,7 +779,7 @@ int igmp_mtrace_recv_qry_req(struct igmp_sock *igmp, struct ip *ip_hdr, /* 6.2.2. 2. Attempt to determine the forwarding information... */ - if (mtracep->grp_addr.s_addr) + if (mtracep->grp_addr.s_addr != INADDR_ANY) fwd_info = mtrace_fwd_info(pim, mtracep, rspp, &out_ifp); else fwd_info = mtrace_fwd_info_weak(pim, mtracep, rspp, &out_ifp); @@ -797,7 +797,7 @@ int igmp_mtrace_recv_qry_req(struct igmp_sock *igmp, struct ip *ip_hdr, reached_source = false; - if (nh_addr.s_addr == 0) { + if (nh_addr.s_addr == INADDR_ANY) { /* no pim? i.e. 7.5.3. No Previous Hop */ if (!out_ifp->info) { if (PIM_DEBUG_MTRACE) |