rename user pkt to pdu

diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index 2baa25d31768e5a880385c0114a8893ba6866885..d313775c67c0d8399550c99828b3b276b2f7c752 100644 (file)
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -335,7 +335,7 @@ bool snort_detect(Packet* p)
     case PktType::TCP:
     case PktType::UDP:
     case PktType::ICMP:
-    case PktType::USER:
+    case PktType::PDU:
     case PktType::FILE:
     {
         PROFILE_VARS;

diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 235c3998af4472fbef491808c30cc8d2fcf88b49..79fefd4c3052ae59c1a6ec1b7f53f7252f3265ad 100644 (file)
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -1289,7 +1289,7 @@ int fpEvalPacket(Packet* p)
         fpEvalHeaderSvc(p, omd, SNORT_PROTO_UDP);
         break;
 
-    case PktType::USER:
+    case PktType::PDU:
         if ( snort_conf->sopgTable->user_mode )
             fpEvalHeaderSvc(p, omd, SNORT_PROTO_USER);
 

diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index 796aeecb00c0003277de03f897046b611ee046b8..226e12fba188f2cdbb59902a7f24fb96591e6267 100644 (file)
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -113,7 +113,7 @@ PegCount FlowControl::get_flows(PktType proto)
     case PktType::ICMP: return icmp_count;
     case PktType::TCP:  return tcp_count;
     case PktType::UDP:  return udp_count;
-    case PktType::USER: return user_count;
+    case PktType::PDU: return user_count;
     case PktType::FILE: return file_count;
     default:            return 0;
     }
@@ -139,7 +139,7 @@ void FlowControl::clear_counts()
     if ( (cache = get_cache(PktType::UDP)) )
         cache->reset_prunes();
 
-    if ( (cache = get_cache(PktType::USER)) )
+    if ( (cache = get_cache(PktType::PDU)) )
         cache->reset_prunes();
 
     if ( (cache = get_cache(PktType::FILE)) )
@@ -166,7 +166,7 @@ inline FlowCache* FlowControl::get_cache (PktType proto)
     case PktType::ICMP: return icmp_cache;
     case PktType::TCP:  return tcp_cache;
     case PktType::UDP:  return udp_cache;
-    case PktType::USER: return user_cache;
+    case PktType::PDU: return user_cache;
     case PktType::FILE: return file_cache;
     default:            return nullptr;
     }
@@ -405,7 +405,7 @@ static void init_roles(Packet* p, Flow* flow)
         init_roles_udp(p, flow);
         break;
 
-    case PktType::USER:
+    case PktType::PDU:
     case PktType::FILE:
         init_roles_user(p, flow);
         break;
@@ -715,7 +715,7 @@ void FlowControl::process_user(Packet* p)
 
     if ( !flow->session )
     {
-        flow->init(PktType::USER);
+        flow->init(PktType::PDU);
         flow->session = get_user(flow);
     }
 

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index f0bf0ade80b44a602833737813b5b4172b6fbb13..7ff5e0a2ca3ffd96ad543dcfe306a5bc3b49adcc 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -614,7 +614,7 @@ static void instantiate_binder(SnortConfig* sc, FrameworkPolicy* fp)
         m->add((unsigned)PktType::UDP, wiz_id);
 
     if ( tcp or udp )
-        m->add((unsigned)PktType::USER, wiz_id);
+        m->add((unsigned)PktType::PDU, wiz_id);
 
     const InspectApi* api = get_plugin(bind_id);
     InspectorManager::instantiate(api, m, sc);

diff --git a/src/network_inspectors/binder/bind_module.cc b/src/network_inspectors/binder/bind_module.cc
index 29e5cab2520b90baacba447048dc9e9ea87fb5e3..21b6b9f2ae1e36f7c3a4d4bd5e2edf8d2550bdda 100644 (file)
--- a/src/network_inspectors/binder/bind_module.cc
+++ b/src/network_inspectors/binder/bind_module.cc
@@ -154,7 +154,7 @@ bool BinderModule::set(const char* fqn, Value& v, SnortConfig*)
         const PktType mask[] =
         {
             PktType::ANY, PktType::IP, PktType::ICMP, PktType::TCP, PktType::UDP,
-            PktType::USER, PktType::FILE
+            PktType::PDU, PktType::FILE
         };
         work->when.protos = (unsigned)mask[v.get_long()];
     }

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index 0ad2366c75091964037a92f99b853c165bbdd65b..ad0b2892de27c1ca1468996594b1e53fa40aa5a9 100644 (file)
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -339,7 +339,7 @@ void Stuff::apply_session(Flow* flow, const HostAttributeEntry* host)
         set_session(flow, INS_UDP);
         break;
 
