diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
| commit | 5d66575dd923625f5f8a569b19801db44c111619 (patch) | |
| tree | 14f508983141729f86ce893b1f31e0d11cf1b4db /contrib/tcpdump/print-atm.c | |
| parent | fb0e3fc91b71a7c77c12753c471331fc4757d33c (diff) | |
| download | FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.zip FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.tar.gz | |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/print-atm.c')
| -rw-r--r-- | contrib/tcpdump/print-atm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c index 5690952..4e061b0 100644 --- a/contrib/tcpdump/print-atm.c +++ b/contrib/tcpdump/print-atm.c @@ -22,7 +22,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38 2005/01/19 16:46:27 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38.2.2 2005/06/20 07:45:06 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -258,7 +258,7 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, case OAMF4SC: /* fall through */ case OAMF4EC: - oam_print(p, length); + oam_print(p, length, ATM_OAM_HEC); return; case METAC: @@ -289,13 +289,13 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, } int -oam_print (const u_char *p, u_int length) { +oam_print (const u_char *p, u_int length, u_int hec) { u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp; cell_header = EXTRACT_32BITS(p); - cell_type = ((*(p+4))>>4) & 0x0f; - func_type = *(p) & 0x0f; + cell_type = ((*(p+4+hec))>>4) & 0x0f; + func_type = *(p+4+hec) & 0x0f; vpi = (cell_header>>20)&0xff; vci = (cell_header>>4)&0xffff; |
