Commit 7823f04f authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller
Browse files

tipc: introduce new unified address type for internal use 



We introduce a simplified version of struct sockaddr_tipc, using
anonymous unions and structures. Apart from being nicer to work with,
this struct will come in handy when we in a later commit add another
address type.

Signed-off-by: default avatarJon Maloy <jmaloy@redhat.com>
Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Acked-by: default avatarHoang Le <hoang.h.le@dektech.com.au>
Acked-by: default avatarTung Nguyen <tung.q.nguyen@dektech.com.au>
Acked-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b26b5aa9

net/tipc/addr.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 * Copyright (c) 2000-2006, 2018, Ericsson AB

 * Copyright (c) 2004-2005, 2010-2011, Wind River Systems

 * Copyright (c) 2020-2021, Red Hat Inc

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

net/tipc/addr.h

+45 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (c) 2000-2006, 2018, Ericsson AB

 * Copyright (c) 2004-2005, Wind River Systems

 * Copyright (c) 2020, Red Hat Inc

 * Copyright (c) 2020-2021, Red Hat Inc

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,50 @@ 
#include <net/netns/generic.h>

#include "core.h"



/* Struct tipc_uaddr: internal version of struct sockaddr_tipc.

 * Must be kept aligned both regarding field positions and size.

 */

struct tipc_uaddr {

	unsigned short family;

	unsigned char addrtype;

	signed char scope;

	union {

		struct {

			struct tipc_service_addr sa;

			u32 lookup_node;

		};

		struct tipc_service_range sr;

		struct tipc_socket_addr sk;

	};

};



static inline void tipc_uaddr(struct tipc_uaddr *ua, u32 atype, u32 scope,

			      u32 type, u32 lower, u32 upper)

{

	ua->family = AF_TIPC;

	ua->addrtype = atype;

	ua->scope = scope;

	ua->sr.type = type;

	ua->sr.lower = lower;

	ua->sr.upper = upper;

}



static inline bool tipc_uaddr_valid(struct tipc_uaddr *ua, int len)

{

	u32 atype;



	if (len < sizeof(struct sockaddr_tipc))

		return false;

	atype = ua->addrtype;

	if (ua->family != AF_TIPC)

		return false;

	if (atype == TIPC_SERVICE_ADDR || atype == TIPC_SOCKET_ADDR)

		return true;

	if (atype == TIPC_SERVICE_RANGE)

		return ua->sr.upper >= ua->sr.lower;

	return false;

}



static inline u32 tipc_own_addr(struct net *net)

{

	return tipc_net(net)->node_addr;