-    case PktType::USER:
+    case PktType::PDU:
         set_session(flow, INS_USER);
         break;
 

diff --git a/src/protocols/packet.cc b/src/protocols/packet.cc
index 9aa74349da257f3f6a1dede6080ad5dfd6b0f950..d173b19f0a2a874b980a599711fa35de0b73c939 100644 (file)
--- a/src/protocols/packet.cc
+++ b/src/protocols/packet.cc
@@ -110,7 +110,7 @@ const char* Packet::get_type() const
     case PktType::UDP:
         return "UDP";
 
-    case PktType::USER:
+    case PktType::PDU:
     case PktType::FILE:
         if ( proto_bits & PROTO_BIT__TCP )
             return "TCP";

diff --git a/src/protocols/packet.h b/src/protocols/packet.h
index b4f2e5b956addb50c19c92248a52c4409dd5dbf9..a019acea346227213dd40729168a65511cff51ca 100644 (file)
--- a/src/protocols/packet.h
+++ b/src/protocols/packet.h
@@ -195,7 +195,7 @@ struct SO_PUBLIC Packet
     { return ptrs.get_pkt_type() == PktType::ICMP; }
 
     inline bool is_data() const
-    { return (ptrs.get_pkt_type() == PktType::USER) or (ptrs.get_pkt_type() == PktType::FILE); }
+    { return (ptrs.get_pkt_type() == PktType::PDU) or (ptrs.get_pkt_type() == PktType::FILE); }
 
     inline bool is_cooked() const
     { return packet_flags & PKT_PSEUDO; }

diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index cccd300b590c9e99b04542bd14d44f87bb3eda69..ec9a05e8353e67c75f107d27deb43c463d22921b 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -530,7 +530,7 @@ static const InspectApi fs_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "ftp",
     fs_init,

diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index 858a0399682bf89609a04879834eb3933d26aacb..6e870c1b05c6c5004156436a510c5111016cf0e8 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -302,7 +302,7 @@ const InspectApi fd_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "ftp-data",
     fd_init,

diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc
index f5819567464ccaf08bab3f644d1418cc196e2aa1..8d1d8c75570bc0d38d0f986a0aa57849fcf12284 100644 (file)
--- a/src/service_inspectors/ftp_telnet/telnet.cc
+++ b/src/service_inspectors/ftp_telnet/telnet.cc
@@ -331,7 +331,7 @@ const InspectApi tn_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "telnet",
     tn_init,

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index c15673872cab3a793bb48c54f8fdae2b7f3ff6a5..ad9c1b8f3227e5bb2a13f0ce7d3ce64bc776621f 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -477,7 +477,7 @@ static const InspectApi hi_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     buffers,
     "http",
     hs_init,

diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index 3997304d80236ac51771c72547dca59410585317..c2d6f54fad72e823d4bb6f8b7dafbf451f2502c3 100644 (file)
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -895,7 +895,7 @@ const InspectApi imap_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "imap",
     imap_init,

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_api.cc b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
index ea9b6cffc577dbeade16956b00b5a3619e3af3ed..d38aa853fe479f4ec2dea83c0759b6a98dda0e13 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_api.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
@@ -63,7 +63,7 @@ const InspectApi NHttpApi::nhttp_api =
         NHttpApi::nhttp_mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     legacy_buffers,
     "http",
     NHttpApi::nhttp_init,

diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index f5a2ccf4a22c88bc58d3de257bc7d85d07590ae4..c9fce192cdd45ccf85f291c66e58150e0649d325 100644 (file)
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -827,7 +827,7 @@ const InspectApi pop_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "pop",
     pop_init,

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index 5c81caaa51ac28f1ec749d622ce37bcd2d83b238..6412a637492a97b63c80a6ce28a83bd75f388e54 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -1120,7 +1120,7 @@ static const InspectApi rd_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "sunrpc",
     rd_init,

diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index be6470279dc9bf57f84fcaf747a890eb83b0eb28..49a5bdfa5af35625ec35b03b5a98b601c5522ce9 100644 (file)
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -432,7 +432,7 @@ const InspectApi sip_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER | (uint16_t)PktType::UDP,
+    (uint16_t)PktType::PDU | (uint16_t)PktType::UDP,
     nullptr, // buffers
     "sip",
     sip_init,

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index 19886330a265a2cad0c56fd0f178a83f823f3f60..822607be7c465fa0d2a2d925de3d740d99369344 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -1753,7 +1753,7 @@ const InspectApi smtp_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr,                // buffers
     "smtp",
     smtp_init,

diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index aaeb62f7db94dac4619dd0b2ef56d7995d452d71..f83b115252d323dccf39d067c65b7f10930b7715 100644 (file)
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -863,7 +863,7 @@ const InspectApi ssh_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "ssh",
     ssh_init,

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 735895ffb56360be537a0b68829fe2c746390c28..38c4b02fe5c6a5fc49c3564e2ea23f56fff8823c 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -492,7 +492,7 @@ const InspectApi ssl_api =
         mod_dtor
     },
     IT_SERVICE,
-    (uint16_t)PktType::USER,
+    (uint16_t)PktType::PDU,
     nullptr, // buffers
     "ssl",
     ssl_init,

diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index bb74ed6e231e9d902845c69a9131df8fdc0155d8..afcc614b42a32f85208e5d3e687eb735291f48d6 100644 (file)
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -256,7 +256,7 @@ static const InspectApi wiz_api =
         mod_dtor
     },
     IT_WIZARD,
-    (uint16_t)PktType::TCP | (uint16_t)PktType::UDP | (uint16_t)PktType::USER,
+    (uint16_t)PktType::TCP | (uint16_t)PktType::UDP | (uint16_t)PktType::PDU,
     nullptr, // buffers
     nullptr, // service
     nullptr, // init

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 767ebecdef92e2b055c5e18d763f48efdd19da1b..62451db6133c203dfaaabfa82d6df362781a4d59 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -97,8 +97,8 @@ void base_sum()
     t_stats.udp_flows = flow_con->get_flows(PktType::UDP);
     t_stats.udp_prunes = flow_con->get_prunes(PktType::UDP);
 
-    t_stats.user_flows = flow_con->get_flows(PktType::USER);
-    t_stats.user_prunes = flow_con->get_prunes(PktType::USER);
+    t_stats.user_flows = flow_con->get_flows(PktType::PDU);
+    t_stats.user_prunes = flow_con->get_prunes(PktType::PDU);
 
     t_stats.file_flows = flow_con->get_flows(PktType::FILE);
     t_stats.file_prunes = flow_con->get_prunes(PktType::FILE);
@@ -206,11 +206,11 @@ void StreamBase::tinit()
     }
     if ( config->user_cfg.max_sessions )
     {
-        if ( (f = InspectorManager::get_session((uint16_t)PktType::USER)) )
+        if ( (f = InspectorManager::get_session((uint16_t)PktType::PDU)) )
         {
             flow_con->init_user(config->user_cfg, f);
             // FIXIT-L update stream_ip to use standard memcap
-            //UserSession::set_memcap(flow_con->get_memcap(PktType::USER));
+            //UserSession::set_memcap(flow_con->get_memcap(PktType::PDU));
         }
     }
     if ( config->file_cfg.max_sessions )
@@ -231,7 +231,7 @@ void StreamBase::tterm()
     flow_con->purge_flows(PktType::ICMP);
     flow_con->purge_flows(PktType::TCP);
     flow_con->purge_flows(PktType::UDP);
-    flow_con->purge_flows(PktType::USER);
+    flow_con->purge_flows(PktType::PDU);
     flow_con->purge_flows(PktType::FILE);
 }
 
@@ -275,7 +275,7 @@ void StreamBase::eval(Packet* p)
             flow_con->process_udp(p);
         break;
 
-    case PktType::USER:
+    case PktType::PDU:
         flow_con->process_user(p);
         break;
 

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index b9ac60d283e6add846b93c9456cca8114d111c29..e586895670232ab9fa5300b702ada93830309e40 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -2010,7 +2010,7 @@ static int FlushStream(
 // FIXIT-L consolidate encode format, update, and this into new function?
 static void prep_s5_pkt(Flow* flow, Packet* p, uint32_t pkt_flags)
 {
-    s5_pkt->ptrs.set_pkt_type(PktType::USER);
+    s5_pkt->ptrs.set_pkt_type(PktType::PDU);
     s5_pkt->proto_bits |= PROTO_BIT__TCP;
     s5_pkt->packet_flags |= (pkt_flags & PKT_PDU_FULL);
     s5_pkt->flow = flow;

diff --git a/src/stream/user/stream_user.cc b/src/stream/user/stream_user.cc
index 5d63ae58cfc2a7744405c7322d54ca43fb4eb455..ed30633930ff44e356230abd30b843285f728c3a 100644 (file)
--- a/src/stream/user/stream_user.cc
+++ b/src/stream/user/stream_user.cc
@@ -131,7 +131,7 @@ static const InspectApi user_api =
         mod_dtor
     },
     IT_STREAM,
-    (unsigned)PktType::USER,
+    (unsigned)PktType::PDU,
     nullptr, // buffers
     nullptr, // service
     nullptr, // pinit