Attachment #187699 for bug #265460

View | Details | Raw Unified | Return to bug 265460 | Differences between
Collapse All | Expand All




    switch (c) {
	case '1':		/*cmd: ipp2p*/
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified once!");
/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p-data' may only be "
				"specified alone!");*/
	    if ((*flags) != 0)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
	    *flags += SHORT_HAND_IPP2P;
	    info->cmd = *flags;
	    break;
	    
	case '2':		/*cmd: edk*/
	    if ((*flags & IPP2P_EDK) == IPP2P_EDK)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--edk' may only be "
				"specified once");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p-data' may only be "
				"specified alone!");*/
            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
	    *flags += IPP2P_EDK;
	    info->cmd = *flags;	    
	    break;


	case '7':		/*cmd: dc*/
            if ((*flags & IPP2P_DC) == IPP2P_DC)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--dc' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p-data' may only be "
				"specified alone!");*/
            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_DC;
	    info->cmd = *flags;
	    break;


	case '9':		/*cmd: gnu*/
            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--gnu' may only be "
                                "specified once!");
/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p-data' may only be "
				"specified alone!");*/
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
            if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_GNU;
	    info->cmd = *flags;
	    break;

	case 'a':		/*cmd: kazaa*/
            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--kazaa' may only be "
                                "specified once!");
/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p-data' may only be "
				"specified alone!");*/
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
            if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_KAZAA;
	    info->cmd = *flags;
	    break;																											

	case 'b':		/*cmd: bit*/
            if ((*flags & IPP2P_BIT) == IPP2P_BIT)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--bit' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_BIT;
	    info->cmd = *flags;
	    break;																											

	case 'c':		/*cmd: apple*/
            if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--apple' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_APPLE;
	    info->cmd = *flags;
	    break;																											


	case 'd':		/*cmd: soul*/
            if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--soul' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_SOUL;
	    info->cmd = *flags;
	    break;																											


	case 'e':		/*cmd: winmx*/
            if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--winmx' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_WINMX;
	    info->cmd = *flags;
	    break;																											

	case 'f':		/*cmd: ares*/
            if ((*flags & IPP2P_ARES) == IPP2P_ARES)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--ares' may only be "
                                "specified once!");
	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
		    xtables_error(PARAMETER_PROBLEM,
				"ipp2p: `--ipp2p' may only be "
				"specified alone!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_ARES;
	    info->cmd = *flags;
	    break;																											
	
	case 'g':		/*cmd: mute*/
            if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--mute' may only be "
                                "specified once!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_MUTE;
	    info->cmd = *flags;
	    break;																											
	case 'h':		/*cmd: waste*/
            if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--waste' may only be "
                                "specified once!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_WASTE;
	    info->cmd = *flags;
	    break;																											
	case 'i':		/*cmd: xdcc*/
            if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
            xtables_error(PARAMETER_PROBLEM,
                                "ipp2p: `--ares' may only be "
                                "specified once!");
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
            *flags += IPP2P_XDCC;
	    info->cmd = *flags;
	    break;																											

	case 'j':		/*cmd: debug*/
	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
	    info->debug = 1;
	    break;																											

	default:
//            xtables_error(PARAMETER_PROBLEM,
//	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
	    return 0;
    }

