KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetfilter_queue: bump to git HEAD

Browse source 
b39cac7 src: Correct typo in the location of internal.h in #include
58cb066 src: Declare the define visibility attribute together
e84b559 Revert "src: Declare the define visibility attribute together"
003c2b1 examples: set dummy connmark value to show use of NFQA_CT nested attribute
63973da doc: extend the doxygen section about NFQA_CFG_F_GSO
d7f74c7 build: bump version to 1.0.3
3f9eb57 build: bump library release version too
601abd1 doc: Add information about retrieving UID/GID/SECCTX fields

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2017-10-08 21:46:44 +03:00
parent c972779e98
commit bcfc39b763
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/libs/libnetfilter-queue/Makefile
View file

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://git.netfilter.org/libnetfilter_queue PKG_SOURCE_URL=https://git.netfilter.org/libnetfilter_queue
PKG_SOURCE_DATE:=2016-07-03 PKG_SOURCE_DATE:=2017-06-27
PKG_SOURCE_VERSION:=981025e103d887fb6a9c9bb49c74ec323108d098 PKG_SOURCE_VERSION:=601abd1c71ccdf90753cf294c120ad43fb25dc54
PKG_MIRROR_HASH:=85c124be0e19162e1ebd1aba6e7e86bb4106e9dab4267baaf66d3ccb48d56e3f PKG_MIRROR_HASH:=283b99cfe5856dc87fd6bab8f78c0c59b72462d6b4f2b13111f928cf33020eb3
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+

18
package/libs/libnetfilter-queue/patches/100-checksum_computation.patch
View file

@ -8,7 +8,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip6.h> #include <netinet/ip6.h>
@@ -26,8 +27,13 @@ uint16_t nfq_checksum(uint32_t sum, uint16_t *buf, int size) @@ -26,8 +27,13 @@ uint16_t nfq_checksum(uint32_t sum, uint
sum += *buf++; sum += *buf++;
size -= sizeof(uint16_t); size -= sizeof(uint16_t);
} }
@ -24,7 +24,7 @@
sum = (sum >> 16) + (sum & 0xffff); sum = (sum >> 16) + (sum & 0xffff);
sum += (sum >>16); sum += (sum >>16);
@@ -35,7 +41,7 @@ uint16_t nfq_checksum(uint32_t sum, uint16_t *buf, int size) @@ -35,7 +41,7 @@ uint16_t nfq_checksum(uint32_t sum, uint
return (uint16_t)(~sum); return (uint16_t)(~sum);
} }
@ -33,7 +33,7 @@
{ {
uint32_t sum = 0; uint32_t sum = 0;
uint32_t iph_len = iph->ihl*4; uint32_t iph_len = iph->ihl*4;
@@ -46,13 +52,13 @@ uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph) @@ -46,13 +52,13 @@ uint16_t nfq_checksum_tcpudp_ipv4(struct
sum += (iph->saddr) & 0xFFFF; sum += (iph->saddr) & 0xFFFF;
sum += (iph->daddr >> 16) & 0xFFFF; sum += (iph->daddr >> 16) & 0xFFFF;
sum += (iph->daddr) & 0xFFFF; sum += (iph->daddr) & 0xFFFF;
@ -49,7 +49,7 @@
{ {
uint32_t sum = 0; uint32_t sum = 0;
uint32_t hdr_len = (uint32_t *)transport_hdr - (uint32_t *)ip6h; uint32_t hdr_len = (uint32_t *)transport_hdr - (uint32_t *)ip6h;
@@ -68,7 +74,7 @@ uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr) @@ -68,7 +74,7 @@ uint16_t nfq_checksum_tcpudp_ipv6(struct
sum += (ip6h->ip6_dst.s6_addr16[i] >> 16) & 0xFFFF; sum += (ip6h->ip6_dst.s6_addr16[i] >> 16) & 0xFFFF;
sum += (ip6h->ip6_dst.s6_addr16[i]) & 0xFFFF; sum += (ip6h->ip6_dst.s6_addr16[i]) & 0xFFFF;
} }
@ -58,11 +58,9 @@
sum += htons(ip6h->ip6_plen); sum += htons(ip6h->ip6_plen);
return nfq_checksum(sum, (uint16_t *)payload, len); return nfq_checksum(sum, (uint16_t *)payload, len);
diff --git a/src/extra/tcp.c b/src/extra/tcp.c
index d1cd79d..a66f392 100644
--- a/src/extra/tcp.c --- a/src/extra/tcp.c
+++ b/src/extra/tcp.c +++ b/src/extra/tcp.c
@@ -96,7 +96,7 @@ nfq_tcp_compute_checksum_ipv4(struct tcphdr *tcph, struct iphdr *iph) @@ -96,7 +96,7 @@ nfq_tcp_compute_checksum_ipv4(struct tcp
{ {
/* checksum field in header needs to be zero for calculation. */ /* checksum field in header needs to be zero for calculation. */
tcph->check = 0; tcph->check = 0;
@ -71,7 +69,7 @@ index d1cd79d..a66f392 100644
} }
EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4); EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4);
@@ -110,7 +110,7 @@ nfq_tcp_compute_checksum_ipv6(struct tcphdr *tcph, struct ip6_hdr *ip6h) @@ -110,7 +110,7 @@ nfq_tcp_compute_checksum_ipv6(struct tcp
{ {
/* checksum field in header needs to be zero for calculation. */ /* checksum field in header needs to be zero for calculation. */
tcph->check = 0; tcph->check = 0;
@ -82,7 +80,7 @@ index d1cd79d..a66f392 100644
--- a/src/extra/udp.c --- a/src/extra/udp.c
+++ b/src/extra/udp.c +++ b/src/extra/udp.c
@@ -96,7 +96,7 @@ nfq_udp_compute_checksum_ipv4(struct udphdr *udph, struct iphdr *iph) @@ -96,7 +96,7 @@ nfq_udp_compute_checksum_ipv4(struct udp
{ {
/* checksum field in header needs to be zero for calculation. */ /* checksum field in header needs to be zero for calculation. */
udph->check = 0; udph->check = 0;
@ -91,7 +89,7 @@ index d1cd79d..a66f392 100644
} }
EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4);
@@ -115,7 +115,7 @@ nfq_udp_compute_checksum_ipv6(struct udphdr *udph, struct ip6_hdr *ip6h) @@ -115,7 +115,7 @@ nfq_udp_compute_checksum_ipv6(struct udp
{ {
/* checksum field in header needs to be zero for calculation. */ /* checksum field in header needs to be zero for calculation. */
udph->check = 0; udph->check = 0;