[iptables] src: Update comments

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Mon Sep 1 14:24:27 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=ddac6c5bc636003d664d25c08ea3fe176565096c
commit ddac6c5bc636003d664d25c08ea3fe176565096c
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Mon Sep 1 14:22:19 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Sep 1 14:22:19 2008 +0200

    src: Update comments
    
    A number of comments are redundant, some outdated and others outright
    wrong in their own way. Remove and fixup.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit a2a7f2b531cc582ab6cc3c2b73715ed1d58b9eab
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Mon Sep 1 14:20:13 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Sep 1 14:20:13 2008 +0200

    src: use regular includes
    
    iptables ships with all header files and prioritized its own include
    directory over /usr/include/linux, so just use the normal brackets.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit bfb7e0b84b5d732e378a3fcbb4132fdbd9938766
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Mon Sep 1 14:19:03 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Sep 1 14:19:03 2008 +0200

    libxt_iprange: fix option names
    
    There is no --src-ip, just --src-range. (Same for --dst-range.)
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 161143d88c4c6f8b25ef191971757803dc5c7c2d
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Mon Sep 1 14:18:01 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Sep 1 14:18:01 2008 +0200

    libxt_mac: flatten casts in libxt_mac
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  ddac6c5bc636003d664d25c08ea3fe176565096c (commit)
       via  a2a7f2b531cc582ab6cc3c2b73715ed1d58b9eab (commit)
       via  bfb7e0b84b5d732e378a3fcbb4132fdbd9938766 (commit)
       via  161143d88c4c6f8b25ef191971757803dc5c7c2d (commit)
      from  a47bb4a9fa24db2f3ba6559c9175f3f1144ee74c (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 ddac6c5bc636003d664d25c08ea3fe176565096c
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Sep 1 14:22:19 2008 +0200

    src: Update comments
    
    A number of comments are redundant, some outdated and others outright
    wrong in their own way. Remove and fixup.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit a2a7f2b531cc582ab6cc3c2b73715ed1d58b9eab
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Sep 1 14:20:13 2008 +0200

    src: use regular includes
    
    iptables ships with all header files and prioritized its own include
    directory over /usr/include/linux, so just use the normal brackets.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit bfb7e0b84b5d732e378a3fcbb4132fdbd9938766
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Sep 1 14:19:03 2008 +0200

    libxt_iprange: fix option names
    
    There is no --src-ip, just --src-range. (Same for --dst-range.)
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 161143d88c4c6f8b25ef191971757803dc5c7c2d
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Sep 1 14:18:01 2008 +0200

    libxt_mac: flatten casts in libxt_mac
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

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

 extensions/libip6t_LOG.c        |    8 +-------
 extensions/libip6t_REJECT.c     |   10 +---------
 extensions/libip6t_ah.c         |    8 +-------
 extensions/libip6t_dst.c        |    8 +-------
 extensions/libip6t_eui64.c      |    3 ---
 extensions/libip6t_frag.c       |    8 +-------
 extensions/libip6t_hbh.c        |   10 ++--------
 extensions/libip6t_icmp6.c      |    8 +-------
 extensions/libip6t_ipv6header.c |    4 ----
 extensions/libip6t_policy.c     |    5 ++---
 extensions/libip6t_rt.c         |    8 +-------
 extensions/libipt_CLUSTERIP.c   |    5 +----
 extensions/libipt_DNAT.c        |    6 ------
 extensions/libipt_ECN.c         |    2 --
 extensions/libipt_LOG.c         |    6 ------
 extensions/libipt_MASQUERADE.c  |    6 ------
 extensions/libipt_MIRROR.c      |    3 ---
 extensions/libipt_NETMAP.c      |    8 --------
 extensions/libipt_REDIRECT.c    |    6 ------
 extensions/libipt_REJECT.c      |    8 --------
 extensions/libipt_SAME.c        |    9 +--------
 extensions/libipt_SET.c         |    7 -------
 extensions/libipt_SNAT.c        |    6 ------
 extensions/libipt_ULOG.c        |    8 +-------
 extensions/libipt_ah.c          |    8 +-------
 extensions/libipt_ecn.c         |    2 --
 extensions/libipt_icmp.c        |    6 ------
 extensions/libipt_policy.c      |    2 +-
 extensions/libipt_realm.c       |   10 ----------
 extensions/libipt_recent.c      |   11 +----------
 extensions/libipt_set.c         |    5 -----
 extensions/libipt_unclean.c     |    3 ---
 extensions/libxt_CLASSIFY.c     |    5 -----
 extensions/libxt_CONNMARK.c     |    6 ------
 extensions/libxt_DSCP.c         |    2 --
 extensions/libxt_MARK.c         |    7 -------
 extensions/libxt_NFQUEUE.c      |    2 --
 extensions/libxt_NOTRACK.c      |    3 ---
 extensions/libxt_SECMARK.c      |    5 -----
 extensions/libxt_TCPMSS.c       |    5 -----
 extensions/libxt_TRACE.c        |    3 ---
 extensions/libxt_comment.c      |    5 -----
 extensions/libxt_connbytes.c    |    5 -----
 extensions/libxt_connlimit.c    |    2 +-
 extensions/libxt_connmark.c     |    4 ----
 extensions/libxt_conntrack.c    |    6 ------
 extensions/libxt_dccp.c         |    4 ----
 extensions/libxt_dscp.c         |    2 --
 extensions/libxt_esp.c          |    6 ------
 extensions/libxt_hashlimit.c    |    7 -------
 extensions/libxt_helper.c       |    6 ------
 extensions/libxt_iprange.c      |   32 ++++++++++++++++----------------
 extensions/libxt_length.c       |    7 -------
 extensions/libxt_limit.c        |    8 +-------
 extensions/libxt_mac.c          |   19 ++++++++-----------
 extensions/libxt_mark.c         |    4 ----
 extensions/libxt_multiport.c    |    3 +--
 extensions/libxt_pkttype.c      |    1 -
 extensions/libxt_quota.c        |    4 ----
 extensions/libxt_sctp.c         |    6 +-----
 extensions/libxt_standard.c     |    3 ---
 extensions/libxt_state.c        |    6 ------
 extensions/libxt_statistic.c    |    3 ---
 extensions/libxt_string.c       |    8 --------
 extensions/libxt_tcp.c          |    6 ------
 extensions/libxt_tcpmss.c       |    6 ------
 extensions/libxt_u32.c          |    3 +--
 extensions/libxt_udp.c          |    6 ------
 68 files changed, 46 insertions(+), 371 deletions(-)
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index a842ee9..bc91f0f 100644
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -74,7 +74,7 @@ mac_parse(int c, char **argv, int invert, unsigned int *flags,
 	return 1;
 }
 
-static void print_mac(unsigned char macaddress[ETH_ALEN])
+static void print_mac(const unsigned char macaddress[ETH_ALEN])
 {
 	unsigned int i;
 
@@ -96,22 +96,25 @@ static void mac_check(unsigned int flags)
 static void
 mac_print(const void *ip, const struct xt_entry_match *match, int numeric)
 {
+	const struct xt_mac_info *info = (void *)match->data;
 	printf("MAC ");
 
-	if (((struct xt_mac_info *)match->data)->invert)
+	if (info->invert)
 		printf("! ");
 	
-	print_mac(((struct xt_mac_info *)match->data)->srcaddr);
+	print_mac(info->srcaddr);
 }
 
 /* Saves the union ipt_matchinfo in parsable form to stdout. */
 static void mac_save(const void *ip, const struct xt_entry_match *match)
 {
-	if (((struct xt_mac_info *)match->data)->invert)
+	const struct xt_mac_info *info = (void *)match->data;
+
+	if (info->invert)
 		printf("! ");
 
 	printf("--mac-source ");
-	print_mac(((struct xt_mac_info *)match->data)->srcaddr);
+	print_mac(info->srcaddr);
 }
 
 static struct xtables_match mac_match = {



More information about the netfilter-cvslog mailing list