final_check(unsigned int flags)
{
    if (!flags)
            xtables_error(PARAMETER_PROBLEM,
	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
}


Return to bug 265460

Lines 88-126 Link Here

(-)libipt_ipp2p.c.old (-48 / +48 lines)
88	switch (c) {	88	switch (c) {
89	case '1': /cmd: ipp2p/	89	case '1': /cmd: ipp2p/
90	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	90	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
91	exit_error(PARAMETER_PROBLEM,	91	xtables_error(PARAMETER_PROBLEM,
92	"ipp2p: `--ipp2p' may only be "	92	"ipp2p: `--ipp2p' may only be "
93	"specified once!");	93	"specified once!");
94	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)	94	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
95	exit_error(PARAMETER_PROBLEM,	95	xtables_error(PARAMETER_PROBLEM,
96	"ipp2p: `--ipp2p-data' may only be "	96	"ipp2p: `--ipp2p-data' may only be "
97	"specified alone!");*/	97	"specified alone!");*/
98	if ((*flags) != 0)	98	if ((*flags) != 0)
99	exit_error(PARAMETER_PROBLEM,	99	xtables_error(PARAMETER_PROBLEM,
100	"ipp2p: `--ipp2p' may only be "	100	"ipp2p: `--ipp2p' may only be "
101	"specified alone!");	101	"specified alone!");
102	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	102	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
103	*flags += SHORT_HAND_IPP2P;	103	*flags += SHORT_HAND_IPP2P;
104	info->cmd = *flags;	104	info->cmd = *flags;
105	break;	105	break;
106		106
107	case '2': /cmd: edk/	107	case '2': /cmd: edk/
108	if ((*flags & IPP2P_EDK) == IPP2P_EDK)	108	if ((*flags & IPP2P_EDK) == IPP2P_EDK)
109	exit_error(PARAMETER_PROBLEM,	109	xtables_error(PARAMETER_PROBLEM,
110	"ipp2p: `--edk' may only be "	110	"ipp2p: `--edk' may only be "
111	"specified once");	111	"specified once");
112	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	112	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
113	exit_error(PARAMETER_PROBLEM,	113	xtables_error(PARAMETER_PROBLEM,
114	"ipp2p: `--ipp2p' may only be "	114	"ipp2p: `--ipp2p' may only be "
115	"specified alone!");	115	"specified alone!");
116	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)	116	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
117	exit_error(PARAMETER_PROBLEM,	117	xtables_error(PARAMETER_PROBLEM,
118	"ipp2p: `--ipp2p-data' may only be "	118	"ipp2p: `--ipp2p-data' may only be "
119	"specified alone!");*/	119	"specified alone!");*/
120	if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)	120	if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
121	exit_error(PARAMETER_PROBLEM,	121	xtables_error(PARAMETER_PROBLEM,
122	"ipp2p: use `--edk' OR `--edk-data' but not both of them!");	122	"ipp2p: use `--edk' OR `--edk-data' but not both of them!");
123	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	123	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
124	*flags += IPP2P_EDK;	124	*flags += IPP2P_EDK;
125	info->cmd = *flags;	125	info->cmd = *flags;
126	break;	126	break;
Lines 128-148 Link Here
128		128
129	case '7': /cmd: dc/	129	case '7': /cmd: dc/
130	if ((*flags & IPP2P_DC) == IPP2P_DC)	130	if ((*flags & IPP2P_DC) == IPP2P_DC)
131	exit_error(PARAMETER_PROBLEM,	131	xtables_error(PARAMETER_PROBLEM,
132	"ipp2p: `--dc' may only be "	132	"ipp2p: `--dc' may only be "
133	"specified once!");	133	"specified once!");
134	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	134	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
135	exit_error(PARAMETER_PROBLEM,	135	xtables_error(PARAMETER_PROBLEM,
136	"ipp2p: `--ipp2p' may only be "	136	"ipp2p: `--ipp2p' may only be "
137	"specified alone!");	137	"specified alone!");
138	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)	138	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
139	exit_error(PARAMETER_PROBLEM,	139	xtables_error(PARAMETER_PROBLEM,
140	"ipp2p: `--ipp2p-data' may only be "	140	"ipp2p: `--ipp2p-data' may only be "
141	"specified alone!");*/	141	"specified alone!");*/
142	if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)	142	if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
143	exit_error(PARAMETER_PROBLEM,	143	xtables_error(PARAMETER_PROBLEM,
144	"ipp2p: use `--dc' OR `--dc-data' but not both of them!");	144	"ipp2p: use `--dc' OR `--dc-data' but not both of them!");
145	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	145	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
146	*flags += IPP2P_DC;	146	*flags += IPP2P_DC;
147	info->cmd = *flags;	147	info->cmd = *flags;
148	break;	148	break;
Lines 150-219 Link Here
150		150
151	case '9': /cmd: gnu/	151	case '9': /cmd: gnu/
152	if ((*flags & IPP2P_GNU) == IPP2P_GNU)	152	if ((*flags & IPP2P_GNU) == IPP2P_GNU)
153	exit_error(PARAMETER_PROBLEM,	153	xtables_error(PARAMETER_PROBLEM,
154	"ipp2p: `--gnu' may only be "	154	"ipp2p: `--gnu' may only be "
155	"specified once!");	155	"specified once!");
156	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)	156	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
157	exit_error(PARAMETER_PROBLEM,	157	xtables_error(PARAMETER_PROBLEM,
158	"ipp2p: `--ipp2p-data' may only be "	158	"ipp2p: `--ipp2p-data' may only be "
159	"specified alone!");*/	159	"specified alone!");*/
160	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	160	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
161	exit_error(PARAMETER_PROBLEM,	161	xtables_error(PARAMETER_PROBLEM,
162	"ipp2p: `--ipp2p' may only be "	162	"ipp2p: `--ipp2p' may only be "
163	"specified alone!");	163	"specified alone!");
164	if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)	164	if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
165	exit_error(PARAMETER_PROBLEM,	165	xtables_error(PARAMETER_PROBLEM,
166	"ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");	166	"ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
167	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	167	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
168	*flags += IPP2P_GNU;	168	*flags += IPP2P_GNU;
169	info->cmd = *flags;	169	info->cmd = *flags;
170	break;	170	break;
171		171
172	case 'a': /cmd: kazaa/	172	case 'a': /cmd: kazaa/
173	if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)	173	if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
174	exit_error(PARAMETER_PROBLEM,	174	xtables_error(PARAMETER_PROBLEM,
175	"ipp2p: `--kazaa' may only be "	175	"ipp2p: `--kazaa' may only be "
176	"specified once!");	176	"specified once!");
177	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)	177	/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
178	exit_error(PARAMETER_PROBLEM,	178	xtables_error(PARAMETER_PROBLEM,
179	"ipp2p: `--ipp2p-data' may only be "	179	"ipp2p: `--ipp2p-data' may only be "
180	"specified alone!");*/	180	"specified alone!");*/
181	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	181	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
182	exit_error(PARAMETER_PROBLEM,	182	xtables_error(PARAMETER_PROBLEM,
183	"ipp2p: `--ipp2p' may only be "	183	"ipp2p: `--ipp2p' may only be "
184	"specified alone!");	184	"specified alone!");
185	if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)	185	if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
186	exit_error(PARAMETER_PROBLEM,	186	xtables_error(PARAMETER_PROBLEM,
187	"ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");	187	"ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
188	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	188	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
189	*flags += IPP2P_KAZAA;	189	*flags += IPP2P_KAZAA;
190	info->cmd = *flags;	190	info->cmd = *flags;
191	break;	191	break;
192		192
193	case 'b': /cmd: bit/	193	case 'b': /cmd: bit/
194	if ((*flags & IPP2P_BIT) == IPP2P_BIT)	194	if ((*flags & IPP2P_BIT) == IPP2P_BIT)
195	exit_error(PARAMETER_PROBLEM,	195	xtables_error(PARAMETER_PROBLEM,
196	"ipp2p: `--bit' may only be "	196	"ipp2p: `--bit' may only be "
197	"specified once!");	197	"specified once!");
198	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	198	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
199	exit_error(PARAMETER_PROBLEM,	199	xtables_error(PARAMETER_PROBLEM,
200	"ipp2p: `--ipp2p' may only be "	200	"ipp2p: `--ipp2p' may only be "
201	"specified alone!");	201	"specified alone!");
202	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	202	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
203	*flags += IPP2P_BIT;	203	*flags += IPP2P_BIT;
204	info->cmd = *flags;	204	info->cmd = *flags;
205	break;	205	break;
206		206
207	case 'c': /cmd: apple/	207	case 'c': /cmd: apple/
208	if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)	208	if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
209	exit_error(PARAMETER_PROBLEM,	209	xtables_error(PARAMETER_PROBLEM,
210	"ipp2p: `--apple' may only be "	210	"ipp2p: `--apple' may only be "
211	"specified once!");	211	"specified once!");
212	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	212	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
213	exit_error(PARAMETER_PROBLEM,	213	xtables_error(PARAMETER_PROBLEM,
214	"ipp2p: `--ipp2p' may only be "	214	"ipp2p: `--ipp2p' may only be "
215	"specified alone!");	215	"specified alone!");
216	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	216	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
217	*flags += IPP2P_APPLE;	217	*flags += IPP2P_APPLE;
218	info->cmd = *flags;	218	info->cmd = *flags;
219	break;	219	break;
Lines 221-234 Link Here
221		221
222	case 'd': /cmd: soul/	222	case 'd': /cmd: soul/
223	if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)	223	if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
224	exit_error(PARAMETER_PROBLEM,	224	xtables_error(PARAMETER_PROBLEM,
225	"ipp2p: `--soul' may only be "	225	"ipp2p: `--soul' may only be "
226	"specified once!");	226	"specified once!");
227	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	227	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
228	exit_error(PARAMETER_PROBLEM,	228	xtables_error(PARAMETER_PROBLEM,
229	"ipp2p: `--ipp2p' may only be "	229	"ipp2p: `--ipp2p' may only be "
230	"specified alone!");	230	"specified alone!");
231	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	231	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
232	*flags += IPP2P_SOUL;	232	*flags += IPP2P_SOUL;
233	info->cmd = *flags;	233	info->cmd = *flags;
234	break;	234	break;
Lines 236-302 Link Here
236		236
237	case 'e': /cmd: winmx/	237	case 'e': /cmd: winmx/
238	if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)	238	if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
239	exit_error(PARAMETER_PROBLEM,	239	xtables_error(PARAMETER_PROBLEM,
240	"ipp2p: `--winmx' may only be "	240	"ipp2p: `--winmx' may only be "
241	"specified once!");	241	"specified once!");
242	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	242	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
243	exit_error(PARAMETER_PROBLEM,	243	xtables_error(PARAMETER_PROBLEM,
244	"ipp2p: `--ipp2p' may only be "	244	"ipp2p: `--ipp2p' may only be "
245	"specified alone!");	245	"specified alone!");
246	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	246	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
247	*flags += IPP2P_WINMX;	247	*flags += IPP2P_WINMX;
248	info->cmd = *flags;	248	info->cmd = *flags;
249	break;	249	break;
250		250
251	case 'f': /cmd: ares/	251	case 'f': /cmd: ares/
252	if ((*flags & IPP2P_ARES) == IPP2P_ARES)	252	if ((*flags & IPP2P_ARES) == IPP2P_ARES)
253	exit_error(PARAMETER_PROBLEM,	253	xtables_error(PARAMETER_PROBLEM,
254	"ipp2p: `--ares' may only be "	254	"ipp2p: `--ares' may only be "
255	"specified once!");	255	"specified once!");
256	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)	256	if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
257	exit_error(PARAMETER_PROBLEM,	257	xtables_error(PARAMETER_PROBLEM,
258	"ipp2p: `--ipp2p' may only be "	258	"ipp2p: `--ipp2p' may only be "
259	"specified alone!");	259	"specified alone!");
260	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	260	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
261	*flags += IPP2P_ARES;	261	*flags += IPP2P_ARES;
262	info->cmd = *flags;	262	info->cmd = *flags;
263	break;	263	break;
264		264
265	case 'g': /cmd: mute/	265	case 'g': /cmd: mute/
266	if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)	266	if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
267	exit_error(PARAMETER_PROBLEM,	267	xtables_error(PARAMETER_PROBLEM,
268	"ipp2p: `--mute' may only be "	268	"ipp2p: `--mute' may only be "
269	"specified once!");	269	"specified once!");
270	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	270	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
271	*flags += IPP2P_MUTE;	271	*flags += IPP2P_MUTE;
272	info->cmd = *flags;	272	info->cmd = *flags;
273	break;	273	break;
274	case 'h': /cmd: waste/	274	case 'h': /cmd: waste/
275	if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)	275	if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
276	exit_error(PARAMETER_PROBLEM,	276	xtables_error(PARAMETER_PROBLEM,
277	"ipp2p: `--waste' may only be "	277	"ipp2p: `--waste' may only be "
278	"specified once!");	278	"specified once!");
279	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	279	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
280	*flags += IPP2P_WASTE;	280	*flags += IPP2P_WASTE;
281	info->cmd = *flags;	281	info->cmd = *flags;
282	break;	282	break;
283	case 'i': /cmd: xdcc/	283	case 'i': /cmd: xdcc/
284	if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)	284	if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
285	exit_error(PARAMETER_PROBLEM,	285	xtables_error(PARAMETER_PROBLEM,
286	"ipp2p: `--ares' may only be "	286	"ipp2p: `--ares' may only be "
287	"specified once!");	287	"specified once!");
288	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	288	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
289	*flags += IPP2P_XDCC;	289	*flags += IPP2P_XDCC;
290	info->cmd = *flags;	290	info->cmd = *flags;
291	break;	291	break;
292		292
293	case 'j': /cmd: debug/	293	case 'j': /cmd: debug/
294	if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");	294	if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
295	info->debug = 1;	295	info->debug = 1;
296	break;	296	break;
297		297
298	default:	298	default:
299	// exit_error(PARAMETER_PROBLEM,	299	// xtables_error(PARAMETER_PROBLEM,
300	// "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");	300	// "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
301	return 0;	301	return 0;
302	}	302	}
Lines 308-314 Link Here
308	final_check(unsigned int flags)	308	final_check(unsigned int flags)
309	{	309	{
310	if (!flags)	310	if (!flags)
311	exit_error(PARAMETER_PROBLEM,	311	xtables_error(PARAMETER_PROBLEM,
312	"\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");	312	"\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
313	}	313	}
314		314