g3-dpi: exclude nnsp along with nntp

bytedance · May 15, 2024 · a0c4c11 · a0c4c11
1 parent 2a64efc
commit a0c4c11
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 0 deletions.
diff --git a/lib/g3-dpi/src/protocol/ftp.rs b/lib/g3-dpi/src/protocol/ftp.rs
@@ -40,6 +40,7 @@ impl ProtocolInspectState {
                 self.exclude_other(MaybeProtocol::Smtp);
                 self.exclude_other(MaybeProtocol::Odmr);
                 self.exclude_other(MaybeProtocol::Nntp);
+                self.exclude_other(MaybeProtocol::Nnsp);
 
                 if &data[0..3] == b"120" {
                     return self.check_ftp_after_code(data, size_limit);
@@ -54,6 +55,7 @@ impl ProtocolInspectState {
                     return Ok(None);
                 }
                 self.exclude_other(MaybeProtocol::Nntp);
+                self.exclude_other(MaybeProtocol::Nnsp);
 
                 if data[2] == b'0' {
                     // may be SMTP
@@ -66,6 +68,7 @@ impl ProtocolInspectState {
                 self.exclude_other(MaybeProtocol::Smtp);
                 self.exclude_other(MaybeProtocol::Odmr);
                 self.exclude_other(MaybeProtocol::Nntp);
+                self.exclude_other(MaybeProtocol::Nnsp);
 
                 if &data[0..3] == b"421" {
                     return self.check_ftp_after_code(data, size_limit);

diff --git a/lib/g3-dpi/src/protocol/imap.rs b/lib/g3-dpi/src/protocol/imap.rs
@@ -46,6 +46,7 @@ impl ProtocolInspectState {
         self.exclude_other(MaybeProtocol::Odmr);
         self.exclude_other(MaybeProtocol::Pop3);
         self.exclude_other(MaybeProtocol::Nntp);
+        self.exclude_other(MaybeProtocol::Nnsp);
         self.exclude_other(MaybeProtocol::Nats);
         self.exclude_other(MaybeProtocol::BitTorrent);
 

diff --git a/lib/g3-dpi/src/protocol/nats.rs b/lib/g3-dpi/src/protocol/nats.rs
@@ -45,6 +45,7 @@ impl ProtocolInspectState {
         self.exclude_other(MaybeProtocol::Odmr);
         self.exclude_other(MaybeProtocol::Pop3);
         self.exclude_other(MaybeProtocol::Nntp);
+        self.exclude_other(MaybeProtocol::Nnsp);
         self.exclude_other(MaybeProtocol::Imap);
         self.exclude_other(MaybeProtocol::BitTorrent);
 

diff --git a/lib/g3-dpi/src/protocol/nntp.rs b/lib/g3-dpi/src/protocol/nntp.rs
@@ -45,6 +45,7 @@ impl ProtocolInspectState {
         // exclude impossible protocols
         self.exclude_other(MaybeProtocol::Ssh);
         self.exclude_other(MaybeProtocol::Nntp);
+        self.exclude_other(MaybeProtocol::Nnsp);
         self.exclude_other(MaybeProtocol::Imap);
         self.exclude_other(MaybeProtocol::Nats);
         self.exclude_other(MaybeProtocol::BitTorrent);

diff --git a/lib/g3-dpi/src/protocol/pop3.rs b/lib/g3-dpi/src/protocol/pop3.rs
@@ -48,6 +48,7 @@ impl ProtocolInspectState {
         self.exclude_other(MaybeProtocol::Smtp);
         self.exclude_other(MaybeProtocol::Odmr);
         self.exclude_other(MaybeProtocol::Nntp);
+        self.exclude_other(MaybeProtocol::Nnsp);
         self.exclude_other(MaybeProtocol::Imap);
         self.exclude_other(MaybeProtocol::Nats);
         self.exclude_other(MaybeProtocol::BitTorrent);

diff --git a/lib/g3-dpi/src/protocol/smtp.rs b/lib/g3-dpi/src/protocol/smtp.rs
@@ -45,6 +45,7 @@ impl ProtocolInspectState {
                     return Ok(None);
                 }
                 self.exclude_other(MaybeProtocol::Nntp);
+                self.exclude_other(MaybeProtocol::Nnsp);
 
                 if data[2] == b'0' {
                     // may be FTP
@@ -56,6 +57,7 @@ impl ProtocolInspectState {
                 self.smtp_exclude_by_byte0();
                 self.exclude_other(MaybeProtocol::Ftp);
                 self.exclude_other(MaybeProtocol::Nntp);
+                self.exclude_other(MaybeProtocol::Nnsp);
 
                 if &data[0..3] == b"554" {
                     return self.check_smtp_after_code(data);

diff --git a/lib/g3-dpi/src/protocol/ssh.rs b/lib/g3-dpi/src/protocol/ssh.rs
@@ -121,6 +121,7 @@ impl ProtocolInspectState {
         self.exclude_other(MaybeProtocol::Odmr);
         self.exclude_other(MaybeProtocol::Pop3);
         self.exclude_other(MaybeProtocol::Nntp);
+        self.exclude_other(MaybeProtocol::Nnsp);
         self.exclude_other(MaybeProtocol::Imap);
         self.exclude_other(MaybeProtocol::Nats);
         self.exclude_other(MaybeProtocol::BitTorrent);