Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3796f89 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Add network address mask helper routines 



Introduces a pair of helper routines that convert the network address
for a TIPC node into the network address for its cluster or zone.

This is a cosmetic change designed to avoid future errors caused by
the incorrect use of address bitmasks, and does not alter the existing
operation of TIPC.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent aa847294

net/tipc/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ int tipc_in_scope(u32 domain, u32 addr) 
{

	if (!domain || (domain == addr))

		return 1;

	if (domain == (addr & 0xfffff000u)) /* domain <Z.C.0> */

	if (domain == tipc_cluster_mask(addr)) /* domain <Z.C.0> */

		return 1;

	if (domain == (addr & 0xff000000u)) /* domain <Z.0.0> */

	if (domain == tipc_zone_mask(addr)) /* domain <Z.0.0> */

		return 1;

	return 0;

}

net/tipc/addr.h

+13 −4
Original line number Diff line number Diff line
@@ -37,6 +37,16 @@ 
#ifndef _TIPC_ADDR_H

#define _TIPC_ADDR_H



static inline u32 tipc_zone_mask(u32 addr)

{

	return addr & 0xff000000u;

}



static inline u32 tipc_cluster_mask(u32 addr)

{

	return addr & 0xfffff000u;

}



static inline int in_own_cluster(u32 addr)

{

	return !((addr ^ tipc_own_addr) >> 12);
@@ -49,14 +59,13 @@ static inline int in_own_cluster(u32 addr) 
 * after a network hop.

 */



static inline int addr_domain(int sc)

static inline u32 addr_domain(u32 sc)

{

	if (likely(sc == TIPC_NODE_SCOPE))

		return tipc_own_addr;

	if (sc == TIPC_CLUSTER_SCOPE)

		return tipc_addr(tipc_zone(tipc_own_addr),

				 tipc_cluster(tipc_own_addr), 0);

	return tipc_addr(tipc_zone(tipc_own_addr), 0, 0);

		return tipc_cluster_mask(tipc_own_addr);

	return tipc_zone_mask(tipc_own_addr);

}



int tipc_addr_domain_valid(u32);

net/tipc/node.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) 


	/* Add TLV for broadcast link */



	link_info.dest = htonl(tipc_own_addr & 0xfffff000);

	link_info.dest = htonl(tipc_cluster_mask(tipc_own_addr));

	link_info.up = htonl(1);

	strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME);

	tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));