From e84b55978504a05c687dd636c1c526a99a34019e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 14 Apr 2017 03:29:22 +0200 Subject: Revert "src: Declare the define visibility attribute together" This reverts commit 58cb0668dc15c78cd3af9eeaedf29386e86ecac1. Prepare a new patch to keep this update consistent with libmnl. Signed-off-by: Pablo Neira Ayuso --- src/extra/tcp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/extra/tcp.c') diff --git a/src/extra/tcp.c b/src/extra/tcp.c index 8038ce5..d1cd79d 100644 --- a/src/extra/tcp.c +++ b/src/extra/tcp.c @@ -40,7 +40,7 @@ * \note You have to call nfq_ip_set_transport_header or * nfq_ip6_set_transport_header first to access the TCP header. */ -struct tcphdr __EXPORTED *nfq_tcp_get_hdr(struct pkt_buff *pktb) +struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb) { if (pktb->transport_header == NULL) return NULL; @@ -51,13 +51,14 @@ struct tcphdr __EXPORTED *nfq_tcp_get_hdr(struct pkt_buff *pktb) return (struct tcphdr *)pktb->transport_header; } +EXPORT_SYMBOL(nfq_tcp_get_hdr); /** * nfq_tcp_get_payload - get the TCP packet payload * \param tcph: pointer to the TCP header * \param pktb: pointer to user-space network packet buffer */ -void __EXPORTED *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) +void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) { unsigned int len = tcph->doff * 4; @@ -71,43 +72,47 @@ void __EXPORTED *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) return pktb->transport_header + len; } +EXPORT_SYMBOL(nfq_tcp_get_payload); /** * nfq_tcp_get_payload_len - get the tcp packet payload * \param tcph: pointer to the TCP header * \param pktb: pointer to user-space network packet buffer */ -unsigned int __EXPORTED +unsigned int nfq_tcp_get_payload_len(struct tcphdr *tcph, struct pkt_buff *pktb) { return pktb->tail - pktb->transport_header; } +EXPORT_SYMBOL(nfq_tcp_get_payload_len); /** * nfq_tcp_set_checksum_ipv4 - computes IPv4/TCP packet checksum * \param tcph: pointer to the TCP header * \param iph: pointer to the IPv4 header */ -void __EXPORTED +void nfq_tcp_compute_checksum_ipv4(struct tcphdr *tcph, struct iphdr *iph) { /* checksum field in header needs to be zero for calculation. */ tcph->check = 0; tcph->check = nfq_checksum_tcpudp_ipv4(iph); } +EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4); /** * nfq_tcp_set_checksum_ipv6 - computes IPv6/TCP packet checksum * \param tcph: pointer to the TCP header * \param iph: pointer to the IPv6 header */ -void __EXPORTED +void nfq_tcp_compute_checksum_ipv6(struct tcphdr *tcph, struct ip6_hdr *ip6h) { /* checksum field in header needs to be zero for calculation. */ tcph->check = 0; tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph); } +EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv6); /* * The union cast uses a gcc extension to avoid aliasing problems @@ -129,7 +134,7 @@ union tcp_word_hdr { * \param tcp: pointer to a valid tcp header. * */ -int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) +int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) { int ret, len = 0; @@ -172,6 +177,7 @@ int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcp return ret; } +EXPORT_SYMBOL(nfq_tcp_snprintf); /** * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer @@ -183,7 +189,7 @@ int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcp * * \note This function recalculates the IPv4 and TCP checksums for you. */ -int __EXPORTED +int nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, unsigned int match_offset, unsigned int match_len, const char *rep_buffer, unsigned int rep_len) @@ -202,6 +208,7 @@ nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, return 1; } +EXPORT_SYMBOL(nfq_tcp_mangle_ipv4); /** * @} -- cgit v1.2.3