Skip to content

Commit

Permalink
Merge pull request elastic#346 from Shweta-Bhandare/addHttpContent
Browse files Browse the repository at this point in the history 
Add http content
  • Loading branch information
Shweta Bhandare authored and Shweta Bhandare committed Jun 9, 2015
2 parents 57c0540 + 16cd4c3 commit 315778b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 22 deletions.
2 changes: 1 addition & 1 deletion protofiles/DpiMsgLRproto.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3612,7 +3612,7 @@ optional Void endQ_PROTO_SMTP = 3851; // QOSMOS:Q_PROTO_SMTP,Q_MPA_END
//repeated bytes attach_contentQ_PROTO_GMX = 3914; // QOSMOS:Q_PROTO_GMX,Q_MPA_ATTACH_CONTENT
//repeated bytes file_chunk_contentQ_PROTO_GNUTELLA = 3915; // QOSMOS:Q_PROTO_GNUTELLA,Q_MPA_FILE_CHUNK_CONTENT
//repeated bytes messageQ_PROTO_GTPV2 = 3916; // QOSMOS:Q_PROTO_GTPV2,Q_MPA_MESSAGE
//repeated bytes contentQ_PROTO_HTTP = 3917; // QOSMOS:Q_PROTO_HTTP,Q_MPA_CONTENT
repeated bytes contentQ_PROTO_HTTP = 3917; // QOSMOS:Q_PROTO_HTTP,Q_MPA_CONTENT
//repeated bytes content_rawQ_PROTO_HTTP = 3918; // QOSMOS:Q_PROTO_HTTP,Q_MPA_CONTENT_RAW
//repeated bytes part_contentQ_PROTO_HTTP = 3919; // QOSMOS:Q_PROTO_HTTP,Q_HTTP_PART_CONTENT
//repeated bytes element_valueQ_PROTO_IAX = 3920; // QOSMOS:Q_PROTO_IAX,Q_IAX_ELEMENT_VALUE
Expand Down
1 change: 1 addition & 0 deletions resources/NetMonFieldNames.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ HTTP,cache_controlQ_PROTO_HTTP,cache_control,CacheControl,Cache Control,,,,,Comp
HTTP,charsetQ_PROTO_HTTP,charset,Charset,Charset,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,codeQ_PROTO_HTTP,code,Code,Code,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,connection_headerQ_PROTO_HTTP,connection_header,ConnectionHeader,Connection Header,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,contentQ_PROTO_HTTP,content,HttpContent,Http Content,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,content_dispositionQ_PROTO_HTTP,content_disposition,ContentDisposition,Content Disposition,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,content_encodingQ_PROTO_HTTP,content_encoding,ContentEncoding,Content Encoding,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
HTTP,content_languageQ_PROTO_HTTP,content_language,ContentLanguage,Content Language,,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down
1 change: 1 addition & 0 deletions resources/ProtocolDescriptions.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ http,HyperText Transfer Protocol,#code,Return code sent by the server.
http,HyperText Transfer Protocol,#content_len,Contains the content length of the HTTP request/response.
http,HyperText Transfer Protocol,#x_content_urn,Contains the different hashes of downloaded file (used by Gnutella).
http,HyperText Transfer Protocol,#filename,Name of the transferred file.
http,HyperText Transfer Protocol,#content,Message content.
http,HyperText Transfer Protocol,#content_range,Contains information about the size and offset of downloaded file (used by Gnutella).
http,HyperText Transfer Protocol,#charset,Contains the name of the used charset.
http,HyperText Transfer Protocol,#wap_profile,url link that contains the specification of the used handset.
Expand Down
21 changes: 0 additions & 21 deletions resources/ProtocolFilters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
![,:]Q_PROTO_GMAIL_MOBILE.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_GMX.*,Q_MPA_CONTENT_BODY[,\n]|
![,:]Q_PROTO_GOOGLE_GROUPS.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_HTTP.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_HTTP.*,Q_MPA_CONTENT_RAW[,\n]|
![,:]Q_PROTO_HTTP.*,Q_MPA_CONTENT_TRANSFER_ENCODING[,\n]|
![,:]Q_PROTO_IMAP.*,Q_MPA_CONTENT_ENTRY[,\n]|
Expand Down Expand Up @@ -954,8 +953,6 @@
![,:].*,Q_GEN_DATA[,\n]|
![,:]Q_PROTO_ADC.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_AIM.*,Q_AIM_ICON_DATA[,\n]|
![,:]Q_PROTO_AIM_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_BADONGO.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_BASE.*,Q_BASE_PACKET[,\n]|
![,:]Q_PROTO_BASE.*,Q_BASE_PACKET_IP[,\n]|
![,:]Q_PROTO_BITTORRENT.*,Q_BITTORRENT_FILE_HASH_RAW[,\n]|
Expand All @@ -964,39 +961,32 @@
![,:]Q_PROTO_DIRECTCONNECT.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_EDONKEY.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_FACEBOOK_MAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_FTP_DATA.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_GIOP.*,Q_GIOP_OBJECT_KEY[,\n]|
![,:]Q_PROTO_GMAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_GMAIL_BASIC.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_GMAIL_MOBILE.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_GMX.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_GNUTELLA.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_GTPV2.*,Q_MPA_MESSAGE[,\n]|
![,:]Q_PROTO_HTTP.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_HTTP.*,Q_MPA_CONTENT_RAW[,\n]|
![,:]Q_PROTO_HTTP.*,Q_HTTP_PART_CONTENT[,\n]|
![,:]Q_PROTO_IAX.*,Q_IAX_ELEMENT_VALUE[,\n]|
![,:]Q_PROTO_ICA.*,Q_ICA_APPLICATION_UTF16[,\n]|
![,:]Q_PROTO_ICA.*,Q_ICA_LOGIN_INFO_UTF16[,\n]|
![,:]Q_PROTO_ICMP6.*,Q_ICMP6_LINK_LAYER_RAW_ADDR[,\n]|
![,:]Q_PROTO_IMAP.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_IMP.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_IRC_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_ISUP.*,Q_ISUP_IE_RAW[,\n]|
![,:]Q_PROTO_JABBER.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_JABBER_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_KAKAOTALK.*,Q_MPA_FILE_CHUNK[,\n]|
![,:]Q_PROTO_KRB5.*,Q_KRB5_TICKET_ENC_PART[,\n]|
![,:]Q_PROTO_KRB5.*,Q_KRB5_KDCOPTIONS[,\n]|
![,:]Q_PROTO_LDAP.*,Q_LDAP_VALUE_RAW[,\n]|
![,:]Q_PROTO_LDAP.*,Q_LDAP_ASSERTION_VALUE_RAW[,\n]|
![,:]Q_PROTO_LIVE_HOTMAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_LOTUSNOTES.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_LOTUSNOTES.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_MAILRU.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_MAKTOOB.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_SUBJECT[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_SENDER[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_SENDER_ALIAS[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_SENDER_EMAIL[,\n]|
Expand All @@ -1012,37 +1002,29 @@
![,:]Q_PROTO_MAPI.*,Q_MAPI_APPOINTMENT_LOCATION[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_CONTACT_EMAIL[,\n]|
![,:]Q_PROTO_MAPI.*,Q_MPA_CONTACT_ALIAS[,\n]|
![,:]Q_PROTO_MASHARE.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_MMSE.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_MMSE.*,Q_MMSE_CONTENT_PART_DATA[,\n]|
![,:]Q_PROTO_MOUNT.*,Q_MOUNT_FILEHANDLE[,\n]|
![,:]Q_PROTO_MSN.*,Q_MPA_FILENAME_UTF16[,\n]|
![,:]Q_PROTO_MSN.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_NFS.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_NNTP.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_ORANGEMAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_PALTALK_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_POP3.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_QQ.*,Q_QQ_CALL_DATA[,\n]|
![,:]Q_PROTO_QQ_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_RADIUS.*,Q_RADIUS_FRAMED_IPV6_PREFIX[,\n]|
![,:]Q_PROTO_RADIUS.*,Q_RADIUS_DELEGATED_IPV6_PREFIX[,\n]|
![,:]Q_PROTO_RADIUS.*,Q_RADIUS_AVP_TEXT[,\n]|
![,:]Q_PROTO_RADIUS.*,Q_RADIUS_AVP_STR[,\n]|
![,:]Q_PROTO_RADIUS.*,Q_RADIUS_AVP_PREFIX[,\n]|
![,:]Q_PROTO_RAMBLER_WEBMAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_RTP.*,Q_RTP_PAYLOAD_DATA[,\n]|
![,:]Q_PROTO_RTSP.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_S1AP.*,Q_S1AP_EP_VALUE_RAW[,\n]|
![,:]Q_PROTO_S1AP.*,Q_S1AP_EP_IE_VALUE_RAW[,\n]|
![,:]Q_PROTO_SIP.*,Q_SIP_FROM_TAG[,\n]|
![,:]Q_PROTO_SIP.*,Q_SIP_TO_TAG[,\n]|
![,:]Q_PROTO_SLSK.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_SMB.*,Q_SMB_SERVICE_DATA[,\n]|
![,:]Q_PROTO_SMB.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_SMB.*,Q_SMB_SECURITY_BLOB[,\n]|
![,:]Q_PROTO_SMB.*,Q_SMB_KRB5_BLOB[,\n]|
![,:]Q_PROTO_SMPP.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_SMTP.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_SNMP.*,Q_SNMP_VALUE_RAW[,\n]|
![,:]Q_PROTO_SPDY.*,Q_SPDY_CONTENT[,\n]|
Expand All @@ -1058,18 +1040,15 @@
![,:]Q_PROTO_TDS.*,Q_TDS_RPC_PARAMETER_NAME[,\n]|
![,:]Q_PROTO_TDS.*,Q_TDS_RPC_PARAMETER_TYPE[,\n]|
![,:]Q_PROTO_TDS.*,Q_TDS_RPC_PARAMETER_VALUE[,\n]|
![,:]Q_PROTO_TFTP.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_UDP.*,Q_MPA_STREAM[,\n]|
![,:]Q_PROTO_UNKNOWN.*,Q_UNKNOWN_SESSION_BUFFER[,\n]|
![,:]Q_PROTO_WEBSOCKET.*,Q_WEBSOCKET_RAW[,\n]|
![,:]Q_PROTO_WEBSOCKET.*,Q_WEBSOCKET_MSG[,\n]|
![,:]Q_PROTO_WINMX.*,Q_MPA_FILE_CHUNK_CONTENT[,\n]|
![,:]Q_PROTO_YANDEX_WEBMAIL.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_YANDEX_WEBMAIL.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_YMAIL2.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_YMAIL_CLASSIC.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_YMAIL_MOBILE_NEW.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_YMSG_TRANSFER.*,Q_MPA_CONTENT[,\n]|
![,:]Q_PROTO_ZIMBRA.*,Q_MPA_ATTACH_CONTENT[,\n]|
![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_ATTACH_CONTENT[,\n]
,string,|
Expand Down
1 change: 1 addition & 0 deletions resources/remapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,7 @@ cache_control CacheControl
charset Charset
code Code
connection_header ConnectionHeader
content HttpContent
content_disposition ContentDisposition
content_encoding ContentEncoding
content_language ContentLanguage
Expand Down

0 comments on commit 315778b

Please sign in to comment.