1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00

Cedar/Proto_OpenVPN.c: remove redundant log messages

The "session created" and "session deleted" messages were useful when a single OPENVPN_SERVER object handled multiple UDP sessions.

Now that each session has its own OPENVPN_SERVER object and session creations/deletions are logged by PROTO, the messages are redundant.

In future we will change the OpenVPN implementation so that the multi-session handling code is deleted.

The messages were like this:

OpenVPN Module: The OpenVPN Server Module is starting.
OpenVPN Session 1 (192.168.122.211:47390 -> 0.0.0.0:1194): A new session is created. Protocol: UDP

OpenVPN Session 1 (192.168.122.211:47390 -> 0.0.0.0:1194): Deleting the session.
OpenVPN Module: The OpenVPN Server Module is stopped.
This commit is contained in:
Davide Beatrici 2020-08-06 03:28:08 +02:00
parent cda0062367
commit 5d782a67b4
8 changed files with 0 additions and 35 deletions

View File

@ -2139,8 +2139,6 @@ OPENVPN_SESSION *OvsNewSession(OPENVPN_SERVER *s, IP *server_ip, UINT server_por
Debug("OpenVPN New Session: %s:%u -> %s:%u Proto=%u\n", server_ip_str, server_port, Debug("OpenVPN New Session: %s:%u -> %s:%u Proto=%u\n", server_ip_str, server_port,
client_ip_str, client_port, protocol); client_ip_str, client_port, protocol);
OvsLog(s, se, NULL, "LO_NEW_SESSION", (protocol == OPENVPN_PROTOCOL_UDP ? "UDP" : "TCP"));
return se; return se;
} }
@ -2777,7 +2775,6 @@ void OvsRecvPacket(OPENVPN_SERVER *s, LIST *recv_packet_list, UINT protocol)
OPENVPN_SESSION *se = LIST_DATA(delete_session_list, i); OPENVPN_SESSION *se = LIST_DATA(delete_session_list, i);
Debug("Deleting Session %p\n", se); Debug("Deleting Session %p\n", se);
OvsLog(s, se, NULL, "LO_DELETE_SESSION");
OvsFreeSession(se); OvsFreeSession(se);
@ -2982,8 +2979,6 @@ OPENVPN_SERVER *NewOpenVpnServer(const LIST *options, CEDAR *cedar, INTERRUPT_MA
s->NextSessionId = 1; s->NextSessionId = 1;
OvsLog(s, NULL, NULL, "LO_START");
s->Dh = DhNewFromBits(cedar->DhParamBits); s->Dh = DhNewFromBits(cedar->DhParamBits);
return s; return s;
@ -2999,8 +2994,6 @@ void FreeOpenVpnServer(OPENVPN_SERVER *s)
return; return;
} }
OvsLog(s, NULL, NULL, "LO_STOP");
// Release the sessions list // Release the sessions list
for (i = 0; i < LIST_NUM(s->SessionList); ++i) for (i = 0; i < LIST_NUM(s->SessionList); ++i)
{ {

View File

@ -1827,15 +1827,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certif
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND 发送选项字符串:"%S" LO_OPTION_STR_SEND 发送选项字符串:"%S"
LO_NEW_SESSION 已创建新的会话。协议:%S
LO_INITIATE_REKEY re-keying 进程已开始。 LO_INITIATE_REKEY re-keying 进程已开始。
LO_CHANNEL_ESTABLISHED 该通道成为已建立的状态。 LO_CHANNEL_ESTABLISHED 该通道成为已建立的状态。
LO_PUSH_REPLY 完整字符串回答:"%S" LO_PUSH_REPLY 完整字符串回答:"%S"
LO_CHANNEL_FAILED 无法连接通道。 LO_CHANNEL_FAILED 无法连接通道。
LO_CHANNEL_DISCONNECTED_BY_HUB 此 OpenVPN 的通道被终止,因为虚拟 HUB 管理员断开了此 VPN 会话。 LO_CHANNEL_DISCONNECTED_BY_HUB 此 OpenVPN 的通道被终止,因为虚拟 HUB 管理员断开了此 VPN 会话。
LO_DELETE_SESSION 删除会话中。
LO_START OpenVPN Server 模块正在启动。
LO_STOP OpenVPN Server 模块已停止。
# (IPsec 日志) # (IPsec 日志)

View File

@ -1810,15 +1810,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certif
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND Option Strings to Send: "%S" LO_OPTION_STR_SEND Option Strings to Send: "%S"
LO_NEW_SESSION A new session is created. Protocol: %S
LO_INITIATE_REKEY The re-keying process is started. LO_INITIATE_REKEY The re-keying process is started.
LO_CHANNEL_ESTABLISHED The channel becomes the established state. LO_CHANNEL_ESTABLISHED The channel becomes the established state.
LO_PUSH_REPLY The full strings replied: "%S" LO_PUSH_REPLY The full strings replied: "%S"
LO_CHANNEL_FAILED Failed to connect a channel. LO_CHANNEL_FAILED Failed to connect a channel.
LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session. LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session.
LO_DELETE_SESSION Deleting the session.
LO_START The OpenVPN Server Module is starting.
LO_STOP The OpenVPN Server Module is stopped.
# (IPsec Logs) # (IPsec Logs)

View File

@ -1812,15 +1812,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certif
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND 送信するオプション文字列: "%S" LO_OPTION_STR_SEND 送信するオプション文字列: "%S"
LO_NEW_SESSION 新しいセッションを作成しました。プロトコル: %S
LO_INITIATE_REKEY このチャネルのリキーを開始します。 LO_INITIATE_REKEY このチャネルのリキーを開始します。
LO_CHANNEL_ESTABLISHED チャネルが確立状態になりました。 LO_CHANNEL_ESTABLISHED チャネルが確立状態になりました。
LO_PUSH_REPLY 応答オプション文字列の全文: "%S" LO_PUSH_REPLY 応答オプション文字列の全文: "%S"
LO_CHANNEL_FAILED チャネルの接続処理に失敗しました。 LO_CHANNEL_FAILED チャネルの接続処理に失敗しました。
LO_CHANNEL_DISCONNECTED_BY_HUB 仮想 HUB の管理者によって VPN セッションが切断されたため、この OpenVPN チャネルを切断します。 LO_CHANNEL_DISCONNECTED_BY_HUB 仮想 HUB の管理者によって VPN セッションが切断されたため、この OpenVPN チャネルを切断します。
LO_DELETE_SESSION セッションを削除します。
LO_START OpenVPN サーバーモジュールを起動しました。
LO_STOP OpenVPN サーバーモジュールを停止しました。
# (IPsec ログ) # (IPsec ログ)

View File

@ -1792,15 +1792,11 @@ LO_NEW_CHANNEL 새로운 채널을 만들었습니다.
LO_CHANNEL_ESTABLISHED_NEWKEY 채널이 설정 상태가되었습니다 (원인:리키 완료). LO_CHANNEL_ESTABLISHED_NEWKEY 채널이 설정 상태가되었습니다 (원인:리키 완료).
LO_OPTION_STR_RECV 받은 옵션 문자열:"%S" LO_OPTION_STR_RECV 받은 옵션 문자열:"%S"
LO_OPTION_STR_SEND 보내는 옵션 문자열:"%S" LO_OPTION_STR_SEND 보내는 옵션 문자열:"%S"
LO_NEW_SESSION 새 세션을 만들었습니다. 프로토콜:%S
LO_INITIATE_REKEY 이 채널의 리키를 시작합니다. LO_INITIATE_REKEY 이 채널의 리키를 시작합니다.
LO_CHANNEL_ESTABLISHED 채널이 설정 상태가되었습니다 . LO_CHANNEL_ESTABLISHED 채널이 설정 상태가되었습니다 .
LO_PUSH_REPLY 응답 옵션 문자열 전체:"%S" LO_PUSH_REPLY 응답 옵션 문자열 전체:"%S"
LO_CHANNEL_FAILED 채널의 접속 처리에 실패했습니다. LO_CHANNEL_FAILED 채널의 접속 처리에 실패했습니다.
LO_CHANNEL_DISCONNECTED_BY_HUB 가상 HUB 관리자가 VPN 세션이 끊어 졌기 때문에이 OpenVPN 채널을 끊습니다. LO_CHANNEL_DISCONNECTED_BY_HUB 가상 HUB 관리자가 VPN 세션이 끊어 졌기 때문에이 OpenVPN 채널을 끊습니다.
LO_DELETE_SESSION 세션을 삭제합니다.
LO_START OpenVPN 서버 모듈을 시작했습니다.
LO_STOP OpenVPN 서버 모듈을 중지했습니다.
# IPsec (로그) # IPsec (로그)

View File

@ -1810,15 +1810,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certific
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND Option Strings to Send: "%S" LO_OPTION_STR_SEND Option Strings to Send: "%S"
LO_NEW_SESSION A new session is created. Protocol: %S
LO_INITIATE_REKEY The re-keying process is started. LO_INITIATE_REKEY The re-keying process is started.
LO_CHANNEL_ESTABLISHED The channel becomes the established state. LO_CHANNEL_ESTABLISHED The channel becomes the established state.
LO_PUSH_REPLY The full strings replied: "%S" LO_PUSH_REPLY The full strings replied: "%S"
LO_CHANNEL_FAILED Failed to connect a channel. LO_CHANNEL_FAILED Failed to connect a channel.
LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session. LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session.
LO_DELETE_SESSION Deleting the session.
LO_START The OpenVPN Server Module is starting.
LO_STOP The OpenVPN Server Module is stopped.
# (IPsec Logs) # (IPsec Logs)

View File

@ -1810,15 +1810,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certif
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND Option Strings to Send: "%S" LO_OPTION_STR_SEND Option Strings to Send: "%S"
LO_NEW_SESSION A new session is created. Protocol: %S
LO_INITIATE_REKEY The re-keying process is started. LO_INITIATE_REKEY The re-keying process is started.
LO_CHANNEL_ESTABLISHED The channel becomes the established state. LO_CHANNEL_ESTABLISHED The channel becomes the established state.
LO_PUSH_REPLY The full strings replied: "%S" LO_PUSH_REPLY The full strings replied: "%S"
LO_CHANNEL_FAILED Failed to connect a channel. LO_CHANNEL_FAILED Failed to connect a channel.
LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session. LO_CHANNEL_DISCONNECTED_BY_HUB This OpenVPN channel is being terminated because the administrator of the Virtual Hub has disconnected this the VPN Session.
LO_DELETE_SESSION Deleting the session.
LO_START The OpenVPN Server Module is starting.
LO_STOP The OpenVPN Server Module is stopped.
# (IPsec Logs) # (IPsec Logs)

View File

@ -1830,15 +1830,11 @@ LO_CLIENT_CERT Client certificate received (subject: CN="%s"), will use certif
LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication. LO_CLIENT_UNVERIFIED_CERT Client certificate was provided but did not pass verification (error="%S"), will use password authentication.
LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication. LO_CLIENT_NO_CERT Client certificate is not provided, will use password authentication.
LO_OPTION_STR_SEND 發送選項字串:"%S" LO_OPTION_STR_SEND 發送選項字串:"%S"
LO_NEW_SESSION 已創建新的會話。協議:%S
LO_INITIATE_REKEY re-keying 進程已開始。 LO_INITIATE_REKEY re-keying 進程已開始。
LO_CHANNEL_ESTABLISHED 該通道成為已建立的狀態。 LO_CHANNEL_ESTABLISHED 該通道成為已建立的狀態。
LO_PUSH_REPLY 完整字串回答:"%S" LO_PUSH_REPLY 完整字串回答:"%S"
LO_CHANNEL_FAILED 無法連接通道。 LO_CHANNEL_FAILED 無法連接通道。
LO_CHANNEL_DISCONNECTED_BY_HUB 此 OpenVPN 的通道被終止,因為虛擬 HUB 管理員斷開了此 VPN 會話。 LO_CHANNEL_DISCONNECTED_BY_HUB 此 OpenVPN 的通道被終止,因為虛擬 HUB 管理員斷開了此 VPN 會話。
LO_DELETE_SESSION 刪除會話中。
LO_START OpenVPN Server 模組正在啟動。
LO_STOP OpenVPN Server 模組已停止。
# (IPsec 日誌) # (IPsec 日誌)