From 6798c5c9314516533a936fde0be007991a4ebe70 Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Mon, 25 Mar 2013 12:46:43 +0100 Subject: l2tp: Remove some redundant log messages There is no need to warn about missing Challenge when handling SCCRQ comming from a host for which a secret exists: this will be done automatically upon SCCRP generation (by l2tp_tunnel_genchallresp()). Using the log message from l2tp_tunnel_genchallresp() has the advantage of working for missing Challenge AVPs in both SCCRQ and SCCRP messages. This patch also removes a redundant log message in l2tp_session_recv() when handling unknown message types. Signed-off-by: Guillaume Nault --- accel-pppd/ctrl/l2tp/l2tp.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'accel-pppd') diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 0a1d2c60..3ac6ba70 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -1982,11 +1982,6 @@ static int l2tp_recv_SCCRQ(const struct l2tp_serv_t *serv, return -1; } - if (conf_secret && strlen(conf_secret) > 0 && conn->challenge == NULL) { - if (conf_verbose) - log_warn("l2tp: SCCRQ: no Challenge present in message\n"); - } - return 0; } @@ -2882,10 +2877,6 @@ static void l2tp_session_recv(void *data) l2tp_recv_CDN(sess, pack); break; default: - if (conf_verbose) { - log_warn("l2tp: unexpected Message-Type %hu\n", - msg_type->val.uint16); - } if (msg_type->M) { log_session(log_error, sess, "impossible to handle unknown message type" -- cgit v1.2.3