From fe73d7d8854efda86d4d09757874c48352e6b247 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Nov 2010 13:07:48 +0100 Subject: build: tag function headers rather than decls as exported Signed-off-by: Pablo Neira Ayuso --- include/libmnl/libmnl.h | 102 +++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 54 deletions(-) (limited to 'include/libmnl/libmnl.h') diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 7ef8d5e..0b581d4 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -16,12 +16,6 @@ extern "C" { #endif -#if defined(HAVE_VISIBILITY) && defined(BUILDING_MNL) -#define MNL_API extern __attribute__ ((visibility("default"))) -#else -#define MNL_API extern -#endif - /* * Netlink socket API */ @@ -31,15 +25,15 @@ extern "C" { struct mnl_socket; -MNL_API struct mnl_socket *mnl_socket_open(int type); -MNL_API int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, pid_t pid); -MNL_API int mnl_socket_close(struct mnl_socket *nl); -MNL_API int mnl_socket_get_fd(const struct mnl_socket *nl); -MNL_API unsigned int mnl_socket_get_portid(const struct mnl_socket *nl); -MNL_API ssize_t mnl_socket_sendto(const struct mnl_socket *nl, const void *req, size_t siz); -MNL_API ssize_t mnl_socket_recvfrom(const struct mnl_socket *nl, void *buf, size_t siz); -MNL_API int mnl_socket_setsockopt(const struct mnl_socket *nl, int type, void *buf, socklen_t len); -MNL_API int mnl_socket_getsockopt(const struct mnl_socket *nl, int type, void *buf, socklen_t *len); +extern struct mnl_socket *mnl_socket_open(int type); +extern int mnl_socket_bind(struct mnl_socket *nl, unsigned int groups, pid_t pid); +extern int mnl_socket_close(struct mnl_socket *nl); +extern int mnl_socket_get_fd(const struct mnl_socket *nl); +extern unsigned int mnl_socket_get_portid(const struct mnl_socket *nl); +extern ssize_t mnl_socket_sendto(const struct mnl_socket *nl, const void *req, size_t siz); +extern ssize_t mnl_socket_recvfrom(const struct mnl_socket *nl, void *buf, size_t siz); +extern int mnl_socket_setsockopt(const struct mnl_socket *nl, int type, void *buf, socklen_t len); +extern int mnl_socket_getsockopt(const struct mnl_socket *nl, int type, void *buf, socklen_t *len); /* * Netlink message API @@ -49,30 +43,30 @@ MNL_API int mnl_socket_getsockopt(const struct mnl_socket *nl, int type, void *b #define MNL_ALIGN(len) (((len)+MNL_ALIGNTO-1) & ~(MNL_ALIGNTO-1)) #define MNL_NLMSG_HDRLEN MNL_ALIGN(sizeof(struct nlmsghdr)) -MNL_API size_t mnl_nlmsg_size(size_t len); -MNL_API size_t mnl_nlmsg_get_payload_len(const struct nlmsghdr *nlh); +extern size_t mnl_nlmsg_size(size_t len); +extern size_t mnl_nlmsg_get_payload_len(const struct nlmsghdr *nlh); /* Netlink message header builder */ -MNL_API struct nlmsghdr *mnl_nlmsg_put_header(void *buf); -MNL_API void *mnl_nlmsg_put_extra_header(struct nlmsghdr *nlh, size_t size); +extern struct nlmsghdr *mnl_nlmsg_put_header(void *buf); +extern void *mnl_nlmsg_put_extra_header(struct nlmsghdr *nlh, size_t size); /* Netlink message iterators */ -MNL_API bool mnl_nlmsg_ok(const struct nlmsghdr *nlh, int len); -MNL_API struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len); +extern bool mnl_nlmsg_ok(const struct nlmsghdr *nlh, int len); +extern struct nlmsghdr *mnl_nlmsg_next(const struct nlmsghdr *nlh, int *len); /* Netlink sequence tracking */ -MNL_API bool mnl_nlmsg_seq_ok(const struct nlmsghdr *nlh, unsigned int seq); +extern bool mnl_nlmsg_seq_ok(const struct nlmsghdr *nlh, unsigned int seq); /* Netlink portID checking */ -MNL_API bool mnl_nlmsg_portid_ok(const struct nlmsghdr *nlh, unsigned int portid); +extern bool mnl_nlmsg_portid_ok(const struct nlmsghdr *nlh, unsigned int portid); /* Netlink message getters */ -MNL_API void *mnl_nlmsg_get_payload(const struct nlmsghdr *nlh); -MNL_API void *mnl_nlmsg_get_payload_offset(const struct nlmsghdr *nlh, size_t offset); -MNL_API void *mnl_nlmsg_get_payload_tail(const struct nlmsghdr *nlh); +extern void *mnl_nlmsg_get_payload(const struct nlmsghdr *nlh); +extern void *mnl_nlmsg_get_payload_offset(const struct nlmsghdr *nlh, size_t offset); +extern void *mnl_nlmsg_get_payload_tail(const struct nlmsghdr *nlh); /* Netlink message printer */ -MNL_API void mnl_nlmsg_fprintf(FILE *fd, const void *data, size_t datalen, size_t extra_header_size); +extern void mnl_nlmsg_fprintf(FILE *fd, const void *data, size_t datalen, size_t extra_header_size); /* * Netlink attributes API @@ -80,31 +74,31 @@ MNL_API void mnl_nlmsg_fprintf(FILE *fd, const void *data, size_t datalen, size_ #define MNL_ATTR_HDRLEN MNL_ALIGN(sizeof(struct nlattr)) /* TLV attribute getters */ -MNL_API uint16_t mnl_attr_get_type(const struct nlattr *attr); -MNL_API uint16_t mnl_attr_get_len(const struct nlattr *attr); -MNL_API uint16_t mnl_attr_get_payload_len(const struct nlattr *attr); -MNL_API void *mnl_attr_get_payload(const struct nlattr *attr); -MNL_API uint8_t mnl_attr_get_u8(const struct nlattr *attr); -MNL_API uint16_t mnl_attr_get_u16(const struct nlattr *attr); -MNL_API uint32_t mnl_attr_get_u32(const struct nlattr *attr); -MNL_API uint64_t mnl_attr_get_u64(const struct nlattr *attr); -MNL_API const char *mnl_attr_get_str(const struct nlattr *attr); +extern uint16_t mnl_attr_get_type(const struct nlattr *attr); +extern uint16_t mnl_attr_get_len(const struct nlattr *attr); +extern uint16_t mnl_attr_get_payload_len(const struct nlattr *attr); +extern void *mnl_attr_get_payload(const struct nlattr *attr); +extern uint8_t mnl_attr_get_u8(const struct nlattr *attr); +extern uint16_t mnl_attr_get_u16(const struct nlattr *attr); +extern uint32_t mnl_attr_get_u32(const struct nlattr *attr); +extern uint64_t mnl_attr_get_u64(const struct nlattr *attr); +extern const char *mnl_attr_get_str(const struct nlattr *attr); /* TLV attribute putters */ -MNL_API void mnl_attr_put(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data); -MNL_API void mnl_attr_put_u8(struct nlmsghdr *nlh, uint16_t type, uint8_t data); -MNL_API void mnl_attr_put_u16(struct nlmsghdr *nlh, uint16_t type, uint16_t data); -MNL_API void mnl_attr_put_u32(struct nlmsghdr *nlh, uint16_t type, uint32_t data); -MNL_API void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, uint64_t data); -MNL_API void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data); -MNL_API void mnl_attr_put_strz(struct nlmsghdr *nlh, uint16_t type, const char *data); +extern void mnl_attr_put(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data); +extern void mnl_attr_put_u8(struct nlmsghdr *nlh, uint16_t type, uint8_t data); +extern void mnl_attr_put_u16(struct nlmsghdr *nlh, uint16_t type, uint16_t data); +extern void mnl_attr_put_u32(struct nlmsghdr *nlh, uint16_t type, uint32_t data); +extern void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, uint64_t data); +extern void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data); +extern void mnl_attr_put_strz(struct nlmsghdr *nlh, uint16_t type, const char *data); /* TLV attribute nesting */ -MNL_API struct nlattr *mnl_attr_nest_start(struct nlmsghdr *nlh, uint16_t type); -MNL_API void mnl_attr_nest_end(struct nlmsghdr *nlh, struct nlattr *start); +extern struct nlattr *mnl_attr_nest_start(struct nlmsghdr *nlh, uint16_t type); +extern void mnl_attr_nest_end(struct nlmsghdr *nlh, struct nlattr *start); /* TLV validation */ -MNL_API int mnl_attr_type_valid(const struct nlattr *attr, uint16_t maxtype); +extern int mnl_attr_type_valid(const struct nlattr *attr, uint16_t maxtype); enum mnl_attr_data_type { MNL_TYPE_UNSPEC, @@ -122,12 +116,12 @@ enum mnl_attr_data_type { MNL_TYPE_MAX, }; -MNL_API int mnl_attr_validate(const struct nlattr *attr, enum mnl_attr_data_type type); -MNL_API int mnl_attr_validate2(const struct nlattr *attr, enum mnl_attr_data_type type, size_t len); +extern int mnl_attr_validate(const struct nlattr *attr, enum mnl_attr_data_type type); +extern int mnl_attr_validate2(const struct nlattr *attr, enum mnl_attr_data_type type, size_t len); /* TLV iterators */ -MNL_API bool mnl_attr_ok(const struct nlattr *attr, int len); -MNL_API struct nlattr *mnl_attr_next(const struct nlattr *attr); +extern bool mnl_attr_ok(const struct nlattr *attr, int len); +extern struct nlattr *mnl_attr_next(const struct nlattr *attr); #define mnl_attr_for_each(attr, nlh, offset) \ for ((attr) = mnl_nlmsg_get_payload_offset((nlh), (offset)); \ @@ -142,8 +136,8 @@ MNL_API struct nlattr *mnl_attr_next(const struct nlattr *attr); /* TLV callback-based attribute parsers */ typedef int (*mnl_attr_cb_t)(const struct nlattr *attr, void *data); -MNL_API int mnl_attr_parse(const struct nlmsghdr *nlh, unsigned int offset, mnl_attr_cb_t cb, void *data); -MNL_API int mnl_attr_parse_nested(const struct nlattr *attr, mnl_attr_cb_t cb, void *data); +extern int mnl_attr_parse(const struct nlmsghdr *nlh, unsigned int offset, mnl_attr_cb_t cb, void *data); +extern int mnl_attr_parse_nested(const struct nlattr *attr, mnl_attr_cb_t cb, void *data); /* * callback API @@ -154,10 +148,10 @@ MNL_API int mnl_attr_parse_nested(const struct nlattr *attr, mnl_attr_cb_t cb, v typedef int (*mnl_cb_t)(const struct nlmsghdr *nlh, void *data); -MNL_API int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq, +extern int mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq, unsigned int portid, mnl_cb_t cb_data, void *data); -MNL_API int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq, +extern int mnl_cb_run2(const void *buf, size_t numbytes, unsigned int seq, unsigned int portid, mnl_cb_t cb_data, void *data, mnl_cb_t *cb_ctl_array, unsigned int cb_ctl_array_len); -- cgit v1.2.3