From: Ron Dempster (rdempste) Date: Mon, 27 Jun 2022 12:21:26 +0000 (+0000) Subject: Pull request #3482: ftp_telnet: make active ftp expected session in the correct direction X-Git-Tag: 3.1.33.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74c49a8bb6804a2d742535e3143636191e41449d;p=thirdparty%2Fsnort3.git Pull request #3482: ftp_telnet: make active ftp expected session in the correct direction Merge in SNORT/snort3 from ~RDEMPSTE/snort3:active_ftp to master Squashed commit of the following: commit 9067434d7bf6bef3f21f935beb54833a4cdfed50 Author: Ron Dempster (rdempste) Date: Fri Jun 17 15:05:18 2022 -0400 ftp_telnet: make active ftp expected session in the correct direction --- diff --git a/src/service_inspectors/ftp_telnet/pp_ftp.cc b/src/service_inspectors/ftp_telnet/pp_ftp.cc index 78284a79a..9c8856f35 100644 --- a/src/service_inspectors/ftp_telnet/pp_ftp.cc +++ b/src/service_inspectors/ftp_telnet/pp_ftp.cc @@ -1200,8 +1200,8 @@ static int do_stateful_checks(FTP_SESSION* session, Packet* p, /* Call into Streams to mark data channel as ftp-data */ result = Stream::set_snort_protocol_id_expected( p, PktType::TCP, IpProtocol::TCP, - &session->clientIP, session->clientPort, &session->serverIP, session->serverPort, + &session->clientIP, session->clientPort, ftp_data_snort_protocol_id, fd, true); if (result < 0) @@ -1216,8 +1216,8 @@ static int do_stateful_checks(FTP_SESSION* session, Packet* p, * to ignore. */ Stream::ignore_flow( p, PktType::TCP, IpProtocol::TCP, - &session->clientIP, session->clientPort, &session->serverIP, session->serverPort, + &session->clientIP, session->clientPort, SSN_DIR_BOTH, (new FtpDataFlowData(p))); } }