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

Commit b9f61b16 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: xt_sctp: simplify xt_sctp.h 



The use of xt_sctp.h flagged up -Wshadow warnings in userspace, which
prompted me to look at it and clean it up. Basic operations have been
directly replaced by library calls (memcpy, memset is both available
in the kernel and userspace, and usually faster than a self-made
loop). The is_set and is_clear functions now use a processing time
shortcut, too.

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent fdccecd0

include/linux/netfilter/xt_sctp.h

+35 −49
Original line number Diff line number Diff line
@@ -37,68 +37,54 @@ struct xt_sctp_info { 


#define SCTP_CHUNKMAP_SET(chunkmap, type) 		\

	do { 						\

		chunkmap[type / bytes(u_int32_t)] |= 	\

		(chunkmap)[type / bytes(u_int32_t)] |= 	\

			1 << (type % bytes(u_int32_t));	\

	} while (0)



#define SCTP_CHUNKMAP_CLEAR(chunkmap, type)		 	\

	do {							\

		chunkmap[type / bytes(u_int32_t)] &= 		\

		(chunkmap)[type / bytes(u_int32_t)] &= 		\

			~(1 << (type % bytes(u_int32_t)));	\

	} while (0)



#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) 			\

({								\

	(chunkmap[type / bytes (u_int32_t)] & 			\

	((chunkmap)[type / bytes (u_int32_t)] & 		\

		(1 << (type % bytes (u_int32_t)))) ? 1: 0;	\

})



#define SCTP_CHUNKMAP_RESET(chunkmap) \

	do {							\

		int i; 						\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			chunkmap[i] = 0;			\

	} while (0)

	memset((chunkmap), 0, sizeof(chunkmap))



#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \

	do {							\

		int i; 						\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++) 	\

			chunkmap[i] = ~0;			\

	} while (0)

	memset((chunkmap), ~0U, sizeof(chunkmap))



#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \

	do {							\

		int i; 						\

		for (i = 0; i < ARRAY_SIZE(srcmap); i++) 	\

			destmap[i] = srcmap[i];			\

	} while (0)

	memcpy((destmap), (srcmap), sizeof(srcmap))



#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \

({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i]) {			\

			flag = 0;			\

			break;				\

		}					\

	}						\

        flag;						\

})

	__sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))

static inline bool

__sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)

{

	unsigned int i;

	for (i = 0; i < n; ++i)

		if (chunkmap[i])

			return false;

	return true;

}



#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \

({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i] != ~0) {		\

			flag = 0;			\

				break;			\

		}					\

	}						\

        flag;						\

})

	__sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))

static inline bool

__sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n)

{

	unsigned int i;

	for (i = 0; i < n; ++i)

		if (chunkmap[i] != ~0U)

			return false;

	return true;

}



#endif /* _XT_SCTP_H_ */