From 87e588c336b5460c72bf161759145e1c49f51b93 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Thu, 26 May 2011 16:03:29 +0000 Subject: Add SVN Id and GPL. Minor whitespace cleanup. svn path=/trunk/; revision=37412 --- plugins/tpg/packet-http.c | 66 ++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 23 deletions(-) (limited to 'plugins') diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index 7da2b0cbe5..a834b2c55c 100644 --- a/plugins/tpg/packet-http.c +++ b/plugins/tpg/packet-http.c @@ -1,3 +1,25 @@ +/* packet-http.c + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * 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. + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -7,9 +29,9 @@ #include static const value_string http_response_codes[] = { -{ 200, "OK" }, -{ 302, "Later" }, -{0,NULL} + { 200, "OK" }, + { 302, "Later" }, + { 0, NULL } }; static gint ett_http = -1; @@ -32,19 +54,19 @@ static void dissect_http(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree tpg_parser_data_t* tpg; proto_item* pi = proto_tree_add_item(tree,proto_http,tvb,0,-1,FALSE); proto_tree* pt = proto_item_add_subtree(pi,ett_http); - + tpg = tpg_start(pt,tvb,0,-1,http_tpg_data.wanted_http_sp, msgdata); - + if (( reqresp = TPG_GET(tpg,http_tpg_data.wanted_http_req_resp) )) { tvbparse_elem_t* hdr; - + while(( hdr = TPG_GET(tpg,http_tpg_data.wanted_http_header) )) ; - + if ( TPG_GET(tpg,http_tpg_data.wanted_http_crlf) ) { pi = proto_tree_add_boolean(pt,hf_http_is_response,tvb,0,0,msgdata->is_response); pt = proto_item_add_subtree(pi,ett_http); - + if (msgdata->is_response) { proto_tree_add_uint(pt,hf_http_response_code,tvb,0,0,msgdata->response_code); @@ -56,7 +78,7 @@ static void dissect_http(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree if (msgdata->http_host) proto_tree_add_string(pt,hf_http_host,tvb,0,0,msgdata->http_host); if (msgdata->request_uri) proto_tree_add_string(pt,hf_http_request_uri,tvb,0,0,msgdata->request_uri); } - + } else { /* header fragment */ } @@ -78,19 +100,17 @@ static void proto_register_http(void) { { &hf_http_media, { "=Media", "hyttp.info.media", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, { &hf_http_host, { "=Host", "hyttp.info.host", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }} }; - + gint *ett[] = { ETT_HTTP_PARSER, &ett_http - }; - + }; + tpg_http_init(); - - proto_http = proto_register_protocol("HyTTP", - "HyTTP", "hyttp"); - proto_register_field_array(proto_http, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - + + proto_http = proto_register_protocol("HyTTP", "HyTTP", "hyttp"); + proto_register_field_array(proto_http, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } @@ -109,15 +129,15 @@ G_MODULE_EXPORT const gchar version[] = "0.0.0"; G_MODULE_EXPORT void plugin_register(void) { - /* register the new protocol, protocol fields, and subtrees */ - if (proto_http == -1) { /* execute protocol initialization only once */ - proto_register_http(); - } + /* register the new protocol, protocol fields, and subtrees */ + if (proto_http == -1) { /* execute protocol initialization only once */ + proto_register_http(); + } } G_MODULE_EXPORT void plugin_reg_handoff(void){ - proto_reg_handoff_http(); + proto_reg_handoff_http(); } #endif -- cgit v1.2.3