diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2007-08-19 07:24:27 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2007-08-19 07:24:27 +0000 |
| commit | 604829009a8dbeebf8233b348ceb01afab9fc957 (patch) | |
| tree | a64f4db2127fcc5c9af55e5bfdddd501e0a08635 | |
| parent | 81d06b14df51f242ae42172ebaf2659b2702cc05 (diff) | |
remove compile warnings
| -rw-r--r-- | arptables.c | 10 | ||||
| -rw-r--r-- | extensions/arpt_mangle.c | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/arptables.c b/arptables.c index cd5688e..d7856ad 100644 --- a/arptables.c +++ b/arptables.c @@ -605,7 +605,7 @@ cmd2char(int option) } static void -add_command(int *cmd, const int newcmd, const int othercmds, int invert) +add_command(unsigned int *cmd, const int newcmd, const unsigned int othercmds, int invert) { if (invert) exit_error(PARAMETER_PROBLEM, "unexpected ! flag"); @@ -1281,8 +1281,8 @@ print_firewall(const struct arpt_entry *fw, printf("%s", fw->arp.invflags & ARPT_INV_SRCDEVADDR ? "! " : ""); printf("--src-mac "); - print_mac_and_mask(fw->arp.src_devaddr.addr, - fw->arp.src_devaddr.mask, ETH_ALEN); + print_mac_and_mask((unsigned char *)fw->arp.src_devaddr.addr, + (unsigned char *)fw->arp.src_devaddr.mask, ETH_ALEN); printf(" "); after_devsrc: @@ -1305,8 +1305,8 @@ after_devsrc: printf("%s",fw->arp.invflags & ARPT_INV_TGTDEVADDR ? "! " : ""); printf("--dst-mac "); - print_mac_and_mask(fw->arp.tgt_devaddr.addr, - fw->arp.tgt_devaddr.mask, ETH_ALEN); + print_mac_and_mask((unsigned char *)fw->arp.tgt_devaddr.addr, + (unsigned char *)fw->arp.tgt_devaddr.mask, ETH_ALEN); printf(" "); after_devdst: diff --git a/extensions/arpt_mangle.c b/extensions/arpt_mangle.c index 3bf44e4..c38fc16 100644 --- a/extensions/arpt_mangle.c +++ b/extensions/arpt_mangle.c @@ -50,6 +50,7 @@ parse(int c, char **argv, int invert, unsigned int *flags, struct arpt_mangle *mangle = (struct arpt_mangle *)(*t)->data; struct in_addr *ipaddr; struct ether_addr *macaddr; + int ret = 1; switch (c) { case MANGLE_IPS: @@ -135,8 +136,12 @@ parse(int c, char **argv, int invert, unsigned int *flags, else exit_error(PARAMETER_PROBLEM, "bad target for " "--mangle-target"); + break; + default: + ret = 0; } - return 0; + + return ret; } static void final_check(unsigned int flags) @@ -158,7 +163,7 @@ static void print(const struct arpt_arp *ip, } if (m->flags & ARPT_MANGLE_SDEV) { printf("--mangle-mac-s "); - print_mac(m->src_devaddr, 6); + print_mac((unsigned char *)m->src_devaddr, 6); printf(" "); } if (m->flags & ARPT_MANGLE_TIP) { @@ -170,7 +175,7 @@ static void print(const struct arpt_arp *ip, } if (m->flags & ARPT_MANGLE_TDEV) { printf("--mangle-mac-d "); - print_mac(m->tgt_devaddr, 6); + print_mac((unsigned char *)m->tgt_devaddr, 6); printf(" "); } if (m->target != NF_ACCEPT) { |