diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-05-03 07:46:30 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-05-03 07:46:30 +0200 |
| commit | f19651382eea9b44e0e2bad1b204e3af5ab80f8b (patch) | |
| tree | 3b8344d7c9b85f6b3c479e60a7f7e8c6f4ccbd7b /community/libnids/libnids-1.24-inline.patch | |
| parent | 0c19f2591cf83b6f94ac652e32503446d15b0604 (diff) | |
| download | packages-f19651382eea9b44e0e2bad1b204e3af5ab80f8b.tar.xz | |
community/libnids: removed + from patch
Diffstat (limited to 'community/libnids/libnids-1.24-inline.patch')
| -rw-r--r-- | community/libnids/libnids-1.24-inline.patch | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/community/libnids/libnids-1.24-inline.patch b/community/libnids/libnids-1.24-inline.patch index 000c69bc..c1123c2f 100644 --- a/community/libnids/libnids-1.24-inline.patch +++ b/community/libnids/libnids-1.24-inline.patch @@ -4,43 +4,43 @@ index 0000000..e3a6cce --- /dev/null +++ b/libnids-1.24-inline.patch @@ -0,0 +1,40 @@ -+Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which -+avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and -+my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well. -+ -+--- libnids-1.24/src/checksum.c 2010-02-26 11:58:41.000000000 +0100 -++++ libnids-1.24/src/checksum.c.inline 2016-02-09 14:08:38.000000000 +0100 -+@@ -120,7 +120,7 @@ -+ By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt -+ Gulbrandsen. -+ */ -+-inline u_short ip_fast_csum(u_char * iph, u_int ihl) -++u_short ip_fast_csum(u_char * iph, u_int ihl) -+ { -+ u_int sum; -+ if (dontchksum(((struct ip*)iph)->ip_src.s_addr)) -+@@ -191,13 +191,13 @@ -+ this routine is used for miscellaneous IP-like checksums, mainly in -+ icmp.c -+ */ -+-inline u_short -++u_short -+ ip_compute_csum(u_char * buff, int len) -+ { -+ return (csum_fold(csum_partial(buff, len, 0))); -+ } -+ -+-inline u_short -++u_short -+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr) -+ { -+ if (dontchksum(saddr)) -+@@ -205,7 +205,7 @@ -+ return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, -+ csum_partial((u_char *)th, len, 0)); -+ } -+-inline u_short -++u_short -+ my_udp_check(void *u, int len, u_int saddr, u_int daddr) -+ { -+ if (dontchksum(saddr)) +Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which +avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and +my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well. + +--- libnids-1.24/src/checksum.c 2010-02-26 11:58:41.000000000 +0100 ++++ libnids-1.24/src/checksum.c.inline 2016-02-09 14:08:38.000000000 +0100 +@@ -120,7 +120,7 @@ + By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt + Gulbrandsen. + */ +-inline u_short ip_fast_csum(u_char * iph, u_int ihl) ++u_short ip_fast_csum(u_char * iph, u_int ihl) + { + u_int sum; + if (dontchksum(((struct ip*)iph)->ip_src.s_addr)) +@@ -191,13 +191,13 @@ + this routine is used for miscellaneous IP-like checksums, mainly in + icmp.c + */ +-inline u_short ++u_short + ip_compute_csum(u_char * buff, int len) + { + return (csum_fold(csum_partial(buff, len, 0))); + } + +-inline u_short ++u_short + my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) +@@ -205,7 +205,7 @@ + return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, + csum_partial((u_char *)th, len, 0)); + } +-inline u_short ++u_short + my_udp_check(void *u, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) |