diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-13 03:32:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-13 03:32:57 +0000 |
| commit | 77bb2477bad88420fecc15e3a65e5efee066f582 (patch) | |
| tree | e42b3732ecc66a68f55ce4fffdc3707519c4bcb4 /wiretap/iptrace.c | |
| parent | 8616a33765b7c90c36833f32a2a436252af80564 (diff) | |
| download | wireshark-77bb2477bad88420fecc15e3a65e5efee066f582.tar.gz wireshark-77bb2477bad88420fecc15e3a65e5efee066f582.tar.bz2 wireshark-77bb2477bad88420fecc15e3a65e5efee066f582.zip | |
Get rid of the "vpi" and "vci" arguments to "atm_guess_traffic_type()",
have it get that information from the pseudo-header instead, and set the
VPI and VCI fields in the pseudo-header before calling it.
Don't call it for non-ATM NetMon captures.
svn path=/trunk/; revision=5982
Diffstat (limited to 'wiretap/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 03690ad379..0e58447c29 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c,v 1.42 2002/07/29 06:09:58 guy Exp $ + * $Id: iptrace.c,v 1.43 2002/08/13 03:32:56 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -392,12 +392,6 @@ get_atm_pseudo_header(const guint8 *pd, guint32 len, } /* - * Attempt to guess from the packet data, the VPI, and the VCI - * information about the type of traffic. - */ - atm_guess_traffic_type(pd, len, Vpi, Vci, pseudo_header); - - /* * OK, which value means "DTE->DCE" and which value means * "DCE->DTE"? */ @@ -406,6 +400,12 @@ get_atm_pseudo_header(const guint8 *pd, guint32 len, pseudo_header->atm.vpi = Vpi; pseudo_header->atm.vci = Vci; + /* + * Attempt to guess from the packet data, the VPI, and the VCI + * information about the type of traffic. + */ + atm_guess_traffic_type(pd, len, pseudo_header); + /* We don't have this information */ pseudo_header->atm.cells = 0; pseudo_header->atm.aal5t_u2u = 0; |