forked from osmocom/wireshark
Add an additional "protocol index" argument to "{old_}dissector_add()",
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
This commit is contained in:
parent
925ce16014
commit
43ccfd8054
|
@ -1,7 +1,7 @@
|
|||
/* packet.c
|
||||
* Routines for packet disassembly
|
||||
*
|
||||
* $Id: packet.c,v 1.12 2001/01/09 05:53:21 guy Exp $
|
||||
* $Id: packet.c,v 1.13 2001/01/09 06:32:06 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1160,6 +1160,7 @@ typedef struct {
|
|||
old_dissector_t old;
|
||||
dissector_t new;
|
||||
} dissector;
|
||||
int proto_index;
|
||||
} dtbl_entry_t;
|
||||
|
||||
/* Finds a dissector table by field name. */
|
||||
|
@ -1173,7 +1174,8 @@ find_dissector_table(const char *name)
|
|||
/* add an entry, lookup the dissector table for the specified field name, */
|
||||
/* if a valid table found, add the subdissector */
|
||||
void
|
||||
old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
|
||||
old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector,
|
||||
int proto)
|
||||
{
|
||||
dissector_table_t sub_dissectors = find_dissector_table( name);
|
||||
dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1184,6 +1186,7 @@ old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = TRUE;
|
||||
dtbl_entry->dissector.old = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
g_hash_table_insert( sub_dissectors, GUINT_TO_POINTER( pattern),
|
||||
|
@ -1191,7 +1194,8 @@ old_dissector_add(const char *name, guint32 pattern, old_dissector_t dissector)
|
|||
}
|
||||
|
||||
void
|
||||
dissector_add(const char *name, guint32 pattern, dissector_t dissector)
|
||||
dissector_add(const char *name, guint32 pattern, dissector_t dissector,
|
||||
int proto)
|
||||
{
|
||||
dissector_table_t sub_dissectors = find_dissector_table( name);
|
||||
dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1202,6 +1206,7 @@ dissector_add(const char *name, guint32 pattern, dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = FALSE;
|
||||
dtbl_entry->dissector.new = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
g_hash_table_insert( sub_dissectors, GUINT_TO_POINTER( pattern),
|
||||
|
@ -1319,7 +1324,7 @@ dissector_try_port(dissector_table_t sub_dissectors, guint32 port,
|
|||
dtbl_entry = g_hash_table_lookup(sub_dissectors,
|
||||
GUINT_TO_POINTER(port));
|
||||
if (dtbl_entry != NULL) {
|
||||
pi.match_port = port;
|
||||
pinfo->match_port = port;
|
||||
if (dtbl_entry->is_old_dissector) {
|
||||
/*
|
||||
* New dissector calling old dissector; use
|
||||
|
@ -1373,6 +1378,7 @@ typedef struct {
|
|||
old_heur_dissector_t old;
|
||||
heur_dissector_t new;
|
||||
} dissector;
|
||||
int proto_index;
|
||||
} heur_dtbl_entry_t;
|
||||
|
||||
/* Finds a heuristic dissector table by field name. */
|
||||
|
@ -1384,7 +1390,8 @@ find_heur_dissector_list(const char *name)
|
|||
}
|
||||
|
||||
void
|
||||
old_heur_dissector_add(const char *name, old_heur_dissector_t dissector)
|
||||
old_heur_dissector_add(const char *name, old_heur_dissector_t dissector,
|
||||
int proto)
|
||||
{
|
||||
heur_dissector_list_t *sub_dissectors = find_heur_dissector_list(name);
|
||||
heur_dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1395,13 +1402,14 @@ old_heur_dissector_add(const char *name, old_heur_dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (heur_dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = TRUE;
|
||||
dtbl_entry->dissector.old = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
|
||||
}
|
||||
|
||||
void
|
||||
heur_dissector_add(const char *name, heur_dissector_t dissector)
|
||||
heur_dissector_add(const char *name, heur_dissector_t dissector, int proto)
|
||||
{
|
||||
heur_dissector_list_t *sub_dissectors = find_heur_dissector_list(name);
|
||||
heur_dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1412,6 +1420,7 @@ heur_dissector_add(const char *name, heur_dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (heur_dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = FALSE;
|
||||
dtbl_entry->dissector.new = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
|
||||
|
@ -1480,6 +1489,7 @@ typedef struct {
|
|||
old_dissector_t old;
|
||||
dissector_t new;
|
||||
} dissector;
|
||||
int proto_index;
|
||||
} conv_dtbl_entry_t;
|
||||
|
||||
/* Finds a conversation dissector table by table name. */
|
||||
|
@ -1491,7 +1501,8 @@ find_conv_dissector_list(const char *name)
|
|||
}
|
||||
|
||||
void
|
||||
old_conv_dissector_add(const char *name, old_dissector_t dissector)
|
||||
old_conv_dissector_add(const char *name, old_dissector_t dissector,
|
||||
int proto)
|
||||
{
|
||||
conv_dissector_list_t *sub_dissectors = find_conv_dissector_list(name);
|
||||
conv_dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1502,13 +1513,14 @@ old_conv_dissector_add(const char *name, old_dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (conv_dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = TRUE;
|
||||
dtbl_entry->dissector.old = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
|
||||
}
|
||||
|
||||
void
|
||||
conv_dissector_add(const char *name, dissector_t dissector)
|
||||
conv_dissector_add(const char *name, dissector_t dissector, int proto)
|
||||
{
|
||||
conv_dissector_list_t *sub_dissectors = find_conv_dissector_list(name);
|
||||
conv_dtbl_entry_t *dtbl_entry;
|
||||
|
@ -1519,6 +1531,7 @@ conv_dissector_add(const char *name, dissector_t dissector)
|
|||
dtbl_entry = g_malloc(sizeof (conv_dtbl_entry_t));
|
||||
dtbl_entry->is_old_dissector = FALSE;
|
||||
dtbl_entry->dissector.new = dissector;
|
||||
dtbl_entry->proto_index = proto;
|
||||
|
||||
/* do the table insertion */
|
||||
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
|
||||
|
@ -1559,6 +1572,7 @@ static GHashTable *registered_dissectors = NULL;
|
|||
struct dissector_handle {
|
||||
const char *name; /* dissector name */
|
||||
dissector_t dissector;
|
||||
int proto_index;
|
||||
};
|
||||
|
||||
/* Find a registered dissector by name. */
|
||||
|
@ -1571,7 +1585,7 @@ find_dissector(const char *name)
|
|||
|
||||
/* Register a dissector by name. */
|
||||
void
|
||||
register_dissector(const char *name, dissector_t dissector)
|
||||
register_dissector(const char *name, dissector_t dissector, int proto)
|
||||
{
|
||||
struct dissector_handle *handle;
|
||||
|
||||
|
@ -1587,6 +1601,7 @@ register_dissector(const char *name, dissector_t dissector)
|
|||
handle = g_malloc(sizeof (struct dissector_handle));
|
||||
handle->name = name;
|
||||
handle->dissector = dissector;
|
||||
handle->proto_index = proto;
|
||||
|
||||
g_hash_table_insert(registered_dissectors, (gpointer)name,
|
||||
(gpointer) handle);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet.h
|
||||
* Definitions for packet disassembly structures and routines
|
||||
*
|
||||
* $Id: packet.h,v 1.16 2001/01/09 05:53:21 guy Exp $
|
||||
* $Id: packet.h,v 1.17 2001/01/09 06:32:06 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -211,8 +211,10 @@ dissector_table_t register_dissector_table(const char *name);
|
|||
|
||||
/* Add a sub-dissector to a dissector table. Called by the protocol routine */
|
||||
/* that wants to register a sub-dissector. */
|
||||
void old_dissector_add(const char *abbrev, guint32 pattern, old_dissector_t dissector);
|
||||
void dissector_add(const char *abbrev, guint32 pattern, dissector_t dissector);
|
||||
void old_dissector_add(const char *abbrev, guint32 pattern,
|
||||
old_dissector_t dissector, int proto);
|
||||
void dissector_add(const char *abbrev, guint32 pattern,
|
||||
dissector_t dissector, int proto);
|
||||
|
||||
/* Add a sub-dissector to a dissector table. Called by the protocol routine */
|
||||
/* that wants to de-register a sub-dissector. */
|
||||
|
@ -244,8 +246,10 @@ void register_heur_dissector_list(const char *name, heur_dissector_list_t *list)
|
|||
|
||||
/* Add a sub-dissector to a heuristic dissector list. Called by the
|
||||
protocol routine that wants to register a sub-dissector. */
|
||||
void old_heur_dissector_add(const char *name, old_heur_dissector_t dissector);
|
||||
void heur_dissector_add(const char *name, heur_dissector_t dissector);
|
||||
void old_heur_dissector_add(const char *name, old_heur_dissector_t dissector,
|
||||
int proto);
|
||||
void heur_dissector_add(const char *name, heur_dissector_t dissector,
|
||||
int proto);
|
||||
|
||||
/* Try all the dissectors in a given heuristic dissector list until
|
||||
we find one that recognizes the protocol, in which case we return
|
||||
|
@ -272,8 +276,10 @@ void register_conv_dissector_list(const char *name, conv_dissector_list_t *list)
|
|||
|
||||
/* Add a sub-dissector to a conversation dissector list. Called by the
|
||||
protocol routine that wants to register a sub-dissector. */
|
||||
void old_conv_dissector_add(const char *name, old_dissector_t dissector);
|
||||
void conv_dissector_add(const char *name, dissector_t dissector);
|
||||
void old_conv_dissector_add(const char *name, old_dissector_t dissector,
|
||||
int proto);
|
||||
void conv_dissector_add(const char *name, dissector_t dissector,
|
||||
int proto);
|
||||
|
||||
/* Handle for dissectors you call directly.
|
||||
This handle is opaque outside of "packet.c". */
|
||||
|
@ -281,7 +287,7 @@ struct dissector_handle;
|
|||
typedef struct dissector_handle *dissector_handle_t;
|
||||
|
||||
/* Register a dissector. */
|
||||
void register_dissector(const char *name, dissector_t dissector);
|
||||
void register_dissector(const char *name, dissector_t dissector, int proto);
|
||||
|
||||
/* Find a dissector by name. */
|
||||
dissector_handle_t find_dissector(const char *name);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-aarp.c
|
||||
* Routines for Appletalk ARP packet disassembly
|
||||
*
|
||||
* $Id: packet-aarp.c,v 1.26 2001/01/03 06:55:26 guy Exp $
|
||||
* $Id: packet-aarp.c,v 1.27 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
|
||||
*
|
||||
|
@ -290,5 +290,5 @@ proto_register_aarp(void)
|
|||
void
|
||||
proto_reg_handoff_aarp(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_AARP, dissect_aarp);
|
||||
dissector_add("ethertype", ETHERTYPE_AARP, dissect_aarp, proto_aarp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for AIM Instant Messenger (OSCAR) dissection
|
||||
* Copyright 2000, Ralf Hoelzer <ralf@well.com>
|
||||
*
|
||||
* $Id: packet-aim.c,v 1.5 2001/01/03 06:55:26 guy Exp $
|
||||
* $Id: packet-aim.c,v 1.6 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@unicom.net>
|
||||
|
@ -620,5 +620,5 @@ proto_register_aim(void)
|
|||
void
|
||||
proto_reg_handoff_aim(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_AIM, &dissect_aim);
|
||||
dissector_add("tcp.port", TCP_PORT_AIM, &dissect_aim, proto_aim);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-arp.c
|
||||
* Routines for ARP packet disassembly
|
||||
*
|
||||
* $Id: packet-arp.c,v 1.41 2001/01/09 01:02:34 guy Exp $
|
||||
* $Id: packet-arp.c,v 1.42 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -943,6 +943,6 @@ proto_register_arp(void)
|
|||
void
|
||||
proto_reg_handoff_arp(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_ARP, dissect_arp);
|
||||
dissector_add("ethertype", ETHERTYPE_REVARP, dissect_arp);
|
||||
dissector_add("ethertype", ETHERTYPE_ARP, dissect_arp, proto_arp);
|
||||
dissector_add("ethertype", ETHERTYPE_REVARP, dissect_arp, proto_arp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ascend.c
|
||||
* Routines for decoding Lucent/Ascend packet traces
|
||||
*
|
||||
* $Id: packet-ascend.c,v 1.22 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-ascend.c,v 1.23 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -157,5 +157,5 @@ proto_reg_handoff_ascend(void)
|
|||
*/
|
||||
eth_handle = find_dissector("eth");
|
||||
ppp_handle = find_dissector("ppp");
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend, proto_ascend);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-atalk.c
|
||||
* Routines for Appletalk packet disassembly (DDP, currently).
|
||||
*
|
||||
* $Id: packet-atalk.c,v 1.48 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-atalk.c,v 1.49 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
|
||||
*
|
||||
|
@ -582,10 +582,10 @@ proto_register_atalk(void)
|
|||
void
|
||||
proto_reg_handoff_atalk(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_ATALK, dissect_ddp);
|
||||
dissector_add("ppp.protocol", PPP_AT, dissect_ddp);
|
||||
dissector_add("null.type", BSD_AF_APPLETALK, dissect_ddp);
|
||||
dissector_add("ddp.type", DDP_NBP, dissect_nbp);
|
||||
dissector_add("ddp.type", DDP_RTMPREQ, dissect_rtmp_request);
|
||||
dissector_add("ddp.type", DDP_RTMPDATA, dissect_rtmp_data);
|
||||
dissector_add("ethertype", ETHERTYPE_ATALK, dissect_ddp, proto_ddp);
|
||||
dissector_add("ppp.protocol", PPP_AT, dissect_ddp, proto_ddp);
|
||||
dissector_add("null.type", BSD_AF_APPLETALK, dissect_ddp, proto_ddp);
|
||||
dissector_add("ddp.type", DDP_NBP, dissect_nbp, proto_nbp);
|
||||
dissector_add("ddp.type", DDP_RTMPREQ, dissect_rtmp_request, proto_rtmp);
|
||||
dissector_add("ddp.type", DDP_RTMPDATA, dissect_rtmp_data, proto_rtmp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-atm.c
|
||||
* Routines for ATM packet disassembly
|
||||
*
|
||||
* $Id: packet-atm.c,v 1.30 2001/01/03 10:34:41 guy Exp $
|
||||
* $Id: packet-atm.c,v 1.31 2001/01/09 06:31:33 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -801,5 +801,6 @@ proto_reg_handoff_atm(void)
|
|||
*/
|
||||
llc_handle = find_dissector("llc");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ATM_SNIFFER, dissect_atm,
|
||||
proto_atm);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-auto_rp.c,v 1.11 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-auto_rp.c,v 1.12 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -245,7 +245,8 @@ void proto_register_auto_rp(void)
|
|||
void
|
||||
proto_reg_handoff_auto_rp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp);
|
||||
dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, dissect_auto_rp,
|
||||
proto_auto_rp);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for BGP packet dissection.
|
||||
* Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
|
||||
*
|
||||
* $Id: packet-bgp.c,v 1.31 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-bgp.c,v 1.32 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Supports:
|
||||
* RFC1771 A Border Gateway Protocol 4 (BGP-4)
|
||||
|
@ -1516,5 +1516,5 @@ proto_register_bgp(void)
|
|||
void
|
||||
proto_reg_handoff_bgp(void)
|
||||
{
|
||||
old_dissector_add("tcp.port", BGP_TCP_PORT, dissect_bgp);
|
||||
old_dissector_add("tcp.port", BGP_TCP_PORT, dissect_bgp, proto_bgp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for BOOTP/DHCP packet disassembly
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-bootp.c,v 1.44 2001/01/03 22:49:06 guy Exp $
|
||||
* $Id: packet-bootp.c,v 1.45 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* The information used comes from:
|
||||
* RFC 951: Bootstrap Protocol
|
||||
|
@ -899,5 +899,5 @@ proto_register_bootp(void)
|
|||
void
|
||||
proto_reg_handoff_bootp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp);
|
||||
dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp, proto_bootp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-bpdu.c
|
||||
* Routines for BPDU (Spanning Tree Protocol) disassembly
|
||||
*
|
||||
* $Id: packet-bpdu.c,v 1.18 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-bpdu.c,v 1.19 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
|
||||
*
|
||||
|
@ -319,11 +319,11 @@ proto_register_bpdu(void)
|
|||
proto_register_field_array(proto_bpdu, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("bpdu", dissect_bpdu);
|
||||
register_dissector("bpdu", dissect_bpdu, proto_bpdu);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_bpdu(void)
|
||||
{
|
||||
dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu);
|
||||
dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu, proto_bpdu);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-bxxp.c
|
||||
* Routines for BXXP packet disassembly
|
||||
*
|
||||
* $Id: packet-bxxp.c,v 1.14 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-bxxp.c,v 1.15 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
|
@ -1257,6 +1257,6 @@ proto_reg_handoff_bxxp(void)
|
|||
|
||||
tcp_port = global_bxxp_tcp_port;
|
||||
|
||||
dissector_add("tcp.port", global_bxxp_tcp_port, dissect_bxxp);
|
||||
dissector_add("tcp.port", global_bxxp_tcp_port, dissect_bxxp, proto_bxxp);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for the disassembly of the "Cisco Discovery Protocol"
|
||||
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
|
||||
*
|
||||
* $Id: packet-cdp.c,v 1.30 2001/01/05 19:14:05 guy Exp $
|
||||
* $Id: packet-cdp.c,v 1.31 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -524,5 +524,5 @@ proto_register_cdp(void)
|
|||
void
|
||||
proto_reg_handoff_cdp(void)
|
||||
{
|
||||
dissector_add("llc.cisco_pid", 0x2000, dissect_cdp);
|
||||
dissector_add("llc.cisco_pid", 0x2000, dissect_cdp, proto_cdp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-cgmp.c
|
||||
* Routines for the disassembly of the Cisco Group Management Protocol
|
||||
*
|
||||
* $Id: packet-cgmp.c,v 1.7 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-cgmp.c,v 1.8 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -144,5 +144,5 @@ proto_register_cgmp(void)
|
|||
void
|
||||
proto_reg_handoff_cgmp(void)
|
||||
{
|
||||
dissector_add("llc.cisco_pid", 0x2001, dissect_cgmp);
|
||||
dissector_add("llc.cisco_pid", 0x2001, dissect_cgmp, proto_cgmp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-clip.c
|
||||
* Routines for clip packet disassembly
|
||||
*
|
||||
* $Id: packet-clip.c,v 1.13 2000/11/29 05:16:15 gram Exp $
|
||||
* $Id: packet-clip.c,v 1.14 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -102,5 +102,6 @@ proto_reg_handoff_clip(void)
|
|||
* Get a handle for the IP dissector.
|
||||
*/
|
||||
ip_handle = find_dissector("ip");
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, dissect_clip);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, dissect_clip,
|
||||
-1); /* XXX */
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-clnp.c
|
||||
* Routines for ISO/OSI network and transport protocol packet disassembly
|
||||
*
|
||||
* $Id: packet-clnp.c,v 1.21 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-clnp.c,v 1.22 2001/01/09 06:31:34 guy Exp $
|
||||
* Laurent Deniel <deniel@worldnet.fr>
|
||||
* Ralf Schneider <Ralf.Schneider@t-online.de>
|
||||
*
|
||||
|
@ -1906,7 +1906,8 @@ void proto_register_cotp(void)
|
|||
/* subdissector code */
|
||||
register_heur_dissector_list("cotp_is", &cotp_is_heur_subdissector_list);
|
||||
|
||||
register_dissector("ositp", dissect_ositp);
|
||||
/* XXX - what about CLTP? */
|
||||
register_dissector("ositp", dissect_ositp, proto_cotp);
|
||||
}
|
||||
|
||||
void proto_register_cltp(void)
|
||||
|
@ -1927,6 +1928,8 @@ void proto_register_cltp(void)
|
|||
void
|
||||
proto_reg_handoff_clnp(void)
|
||||
{
|
||||
dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp);
|
||||
dissector_add("osinl", NLPID_NULL, dissect_clnp); /* Inactive subset */
|
||||
dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp,
|
||||
proto_clnp);
|
||||
dissector_add("osinl", NLPID_NULL, dissect_clnp,
|
||||
proto_clnp); /* Inactive subset */
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-cops.c,v 1.9 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-cops.c,v 1.10 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -828,5 +828,5 @@ void proto_register_cops(void)
|
|||
void
|
||||
proto_reg_handoff_cops(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_COPS, dissect_cops);
|
||||
dissector_add("tcp.port", TCP_PORT_COPS, dissect_cops, proto_cops);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* see http://ddt.sourceforge.net/
|
||||
* Olivier Abad <oabad@cybercable.fr>
|
||||
*
|
||||
* $Id: packet-ddtp.c,v 1.13 2001/01/04 04:44:02 gram Exp $
|
||||
* $Id: packet-ddtp.c,v 1.14 2001/01/09 06:31:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -198,5 +198,5 @@ proto_register_ddtp(void)
|
|||
void
|
||||
proto_reg_handoff_ddtp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_DDTP, dissect_ddtp);
|
||||
dissector_add("udp.port", UDP_PORT_DDTP, dissect_ddtp, proto_ddtp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-dec-bpdu.c
|
||||
* Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly
|
||||
*
|
||||
* $Id: packet-dec-bpdu.c,v 1.3 2001/01/07 00:23:03 guy Exp $
|
||||
* $Id: packet-dec-bpdu.c,v 1.4 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Copyright 2001 Paul Ionescu <paul@acorp.ro>
|
||||
*
|
||||
|
@ -164,5 +164,6 @@ proto_register_dec_bpdu(void)
|
|||
void
|
||||
proto_reg_handoff_dec_bpdu(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_DEC_LB, dissect_dec_bpdu);
|
||||
dissector_add("ethertype", ETHERTYPE_DEC_LB, dissect_dec_bpdu,
|
||||
proto_dec_bpdu);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-diameter.c
|
||||
* Routines for DIAMETER packet disassembly
|
||||
*
|
||||
* $Id: packet-diameter.c,v 1.10 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-diameter.c,v 1.11 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
|
||||
*
|
||||
|
@ -761,10 +761,14 @@ proto_reg_handoff_diameter(void)
|
|||
|
||||
/* g_warning ("Diameter: Adding tcp dissector to port %d",
|
||||
gbl_diameterTcpPort); */
|
||||
old_dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter);
|
||||
old_dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter);
|
||||
old_dissector_add("tcp.port", gbl_diameterTcpPort, dissect_diameter,
|
||||
proto_diameter);
|
||||
old_dissector_add("udp.port", gbl_diameterUdpPort, dissect_diameter,
|
||||
proto_diameter);
|
||||
#ifdef SCTP_DISSECTORS_ENABLED
|
||||
old_dissector_add("sctp.srcport", gbl_diameterSctpPort, dissect_diameter);
|
||||
old_dissector_add("sctp.destport", gbl_diameterSctpPort, dissect_diameter);
|
||||
old_dissector_add("sctp.srcport", gbl_diameterSctpPort,
|
||||
dissect_diameter, proto_diameter);
|
||||
old_dissector_add("sctp.destport", gbl_diameterSctpPort,
|
||||
dissect_diameter, proto_diameter);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-dns.c
|
||||
* Routines for DNS packet disassembly
|
||||
*
|
||||
* $Id: packet-dns.c,v 1.60 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-dns.c,v 1.61 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -2482,6 +2482,6 @@ proto_register_dns(void)
|
|||
void
|
||||
proto_reg_handoff_dns(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_DNS, dissect_dns);
|
||||
old_dissector_add("tcp.port", TCP_PORT_DNS, dissect_dns_tcp);
|
||||
old_dissector_add("udp.port", UDP_PORT_DNS, dissect_dns, proto_dns);
|
||||
old_dissector_add("tcp.port", TCP_PORT_DNS, dissect_dns_tcp, proto_dns);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for EIGRP dissection
|
||||
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
|
||||
*
|
||||
* $Id: packet-eigrp.c,v 1.10 2001/01/03 06:55:27 guy Exp $
|
||||
* $Id: packet-eigrp.c,v 1.11 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -466,7 +466,7 @@ proto_register_eigrp(void)
|
|||
void
|
||||
proto_reg_handoff_eigrp(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_EIGRP, dissect_eigrp);
|
||||
dissector_add("ddp.type", DDP_EIGRP, dissect_eigrp);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_EIGRP, dissect_eigrp);
|
||||
dissector_add("ip.proto", IP_PROTO_EIGRP, dissect_eigrp, proto_eigrp);
|
||||
dissector_add("ddp.type", DDP_EIGRP, dissect_eigrp, proto_eigrp);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_EIGRP, dissect_eigrp, proto_eigrp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ISO/OSI End System to Intermediate System
|
||||
* Routeing Exchange Protocol ISO 9542.
|
||||
*
|
||||
* $Id: packet-esis.c,v 1.10 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-esis.c,v 1.11 2001/01/09 06:31:35 guy Exp $
|
||||
* Ralf Schneider <Ralf.Schneider@t-online.de>
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
|
@ -432,5 +432,5 @@ proto_register_esis(void) {
|
|||
void
|
||||
proto_reg_handoff_esis(void)
|
||||
{
|
||||
dissector_add("osinl", NLPID_ISO9542_ESIS, dissect_esis);
|
||||
dissector_add("osinl", NLPID_ISO9542_ESIS, dissect_esis, proto_esis);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-eth.c
|
||||
* Routines for ethernet packet disassembly
|
||||
*
|
||||
* $Id: packet-eth.c,v 1.53 2001/01/03 10:34:41 guy Exp $
|
||||
* $Id: packet-eth.c,v 1.54 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -380,7 +380,7 @@ proto_register_eth(void)
|
|||
proto_register_field_array(proto_eth, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("eth", dissect_eth);
|
||||
register_dissector("eth", dissect_eth, proto_eth);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -392,5 +392,6 @@ proto_reg_handoff_eth(void)
|
|||
isl_handle = find_dissector("isl");
|
||||
llc_handle = find_dissector("llc");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth,
|
||||
proto_eth);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Laurent Deniel <deniel@worldnet.fr>
|
||||
*
|
||||
* $Id: packet-fddi.c,v 1.45 2001/01/03 10:34:41 guy Exp $
|
||||
* $Id: packet-fddi.c,v 1.46 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -385,6 +385,8 @@ proto_reg_handoff_fddi(void)
|
|||
*/
|
||||
llc_handle = find_dissector("llc");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FDDI, dissect_fddi_not_bitswapped);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED, dissect_fddi_bitswapped);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FDDI,
|
||||
dissect_fddi_not_bitswapped, proto_fddi);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED,
|
||||
dissect_fddi_bitswapped, proto_fddi);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
|
||||
*
|
||||
* $Id: packet-fr.c,v 1.3 2001/01/08 22:18:21 guy Exp $
|
||||
* $Id: packet-fr.c,v 1.4 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -141,10 +141,10 @@ void proto_register_fr(void)
|
|||
proto_register_field_array(proto_fr, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("fr", dissect_fr);
|
||||
register_dissector("fr", dissect_fr, proto_fr);
|
||||
};
|
||||
|
||||
void proto_reg_handoff_fr(void)
|
||||
{
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr, proto_fr);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ftp packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-ftp.c,v 1.25 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-ftp.c,v 1.26 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -264,6 +264,6 @@ proto_register_ftp(void)
|
|||
void
|
||||
proto_reg_handoff_ftp(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata);
|
||||
dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp);
|
||||
dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata, proto_ftp);
|
||||
dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp, proto_ftp_data);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Laurent Deniel <deniel@worldnet.fr>
|
||||
* Craig Rodrigues <rodrigc@mediaone.net>
|
||||
*
|
||||
* $Id: packet-giop.c,v 1.27 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-giop.c,v 1.28 2001/01/09 06:31:35 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1435,5 +1435,5 @@ proto_register_giop (void)
|
|||
void
|
||||
proto_reg_handoff_giop (void)
|
||||
{
|
||||
heur_dissector_add ("tcp", dissect_giop);
|
||||
heur_dissector_add ("tcp", dissect_giop, proto_giop);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for the Generic Routing Encapsulation (GRE) protocol
|
||||
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
|
||||
*
|
||||
* $Id: packet-gre.c,v 1.35 2001/01/07 22:35:21 guy Exp $
|
||||
* $Id: packet-gre.c,v 1.36 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -384,7 +384,7 @@ proto_register_gre(void)
|
|||
void
|
||||
proto_reg_handoff_gre(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre);
|
||||
dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre, proto_gre);
|
||||
|
||||
/*
|
||||
* Get handles for the IP, PPP, and Frame Relay dissectors.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for Sinec H1 packet disassembly
|
||||
* Gerrit Gehnen <G.Gehnen@atrie.de>
|
||||
*
|
||||
* $Id: packet-h1.c,v 1.16 2001/01/05 08:34:35 guy Exp $
|
||||
* $Id: packet-h1.c,v 1.17 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -317,5 +317,5 @@ proto_register_h1 (void)
|
|||
void
|
||||
proto_reg_handoff_h1(void)
|
||||
{
|
||||
heur_dissector_add("cotp_is", dissect_h1);
|
||||
heur_dissector_add("cotp_is", dissect_h1, proto_h1);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-hsrp.c,v 1.14 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-hsrp.c,v 1.15 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -244,5 +244,5 @@ void proto_register_hsrp(void)
|
|||
void
|
||||
proto_reg_handoff_hsrp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp);
|
||||
dissector_add("udp.port", UDP_PORT_HSRP, dissect_hsrp, proto_hsrp);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-http.c,v 1.32 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-http.c,v 1.33 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -395,13 +395,16 @@ proto_register_http(void)
|
|||
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);
|
||||
dissector_add("tcp.port", TCP_PORT_HTTP, dissect_http, proto_http);
|
||||
dissector_add("tcp.port", TCP_ALT_PORT_HTTP, dissect_http, proto_http);
|
||||
dissector_add("tcp.port", TCP_PORT_PROXY_HTTP, dissect_http,
|
||||
proto_http);
|
||||
dissector_add("tcp.port", TCP_PORT_PROXY_ADMIN_HTTP, dissect_http,
|
||||
proto_http);
|
||||
dissector_add("tcp.port", 631, dissect_http, proto_http);
|
||||
|
||||
dissector_add("tcp.port", TCP_PORT_SSDP, dissect_http);
|
||||
dissector_add("udp.port", UDP_PORT_SSDP, dissect_http);
|
||||
dissector_add("tcp.port", TCP_PORT_SSDP, dissect_http, proto_http);
|
||||
dissector_add("udp.port", UDP_PORT_SSDP, dissect_http, proto_http);
|
||||
|
||||
/*
|
||||
* Get a handle for the IPP dissector.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-icmpv6.c
|
||||
* Routines for ICMPv6 packet disassembly
|
||||
*
|
||||
* $Id: packet-icmpv6.c,v 1.33 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-icmpv6.c,v 1.34 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1194,5 +1194,5 @@ proto_register_icmpv6(void)
|
|||
void
|
||||
proto_reg_handoff_icmpv6(void)
|
||||
{
|
||||
old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6);
|
||||
old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6, proto_icmpv6);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ICP (internet cache protocol) packet disassembly
|
||||
* RFC 2186 && RFC 2187
|
||||
*
|
||||
* $Id: packet-icp.c,v 1.14 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-icp.c,v 1.15 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Peter Torvals
|
||||
|
@ -298,5 +298,5 @@ proto_register_icp(void)
|
|||
void
|
||||
proto_reg_handoff_icp(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_ICP, dissect_icp);
|
||||
old_dissector_add("udp.port", UDP_PORT_ICP, dissect_icp, proto_icp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-icq.c
|
||||
* Routines for ICQ packet disassembly
|
||||
*
|
||||
* $Id: packet-icq.c,v 1.25 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-icq.c,v 1.26 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Johan Feyaerts
|
||||
|
@ -2497,5 +2497,5 @@ proto_register_icq(void)
|
|||
void
|
||||
proto_reg_handoff_icq(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq);
|
||||
old_dissector_add("udp.port", UDP_PORT_ICQ, dissect_icq, proto_icq);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2000, Axis Communications AB
|
||||
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
|
||||
*
|
||||
* $Id: packet-ieee80211.c,v 1.8 2001/01/03 10:34:41 guy Exp $
|
||||
* $Id: packet-ieee80211.c,v 1.9 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@unicom.net>
|
||||
|
@ -1751,5 +1751,6 @@ proto_reg_handoff_wlan(void)
|
|||
*/
|
||||
llc_handle = find_dissector("llc");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, dissect_ieee80211);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, dissect_ieee80211,
|
||||
proto_wlan);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for IGRP dissection
|
||||
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
|
||||
*
|
||||
* $Id: packet-igrp.c,v 1.3 2001/01/03 06:55:28 guy Exp $
|
||||
* $Id: packet-igrp.c,v 1.4 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -207,7 +207,7 @@ void proto_register_igrp(void)
|
|||
void
|
||||
proto_reg_handoff_igrp(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_IGRP , dissect_igrp);
|
||||
dissector_add("ip.proto", IP_PROTO_IGRP , dissect_igrp, proto_igrp);
|
||||
}
|
||||
|
||||
/* IGRP Packet structure:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for imap packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-imap.c,v 1.12 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-imap.c,v 1.13 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -182,5 +182,5 @@ proto_register_imap(void)
|
|||
void
|
||||
proto_reg_handoff_imap(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap);
|
||||
dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap, proto_imap);
|
||||
}
|
||||
|
|
22
packet-ip.c
22
packet-ip.c
|
@ -1,7 +1,7 @@
|
|||
/* packet-ip.c
|
||||
* Routines for IP and miscellaneous IP protocol packet disassembly
|
||||
*
|
||||
* $Id: packet-ip.c,v 1.118 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-ip.c,v 1.119 2001/01/09 06:31:36 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1335,7 +1335,7 @@ proto_register_igmp(void)
|
|||
void
|
||||
proto_reg_handoff_igmp(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_IGMP, dissect_igmp);
|
||||
dissector_add("ip.proto", IP_PROTO_IGMP, dissect_igmp, proto_igmp);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1473,19 +1473,19 @@ proto_register_ip(void)
|
|||
"Whether the IPv4 type-of-service field should be decoded as a Differentiated Services field",
|
||||
&g_ip_dscp_actif);
|
||||
|
||||
register_dissector("ip", dissect_ip);
|
||||
register_dissector("ip", dissect_ip, proto_ip);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_ip(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_IP, dissect_ip);
|
||||
dissector_add("ppp.protocol", PPP_IP, dissect_ip);
|
||||
dissector_add("ppp.protocol", CISCO_IP, dissect_ip);
|
||||
dissector_add("llc.dsap", SAP_IP, dissect_ip);
|
||||
dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip);
|
||||
dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip);
|
||||
dissector_add("null.type", BSD_AF_INET, dissect_ip);
|
||||
dissector_add("ethertype", ETHERTYPE_IP, dissect_ip, proto_ip);
|
||||
dissector_add("ppp.protocol", PPP_IP, dissect_ip, proto_ip);
|
||||
dissector_add("ppp.protocol", CISCO_IP, dissect_ip, proto_ip);
|
||||
dissector_add("llc.dsap", SAP_IP, dissect_ip, proto_ip);
|
||||
dissector_add("ip.proto", IP_PROTO_IPV4, dissect_ip, proto_ip);
|
||||
dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip, proto_ip);
|
||||
dissector_add("null.type", BSD_AF_INET, dissect_ip, proto_ip);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1518,5 +1518,5 @@ proto_register_icmp(void)
|
|||
void
|
||||
proto_reg_handoff_icmp(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_ICMP, dissect_icmp);
|
||||
dissector_add("ip.proto", IP_PROTO_ICMP, dissect_icmp, proto_icmp);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-ipp.c,v 1.18 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-ipp.c,v 1.19 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -567,7 +567,7 @@ proto_register_ipp(void)
|
|||
* (you can't refer to it directly from a plugin dissector
|
||||
* on Windows without stuffing it into the Big Transfer Vector).
|
||||
*/
|
||||
register_dissector("ipp", dissect_ipp);
|
||||
register_dissector("ipp", dissect_ipp, proto_ipp);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -581,5 +581,5 @@ proto_reg_handoff_ipp(void)
|
|||
|
||||
Or should the HTTP dissector decide that the payload is
|
||||
IPP based on the MIME headers? */
|
||||
dissector_add("tcp.port", 631, dissect_http);
|
||||
dissector_add("tcp.port", 631, dissect_http, -1); /* XXX */
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ipsec.c
|
||||
* Routines for IPsec/IPComp packet disassembly
|
||||
*
|
||||
* $Id: packet-ipsec.c,v 1.24 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-ipsec.c,v 1.25 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -366,7 +366,8 @@ proto_register_ipsec(void)
|
|||
void
|
||||
proto_reg_handoff_ipsec(void)
|
||||
{
|
||||
old_dissector_add("ip.proto", IP_PROTO_AH, dissect_ah);
|
||||
old_dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp);
|
||||
old_dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp);
|
||||
old_dissector_add("ip.proto", IP_PROTO_AH, dissect_ah, proto_ah);
|
||||
old_dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp, proto_esp);
|
||||
old_dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp,
|
||||
proto_ipcomp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ipv6.c
|
||||
* Routines for IPv6 packet disassembly
|
||||
*
|
||||
* $Id: packet-ipv6.c,v 1.49 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-ipv6.c,v 1.50 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -526,10 +526,16 @@ proto_register_ipv6(void)
|
|||
void
|
||||
proto_reg_handoff_ipv6(void)
|
||||
{
|
||||
old_dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6);
|
||||
old_dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6);
|
||||
old_dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6);
|
||||
old_dissector_add("null.type", BSD_AF_INET6_BSD, dissect_ipv6);
|
||||
old_dissector_add("null.type", BSD_AF_INET6_FREEBSD, dissect_ipv6);
|
||||
old_dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none);
|
||||
old_dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6,
|
||||
proto_ipv6);
|
||||
old_dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6,
|
||||
proto_ipv6);
|
||||
old_dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6,
|
||||
proto_ipv6);
|
||||
old_dissector_add("null.type", BSD_AF_INET6_BSD, dissect_ipv6,
|
||||
proto_ipv6);
|
||||
old_dissector_add("null.type", BSD_AF_INET6_FREEBSD, dissect_ipv6,
|
||||
proto_ipv6);
|
||||
old_dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none,
|
||||
proto_ipv6);
|
||||
}
|
||||
|
|
24
packet-ipx.c
24
packet-ipx.c
|
@ -2,7 +2,7 @@
|
|||
* Routines for NetWare's IPX
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-ipx.c,v 1.72 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-ipx.c,v 1.73 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -912,13 +912,17 @@ proto_reg_handoff_ipx(void)
|
|||
*/
|
||||
nbipx_handle = find_dissector("nbipx");
|
||||
|
||||
dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx);
|
||||
dissector_add("ethertype", ETHERTYPE_IPX, dissect_ipx);
|
||||
dissector_add("ppp.protocol", PPP_IPX, dissect_ipx);
|
||||
dissector_add("llc.dsap", SAP_NETWARE, dissect_ipx);
|
||||
dissector_add("null.type", BSD_AF_IPX, dissect_ipx);
|
||||
dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, dissect_spx);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_SAP, dissect_ipxsap);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, dissect_ipxrip);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, dissect_ipxmsg);
|
||||
dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx, proto_ipx);
|
||||
dissector_add("ethertype", ETHERTYPE_IPX, dissect_ipx, proto_ipx);
|
||||
dissector_add("ppp.protocol", PPP_IPX, dissect_ipx, proto_ipx);
|
||||
dissector_add("llc.dsap", SAP_NETWARE, dissect_ipx, proto_ipx);
|
||||
dissector_add("null.type", BSD_AF_IPX, dissect_ipx, proto_ipx);
|
||||
dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, dissect_spx,
|
||||
proto_spx);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_SAP, dissect_ipxsap,
|
||||
proto_sap);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, dissect_ipxrip,
|
||||
proto_sap);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, dissect_ipxmsg,
|
||||
proto_ipxmsg);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-irc.c
|
||||
* Routines for MSX irc packet dissection
|
||||
*
|
||||
* $Id: packet-irc.c,v 1.10 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-irc.c,v 1.11 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -167,6 +167,6 @@ proto_register_irc(void)
|
|||
void
|
||||
proto_reg_handoff_irc(void)
|
||||
{
|
||||
old_dissector_add("tcp.port", TCP_PORT_IRC, dissect_irc);
|
||||
old_dissector_add("tcp.port", TCP_PORT_IRC, dissect_irc, proto_irc);
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* (ISAKMP) (RFC 2408)
|
||||
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
|
||||
*
|
||||
* $Id: packet-isakmp.c,v 1.33 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-isakmp.c,v 1.34 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1454,5 +1454,6 @@ proto_register_isakmp(void)
|
|||
void
|
||||
proto_reg_handoff_isakmp(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp);
|
||||
old_dissector_add("udp.port", UDP_PORT_ISAKMP, dissect_isakmp,
|
||||
proto_isakmp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ISO/OSI network and transport protocol packet disassembly, core
|
||||
* bits.
|
||||
*
|
||||
* $Id: packet-isis.c,v 1.16 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-isis.c,v 1.17 2001/01/09 06:31:37 guy Exp $
|
||||
* Stuart Stanley <stuarts@mxmail.net>
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
|
@ -337,5 +337,5 @@ proto_register_isis(void) {
|
|||
void
|
||||
proto_reg_handoff_isis(void)
|
||||
{
|
||||
old_dissector_add("osinl", NLPID_ISO10589_ISIS, dissect_isis);
|
||||
old_dissector_add("osinl", NLPID_ISO10589_ISIS, dissect_isis, proto_isis);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-isl.c
|
||||
* Routines for Cisco ISL Ethernet header disassembly
|
||||
*
|
||||
* $Id: packet-isl.c,v 1.20 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-isl.c,v 1.21 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -346,5 +346,5 @@ proto_register_isl(void)
|
|||
proto_register_field_array(proto_isl, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("isl", dissect_isl);
|
||||
register_dissector("isl", dissect_isl, proto_isl);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Wes Hardaker (c) 2000
|
||||
* wjhardaker@ucdavis.edu
|
||||
*
|
||||
* $Id: packet-kerberos.c,v 1.13 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-kerberos.c,v 1.14 2001/01/09 06:31:37 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1308,8 +1308,10 @@ proto_register_kerberos(void) {
|
|||
void
|
||||
proto_reg_handoff_kerberos(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_KERBEROS, dissect_kerberos);
|
||||
old_dissector_add("tcp.port", TCP_PORT_KERBEROS, dissect_kerberos);
|
||||
old_dissector_add("udp.port", UDP_PORT_KERBEROS, dissect_kerberos,
|
||||
proto_kerberos);
|
||||
old_dissector_add("tcp.port", TCP_PORT_KERBEROS, dissect_kerberos,
|
||||
proto_kerberos);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* Laurent Cazalet <laurent.cazalet@mailclub.net>
|
||||
* Thomas Parvais <thomas.parvais@advalvas.be>
|
||||
*
|
||||
* $Id: packet-l2tp.c,v 1.19 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-l2tp.c,v 1.20 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -831,7 +831,8 @@ proto_register_l2tp(void)
|
|||
void
|
||||
proto_reg_handoff_l2tp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp);
|
||||
dissector_add("udp.port", UDP_PORT_L2TP, dissect_l2tp,
|
||||
proto_l2tp);
|
||||
|
||||
/*
|
||||
* Get a handle for the PPP dissector.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for lapb frame disassembly
|
||||
* Olivier Abad <oabad@cybercable.fr>
|
||||
*
|
||||
* $Id: packet-lapb.c,v 1.26 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-lapb.c,v 1.27 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -136,11 +136,11 @@ proto_register_lapb(void)
|
|||
proto_register_field_array (proto_lapb, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("lapb", dissect_lapb);
|
||||
register_dissector("lapb", dissect_lapb, proto_lapb);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_lapb(void)
|
||||
{
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LAPB, dissect_lapb);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LAPB, dissect_lapb, proto_lapb);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by
|
||||
* Olivier Abad <oabad@cybercable.fr>
|
||||
*
|
||||
* $Id: packet-lapbether.c,v 1.3 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-lapbether.c,v 1.4 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -108,6 +108,6 @@ proto_reg_handoff_lapbether(void)
|
|||
*/
|
||||
lapb_handle = find_dissector("lapb");
|
||||
|
||||
dissector_add("ethertype", ETHERTYPE_DEC, dissect_lapbether);
|
||||
dissector_add("ethertype", ETHERTYPE_DEC, dissect_lapbether, proto_lapbether);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for LAPD frame disassembly
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-lapd.c,v 1.18 2001/01/03 06:55:29 guy Exp $
|
||||
* $Id: packet-lapd.c,v 1.19 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -206,5 +206,5 @@ proto_register_lapd(void)
|
|||
void
|
||||
proto_reg_handoff_lapd(void)
|
||||
{
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LAPD, dissect_lapd);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_LAPD, dissect_lapd, proto_lapd);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ldap.c
|
||||
* Routines for ldap packet dissection
|
||||
*
|
||||
* $Id: packet-ldap.c,v 1.20 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-ldap.c,v 1.21 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1209,5 +1209,5 @@ proto_register_ldap(void)
|
|||
void
|
||||
proto_reg_handoff_ldap(void)
|
||||
{
|
||||
old_dissector_add("tcp.port", TCP_PORT_LDAP, dissect_ldap);
|
||||
old_dissector_add("tcp.port", TCP_PORT_LDAP, dissect_ldap, proto_ldap);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-ldp.c
|
||||
* Routines for ldp packet disassembly
|
||||
*
|
||||
* $Id: packet-ldp.c,v 1.12 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-ldp.c,v 1.13 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
|
@ -834,7 +834,7 @@ proto_reg_handoff_ldp(void)
|
|||
tcp_port = global_ldp_tcp_port;
|
||||
udp_port = global_ldp_udp_port;
|
||||
|
||||
dissector_add("tcp.port", global_ldp_tcp_port, dissect_ldp);
|
||||
dissector_add("udp.port", global_ldp_udp_port, dissect_ldp);
|
||||
dissector_add("tcp.port", global_ldp_tcp_port, dissect_ldp, proto_ldp);
|
||||
dissector_add("udp.port", global_ldp_udp_port, dissect_ldp, proto_ldp);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for IEEE 802.2 LLC layer
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-llc.c,v 1.77 2001/01/05 19:07:37 guy Exp $
|
||||
* $Id: packet-llc.c,v 1.78 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -479,7 +479,7 @@ proto_register_llc(void)
|
|||
subdissector_table = register_dissector_table("llc.dsap");
|
||||
cisco_subdissector_table = register_dissector_table("llc.cisco_pid");
|
||||
|
||||
register_dissector("llc", dissect_llc);
|
||||
register_dissector("llc", dissect_llc, proto_llc);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -490,5 +490,6 @@ proto_reg_handoff_llc(void)
|
|||
*/
|
||||
bpdu_handle = find_dissector("bpdu");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, dissect_llc);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, dissect_llc,
|
||||
proto_llc);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for LPR and LPRng packet disassembly
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-lpd.c,v 1.25 2001/01/06 00:02:41 guy Exp $
|
||||
* $Id: packet-lpd.c,v 1.26 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -196,5 +196,5 @@ proto_register_lpd(void)
|
|||
void
|
||||
proto_reg_handoff_lpd(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd);
|
||||
dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd, proto_lpd);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-mapi.c
|
||||
* Routines for MSX mapi packet dissection
|
||||
*
|
||||
* $Id: packet-mapi.c,v 1.12 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-mapi.c,v 1.13 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -117,5 +117,5 @@ proto_register_mapi(void)
|
|||
void
|
||||
proto_reg_handoff_mapi(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_MAPI, dissect_mapi);
|
||||
dissector_add("tcp.port", TCP_PORT_MAPI, dissect_mapi, proto_mapi);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for Mobile IP dissection
|
||||
* Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
|
||||
*
|
||||
* $Id: packet-mip.c,v 1.11 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-mip.c,v 1.12 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@unicom.net>
|
||||
|
@ -299,5 +299,5 @@ void proto_register_mip(void)
|
|||
void
|
||||
proto_reg_handoff_mip(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_MIP, dissect_mip);
|
||||
old_dissector_add("udp.port", UDP_PORT_MIP, dissect_mip, proto_mip);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
|
||||
*
|
||||
* $Id: packet-mpls.c,v 1.15 2001/01/06 05:11:32 guy Exp $
|
||||
* $Id: packet-mpls.c,v 1.16 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -210,6 +210,6 @@ proto_reg_handoff_mpls(void)
|
|||
*/
|
||||
ip_handle = find_dissector("ip");
|
||||
|
||||
dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls);
|
||||
dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls);
|
||||
dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls, proto_mpls);
|
||||
dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls, proto_mpls);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for Microsoft Proxy packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-msproxy.c,v 1.15 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-msproxy.c,v 1.16 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1354,5 +1354,6 @@ proto_reg_handoff_msproxy(void) {
|
|||
|
||||
/* dissector install routine */
|
||||
|
||||
old_dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy);
|
||||
old_dissector_add("udp.port", UDP_PORT_MSPROXY, dissect_msproxy,
|
||||
proto_msproxy);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for NetBIOS over IPX packet disassembly
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-nbipx.c,v 1.33 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-nbipx.c,v 1.34 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -476,11 +476,12 @@ proto_register_nbipx(void)
|
|||
/* proto_register_field_array(proto_nbipx, hf, array_length(hf));*/
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
register_dissector("nbipx", dissect_nbipx);
|
||||
register_dissector("nbipx", dissect_nbipx, proto_nbipx);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_nbipx(void)
|
||||
{
|
||||
dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_DGRAM, dissect_nwlink_dg);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_DGRAM,
|
||||
dissect_nwlink_dg, proto_nbipx);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
* Much stuff added by Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-nbns.c,v 1.49 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-nbns.c,v 1.50 2001/01/09 06:31:38 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1771,8 +1771,8 @@ proto_register_nbt(void)
|
|||
void
|
||||
proto_reg_handoff_nbt(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
|
||||
old_dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
|
||||
old_dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss);
|
||||
old_dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss);
|
||||
old_dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns, proto_nbns);
|
||||
old_dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm, proto_nbdgm);
|
||||
old_dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss, proto_nbss);
|
||||
old_dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss, proto_nbss);
|
||||
}
|
||||
|
|
11
packet-ncp.c
11
packet-ncp.c
|
@ -3,7 +3,7 @@
|
|||
* 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.45 2001/01/03 16:41:06 gram Exp $
|
||||
* $Id: packet-ncp.c,v 1.46 2001/01/09 06:31:39 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -399,8 +399,9 @@ proto_register_ncp(void)
|
|||
void
|
||||
proto_reg_handoff_ncp(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_NCP, dissect_ncp);
|
||||
dissector_add("udp.port", UDP_PORT_NCP, dissect_ncp);
|
||||
dissector_add("ipx.packet_type", IPX_PACKET_TYPE_NCP, dissect_ncp);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_NCP, dissect_ncp);
|
||||
dissector_add("tcp.port", TCP_PORT_NCP, dissect_ncp, proto_ncp);
|
||||
dissector_add("udp.port", UDP_PORT_NCP, dissect_ncp, proto_ncp);
|
||||
dissector_add("ipx.packet_type", IPX_PACKET_TYPE_NCP, dissect_ncp,
|
||||
proto_ncp);
|
||||
dissector_add("ipx.socket", IPX_SOCKET_NCP, dissect_ncp, proto_ncp);
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* derived from the packet-nbns.c
|
||||
*
|
||||
* $Id: packet-netbios.c,v 1.28 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-netbios.c,v 1.29 2001/01/09 06:31:39 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1172,5 +1172,5 @@ void proto_register_netbios(void)
|
|||
void
|
||||
proto_reg_handoff_netbios(void)
|
||||
{
|
||||
dissector_add("llc.dsap", SAP_NETBIOS, dissect_netbios);
|
||||
dissector_add("llc.dsap", SAP_NETBIOS, dissect_netbios, proto_netbios);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for nntp packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-nntp.c,v 1.17 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-nntp.c,v 1.18 2001/01/09 06:31:39 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -149,5 +149,5 @@ proto_register_nntp(void)
|
|||
void
|
||||
proto_reg_handoff_nntp(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp);
|
||||
dissector_add("tcp.port", TCP_PORT_NNTP, dissect_nntp, proto_nntp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for NTP packet dissection
|
||||
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
|
||||
*
|
||||
* $Id: packet-ntp.c,v 1.23 2001/01/07 01:47:37 guy Exp $
|
||||
* $Id: packet-ntp.c,v 1.24 2001/01/09 06:31:39 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -502,6 +502,6 @@ proto_register_ntp(void)
|
|||
void
|
||||
proto_reg_handoff_ntp(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp);
|
||||
dissector_add("tcp.port", TCP_PORT_NTP, dissect_ntp);
|
||||
dissector_add("udp.port", UDP_PORT_NTP, dissect_ntp, proto_ntp);
|
||||
dissector_add("tcp.port", TCP_PORT_NTP, dissect_ntp, proto_ntp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-null.c
|
||||
* Routines for null packet disassembly
|
||||
*
|
||||
* $Id: packet-null.c,v 1.37 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-null.c,v 1.38 2001/01/09 06:31:39 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -322,5 +322,5 @@ proto_reg_handoff_null(void)
|
|||
* Get a handle for the PPP dissector.
|
||||
*/
|
||||
ppp_handle = find_dissector("ppp");
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_NULL, dissect_null);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_NULL, dissect_null, proto_null);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ISO/OSI network and transport protocol packet disassembly
|
||||
* Main entrance point and common functions
|
||||
*
|
||||
* $Id: packet-osi.c,v 1.38 2000/11/19 08:54:00 guy Exp $
|
||||
* $Id: packet-osi.c,v 1.39 2001/01/09 06:31:39 guy Exp $
|
||||
* Laurent Deniel <deniel@worldnet.fr>
|
||||
* Ralf Schneider <Ralf.Schneider@t-online.de>
|
||||
*
|
||||
|
@ -277,6 +277,6 @@ proto_register_osi(void)
|
|||
void
|
||||
proto_reg_handoff_osi(void)
|
||||
{
|
||||
dissector_add("llc.dsap", SAP_OSINL, dissect_osi);
|
||||
dissector_add("null.type", BSD_AF_ISO, dissect_osi);
|
||||
dissector_add("llc.dsap", SAP_OSINL, dissect_osi, -1);
|
||||
dissector_add("null.type", BSD_AF_ISO, dissect_osi, -1);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for OSPF packet disassembly
|
||||
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
|
||||
*
|
||||
* $Id: packet-ospf.c,v 1.34 2001/01/03 16:41:07 gram Exp $
|
||||
* $Id: packet-ospf.c,v 1.35 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* At this time, this module is able to analyze OSPF
|
||||
* packets as specified in RFC2328. MOSPF (RFC1584) and other
|
||||
|
@ -1053,5 +1053,5 @@ proto_register_ospf(void)
|
|||
void
|
||||
proto_reg_handoff_ospf(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_OSPF, dissect_ospf);
|
||||
dissector_add("ip.proto", IP_PROTO_OSPF, dissect_ospf, proto_ospf);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for PIM disassembly
|
||||
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
|
||||
*
|
||||
* $Id: packet-pim.c,v 1.20 2001/01/03 06:55:30 guy Exp $
|
||||
* $Id: packet-pim.c,v 1.21 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -608,7 +608,7 @@ proto_register_pim(void)
|
|||
void
|
||||
proto_reg_handoff_pim(void)
|
||||
{
|
||||
old_dissector_add("ip.proto", IP_PROTO_PIM, dissect_pim);
|
||||
old_dissector_add("ip.proto", IP_PROTO_PIM, dissect_pim, proto_pim);
|
||||
|
||||
/*
|
||||
* Get a handle for the IP dissector.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for pop packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-pop.c,v 1.22 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-pop.c,v 1.23 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -222,5 +222,5 @@ proto_register_pop(void)
|
|||
void
|
||||
proto_reg_handoff_pop(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_POP, dissect_pop);
|
||||
dissector_add("tcp.port", TCP_PORT_POP, dissect_pop, proto_pop);
|
||||
}
|
||||
|
|
10
packet-ppp.c
10
packet-ppp.c
|
@ -1,7 +1,7 @@
|
|||
/* packet-ppp.c
|
||||
* Routines for ppp packet disassembly
|
||||
*
|
||||
* $Id: packet-ppp.c,v 1.50 2001/01/03 07:53:43 guy Exp $
|
||||
* $Id: packet-ppp.c,v 1.51 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1425,8 +1425,8 @@ proto_register_ppp(void)
|
|||
/* subdissector code */
|
||||
subdissector_table = register_dissector_table("ppp.protocol");
|
||||
|
||||
register_dissector("ppp", dissect_ppp);
|
||||
register_dissector("payload_ppp", dissect_payload_ppp);
|
||||
register_dissector("ppp", dissect_ppp, proto_ppp);
|
||||
register_dissector("payload_ppp", dissect_payload_ppp, proto_ppp);
|
||||
|
||||
/* Register the preferences for the ppp protocol */
|
||||
ppp_module = prefs_register_protocol(proto_ppp, NULL);
|
||||
|
@ -1468,6 +1468,6 @@ proto_register_mp(void)
|
|||
void
|
||||
proto_reg_handoff_ppp(void)
|
||||
{
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp, proto_ppp);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp, proto_ppp);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-pppoe.c
|
||||
* Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516)
|
||||
*
|
||||
* $Id: packet-pppoe.c,v 1.14 2001/01/04 04:15:30 guy Exp $
|
||||
* $Id: packet-pppoe.c,v 1.15 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -222,7 +222,8 @@ proto_register_pppoed(void)
|
|||
void
|
||||
proto_reg_handoff_pppoed(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed);
|
||||
dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed,
|
||||
proto_pppoed);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -296,7 +297,8 @@ proto_register_pppoes(void)
|
|||
void
|
||||
proto_reg_handoff_pppoes(void)
|
||||
{
|
||||
dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes);
|
||||
dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes,
|
||||
proto_pppoes);
|
||||
|
||||
/*
|
||||
* Get a handle for the PPP payload dissector.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* 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.16 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-pptp.c,v 1.17 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -832,5 +832,5 @@ proto_register_pptp(void)
|
|||
void
|
||||
proto_reg_handoff_pptp(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_PPTP, dissect_pptp);
|
||||
dissector_add("tcp.port", TCP_PORT_PPTP, dissect_pptp, proto_pptp);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Uwe Girlich <uwe@planetquake.com>
|
||||
* http://www.idsoftware.com/q1source/q1source.zip
|
||||
*
|
||||
* $Id: packet-quake.c,v 1.11 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-quake.c,v 1.12 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -718,5 +718,5 @@ proto_register_quake(void)
|
|||
void
|
||||
proto_reg_handoff_quake(void)
|
||||
{
|
||||
dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake);
|
||||
dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake, proto_quake);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-radius.c
|
||||
* Routines for RADIUS packet disassembly
|
||||
*
|
||||
* $Id: packet-radius.c,v 1.21 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-radius.c,v 1.22 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Johan Feyaerts
|
||||
|
@ -784,8 +784,12 @@ proto_register_radius(void)
|
|||
void
|
||||
proto_reg_handoff_radius(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADIUS, dissect_radius,
|
||||
proto_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADIUS_NEW, dissect_radius,
|
||||
proto_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADACCT, dissect_radius,
|
||||
proto_radius);
|
||||
old_dissector_add("udp.port", UDP_PORT_RADACCT_NEW, dissect_radius,
|
||||
proto_radius);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-raw.c
|
||||
* Routines for raw packet disassembly
|
||||
*
|
||||
* $Id: packet-raw.c,v 1.23 2000/11/29 05:16:15 gram Exp $
|
||||
* $Id: packet-raw.c,v 1.24 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -163,5 +163,5 @@ proto_reg_handoff_raw(void)
|
|||
*/
|
||||
ip_handle = find_dissector("ip");
|
||||
ppp_handle = find_dissector("ppp");
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP, dissect_raw);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP, dissect_raw, -1);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for RIPv1 and RIPv2 packet disassembly
|
||||
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
|
||||
*
|
||||
* $Id: packet-rip.c,v 1.21 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-rip.c,v 1.22 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -211,5 +211,5 @@ proto_register_rip(void)
|
|||
void
|
||||
proto_reg_handoff_rip(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_RIP, dissect_rip);
|
||||
dissector_add("udp.port", UDP_PORT_RIP, dissect_rip, proto_rip);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
|
||||
* derived from packet-rip.c
|
||||
*
|
||||
* $Id: packet-ripng.c,v 1.16 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-ripng.c,v 1.17 2001/01/09 06:31:40 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -159,5 +159,5 @@ proto_register_ripng(void)
|
|||
void
|
||||
proto_reg_handoff_ripng(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng);
|
||||
old_dissector_add("udp.port", UDP_PORT_RIPNG, dissect_ripng, proto_ripng);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for unix rlogin packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-rlogin.c,v 1.12 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-rlogin.c,v 1.13 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -495,5 +495,6 @@ proto_reg_handoff_rlogin(void) {
|
|||
|
||||
/* dissector install routine */
|
||||
|
||||
old_dissector_add("tcp.port", TCP_PORT_RLOGIN, dissect_rlogin);
|
||||
old_dissector_add("tcp.port", TCP_PORT_RLOGIN, dissect_rlogin,
|
||||
proto_rlogin);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for rpc dissection
|
||||
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
|
||||
*
|
||||
* $Id: packet-rpc.c,v 1.46 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-rpc.c,v 1.47 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1772,6 +1772,6 @@ proto_register_rpc(void)
|
|||
void
|
||||
proto_reg_handoff_rpc(void)
|
||||
{
|
||||
heur_dissector_add("tcp", dissect_rpc);
|
||||
heur_dissector_add("udp", dissect_rpc);
|
||||
heur_dissector_add("tcp", dissect_rpc, proto_rpc);
|
||||
heur_dissector_add("udp", dissect_rpc, proto_rpc);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Robert Tsai <rtsai@netapp.com>
|
||||
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-rsh.c,v 1.8 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-rsh.c,v 1.9 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -129,5 +129,5 @@ proto_register_rsh(void)
|
|||
void
|
||||
proto_reg_handoff_rsh(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_RSH, dissect_rsh);
|
||||
dissector_add("tcp.port", TCP_PORT_RSH, dissect_rsh, proto_rsh);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
|
||||
*
|
||||
* $Id: packet-rsvp.c,v 1.30 2001/01/03 16:41:07 gram Exp $
|
||||
* $Id: packet-rsvp.c,v 1.31 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -2044,5 +2044,6 @@ proto_register_rsvp(void)
|
|||
void
|
||||
proto_reg_handoff_rsvp(void)
|
||||
{
|
||||
old_dissector_add("ip.proto", IP_PROTO_RSVP, dissect_rsvp);
|
||||
old_dissector_add("ip.proto", IP_PROTO_RSVP, dissect_rsvp,
|
||||
proto_rsvp);
|
||||
}
|
||||
|
|
|
@ -196,7 +196,7 @@ void rtcp_add_address( const unsigned char* ip_addr, int prt )
|
|||
* know that we're interested in traffic
|
||||
*/
|
||||
if ( ! heur_init ) {
|
||||
heur_dissector_add( "udp", dissect_rtcp_heur );
|
||||
heur_dissector_add( "udp", dissect_rtcp_heur, proto_rtcp );
|
||||
heur_init = TRUE;
|
||||
}
|
||||
|
||||
|
@ -1226,5 +1226,5 @@ proto_reg_handoff_rtcp(void)
|
|||
* Register this dissector as one that can be assigned to a
|
||||
* UDP conversation.
|
||||
*/
|
||||
conv_dissector_add("udp", dissect_rtcp);
|
||||
conv_dissector_add("udp", dissect_rtcp, proto_rtcp);
|
||||
}
|
||||
|
|
|
@ -164,7 +164,7 @@ void rtp_add_address( const unsigned char* ip_addr, int prt )
|
|||
* know that we're interested in traffic
|
||||
*/
|
||||
if ( ! heur_init ) {
|
||||
heur_dissector_add( "udp", dissect_rtp_heur );
|
||||
heur_dissector_add( "udp", dissect_rtp_heur, proto_rtp );
|
||||
heur_init = TRUE;
|
||||
}
|
||||
|
||||
|
@ -637,5 +637,5 @@ proto_reg_handoff_rtp(void)
|
|||
* Register this dissector as one that can be assigned to a
|
||||
* UDP conversation.
|
||||
*/
|
||||
conv_dissector_add("udp", dissect_rtp);
|
||||
conv_dissector_add("udp", dissect_rtp, proto_rtp);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Jason Lango <jal@netapp.com>
|
||||
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-rtsp.c,v 1.31 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-rtsp.c,v 1.32 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -620,7 +620,7 @@ proto_register_rtsp(void)
|
|||
void
|
||||
proto_reg_handoff_rtsp(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_RTSP, dissect_rtsp);
|
||||
dissector_add("tcp.port", TCP_PORT_RTSP, dissect_rtsp, proto_rtsp);
|
||||
|
||||
/*
|
||||
* Get a handle for the SDP dissector.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Based on routines from tcpdump patches by
|
||||
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
|
||||
*
|
||||
* $Id: packet-rx.c,v 1.17 2001/01/03 16:41:07 gram Exp $
|
||||
* $Id: packet-rx.c,v 1.18 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -253,6 +253,7 @@ proto_reg_handoff_rx(void)
|
|||
/* Ports in the range UDP_PORT_RX_LOW to UDP_PORT_RX_HIGH
|
||||
are all used for various AFS services. */
|
||||
for (port = UDP_PORT_RX_LOW; port <= UDP_PORT_RX_HIGH; port++)
|
||||
old_dissector_add("udp.port", port, dissect_rx);
|
||||
old_dissector_add("udp.port", UDP_PORT_RX_AFS_BACKUPS, dissect_rx);
|
||||
old_dissector_add("udp.port", port, dissect_rx, proto_rx);
|
||||
old_dissector_add("udp.port", UDP_PORT_RX_AFS_BACKUPS, dissect_rx,
|
||||
proto_rx);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-sap.c,v 1.17 2001/01/03 06:55:31 guy Exp $
|
||||
* $Id: packet-sap.c,v 1.18 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -366,7 +366,7 @@ void proto_register_sap(void)
|
|||
void
|
||||
proto_reg_handoff_sap(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_SAP, dissect_sap);
|
||||
dissector_add("udp.port", UDP_PORT_SAP, dissect_sap, proto_sap);
|
||||
|
||||
/*
|
||||
* Get a handle for the SDP dissector.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for Stream Control Transmission Protocol dissection
|
||||
* Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
|
||||
*
|
||||
* $Id: packet-sctp.c,v 1.8 2001/01/03 06:55:32 guy Exp $
|
||||
* $Id: packet-sctp.c,v 1.9 2001/01/09 06:31:41 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@unicom.net>
|
||||
|
@ -1820,5 +1820,5 @@ proto_register_sctp(void)
|
|||
void
|
||||
proto_reg_handoff_sctp(void)
|
||||
{
|
||||
dissector_add("ip.proto", IP_PROTO_SCTP, dissect_sctp);
|
||||
dissector_add("ip.proto", IP_PROTO_SCTP, dissect_sctp, proto_sctp);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Jason Lango <jal@netapp.com>
|
||||
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
|
||||
*
|
||||
* $Id: packet-sdp.c,v 1.18 2001/01/03 06:55:32 guy Exp $
|
||||
* $Id: packet-sdp.c,v 1.19 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -227,5 +227,5 @@ proto_register_sdp(void)
|
|||
* (you can't refer to it directly from a plugin dissector
|
||||
* on Windows without stuffing it into the Big Transfer Vector).
|
||||
*/
|
||||
register_dissector("sdp", dissect_sdp);
|
||||
register_dissector("sdp", dissect_sdp, proto_sdp);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-sip.c,v 1.9 2001/01/03 06:55:32 guy Exp $
|
||||
* $Id: packet-sip.c,v 1.10 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -196,8 +196,8 @@ void proto_register_sip(void)
|
|||
void
|
||||
proto_reg_handoff_sip(void)
|
||||
{
|
||||
dissector_add("tcp.port", TCP_PORT_SIP, dissect_sip);
|
||||
dissector_add("udp.port", UDP_PORT_SIP, dissect_sip);
|
||||
dissector_add("tcp.port", TCP_PORT_SIP, dissect_sip, proto_sip);
|
||||
dissector_add("udp.port", UDP_PORT_SIP, dissect_sip, proto_sip);
|
||||
|
||||
/*
|
||||
* Get a handle for the SDP dissector.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-sll.c
|
||||
* Routines for disassembly of packets from Linux "cooked mode" captures
|
||||
*
|
||||
* $Id: packet-sll.c,v 1.3 2001/01/03 10:34:41 guy Exp $
|
||||
* $Id: packet-sll.c,v 1.4 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -320,5 +320,5 @@ proto_reg_handoff_sll(void)
|
|||
*/
|
||||
llc_handle = find_dissector("llc");
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll, proto_sll);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-smtp.c
|
||||
* Routines for SMTP packet disassembly
|
||||
*
|
||||
* $Id: packet-smtp.c,v 1.13 2001/01/03 06:55:32 guy Exp $
|
||||
* $Id: packet-smtp.c,v 1.14 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
|
@ -592,6 +592,6 @@ proto_reg_handoff_smtp(void)
|
|||
|
||||
tcp_port = global_smtp_tcp_port;
|
||||
|
||||
dissector_add("tcp.port", global_smtp_tcp_port, dissect_smtp);
|
||||
dissector_add("tcp.port", global_smtp_tcp_port, dissect_smtp, proto_smtp);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SNA
|
||||
* Gilbert Ramirez <gram@xiexie.org>
|
||||
*
|
||||
* $Id: packet-sna.c,v 1.22 2001/01/03 21:52:40 guy Exp $
|
||||
* $Id: packet-sna.c,v 1.23 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1224,5 +1224,6 @@ proto_register_sna(void)
|
|||
void
|
||||
proto_reg_handoff_sna(void)
|
||||
{
|
||||
old_dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna);
|
||||
old_dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna,
|
||||
proto_sna);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SNMP (simple network management protocol)
|
||||
* D.Jorand (c) 1998
|
||||
*
|
||||
* $Id: packet-snmp.c,v 1.56 2001/01/03 16:41:07 gram Exp $
|
||||
* $Id: packet-snmp.c,v 1.57 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -2090,10 +2090,16 @@ proto_register_snmp(void)
|
|||
void
|
||||
proto_reg_handoff_snmp(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp);
|
||||
old_dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp);
|
||||
old_dissector_add("tcp.port", TCP_PORT_SMUX, dissect_smux);
|
||||
old_dissector_add("ethertype", ETHERTYPE_SNMP, dissect_snmp);
|
||||
old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, dissect_snmp);
|
||||
old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, dissect_snmp);
|
||||
old_dissector_add("udp.port", UDP_PORT_SNMP, dissect_snmp,
|
||||
proto_snmp);
|
||||
old_dissector_add("udp.port", UDP_PORT_SNMP_TRAP, dissect_snmp,
|
||||
proto_snmp);
|
||||
old_dissector_add("tcp.port", TCP_PORT_SMUX, dissect_smux,
|
||||
proto_smux);
|
||||
old_dissector_add("ethertype", ETHERTYPE_SNMP, dissect_snmp,
|
||||
proto_snmp);
|
||||
old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, dissect_snmp,
|
||||
proto_snmp);
|
||||
old_dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, dissect_snmp,
|
||||
proto_snmp);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for socks versions 4 &5 packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-socks.c,v 1.16 2001/01/03 06:55:33 guy Exp $
|
||||
* $Id: packet-socks.c,v 1.17 2001/01/09 06:31:43 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1151,5 +1151,6 @@ proto_reg_handoff_socks(void) {
|
|||
|
||||
/* dissector install routine */
|
||||
|
||||
old_dissector_add("tcp.port", TCP_PORT_SOCKS, dissect_socks);
|
||||
old_dissector_add("tcp.port", TCP_PORT_SOCKS, dissect_socks,
|
||||
proto_socks);
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* In particular I have not had an opportunity to see how it
|
||||
* responds to SRVLOC over TCP.
|
||||
*
|
||||
* $Id: packet-srvloc.c,v 1.18 2001/01/03 16:41:07 gram Exp $
|
||||
* $Id: packet-srvloc.c,v 1.19 2001/01/09 06:31:44 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -518,12 +518,12 @@ proto_register_srvloc(void)
|
|||
FT_UINT16, BASE_DEC, VALS(srvloc_errs), 0x0,
|
||||
""}
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
&ett_srvloc,
|
||||
&ett_srvloc_flags,
|
||||
};
|
||||
static gint *ett[] = {
|
||||
&ett_srvloc,
|
||||
&ett_srvloc_flags,
|
||||
};
|
||||
|
||||
proto_srvloc = proto_register_protocol("Service Location Protocol",
|
||||
"SRVLOC", "srvloc");
|
||||
|
@ -534,7 +534,9 @@ proto_register_srvloc(void)
|
|||
void
|
||||
proto_reg_handoff_srvloc(void)
|
||||
{
|
||||
old_dissector_add("tcp.port", TCP_PORT_SRVLOC, dissect_srvloc);
|
||||
old_dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc);
|
||||
old_dissector_add("tcp.port", TCP_PORT_SRVLOC, dissect_srvloc,
|
||||
proto_srvloc);
|
||||
old_dissector_add("udp.port", UDP_PORT_SRVLOC, dissect_srvloc,
|
||||
proto_srvloc);
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Copyright 2000, Gerald Combs <gerald@zing.org>
|
||||
*
|
||||
* $Id: packet-syslog.c,v 1.8 2001/01/03 06:55:33 guy Exp $
|
||||
* $Id: packet-syslog.c,v 1.9 2001/01/09 06:31:44 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -249,5 +249,5 @@ void proto_register_syslog(void)
|
|||
void
|
||||
proto_reg_handoff_syslog(void)
|
||||
{
|
||||
dissector_add("udp.port", UDP_PORT_SYSLOG, dissect_syslog);
|
||||
dissector_add("udp.port", UDP_PORT_SYSLOG, dissect_syslog, proto_syslog);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-tacacs.c
|
||||
* Routines for cisco tacacs/tacplus/AAA packet dissection
|
||||
*
|
||||
* $Id: packet-tacacs.c,v 1.9 2001/01/03 06:55:33 guy Exp $
|
||||
* $Id: packet-tacacs.c,v 1.10 2001/01/09 06:31:44 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -159,6 +159,8 @@ proto_register_tacacs(void)
|
|||
void
|
||||
proto_reg_handoff_tacacs(void)
|
||||
{
|
||||
old_dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs);
|
||||
old_dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus);
|
||||
old_dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs,
|
||||
proto_tacacs);
|
||||
old_dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus,
|
||||
proto_tacacs);
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue