# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.179 2000/04/08 03:32:09 guy Exp $
+# $Id: Makefile.am,v 1.180 2000/04/08 07:07:06 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
packet-atm.c \
packet-atm.h \
packet-auto_rp.c \
- packet-auto_rp.h \
packet-bgp.c \
packet-bgp.h \
packet-bootp.c \
- packet-bootp.h \
packet-bootparams.c \
packet-bootparams.h \
packet-bpdu.c \
packet-fddi.c \
packet-fddi.h \
packet-ftp.c \
- packet-ftp.h \
packet-giop.c \
packet-giop.h \
packet-gre.c \
packet-h1.c \
packet-h1.h \
packet-hsrp.c \
- packet-hsrp.h \
packet-http.c \
packet-http.h \
packet-icmpv6.c\
packet-icmpv6.h\
packet-icp.c \
- packet-icp.h \
packet-icq.c \
- packet-icq.h \
packet-imap.c \
- packet-imap.h \
packet-ip.c \
packet-ip.h \
packet-ipp.c \
packet-ipx.c \
packet-ipx.h \
packet-irc.c \
- packet-irc.h \
packet-isakmp.c\
- packet-isakmp.h\
packet-isis.h \
packet-isis.c \
packet-isis-clv.h \
packet-isl.c \
packet-isl.h \
packet-l2tp.c \
- packet-l2tp.h \
packet-lapb.c \
packet-lapb.h \
packet-lapd.c \
packet-llc.c \
packet-llc.h \
packet-lpd.c \
- packet-lpd.h \
packet-mapi.c \
- packet-mapi.h \
packet-mount.c \
packet-mount.h \
packet-mpls.c \
packet-nbipx.c \
packet-nbipx.h \
packet-nbns.c \
- packet-nbns.h \
packet-ncp.c \
packet-ncp.h \
packet-netbios.c \
packet-nlm.c \
packet-nlm.h \
packet-nntp.c \
- packet-nntp.h \
packet-ntp.c \
packet-ntp.h \
packet-null.c \
packet-pim.c \
packet-pim.h \
packet-pop.c \
- packet-pop.h \
packet-portmap.c \
packet-portmap.h \
packet-ppp.c \
packet-pppoe.c \
packet-pppoe.h \
packet-pptp.c \
- packet-pptp.h \
packet-q2931.c \
packet-q2931.h \
packet-q931.c \
packet-q931.h \
packet-radius.c\
- packet-radius.h\
packet-raw.c \
packet-raw.h \
packet-rip.c \
packet-rsvp.c \
packet-rsvp.h \
packet-rtsp.c \
- packet-rtsp.h \
packet-rx.c \
packet-rx.h \
packet-sap.c \
- packet-sap.h \
packet-sdp.c \
packet-sdp.h \
packet-smb.c \
packet-snmp.c \
packet-snmp.h \
packet-srvloc.c \
- packet-srvloc.h \
packet-sscop.c \
packet-sscop.h \
packet-stat.c \
packet-stat.h \
packet-tacacs.c \
- packet-tacacs.h \
packet-tcp.c \
packet-tcp.h \
packet-telnet.c\
- packet-telnet.h\
packet-tftp.c \
packet-tftp.h \
packet-time.c \
- packet-time.h \
packet-tns.c \
packet-tns.h \
packet-tr.c \
packet-vrrp.h \
packet-vtp.c \
packet-vtp.h \
- packet-wccp.c\
- packet-wccp.h\
- packet-who.c\
- packet-who.h\
+ packet-wccp.c \
+ packet-who.c \
packet-x25.c \
packet-x25.h \
packet-yhoo.c \
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-auto_rp.c,v 1.3 2000/03/12 04:47:35 gram Exp $
+ * $Id: packet-auto_rp.c,v 1.4 2000/04/08 07:07:08 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint hf_auto_rp_group = -1;
static gint hf_auto_rp_mask_sgn = -1;
+#define UDP_PORT_PIM_RP_DISC 496
+
struct auto_rp_fixed_hdr {
#define AUTO_RP_VERSION_MASK 0xf0
#define AUTO_RP_TYPE_MASK 0x0f
static int do_auto_rp_map(const u_char *pd, int offset, frame_data *fd, proto_tree *auto_rp_tree);
-void dissect_auto_rp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void dissect_auto_rp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
struct auto_rp_fixed_hdr arh;
gboolean short_hdr = FALSE;
return;
}
+void
+proto_reg_handoff_auto_rp(void)
+{
+ dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp);
+}
+
/*
* Handles one Auto-RP map entry. Returns the number of bytes in the map entry or < 0 for error.
*/
return offset;
}
-
+++ /dev/null
-/* packet-auto_rp.h
- *
- * $Id: packet-auto_rp.h,v 1.1 2000/02/15 21:02:02 gram 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.
- */
-
-
-void dissect_auto_rp(const u_char *, int, frame_data *, proto_tree *);
* Routines for BGP packet dissection.
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id
+ * $Id: packet-bgp.c,v 1.21 2000/04/08 07:07:08 guy Exp $
*
* Supports:
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
#include <arpa/inet.h>
#endif
+#define TCP_PORT_BGP 179
+
static const value_string bgptypevals[] = {
{ BGP_OPEN, "OPEN Message" },
{ BGP_UPDATE, "UPDATE Message" },
/*
* Dissect a BGP packet.
*/
-void
+static void
dissect_bgp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_item *ti; /* tree item */
proto_bgp = proto_register_protocol("Border Gateway Protocol", "bgp");
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_bgp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_BGP, dissect_bgp);
+}
/* packet-bgp.c
* Definitions for BGP packet disassembly structures and routine
*
- * $Id: packet-bgp.h,v 1.7 2000/02/15 21:02:02 gram Exp $
+ * $Id: packet-bgp.h,v 1.8 2000/04/08 07:07:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#ifndef __PACKET_BGP_H__
#define __PACKET_BGP_H__
-void dissect_bgp(const u_char *, int, frame_data *, proto_tree *);
-
/* some handy things to know */
#define BGP_MAX_PACKET_SIZE 4096
#define BGP_MARKER_SIZE 16
* Routines for BOOTP/DHCP packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-bootp.c,v 1.29 2000/03/29 09:29:16 guy Exp $
+ * $Id: packet-bootp.c,v 1.30 2000/04/08 07:07:10 guy Exp $
*
* The information used comes from:
* RFC 2132: DHCP Options and BOOTP Vendor Extensions
static guint ett_bootp = -1;
static guint ett_bootp_option = -1;
+#define UDP_PORT_BOOTPS 67
+
enum field_type { none, ipv4, string, toggle, yes_no, special, opaque,
time_in_secs,
val_u_byte, val_u_short, val_u_long,
return consumed;
}
-void
+static void
dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *bp_tree;
proto_register_field_array(proto_bootp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_bootp(void)
+{
+ dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp);
+}
+++ /dev/null
-/* packet-bootp.h
- *
- * $Id: packet-bootp.h,v 1.1 2000/02/15 21:02:03 gram 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.
- */
-
-
-void dissect_bootp(const u_char *, int, frame_data *, proto_tree *);
* see http://dhis.sourceforge.net/
* Olivier Abad <abad@daba.dhis.net>
*
- * $Id: packet-dhis.c,v 1.2 2000/02/23 22:41:15 oabad Exp $
+ * $Id: packet-dhis.c,v 1.3 2000/04/08 07:07:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static int ett_dhis = -1;
+#define UDP_PORT_DHIS1 58800
+#define UDP_PORT_DHIS2 58801
+
static const value_string vals_dhis_version[] = {
{ DHIS_VERSION_ERROR, "Protocol Error" },
{ DHIS_VERSION_4, "4" },
{ 0, NULL}
};
-void
+static void
dissect_dhis(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_register_field_array(proto_dhis, hf_dhis, array_length(hf_dhis));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_dhis(void)
+{
+ dissector_add("udp.port", UDP_PORT_DHIS1, dissect_dhis);
+ dissector_add("udp.port", UDP_PORT_DHIS2, dissect_dhis);
+}
* see http://dhis.sourceforge.net/
* Olivier Abad <abad@daba.dhis.net>
*
- * $Id: packet-dhis.h,v 1.2 2000/02/23 22:41:15 oabad Exp $
+ * $Id: packet-dhis.h,v 1.3 2000/04/08 07:07:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#define DHIS_INVALID_PASSWORD 2
#define DHIS_INVALID_ACCOUNT 3
#define DHIS_INVALID_OPCODE 4
-
-void dissect_dhis(const u_char *, int, frame_data *, proto_tree *);
* Routines for ftp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-ftp.c,v 1.12 2000/03/12 04:47:37 gram Exp $
+ * $Id: packet-ftp.c,v 1.13 2000/04/08 07:07:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_ftp = -1;
-void
+#define TCP_PORT_FTPDATA 20
+#define TCP_PORT_FTP 21
+
+static void
dissect_ftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *ftp_tree, *ti;
}
}
-void
+static void
dissect_ftpdata(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *ti;
proto_register_field_array(proto_ftp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ftp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata);
+ dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp);
+}
+
+++ /dev/null
-/* packet-ftp.h
- *
- * $Id: packet-ftp.h,v 1.1 2000/02/15 21:02:10 gram 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.
- */
-
-
-void dissect_ftp(const u_char *, int, frame_data *, proto_tree *);
-void dissect_ftpdata(const u_char *, int, frame_data *, proto_tree *);
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-hsrp.c,v 1.2 2000/01/07 22:05:31 guy Exp $
+ * $Id: packet-hsrp.c,v 1.3 2000/04/08 07:07:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint proto_hsrp = -1;
static gint ett_hsrp = -1;
+#define UDP_PORT_HSRP 1985
+
struct hsrp_packet { /* Multicast to 224.0.0.2, TTL 1, UDP, port 1985 */
guint8 version; /* RFC2281 describes version 0 */
guint8 opcode;
{HSRP_STATE_ACTIVE, "Active"}
};
-void dissect_hsrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void
+dissect_hsrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
struct hsrp_packet hsrp;
gboolean short_packet = FALSE;
return;
}
+
+void
+proto_reg_handoff_hsrp(void)
+{
+ dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp);
+}
+++ /dev/null
-/* packet-hsrp.h
- *
- * $Id: packet-hsrp.h,v 1.1 2000/02/15 21:02:12 gram 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.
- */
-
-
-void dissect_hsrp(const u_char *, int, frame_data *, proto_tree *);
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-http.c,v 1.16 2000/02/23 20:55:33 guy Exp $
+ * $Id: packet-http.c,v 1.17 2000/04/08 07:07:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_http = -1;
+#define TCP_PORT_HTTP 80
+#define TCP_PORT_PROXY_HTTP 3128
+#define TCP_PORT_PROXY_ADMIN_HTTP 3132
+#define TCP_ALT_PORT_HTTP 8080
+
static int is_http_request_or_reply(const u_char *data, int linelen, http_type_t *type);
void dissect_http(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
proto_register_field_array(proto_http, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_http(void)
+{
+ dissector_add("tcp.port", TCP_PORT_HTTP, dissect_http);
+ dissector_add("tcp.port", TCP_ALT_PORT_HTTP, dissect_http);
+ dissector_add("tcp.port", TCP_PORT_PROXY_HTTP, dissect_http);
+ dissector_add("tcp.port", TCP_PORT_PROXY_ADMIN_HTTP, dissect_http);
+}
* Routines for ICP (internet cache protocol) packet disassembly
* RFC 2186 && RFC 2187
*
- * $Id: packet-icp.c,v 1.5 2000/03/12 04:47:38 gram Exp $
+ * $Id: packet-icp.c,v 1.6 2000/04/08 07:07:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Peter Torvals
static gint ett_icp = -1;
static gint ett_icp_payload = -1;
+#define UDP_PORT_ICP 3130
+
#define CODE_ICP_OP_QUERY 1
#define CODE_ICP_OP_INVALID 0
#define CODE_ICP_OP_HIT 2
} e_icphdr;
static gchar textbuf[MAX_TEXTBUF_LENGTH];
-void dissect_icp_payload( const u_char *pd, int offset,
+
+static void dissect_icp_payload( const u_char *pd, int offset,
frame_data *fd,proto_tree *pload_tree, e_icphdr *icph)
{
/* To Be Done take care of fragmentation*/
}
}
-void dissect_icp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void dissect_icp(const u_char *pd, int offset, frame_data *fd,
+ proto_tree *tree)
{
proto_tree *icp_tree , *payload_tree;
proto_item *ti , *payloadtf;
proto_register_field_array(proto_icp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_icp(void)
+{
+ dissector_add("udp.port", UDP_PORT_ICP, dissect_icp);
+}
+++ /dev/null
-/* packet-icp.h
- *
- * $Id: packet-icp.h,v 1.1 2000/02/15 21:02:14 gram 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.
- */
-
-
-void dissect_icp(const u_char *, int, frame_data *, proto_tree *);
/* packet-icq.c
* Routines for ICQ packet disassembly
*
- * $Id: packet-icq.c,v 1.13 2000/03/14 07:12:23 gram Exp $
+ * $Id: packet-icq.c,v 1.14 2000/04/08 07:07:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Johan Feyaerts
static gint ett_icq_body = -1;
static gint ett_icq_body_parts = -1;
+#define UDP_PORT_ICQ 4000
+
enum { ICQ5_client, ICQ5_server};
-void dissect_icqv5(const u_char *pd,
+static void dissect_icqv5(const u_char *pd,
int offset,
frame_data *fd,
proto_tree *tree);
}
}
-void dissect_icqv5(const u_char *pd,
- int offset,
- frame_data *fd,
- proto_tree *tree)
+static void dissect_icqv5(const u_char *pd,
+ int offset,
+ frame_data *fd,
+ proto_tree *tree)
{
guint32 unknown = pletohl(&pd[offset + ICQ5_UNKNOWN]);
}
}
-void dissect_icq(const u_char *pd,
- int offset,
- frame_data *fd,
- proto_tree *tree)
+static void dissect_icq(const u_char *pd,
+ int offset,
+ frame_data *fd,
+ proto_tree *tree)
{
int version = 0;
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_icq(void)
+{
+ dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq);
+}
+++ /dev/null
-/* packet-icq.h
- *
- * $Id: packet-icq.h,v 1.1 2000/02/15 21:02:14 gram 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.
- */
-
-
-void dissect_icq(const u_char *, int, frame_data *, proto_tree *);
* Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-imap.c,v 1.4 2000/01/07 22:05:31 guy Exp $
+ * $Id: packet-imap.c,v 1.5 2000/04/08 07:07:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_imap = -1;
-void
+#define TCP_PORT_IMAP 143
+
+static void
dissect_imap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *imap_tree, *ti;
proto_register_field_array(proto_imap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_imap(void)
+{
+ dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap);
+}
+++ /dev/null
-/* packet-imap.h
- *
- * $Id: packet-imap.h,v 1.1 2000/02/15 21:02:15 gram 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.
- */
-
-
-void dissect_imap(const u_char *, int, frame_data *, proto_tree *);
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-ipp.c,v 1.7 2000/03/07 06:28:47 guy Exp $
+ * $Id: packet-ipp.c,v 1.8 2000/04/08 07:07:20 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <glib.h>
#include "packet.h"
+#include "packet-http.h"
static int proto_ipp = -1;
/* proto_register_field_array(proto_ipp, hf, array_length(hf));*/
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ipp(void)
+{
+ /* XXX - should we just register ourselves as a dissector,
+ and call the HTTP dissector?
+
+ Should we pass to it a pointer to our dissector, so that
+ it knows to call us?
+
+ Or should the HTTP dissector decide that the payload is
+ IPP based on the MIME headers? */
+ dissector_add("tcp.port", 631, dissect_http);
+}
+
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ipx.c,v 1.51 2000/03/20 22:52:41 gram Exp $
+ * $Id: packet-ipx.c,v 1.52 2000/04/08 07:07:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
typedef void (dissect_func_t)(const u_char *, int, frame_data *, proto_tree *);
+#define UDP_PORT_IPX 213 /* RFC 1234 */
+
struct port_info {
guint16 port;
dissect_func_t *func;
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ipx(void)
+{
+ dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx);
+}
/* packet-irc.c
* Routines for MSX irc packet dissection
*
- * $Id: packet-irc.c,v 1.3 2000/01/07 22:05:31 guy Exp $
+ * $Id: packet-irc.c,v 1.4 2000/04/08 07:07:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_irc = -1;
-void dissect_irc_request(proto_tree *tree, char *line, int offset, int len)
+#define TCP_PORT_IRC 6667
+ /* good candidate for dynamic port specification */
+
+static void
+dissect_irc_request(proto_tree *tree, char *line, int offset, int len)
{
proto_tree_add_item_hidden(tree, hf_irc_request,
offset, len, TRUE);
len, "Request Line: %s", line);
}
-void dissect_irc_response(proto_tree *tree, char *line, int offset, int len)
+static void
+dissect_irc_response(proto_tree *tree, char *line, int offset, int len)
{
proto_tree_add_item_hidden(tree, hf_irc_response,
offset, len, TRUE);
len, "Response Line: %s", line);
}
-void
+static void
dissect_irc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *irc_tree, *ti;
proto_register_field_array(proto_irc, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_irc(void)
+{
+ dissector_add("tcp.port", TCP_PORT_IRC, dissect_irc);
+}
+
+++ /dev/null
-/* packet-irc.h
- *
- * $Id: packet-irc.h,v 1.1 2000/02/15 21:02:26 gram 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.
- */
-
-
-void dissect_irc(const u_char *, int, frame_data *, proto_tree *);
* Routines for the Internet Security Association and Key Management Protocol (ISAKMP)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.12 2000/01/07 22:05:31 guy Exp $
+ * $Id: packet-isakmp.c,v 1.13 2000/04/08 07:07:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_isakmp_flags = -1;
static gint ett_isakmp_payload = -1;
+#define UDP_PORT_ISAKMP 500
+
#define NUM_PROTO_TYPES 5
#define proto2str(t) \
((t < NUM_PROTO_TYPES) ? prototypestr[t] : "UNKNOWN-PROTO-TYPE")
{"Vendor ID", dissect_vid }
};
-void dissect_isakmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+static void
+dissect_isakmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
struct isakmp_hdr * hdr = (struct isakmp_hdr *)(pd + offset);
guint32 len;
/* proto_register_field_array(proto_isakmp, hf, array_length(hf));*/
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_isakmp(void)
+{
+ dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp);
+}
+++ /dev/null
-/* packet-isakmp.h
- *
- * $Id: packet-isakmp.h,v 1.1 2000/02/15 21:02:27 gram 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.
- */
-
-
-void dissect_isakmp(const u_char *, int, frame_data *, proto_tree *);
* Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be>
*
- * $Id: packet-l2tp.c,v 1.7 2000/04/05 15:57:04 gram Exp $
+ * $Id: packet-l2tp.c,v 1.8 2000/04/08 07:07:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "packet.h"
#include "resolv.h"
-
+#define UDP_PORT_L2TP 1701
#define CONTROL_BIT(msg_info) (msg_info & 0x8000) /* Type bit control = 1 data = 0 */
#define LENGTH_BIT(msg_info) (msg_info & 0x4000) /* Length bit = 1 */
static gchar textbuffer[200];
-void dissect_l2tp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+
+static void
+dissect_l2tp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *l2tp_tree, *l2tp_avp_tree;
proto_item *ti, *tf;
proto_register_field_array(proto_l2tp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_l2tp(void)
+{
+ dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp);
+}
+++ /dev/null
-/* packet-l2tp.h
- *
- * $Id: packet-l2tp.h,v 1.1 2000/02/15 21:02:29 gram 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.
- */
-
-
-void dissect_l2tp(const u_char *, int, frame_data *, proto_tree *);
/* packet-ldap.c
* Routines for ldap packet dissection
*
- * $Id: packet-ldap.c,v 1.8 2000/04/06 03:59:28 guy Exp $
+ * $Id: packet-ldap.c,v 1.9 2000/04/08 07:07:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_ldap_referrals = -1;
static gint ett_ldap_attribute = -1;
+#define TCP_PORT_LDAP 389
+
static value_string msgTypes [] = {
{LDAP_REQ_BIND, "Bind Request"},
{LDAP_REQ_UNBIND, "Unbind Request"},
return 0;
}
-void
+static void
dissect_ldap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *ldap_tree = 0, *ti, *msg_tree;
proto_register_field_array(proto_ldap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ldap(void)
+{
+ dissector_add("tcp.port", TCP_PORT_LDAP, dissect_ldap);
+}
+
/* packet-ldap.h
*
- * $Id: packet-ldap.h,v 1.3 2000/03/29 09:25:21 guy Exp $
+ * $Id: packet-ldap.h,v 1.4 2000/04/08 07:07:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#define LDAP_MOD_ADD 0
#define LDAP_MOD_DELETE 1
#define LDAP_MOD_REPLACE 2
-
-void dissect_ldap(const u_char *, int, frame_data *, proto_tree *);
* Routines for LPR and LPRng packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-lpd.c,v 1.16 2000/01/22 06:22:14 guy Exp $
+ * $Id: packet-lpd.c,v 1.17 2000/04/08 07:07:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <glib.h>
#include "packet.h"
+#define TCP_PORT_PRINTER 515
+
static int proto_lpd = -1;
static int hf_lpd_response = -1;
static int hf_lpd_request = -1;
static char* find_printer_string(const u_char *pd, int offset, int frame_length);
-void
+static void
dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *lpd_tree;
proto_register_subtree_array(ett, array_length(ett));
}
+void
+proto_reg_handoff_lpd(void)
+{
+ dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd);
+}
+++ /dev/null
-/* packet-lpd.h
- *
- * $Id: packet-lpd.h,v 1.1 2000/02/15 21:02:34 gram 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.
- */
-
-
-void dissect_lpd(const u_char *, int, frame_data *, proto_tree *);
/* packet-mapi.c
* Routines for MSX mapi packet dissection
*
- * $Id: packet-mapi.c,v 1.4 2000/01/07 22:05:32 guy Exp $
+ * $Id: packet-mapi.c,v 1.5 2000/04/08 07:07:29 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_mapi = -1;
-void
+#define TCP_PORT_MAPI 1065
+
+static void
dissect_mapi(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *mapi_tree, *ti;
if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "MAPI");
+ col_add_str(fd, COL_PROTOCOL, "MAPI");
if (check_col(fd, COL_INFO))
{
proto_register_field_array(proto_mapi, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_mapi(void)
+{
+ dissector_add("tcp.port", TCP_PORT_MAPI, dissect_mapi);
+}
+++ /dev/null
-/* packet-mapi.h
- *
- * $Id: packet-mapi.h,v 1.1 2000/02/15 21:02:34 gram 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.
- */
-
-
-void dissect_mapi(const u_char *, int, frame_data *, proto_tree *);
* Gilbert Ramirez <gram@xiexie.org>
* Much stuff added by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nbns.c,v 1.38 2000/03/12 04:47:42 gram Exp $
+ * $Id: packet-nbns.c,v 1.39 2000/04/08 07:07:29 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_nbss = -1;
static gint ett_nbss_flags = -1;
+#define UDP_PORT_NBNS 137
+#define UDP_PORT_NBDGM 138
+#define TCP_PORT_NBSS 139
+
/* Packet structure taken from RFC 1002. See also RFC 1001.
* Opcode, flags, and rcode treated as "flags", similarly to DNS,
* to make it easier to lift the dissection code from "packet-dns.c". */
return cur_off - start_off;
}
-void
+static void
dissect_nbns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
int nbns_data_offset;
guint8 error_code;
};
-void
+static void
dissect_nbdgm(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *nbdgm_tree = NULL;
return length + 4;
}
-void
+static void
dissect_nbss(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
guint8 msg_type;
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_nbt(void)
+{
+ dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
+ dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
+ dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss);
+}
+++ /dev/null
-/* packet-nbns.h
- *
- * $Id: packet-nbns.h,v 1.1 2000/02/15 21:02:39 gram 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.
- */
-
-
-void dissect_nbdgm(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbns(const u_char *, int, frame_data *, proto_tree *);
-void dissect_nbss(const u_char *, int, frame_data *, proto_tree *);
* Gilbert Ramirez <gram@xiexie.org>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
*
- * $Id: packet-ncp.c,v 1.31 2000/03/12 04:47:43 gram Exp $
+ * $Id: packet-ncp.c,v 1.32 2000/04/08 07:07:30 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_ncp_request_fields = -1;
static gint ett_ncp_reply_fields = -1;
+#define TCP_PORT_NCP 524
+
struct svc_record;
static void
proto_register_subtree_array(ett, array_length(ett));
register_init_routine(&ncp_init_protocol);
}
+
+void
+proto_reg_handoff_ncp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_NCP, dissect_ncp);
+}
* Routines for nntp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-nntp.c,v 1.7 2000/01/07 22:05:34 guy Exp $
+ * $Id: packet-nntp.c,v 1.8 2000/04/08 07:07:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_nntp = -1;
-void
+#define TCP_PORT_NNTP 119
+
+static void
dissect_nntp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
gchar *type;
proto_register_field_array(proto_nntp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_nntp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp);
+}
+++ /dev/null
-/* packet-nntp.h
- *
- * $Id: packet-nntp.h,v 1.1 2000/02/15 21:02:43 gram 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.
- */
-
-
-void dissect_nntp(const u_char *, int, frame_data *, proto_tree *);
* Routines for NTP packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-ntp.c,v 1.10 2000/03/12 04:47:44 gram Exp $
+ * $Id: packet-ntp.c,v 1.11 2000/04/08 07:07:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* first 32 bits and the fraction part in the last 32 bits.
*/
+#define UDP_PORT_NTP 123
+#define TCP_PORT_NTP 123
+
/* Leap indicator, 2bit field is used to warn of a inserted/deleted
* second, or to alarm loosed synchronization.
*/
* buff - string buffer for result (OUT)
* returns pointer to filled buffer.
*/
-char *
+static char *
ntp_fmt_ts(unsigned char * reftime, char* buff)
{
guint32 tempstmp, tempfrac;
* fd - frame data
* proto_tree - resolved protocol tree
*/
-void
+static void
dissect_ntp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *ntp_tree, *flags_tree;
proto_register_field_array(proto_ntp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ntp(void)
+{
+ dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp);
+ dissector_add("tcp.port", TCP_PORT_NTP, dissect_ntp);
+}
/* packet-ntp.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet-ntp.h,v 1.3 2000/02/15 21:02:43 gram Exp $
+ * $Id: packet-ntp.h,v 1.4 2000/04/08 07:07:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#ifndef PACKET_NTP_H
#define PACKET_NTP_H
-void dissect_ntp(const u_char *, int, frame_data *, proto_tree *);
-
#define NTP_LI_MASK 192
#define NTP_LI_NONE 0
#define NTP_LI_61 64
* Routines for pop packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-pop.c,v 1.12 2000/01/07 22:05:35 guy Exp $
+ * $Id: packet-pop.c,v 1.13 2000/04/08 07:07:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_pop = -1;
+#define TCP_PORT_POP 110
+
static gboolean is_continuation(const u_char *data);
-void
+static void
dissect_pop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *pop_tree, *ti;
}
}
+static gboolean is_continuation(const u_char *data)
+{
+ if (strncmp(data, "+OK", strlen("+OK")) == 0)
+ return FALSE;
+
+ if (strncmp(data, "-ERR", strlen("-ERR")) == 0)
+ return FALSE;
+
+ return TRUE;
+}
+
void
proto_register_pop(void)
{
proto_register_subtree_array(ett, array_length(ett));
}
-static gboolean is_continuation(const u_char *data)
+void
+proto_reg_handoff_pop(void)
{
- if (strncmp(data, "+OK", strlen("+OK")) == 0)
- return FALSE;
-
- if (strncmp(data, "-ERR", strlen("-ERR")) == 0)
- return FALSE;
-
- return TRUE;
+ dissector_add("tcp.port", TCP_PORT_POP, dissect_pop);
}
+++ /dev/null
-/* packet-pop.h
- *
- * $Id: packet-pop.h,v 1.1 2000/02/15 21:02:51 gram 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.
- */
-
-
-void dissect_pop(const u_char *, int, frame_data *, proto_tree *);
* Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-pptp.c,v 1.8 2000/01/20 07:31:29 guy Exp $
+ * $Id: packet-pptp.c,v 1.9 2000/04/08 07:07:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_pptp = -1;
+#define TCP_PORT_PPTP 1723
+
#define NUM_MSG_TYPES 3
#define msgtype2str(t) \
((t < NUM_MSG_TYPES) ? msgtypestr[t] : "UNKNOWN-MESSAGES-TYPE")
guint32 recv_acm;
};
-void
+static void
dissect_pptp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
struct pptp_hdr * hdr = (struct pptp_hdr *)(pd + offset);
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_pptp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_PPTP, dissect_pptp);
+}
+++ /dev/null
-/* packet-pptp.h
- *
- * $Id: packet-pptp.h,v 1.1 2000/02/15 21:02:55 gram 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.
- */
-
-
-void dissect_pptp(const u_char *, int, frame_data *, proto_tree *);
/* packet-radius.c
* Routines for RADIUS packet disassembly
*
- * $Id: packet-radius.c,v 1.10 2000/04/05 16:01:39 gram Exp $
+ * $Id: packet-radius.c,v 1.11 2000/04/08 07:07:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Johan Feyaerts
static gint ett_radius = -1;
static gint ett_radius_avp = -1;
+#define UDP_PORT_RADIUS 1645
+#define UDP_PORT_RADIUS_NEW 1812
+#define UDP_PORT_RADACCT 1646
+#define UDP_PORT_RADACCT_NEW 1813
+
typedef struct _e_radiushdr {
guint8 rh_code;
guint8 rh_ident;
}
}
-void dissect_radius(const u_char *pd, int offset, frame_data *fd,
+static void dissect_radius(const u_char *pd, int offset, frame_data *fd,
proto_tree
*tree)
{
proto_register_field_array(proto_radius, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_radius(void)
+{
+ dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius);
+ dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius);
+ dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius);
+ dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius);
+}
+++ /dev/null
-/* packet-radius.h
- *
- * $Id: packet-radius.h,v 1.1 2000/02/15 21:02:57 gram 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.
- */
-
-
-void dissect_radius(const u_char *, int, frame_data *, proto_tree *);
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
* derived from packet-rip.c
*
- * $Id: packet-ripng.c,v 1.8 2000/03/12 04:47:48 gram Exp $
+ * $Id: packet-ripng.c,v 1.9 2000/04/08 07:07:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_ripng = -1;
static gint ett_ripng_addr = -1;
-void
+#define UDP_PORT_RIPNG 521
+
+static void
dissect_ripng(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
struct rip6 rip6;
struct netinfo6 ni6;
proto_register_field_array(proto_ripng, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ripng(void)
+{
+ dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng);
+}
* RIPng definition
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-ripng.h,v 1.2 2000/02/15 21:02:59 gram Exp $
+ * $Id: packet-ripng.h,v 1.3 2000/04/08 07:07:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "packet-ipv6.h"
#endif
-void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
-
/*
* KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.h,v 1.1.1.1 1999/08/08 23:31:35 itojun Exp
*/
* Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rtsp.c,v 1.8 2000/02/15 21:03:04 gram Exp $
+ * $Id: packet-rtsp.c,v 1.9 2000/04/08 07:07:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static int hf_rtsp_url = -1;
static int hf_rtsp_status = -1;
+#define TCP_PORT_RTSP 554
+
static int process_rtsp_request_or_reply(const u_char *data, int offset,
int linelen, proto_tree *tree);
return 1;
}
-void dissect_rtsp(const u_char *pd, int offset, frame_data *fd,
+static void dissect_rtsp(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree)
{
proto_tree *rtsp_tree;
proto_register_field_array(proto_rtsp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_rtsp(void)
+{
+ dissector_add("tcp.port", TCP_PORT_RTSP, dissect_rtsp);
+}
+++ /dev/null
-/* packet-rtsp.h
- *
- * $Id: packet-rtsp.h,v 1.1 2000/02/15 21:03:05 gram 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.
- */
-
-
-void dissect_rtsp(const u_char *, int, frame_data *, proto_tree *);
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-sap.c,v 1.5 2000/02/15 21:03:07 gram Exp $
+ * $Id: packet-sap.c,v 1.6 2000/04/08 07:07:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "packet-ipv6.h"
#include "packet-sdp.h"
+#define UDP_PORT_SAP 9875
+
#define MCAST_SAP_VERSION_MASK 0xE0 /* 3 bits for SAP version*/
#define MCAST_SAP_VERSION_SHIFT 5 /* Right shift 5 bits to get the version */
#define MCAST_SAP_VER0 0 /* Version 0 */
static gint ett_sap_auth = -1;
static gint ett_sap_authf = -1;
-void dissect_sap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void
+dissect_sap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
int sap_version, is_ipv6, is_del, is_enc, is_comp, addr_len;
guint8 auth_len;
proto_register_field_array(proto_sap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_sap(void)
+{
+ dissector_add("udp.port", UDP_PORT_SAP, dissect_sap);
+}
+++ /dev/null
-/* packet-sap.h
- *
- * $Id: packet-sap.h,v 1.1 2000/02/15 21:03:08 gram 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.
- */
-
-
-void dissect_sap(const u_char *, int, frame_data *, proto_tree *);
* Routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998
*
- * $Id: packet-snmp.c,v 1.26 2000/03/15 07:12:55 guy Exp $
+ * $Id: packet-snmp.c,v 1.27 2000/04/08 07:07:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_snmp = -1;
+#define UDP_PORT_SNMP 161
+#define UDP_PORT_SNMP_TRAP 162
+
/* Protocol version numbers */
#define SNMP_VERSION_1 0
#define SNMP_VERSION_2c 1
/* proto_register_field_array(proto_snmp, hf, array_length(hf));*/
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_snmp(void)
+{
+ dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp);
+ dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp);
+}
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.6 2000/01/22 02:00:24 guy Exp $
+ * $Id: packet-srvloc.c,v 1.7 2000/04/08 07:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "packet.h"
#include "packet-ipv6.h"
-int proto_srvloc = -1;
-int hf_srvloc_version = -1;
-int hf_srvloc_function = -1;
-int hf_srvloc_flags = -1;
-int hf_srvloc_error = -1;
+static int proto_srvloc = -1;
+static int hf_srvloc_version = -1;
+static int hf_srvloc_function = -1;
+static int hf_srvloc_flags = -1;
+static int hf_srvloc_error = -1;
static gint ett_srvloc = -1;
-gint ett_srvloc_flags = -1;
+static gint ett_srvloc_flags = -1;
+
+#define TCP_PORT_SRVLOC 427
+#define UDP_PORT_SRVLOC 427
/* Define function types */
/* Packet dissection routine called by tcp & udp when port 427 detected */
-void
+static void
dissect_srvloc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_item *ti, *tf;
proto_register_field_array(proto_srvloc, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
};
+
+void
+proto_reg_handoff_srvloc(void)
+{
+ dissector_add("tcp.port", TCP_PORT_SRVLOC, dissect_srvloc);
+ dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc);
+}
+
+++ /dev/null
-/* packet-srvloc.h
- *
- * $Id: packet-srvloc.h,v 1.1 2000/02/15 21:03:11 gram 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.
- */
-
-
-void dissect_srvloc(const u_char *, int, frame_data *, proto_tree *);
/* packet-tacacs.c
* Routines for cisco tacacs/tacplus/AAA packet dissection
*
- * $Id: packet-tacacs.c,v 1.2 2000/01/07 22:05:41 guy Exp $
+ * $Id: packet-tacacs.c,v 1.3 2000/04/08 07:07:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_tacacs = -1;
-void
+#define UDP_PORT_TACACS 49
+#define TCP_PORT_TACACS 49
+
+static void
dissect_tacacs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *tacacs_tree, *ti;
if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "TACACS");
+ col_add_str(fd, COL_PROTOCOL, "TACACS");
if (check_col(fd, COL_INFO))
{
}
}
-void
+static void
dissect_tacplus(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *tacacs_tree, *ti;
proto_register_field_array(proto_tacacs, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_tacacs(void)
+{
+ dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs);
+ dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus);
+}
+++ /dev/null
-/* packet-tacacs.h
- *
- * $Id: packet-tacacs.h,v 1.1 2000/02/15 21:03:14 gram 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.
- */
-
-
-void dissect_tacacs(const u_char *, int, frame_data *, proto_tree *);
-void dissect_tacplus(const u_char *, int, frame_data *, proto_tree *);
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c,v 1.65 2000/04/08 03:32:10 guy Exp $
+ * $Id: packet-tcp.c,v 1.66 2000/04/08 07:07:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "plugins.h"
-#include "packet-bgp.h"
#include "packet-ip.h"
-#include "packet-ftp.h"
#include "packet-giop.h"
-#include "packet-http.h"
-#include "packet-imap.h"
-#include "packet-irc.h"
-#include "packet-ldap.h"
-#include "packet-lpd.h"
-#include "packet-mapi.h"
-#include "packet-nbns.h"
-#include "packet-ncp.h"
-#include "packet-nntp.h"
-#include "packet-ntp.h"
-#include "packet-pop.h"
-#include "packet-pptp.h"
#include "packet-rpc.h"
-#include "packet-rtsp.h"
-#include "packet-srvloc.h"
-#include "packet-tacacs.h"
-#include "packet-telnet.h"
-#include "packet-tns.h"
#include "packet-yhoo.h"
extern FILE* data_out_file;
/* TCP Ports */
-#define TCP_PORT_FTPDATA 20
-#define TCP_PORT_FTP 21
-#define TCP_PORT_TELNET 23
#define TCP_PORT_SMTP 25
-#define TCP_PORT_HTTP 80
-#define TCP_PORT_TACACS 49
-#define TCP_PORT_POP 110
-#define TCP_PORT_NNTP 119
-#define TCP_PORT_NTP 123
-#define TCP_PORT_NBSS 139
-#define TCP_PORT_IMAP 143
-#define TCP_PORT_BGP 179
-#define TCP_PORT_LDAP 389
-#define TCP_PORT_SRVLOC 427
-#define TCP_PORT_PRINTER 515
-#define TCP_PORT_NCP 524
-#define TCP_PORT_RTSP 554
-#define TCP_PORT_MAPI 1065
-#define TCP_PORT_TNS 1521
-#define TCP_PORT_PPTP 1723
-#define TCP_PORT_PROXY_HTTP 3128
-#define TCP_PORT_PROXY_ADMIN_HTTP 3132
#define TCP_PORT_YHOO 5050
-#define TCP_ALT_PORT_HTTP 8080
-#define TCP_PORT_IRC 6667
- /* good candidate for dynamic port specification */
/* TCP structs and definitions */
/* subdissector code */
subdissector_table = register_dissector_table(hf_tcp_port);
-
- dissector_add( "tcp.port", TCP_PORT_PRINTER, &dissect_lpd);
- dissector_add( "tcp.port", TCP_PORT_TELNET, &dissect_telnet);
- dissector_add( "tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata);
- dissector_add( "tcp.port", TCP_PORT_FTP, &dissect_ftp);
- dissector_add( "tcp.port", TCP_PORT_POP, &dissect_pop);
- dissector_add( "tcp.port", TCP_PORT_IMAP, &dissect_imap);
- dissector_add( "tcp.port", TCP_PORT_NNTP, &dissect_nntp);
- dissector_add( "tcp.port", TCP_PORT_NTP, &dissect_ntp);
- dissector_add( "tcp.port", TCP_PORT_PPTP, &dissect_pptp);
- dissector_add( "tcp.port", TCP_PORT_PPTP, &dissect_pptp);
- dissector_add( "tcp.port", TCP_PORT_HTTP, &dissect_http);
- dissector_add( "tcp.port", TCP_ALT_PORT_HTTP, &dissect_http);
- dissector_add( "tcp.port", 631, &dissect_http); /* IPP */
- dissector_add( "tcp.port", TCP_PORT_PROXY_HTTP, &dissect_http);
- dissector_add( "tcp.port", TCP_PORT_PROXY_ADMIN_HTTP, &dissect_http);
- dissector_add( "tcp.port", TCP_PORT_NBSS, &dissect_nbss);
- dissector_add( "tcp.port", TCP_PORT_RTSP, &dissect_rtsp);
- dissector_add( "tcp.port", TCP_PORT_BGP, &dissect_bgp);
- dissector_add( "tcp.port", TCP_PORT_TACACS, &dissect_tacplus);
- dissector_add( "tcp.port", TCP_PORT_MAPI, &dissect_mapi);
- dissector_add( "tcp.port", TCP_PORT_TNS, &dissect_tns);
- dissector_add( "tcp.port", TCP_PORT_IRC, &dissect_irc);
- dissector_add( "tcp.port", TCP_PORT_LDAP, &dissect_ldap);
- dissector_add( "tcp.port", TCP_PORT_SRVLOC, &dissect_srvloc);
- dissector_add( "tcp.port", TCP_PORT_NCP, &dissect_ncp);
}
* Routines for telnet packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-telnet.c,v 1.10 2000/03/23 10:49:33 guy Exp $
+ * $Id: packet-telnet.c,v 1.11 2000/04/08 07:07:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
/* Some defines for Telnet */
+#define TCP_PORT_TELNET 23
+
#define TN_IAC 255
#define TN_DONT 254
#define TN_DO 253
return offset;
}
-void
+static void
dissect_telnet(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *telnet_tree, *ti;
/* proto_register_field_array(proto_telnet, hf, array_length(hf));*/
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_telnet(void)
+{
+ dissector_add("tcp.port", TCP_PORT_TELNET, dissect_telnet);
+}
+++ /dev/null
-/* packet-telnet.h
- *
- * $Id: packet-telnet.h,v 1.1 2000/02/15 21:03:17 gram 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.
- */
-
-
-void dissect_telnet(const u_char *, int, frame_data *, proto_tree *);
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TIME Option Extension
*
- * $Id: packet-time.c,v 1.3 2000/03/20 22:52:48 gram Exp $
+ * $Id: packet-time.c,v 1.4 2000/04/08 07:07:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_time = -1;
-void
+#define UDP_PORT_TIME 37
+
+static void
dissect_time(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *time_tree;
col_add_str(fd, COL_PROTOCOL, "TIME");
if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "TIME %s", pi.srcport == 37? "Response":"Request");
+ col_add_fstr(fd, COL_INFO, "TIME %s", pi.srcport == UDP_PORT_TIME? "Response":"Request");
}
if (tree) {
proto_register_field_array(proto_time, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_time(void)
+{
+ dissector_add("udp.port", UDP_PORT_TIME, dissect_time);
+}
+++ /dev/null
-/* packet-time.h
- *
- * $Id: packet-time.h,v 1.1 2000/02/15 21:03:18 gram 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.
- */
-
-
-void dissect_time(const u_char *, int, frame_data *, proto_tree *);
/* packet-tns.c
* Routines for MSX tns packet dissection
*
- * $Id: packet-tns.c,v 1.4 2000/01/07 22:05:41 guy Exp $
+ * $Id: packet-tns.c,v 1.5 2000/04/08 07:07:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_tns_connect = -1;
static gint ett_sql = -1;
+#define TCP_PORT_TNS 1521
+
static const value_string tns_type_vals[] = {
{TNS_TYPE_CONNECT, "Connect" },
{TNS_TYPE_ACCEPT, "Accept" },
{TNS_TYPE_DATA, "Data" },
{TNS_TYPE_RESEND, "Resend"},
- {0, NULL}
+ {0, NULL}
};
#define TRUNC(length) if ( ! BYTES_ARE_IN_FRAME(offset, length)) { \
dissect_data(pd,offset,fd,tree); return; }
-void dissect_tns_sns(const u_char *pd, int offset, frame_data *fd,
+static void dissect_tns_sns(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree, proto_tree *tns_tree)
{
proto_tree *sns_tree = NULL, *ti;
}
}
-void dissect_tns_data(const u_char *pd, int offset, frame_data *fd,
+static void dissect_tns_data(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree, proto_tree *tns_tree)
{
return;
}
-void dissect_tns_connect(const u_char *pd, int offset, frame_data *fd,
+static void dissect_tns_connect(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree, proto_tree *tns_tree)
{
proto_tree *connect_tree = NULL, *ti;
return;
}
-void dissect_tns_accept(const u_char *pd, int offset, frame_data *fd,
+static void dissect_tns_accept(const u_char *pd, int offset, frame_data *fd,
proto_tree *tree, proto_tree *tns_tree)
{
dissect_data(pd,offset,fd,tns_tree);
}
-void
+static void
dissect_tns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *tns_tree = NULL, *ti;
guint16 type;
if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "TNS");
+ col_add_str(fd, COL_PROTOCOL, "TNS");
if (check_col(fd, COL_INFO))
{
proto_register_field_array(proto_tns, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_tns(void)
+{
+ dissector_add("tcp.port", TCP_PORT_TNS, dissect_tns);
+}
/* packet-tns.h
*
- * $Id: packet-tns.h,v 1.2 2000/02/15 21:03:19 gram Exp $
+ * $Id: packet-tns.h,v 1.3 2000/04/08 07:07:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-void dissect_tns(const u_char *, int, frame_data *, proto_tree *);
-
#ifndef PACKET_TNS_H
#define PACKET_TNS_H
/* packet-udp.c
* Routines for UDP packet disassembly
*
- * $Id: packet-udp.c,v 1.58 2000/04/04 22:26:36 oabad Exp $
+ * $Id: packet-udp.c,v 1.59 2000/04/08 07:07:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "plugins.h"
-#include "packet-auto_rp.h"
-#include "packet-bootp.h"
-#include "packet-dhis.h"
-#include "packet-hsrp.h"
-#include "packet-icp.h"
-#include "packet-icq.h"
-#include "packet-ipx.h"
-#include "packet-isakmp.h"
-#include "packet-l2tp.h"
-#include "packet-nbns.h"
#include "packet-ncp.h"
-#include "packet-ntp.h"
-#include "packet-radius.h"
#include "packet-rip.h"
-#include "packet-ripng.h"
#include "packet-rpc.h"
#include "packet-rx.h"
-#include "packet-sap.h"
-#include "packet-snmp.h"
-#include "packet-srvloc.h"
-#include "packet-tacacs.h"
#include "packet-tftp.h"
-#include "packet-time.h"
#include "packet-vines.h"
-#include "packet-wccp.h"
-#include "packet-who.h"
static int proto_udp = -1;
static int hf_udp_srcport = -1;
/* UDP Ports -> should go in packet-udp.h */
-#define UDP_PORT_TIME 37
-#define UDP_PORT_TACACS 49
-#define UDP_PORT_BOOTPS 67
#define UDP_PORT_TFTP 69
-#define UDP_PORT_NTP 123
-#define UDP_PORT_NBNS 137
-#define UDP_PORT_NBDGM 138
-#define UDP_PORT_SNMP 161
-#define UDP_PORT_SNMP_TRAP 162
-#define UDP_PORT_IPX 213 /* RFC 1234 */
-#define UDP_PORT_SRVLOC 427
-#define UDP_PORT_PIM_RP_DISC 496
-#define UDP_PORT_ISAKMP 500
-#define UDP_PORT_WHO 513
#define UDP_PORT_RIP 520
-#define UDP_PORT_RIPNG 521
#define UDP_PORT_NCP 524
#define UDP_PORT_VINES 573
-#define UDP_PORT_RADIUS 1645
-#define UDP_PORT_L2TP 1701
-#define UDP_PORT_RADIUS_NEW 1812
-#define UDP_PORT_RADACCT 1646
-#define UDP_PORT_RADACCT_NEW 1813
-#define UDP_PORT_HSRP 1985
-#define UDP_PORT_ICP 3130
-#define UDP_PORT_ICQ 4000
-#define UDP_PORT_SAP 9875
#define UDP_PORT_RX_LOW 7000
#define UDP_PORT_RX_HIGH 7009
#define UDP_PORT_RX_AFS_BACKUPS 7021
-#define UDP_PORT_WCCP 2048
-#define UDP_PORT_DHIS1 58800
-#define UDP_PORT_DHIS2 58801
static dissector_table_t udp_dissector_table;
/* subdissector code */
udp_dissector_table = register_dissector_table(hf_udp_port);
-
- /* Now add the protocols we know about.
- XXX - we should add all the UDP ports this way, rather
- than having the giant "if", just as is now done in
- "packet-tcp.c". */
-
- dissector_add("udp.port", UDP_PORT_TIME, dissect_time);
- dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs);
- dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp);
- dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp);
- dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
- dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
- dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp);
- dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp);
- dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx);
- dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc);
- dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp);
- dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp);
- dissector_add("udp.port", UDP_PORT_WHO, dissect_who);
- dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng);
- dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius);
- dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp);
- dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius);
- dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius);
- dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius);
- dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp);
- dissector_add("udp.port", UDP_PORT_ICP, dissect_icp);
- dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq);
- dissector_add("udp.port", UDP_PORT_SAP, dissect_sap);
- dissector_add("udp.port", UDP_PORT_WCCP, dissect_wccp);
- dissector_add("udp.port", UDP_PORT_DHIS1, dissect_dhis);
- dissector_add("udp.port", UDP_PORT_DHIS2, dissect_dhis);
}
* Routines for Web Cache Coordination Protocol dissection
* Jerry Talkington <jerryt@netapp.com>
*
- * $Id: packet-wccp.c,v 1.5 2000/03/12 04:47:51 gram Exp $
+ * $Id: packet-wccp.c,v 1.6 2000/04/08 07:07:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
*
* if it hasn't expired yet.
*/
+
+#define UDP_PORT_WCCP 2048
+
#define WCCPv1 0x0004
#define WCCP_HERE_I_AM 7
#define WCCP_I_SEE_YOU 8
guint32 start, int offset);
static gchar *bucket_name(guint8 bucket);
-void
+static void
dissect_wccp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *wccp_tree = NULL;
proto_register_field_array(proto_wccp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_wccp(void)
+{
+ dissector_add("udp.port", UDP_PORT_WCCP, dissect_wccp);
+}
+++ /dev/null
-/* packet-wccp.h
- *
- * $Id: packet-wccp.h,v 1.1 2000/02/15 21:03:27 gram 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.
- */
-
-
-void dissect_wccp(const u_char *, int, frame_data *, proto_tree *);
* Routines for who protocol (see man rwhod)
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-who.c,v 1.4 2000/03/12 04:47:51 gram Exp $
+ * $Id: packet-who.c,v 1.5 2000/04/08 07:07:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
static gint ett_who = -1;
static gint ett_whoent = -1;
+#define UDP_PORT_WHO 513
static void dissect_whoent(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
-void
+static void
dissect_who(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_register_subtree_array(ett, array_length(ett));
}
+void
+proto_reg_handoff_who(void)
+{
+ dissector_add("udp.port", UDP_PORT_WHO, dissect_who);
+}
+++ /dev/null
-/* packet-who.h
- *
- * $Id: packet-who.h,v 1.1 2000/02/15 21:03:28 gram 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.
- */
-
-
-void dissect_who(const u_char *, int, frame_data *, proto_tree *);
git.samba.org / obnox / wireshark / wip.git / commitdiff