diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-19 02:00:03 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-19 02:00:03 +0000 |
| commit | dd90e7e3273687538e30ebec716f3c151a6f75d5 (patch) | |
| tree | 6a40eee325a205b2340aff40fd48a84d9aa443a9 /packet-null.c | |
| parent | 5c1549b944280ad916855ea949a66a85065ece22 (diff) | |
Have the Etherenet and PPP dissectors register themselves, and have
other dissectors call them through handles. Do the same for the "PPP
payload" dissector, after tvbuffifying it.
Tvbuffify the PPPoE dissector.
Do the last little bit of tvbuffifying the L2TP dissector (it takes
old-style arguments and immediately generates a tvbuff out of them; make
it take new-style arguments).
svn path=/trunk/; revision=2664
Diffstat (limited to 'packet-null.c')
| -rw-r--r-- | packet-null.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/packet-null.c b/packet-null.c index f6e3c2052a..ce18431cca 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.32 2000/11/17 21:00:35 gram Exp $ + * $Id: packet-null.c,v 1.33 2000/11/19 02:00:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -74,6 +74,8 @@ static const value_string family_vals[] = { {0, NULL } }; +static dissector_handle_t ppp_handle; + void capture_null( const u_char *pd, packet_counts *ld ) { @@ -225,7 +227,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Hand it to PPP. */ - dissect_ppp(tvb, pinfo, tree); + call_dissector(ppp_handle, tvb, pinfo, tree); } else { /* load the top pane info. This should be overwritten by @@ -310,3 +312,12 @@ proto_register_null(void) /* subdissector code */ null_dissector_table = register_dissector_table("null.type"); } + +void +proto_reg_handoff_null(void) +{ + /* + * Get a handle for the PPP dissector. + */ + ppp_handle = find_dissector("ppp"); +} |