Skip to content

Add arkime_session_rm_protocol; drop ftp on confirmed SMTP#3919

Merged
awick merged 1 commit into
mainfrom
smtp-ftp-fix
Apr 28, 2026
Merged

Add arkime_session_rm_protocol; drop ftp on confirmed SMTP#3919
awick merged 1 commit into
mainfrom
smtp-ftp-fix

Conversation

@awick

@awick awick commented Apr 28, 2026

Copy link
Copy Markdown
Contributor

The 220 banner is shared by FTP and SMTP, so misc.c's other220 classifier may tag a session as ftp before SMTP commands are seen. Once the smtp parser observes a HELO/EHLO command we know for sure the session is SMTP and the ftp tag is spurious.

  • Add arkime_session_rm_protocol() helper for removing a protocol from a session's STR_HASH protocol field
  • smtp parser removes the ftp protocol tag when it sees HELO/EHLO
  • Regenerate wireshark-bdat golden which had spurious ftp tag

License

I confirm that this contribution is made under an Apache 2.0 license and that I have the authority necessary to make this contribution on behalf of its copyright owner.

The 220 banner is shared by FTP and SMTP, so misc.c's other220
classifier may tag a session as ftp before SMTP commands are seen.
Once the smtp parser observes a HELO/EHLO command we know for sure
the session is SMTP and the ftp tag is spurious.

- Add arkime_session_rm_protocol() helper for removing a protocol
  from a session's STR_HASH protocol field
- smtp parser removes the ftp protocol tag when it sees HELO/EHLO
- Regenerate wireshark-bdat golden which had spurious ftp tag

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@awick awick merged commit 7fc01e5 into main Apr 28, 2026
15 checks passed
@awick awick deleted the smtp-ftp-fix branch April 28, 2026 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant