diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | packet-http.c | 10 | ||||
| -rw-r--r-- | packet-http.h | 30 | ||||
| -rw-r--r-- | packet-ipp.c | 3 |
4 files changed, 10 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index b9c352c6f9..885b5693b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.270 2001/01/10 09:25:13 guy Exp $ +# $Id: Makefile.am,v 1.271 2001/01/11 05:41:47 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -206,7 +206,6 @@ noinst_HEADERS = \ packet-frame.h \ packet-gvrp.h \ packet-h261.h \ - packet-http.h \ packet-ieee80211.h \ packet-ip.h \ packet-ipsec.h \ diff --git a/packet-http.c b/packet-http.c index 9e899afe74..4c7387404f 100644 --- a/packet-http.c +++ b/packet-http.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-http.c,v 1.34 2001/01/11 05:36:09 guy Exp $ + * $Id: packet-http.c,v 1.35 2001/01/11 05:41:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -61,8 +61,14 @@ static gint ett_http = -1; #define TCP_PORT_PROXY_ADMIN_HTTP 3132 #define TCP_ALT_PORT_HTTP 8080 +/* + * IPP is encapsulated in HTTP. + */ #define TCP_PORT_IPP 631 +/* + * So is SSDP (yes, it really *does* run over UDP). + */ #define TCP_PORT_SSDP 1900 #define UDP_PORT_SSDP 1900 @@ -79,7 +85,7 @@ static int is_http_request_or_reply(const u_char *data, int linelen, http_type_t static dissector_handle_t ipp_handle; -void +static void dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { http_proto_t proto; diff --git a/packet-http.h b/packet-http.h deleted file mode 100644 index 5109f5e8fe..0000000000 --- a/packet-http.h +++ /dev/null @@ -1,30 +0,0 @@ -/* packet-http.h - * - * $Id: packet-http.h,v 1.3 2000/11/09 10:56:32 guy Exp $ - * - * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __PACKET_HTTP_H__ -#define __PACKET_HTTP_H__ - -void dissect_http(tvbuff_t *, packet_info *, proto_tree *); - -#endif diff --git a/packet-ipp.c b/packet-ipp.c index 2df6670bc4..391ff4fd7f 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-ipp.c,v 1.20 2001/01/11 05:36:09 guy Exp $ + * $Id: packet-ipp.c,v 1.21 2001/01/11 05:41:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -41,7 +41,6 @@ #include <glib.h> #include "packet.h" #include "strutil.h" -#include "packet-http.h" static int proto_ipp = -1; |