From: Josh G. <ja...@us...> - 2004-09-08 09:20:19
|
Update of /cvsroot/iptables-p2p/iptables-p2p/iptables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11613 Modified Files: libipt_p2p.c Log Message: more formatting corrections Index: libipt_p2p.c =================================================================== RCS file: /cvsroot/iptables-p2p/iptables-p2p/iptables/libipt_p2p.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- libipt_p2p.c 12 Mar 2004 20:08:32 -0000 1.17 +++ libipt_p2p.c 8 Sep 2004 09:20:10 -0000 1.18 @@ -33,7 +33,6 @@ const char *name; int proto; } - protomap[] = { { "all", IPT_P2P_PROTO_ALL }, @@ -69,18 +68,18 @@ static struct iptables_match p2p = { - NULL, - "p2p", - IPTABLES_VERSION, - IPT_ALIGN(sizeof(struct ipt_p2p_info)), - IPT_ALIGN(sizeof(struct ipt_p2p_info)), - &help, - &init, - &parse, - &final_check, - &print, - &save, - opts + NULL, + "p2p", + IPTABLES_VERSION, + IPT_ALIGN(sizeof(struct ipt_p2p_info)), + IPT_ALIGN(sizeof(struct ipt_p2p_info)), + &help, + &init, + &parse, + &final_check, + &print, + &save, + opts }; /*****************************************************************************/ @@ -197,7 +196,7 @@ if (arg[0] == '\0') break; - /* Move beyond the ','. */ + /* Move beyond the comma. */ arg++; } @@ -213,10 +212,11 @@ buflen = 0; buf[buflen] = '\0'; - if (proto == IPT_P2P_PROTO_ALL) { - strcpy(buf, "all"); - return buf; - } + if (proto == IPT_P2P_PROTO_ALL) + { + strcpy(buf, "all"); + return buf; + } for (i = 0; i < PROTOMAP_NELEM; i++) { @@ -245,7 +245,8 @@ } /* Parses command options; returns true if it ate an option. */ -static int parse(int c, char **argv, int invert, unsigned int *flags, +static int parse(int c, + char **argv, int invert, unsigned int *flags, const struct ipt_entry *entry, unsigned int *nfcache, struct ipt_entry_match **match) |