Compile fixes
PATCH 1/1 Compile fixes
Hi,
some fixes to make current CVS compile properly.
Changes
* Fix typo in ipt_ecn.h
* Make connmark match and target compile with NO_SHARED_LIBS=1
* Make POOL target compile with NO_SHARED_LIBS=1
Index: userspace/include/linux/netfilter_ipv4/ipt_ecn.h
===================================================================
RCS file: /cvsroot/netfilter/userspace/include/linux/netfilter_ipv4/ipt_ecn.h,v retrieving revision 1.1
include/linux/netfilter_ipv4/ipt_ecn.h +1 -1
@@ -9,7 +9,7 @@*/ #ifndef _IPT_ECN_H#define _IPT_ECN_H -#include <linux/netfilter_ipv4/ipt_dcsp.h> +#include <linux/netfilter_ipv4/ipt_dscp.h> #define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
Index: userspace/patch-o-matic/base/ecn.patch
===================================================================
RCS file: /cvsroot/netfilter/userspace/patch-o-matic/base/ecn.patch,v retrieving revision 1.1
patch-o-matic/base/ecn.patch +1 -1
@@ -13,7 +13,7 @@ +*/ +#ifndef _IPT_ECN_H +#define _IPT_ECN_H -+#include <linux/netfilter_ipv4/ipt_dcsp.h> ++#include <linux/netfilter_ipv4/ipt_dscp.h> + +#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) +
Index: userspace/extensions/libipt_CONNMARK.c
===================================================================
RCS file: /cvsroot/netfilter/userspace/extensions/libipt_CONNMARK.c,v retrieving revision 1.2
extensions/libipt_CONNMARK.c +1 -0
@@ -146,6 +146,7 @@ } } +static struct iptables_target mark = {NULL ,"CONNMARK" ,
Index: userspace/extensions/libipt_connmark.c
===================================================================
RCS file: /cvsroot/netfilter/userspace/extensions/libipt_connmark.c,v retrieving revision 1.3
extensions/libipt_connmark.c +1 -0
@@ -107,6 +107,7 @@ ((struct ipt_connmark_info *)match->data)->invert, 0); } +static struct iptables_match mark = {NULL ,"connmark" ,
*
//Marcus
Signature · 3 lines
---------------------------------------+-------------------------- Marcus Sundberg <[email protected]> | Firewalls with SIP & NAT Firewall Developer, Ingate Systems AB | http://www.ingate.com/
Harald Welte
AppliedQuoted 3 lines · Marcus Sundberg
Hi,
some fixes to make current CVS compile properly.
thanks, applied.
Quoted 1 line
//Marcus
Signature · 5 lines
Live long and prosper - Harald Welte / [email protected] http://www.gnumonks.org/ ============================================================================ GCS/E/IT d- s-: a-- C+++ UL++++$ P+++ L++++$ E--- W- N++ o? K- w--- O- M+ V-- PS++ PE-- Y++ PGP++ t+ 5-- !X !R tv-- b+++ !DI !D G+ e* h--- r++ y+(*)
Quoted 6 lines · Harald Welte
Quoted 3 lines · Marcus Sundberg
Hi,
some fixes to make current CVS compile properly.
thanks, applied.
Seems I forgot to include the patch for the POOL target in the first mail, so here it comes:
Index: userspace/extensions/libipt_POOL.c
===================================================================
RCS file: /cvsroot/netfilter/userspace/extensions/libipt_POOL.c,v retrieving revision 1.3
extensions/libipt_POOL.c 2 Jun 2002 13:48:14 -0000 renamed from extensions/libipt_POOL.c 29 May 2002 13:08:16 -0000 +3 -0
@@ -15,6 +15,9 @@ #include <libippool/ip_pool_support.h> /* FIXME --RR */ +#define ip_pool_init ip_POOL_init +#define ip_pool_get_index ip_POOL_get_index +#define ip_pool_get_name ip_POOL_get_name #include "../ippool/libippool.c" /* Function which prints out usage message. */
//Marcus
Signature · 3 lines
---------------------------------------+-------------------------- Marcus Sundberg <[email protected]> | Firewalls with SIP & NAT Firewall Developer, Ingate Systems AB | http://www.ingate.com/