[conntrack-tools] config: obsolete `ListenTo' clause

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Fri Mar 20 17:22:38 CET 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=899785226af55b1c09b2b4d57345da2e07e5f729
commit 899785226af55b1c09b2b4d57345da2e07e5f729
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Mar 20 17:21:44 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Mar 20 17:21:44 2009 +0100

    config: obsolete `ListenTo' clause
    
    This patch obsoletes the `ListenTo' clause which is a reminiscent
    of the intial event filtering code.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  899785226af55b1c09b2b4d57345da2e07e5f729 (commit)
      from  16e6a01a6454dc791b7af593390616b4a29724c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 899785226af55b1c09b2b4d57345da2e07e5f729
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Mar 20 17:21:44 2009 +0100

    config: obsolete `ListenTo' clause
    
    This patch obsoletes the `ListenTo' clause which is a reminiscent
    of the intial event filtering code.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 include/conntrackd.h |    2 --
 src/read_config_yy.y |   26 ++------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
This patch obsoletes the `ListenTo' clause which is a reminiscent
of the intial event filtering code.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/include/conntrackd.h b/include/conntrackd.h
index 3411eb0..83f4e24 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -86,8 +86,6 @@ struct ct_conf {
 	unsigned int netlink_buffer_size;
 	unsigned int netlink_buffer_size_max_grown;
 	int nl_overrun_resync;
-	union inet_address *listen_to;
-	unsigned int listen_to_len;
 	unsigned int flags;
 	int family;			/* protocol family */
 	unsigned int resend_queue_size; /* FTFW protocol */
diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index 4e60d95..8ed000f 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -730,30 +730,8 @@ delay_destroy_msgs: T_DELAY
 
 listen_to: T_LISTEN_TO T_IP
 {
-	union inet_address addr;
-
-#ifdef HAVE_INET_PTON_IPV6
-	if (inet_pton(AF_INET6, $2, &addr.ipv6) <= 0)
-#endif
-		if (inet_aton($2, &addr.ipv4) <= 0) {
-			fprintf(stderr, "%s is not a valid IP address\n", $2);
-			exit(EXIT_FAILURE);
-		}
-
-	if (CONFIG(listen_to_len) == 0 || CONFIG(listen_to_len) % 16) {
-		CONFIG(listen_to) = realloc(CONFIG(listen_to),
-					    sizeof(union inet_address) *
-					    (CONFIG(listen_to_len) + 16));
-		if (CONFIG(listen_to) == NULL) {
-			fprintf(stderr, "cannot init listen_to array\n");
-			exit(EXIT_FAILURE);
-		}
-
-		memset(CONFIG(listen_to) + 
-		       (CONFIG(listen_to_len) * sizeof(union inet_address)),
-		       0, sizeof(union inet_address) * 16);
-
-	}
+	fprintf(stderr, "WARNING: The clause `ListenTo' is obsolete, "
+			"ignoring.\n");
 };
 
 state_replication: T_REPLICATE states T_FOR state_proto



More information about the netfilter-cvslog mailing list