mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Schmidt
f0b061bf41
Build and install dynamic library in addition to static library. Fix permissions in extracted directory for easier development. Fix implicit declaration of functions. Fix undefined symbols in i386 build by not declaring functions inline. Modernize checksums.
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
Fix:
|
|
Undefined symbols for architecture i386:
|
|
"_ip_compute_csum", referenced from:
|
|
_process_icmp in tcp_pic.o
|
|
"_ip_fast_csum", referenced from:
|
|
_gen_ip_frag_proc in libnids_pic.o
|
|
"_my_tcp_check", referenced from:
|
|
_process_tcp in tcp_pic.o
|
|
"_my_udp_check", referenced from:
|
|
_gen_ip_proc in libnids_pic.o
|
|
ld: symbol(s) not found for architecture i386
|
|
--- src/checksum.c.orig 2010-02-26 04:58:41.000000000 -0600
|
|
+++ src/checksum.c 2021-07-29 12:02:18.000000000 -0500
|
|
@@ -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))
|