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/atm.c | |
| parent | 8616a33765b7c90c36833f32a2a436252af80564 (diff) | |
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/atm.c')
| -rw-r--r-- | wiretap/atm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/atm.c b/wiretap/atm.c index d4bace9a1a..cf95f14d1d 100644 --- a/wiretap/atm.c +++ b/wiretap/atm.c @@ -1,6 +1,6 @@ /* atm.c * - * $Id: atm.c,v 1.1 2002/04/30 18:58:15 guy Exp $ + * $Id: atm.c,v 1.2 2002/08/13 03:32:56 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -37,7 +37,7 @@ void atm_guess_traffic_type(const guint8 *pd, guint32 len, - guint16 vpi, guint16 vci, union wtap_pseudo_header *pseudo_header) + union wtap_pseudo_header *pseudo_header) { /* * Start out assuming nothing other than that it's AAL5. @@ -46,12 +46,12 @@ atm_guess_traffic_type(const guint8 *pd, guint32 len, pseudo_header->atm.type = TRAF_UNKNOWN; pseudo_header->atm.subtype = TRAF_ST_UNKNOWN; - if (vpi == 0) { + if (pseudo_header->atm.vpi == 0) { /* * Traffic on some PVCs with a VPI of 0 and certain * VCIs is of particular types. */ - switch (vci) { + switch (pseudo_header->atm.vci) { case 5: /* |