osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Anton Ivanov: add support for Frame Relay over ATM. 

svn path=/trunk/; revision=13883
This commit is contained in:
Guy Harris 2005-03-23 20:25:29 +00:00
parent 46b36c7fd5
commit 7fd976834e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -2412,6 +2412,7 @@ Ricardo Muggli <ricardo.muggli [AT] mnsu.edu>
Vladimir Kondratiev <vladimir.kondratiev [AT] gmail.com>
Jaap Keuter <jaap.keuter [AT] xs4all.nl>
Frederic Peters <fpeters [AT] debian.org>
Anton Ivanov <anthony_johnson [AT] mail.ru>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

10
epan/dissectors/packet-atm.c
View File

@ -61,6 +61,7 @@ static gint ett_oamaal = -1;
static dissector_handle_t eth_withoutfcs_handle;
static dissector_handle_t tr_handle;
static dissector_handle_t fr_handle;
static dissector_handle_t llc_handle;
static dissector_handle_t sscop_handle;
static dissector_handle_t lane_handle;
@ -1071,6 +1072,10 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case AAL_5:
switch (pinfo->pseudo_header->atm.type) {
case TRAF_FR:
call_dissector(fr_handle, next_tvb, pinfo, tree);
break;
case TRAF_LLCMX:
call_dissector(llc_handle, next_tvb, pinfo, tree);
break;
@ -1647,11 +1652,12 @@ proto_reg_handoff_atm(void)
dissector_handle_t atm_handle, atm_untruncated_handle;
/*
* Get handles for the Ethernet, Token Ring, LLC, SSCOP, LANE,
* and ILMI dissectors.
* Get handles for the Ethernet, Token Ring, Frame Relay, LLC,
* SSCOP, LANE, and ILMI dissectors.
*/
eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
tr_handle = find_dissector("tr");
fr_handle = find_dissector("fr");
llc_handle = find_dissector("llc");
sscop_handle = find_dissector("sscop");
lane_handle = find_dissector("lane");