forked from osmocom/wireshark
![Michael Mann](/assets/img/avatar_default.png)
This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
104 lines
3.1 KiB
C
104 lines
3.1 KiB
C
/* packet-http.h
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef __PACKET_HTTP_H__
|
|
#define __PACKET_HTTP_H__
|
|
|
|
#include <epan/packet.h>
|
|
#include "ws_symbol_export.h"
|
|
|
|
extern const value_string vals_http_status_code[];
|
|
|
|
WS_DLL_PUBLIC
|
|
void http_tcp_dissector_add(guint32 port, dissector_handle_t handle);
|
|
WS_DLL_PUBLIC
|
|
void http_tcp_dissector_delete(guint32 port);
|
|
WS_DLL_PUBLIC
|
|
void http_tcp_port_add(guint32 port);
|
|
|
|
/* Used for HTTP statistics */
|
|
typedef struct _http_info_value_t {
|
|
guint32 framenum;
|
|
gchar *request_method;
|
|
guint response_code;
|
|
gchar *http_host;
|
|
const gchar *request_uri;
|
|
} http_info_value_t;
|
|
|
|
/* Used for HTTP Export Object feature */
|
|
typedef struct _http_eo_t {
|
|
guint32 pkt_num;
|
|
gchar *hostname;
|
|
gchar *filename;
|
|
gchar *content_type;
|
|
guint32 payload_len;
|
|
const guint8 *payload_data;
|
|
} http_eo_t;
|
|
|
|
/** information about a request and response on a HTTP conversation. */
|
|
typedef struct _http_req_res_t {
|
|
/** the running number on the conversation */
|
|
guint32 number;
|
|
/** frame number of the request */
|
|
guint32 req_framenum;
|
|
/** frame number of the corresponding response */
|
|
guint32 res_framenum;
|
|
/** timestamp of the request */
|
|
nstime_t req_ts;
|
|
/** pointer to the next element in the linked list, NULL for the tail node */
|
|
struct _http_req_res_t *next;
|
|
/** pointer to the previous element in the linked list, NULL for the head node */
|
|
struct _http_req_res_t *prev;
|
|
} http_req_res_t;
|
|
|
|
/** Conversation data of a HTTP connection. */
|
|
typedef struct _http_conv_t {
|
|
guint response_code;
|
|
guint32 startframe; /* First frame of proxied connection */
|
|
gchar *http_host;
|
|
gchar *request_method;
|
|
gchar *request_uri;
|
|
/** the number of requests on the conversation. */
|
|
guint32 req_res_num;
|
|
guint8 upgrade;
|
|
gchar *websocket_protocol; /* Negotiated WebSocket protocol */
|
|
/* Server address and port, known after first server response */
|
|
guint16 server_port;
|
|
address server_addr;
|
|
/** the tail node of req_res */
|
|
http_req_res_t *req_res_tail;
|
|
} http_conv_t;
|
|
|
|
typedef enum _http_type {
|
|
HTTP_REQUEST,
|
|
HTTP_RESPONSE,
|
|
HTTP_NOTIFICATION,
|
|
HTTP_OTHERS
|
|
} http_type_t;
|
|
|
|
/** Passed to dissectors called by the HTTP dissector. */
|
|
typedef struct _http_message_info_t {
|
|
http_type_t type; /* Message type; may be HTTP_OTHERS if not called by HTTP */
|
|
const char *media_str; /* Content-Type parameters */
|
|
} http_message_info_t;
|
|
|
|
#endif /* __PACKET_HTTP_H__ */
|