|
|
|
@ -15,7 +15,7 @@
|
|
|
|
|
* 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
use super::ssh::SSHTransaction;
|
|
|
|
|
use super::ssh::{SSHTransaction, SSH_MAX_BANNER_LEN};
|
|
|
|
|
use crate::jsonbuilder::{JsonBuilder, JsonError};
|
|
|
|
|
|
|
|
|
|
fn log_ssh(tx: &SSHTransaction, js: &mut JsonBuilder) -> Result<bool, JsonError> {
|
|
|
|
@ -25,9 +25,9 @@ fn log_ssh(tx: &SSHTransaction, js: &mut JsonBuilder) -> Result<bool, JsonError>
|
|
|
|
|
}
|
|
|
|
|
if !tx.cli_hdr.protover.is_empty() {
|
|
|
|
|
js.open_object("client")?;
|
|
|
|
|
js.set_string_from_bytes("proto_version", &tx.cli_hdr.protover)?;
|
|
|
|
|
js.set_string_from_bytes_limited("proto_version", &tx.cli_hdr.protover, SSH_MAX_BANNER_LEN)?;
|
|
|
|
|
if !tx.cli_hdr.swver.is_empty() {
|
|
|
|
|
js.set_string_from_bytes("software_version", &tx.cli_hdr.swver)?;
|
|
|
|
|
js.set_string_from_bytes_limited("software_version", &tx.cli_hdr.swver, SSH_MAX_BANNER_LEN)?;
|
|
|
|
|
}
|
|
|
|
|
if !tx.cli_hdr.hassh.is_empty() || !tx.cli_hdr.hassh_string.is_empty() {
|
|
|
|
|
js.open_object("hassh")?;
|
|
|
|
@ -43,9 +43,9 @@ fn log_ssh(tx: &SSHTransaction, js: &mut JsonBuilder) -> Result<bool, JsonError>
|
|
|
|
|
}
|
|
|
|
|
if !tx.srv_hdr.protover.is_empty() {
|
|
|
|
|
js.open_object("server")?;
|
|
|
|
|
js.set_string_from_bytes("proto_version", &tx.srv_hdr.protover)?;
|
|
|
|
|
js.set_string_from_bytes_limited("proto_version", &tx.srv_hdr.protover, SSH_MAX_BANNER_LEN)?;
|
|
|
|
|
if !tx.srv_hdr.swver.is_empty() {
|
|
|
|
|
js.set_string_from_bytes("software_version", &tx.srv_hdr.swver)?;
|
|
|
|
|
js.set_string_from_bytes_limited("software_version", &tx.srv_hdr.swver, SSH_MAX_BANNER_LEN)?;
|
|
|
|
|
}
|
|
|
|
|
if !tx.srv_hdr.hassh.is_empty() || !tx.srv_hdr.hassh_string.is_empty() {
|
|
|
|
|
js.open_object("hassh")?;
|
|
|
|
|