aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2006-09-13 22:59:23 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-18 02:21:06 -0400
commitb552216ff1340a056aa0e12da68203902ae81d2c (patch)
tree1cf2732adbd019bd261140ac8ba58e0dce4df34b /net/ipv4
parent3f5af5b353ca36aca4f8a46e3da2172f669dbbbc (diff)
[IPVS]: remove the debug option go ip_vs_ftp
This patch makes the debuging behaviour of this code more consistent with the rest of IPVS. Signed-Off-By: Simon Horman <horms@verge.net.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ipvs/ip_vs_ftp.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c
index f0c553c038de..37fafb1fbcff 100644
--- a/net/ipv4/ipvs/ip_vs_ftp.c
+++ b/net/ipv4/ipvs/ip_vs_ftp.c
@@ -48,14 +48,6 @@ static int ports[IP_VS_APP_MAX_PORTS] = {21, 0};
48module_param_array(ports, int, NULL, 0); 48module_param_array(ports, int, NULL, 0);
49MODULE_PARM_DESC(ports, "Ports to monitor for FTP control commands"); 49MODULE_PARM_DESC(ports, "Ports to monitor for FTP control commands");
50 50
51/*
52 * Debug level
53 */
54#ifdef CONFIG_IP_VS_DEBUG
55static int debug=0;
56module_param(debug, int, 0);
57#endif
58
59 51
60/* Dummy variable */ 52/* Dummy variable */
61static int ip_vs_ftp_pasv; 53static int ip_vs_ftp_pasv;
@@ -178,7 +170,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
178 &start, &end) != 1) 170 &start, &end) != 1)
179 return 1; 171 return 1;
180 172
181 IP_VS_DBG(1-debug, "PASV response (%u.%u.%u.%u:%d) -> " 173 IP_VS_DBG(7, "PASV response (%u.%u.%u.%u:%d) -> "
182 "%u.%u.%u.%u:%d detected\n", 174 "%u.%u.%u.%u:%d detected\n",
183 NIPQUAD(from), ntohs(port), NIPQUAD(cp->caddr), 0); 175 NIPQUAD(from), ntohs(port), NIPQUAD(cp->caddr), 0);
184 176
@@ -281,7 +273,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
281 while (data <= data_limit - 6) { 273 while (data <= data_limit - 6) {
282 if (strnicmp(data, "PASV\r\n", 6) == 0) { 274 if (strnicmp(data, "PASV\r\n", 6) == 0) {
283 /* Passive mode on */ 275 /* Passive mode on */
284 IP_VS_DBG(1-debug, "got PASV at %zd of %zd\n", 276 IP_VS_DBG(7, "got PASV at %zd of %zd\n",
285 data - data_start, 277 data - data_start,
286 data_limit - data_start); 278 data_limit - data_start);
287 cp->app_data = &ip_vs_ftp_pasv; 279 cp->app_data = &ip_vs_ftp_pasv;
@@ -303,7 +295,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
303 &start, &end) != 1) 295 &start, &end) != 1)
304 return 1; 296 return 1;
305 297
306 IP_VS_DBG(1-debug, "PORT %u.%u.%u.%u:%d detected\n", 298 IP_VS_DBG(7, "PORT %u.%u.%u.%u:%d detected\n",
307 NIPQUAD(to), ntohs(port)); 299 NIPQUAD(to), ntohs(port));
308 300
309 /* Passive mode off */ 301 /* Passive mode off */
@@ -312,7 +304,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
312 /* 304 /*
313 * Now update or create a connection entry for it 305 * Now update or create a connection entry for it
314 */ 306 */
315 IP_VS_DBG(1-debug, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n", 307 IP_VS_DBG(7, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n",
316 ip_vs_proto_name(iph->protocol), 308 ip_vs_proto_name(iph->protocol),
317 NIPQUAD(to), ntohs(port), NIPQUAD(cp->vaddr), 0); 309 NIPQUAD(to), ntohs(port), NIPQUAD(cp->vaddr), 0);
318 310
@@ -382,8 +374,8 @@ static int __init ip_vs_ftp_init(void)
382 ret = register_ip_vs_app_inc(app, app->protocol, ports[i]); 374 ret = register_ip_vs_app_inc(app, app->protocol, ports[i]);
383 if (ret) 375 if (ret)
384 break; 376 break;
385 IP_VS_DBG(1-debug, "%s: loaded support on port[%d] = %d\n", 377 IP_VS_INFO("%s: loaded support on port[%d] = %d\n",
386 app->name, i, ports[i]); 378 app->name, i, ports[i]);
387 } 379 }
388 380
389 if (ret) 381 if (ret)