diff options
| author | hannes <hannes> | 2005-06-20 07:37:01 +0000 |
|---|---|---|
| committer | hannes <hannes> | 2005-06-20 07:37:01 +0000 |
| commit | 99b69f68980a6f0f71a1d8f81e35d40ed028cd13 (patch) | |
| tree | ce696c284baa57afe81eaf14c6445a5bcd33caec /print-atm.c | |
| parent | d16e94e8487d7025d213595c47fc81f6a6c70b40 (diff) | |
| download | tcpdump-99b69f68980a6f0f71a1d8f81e35d40ed028cd13.tar.gz | |
Juniper routers do not deliver a heading HEC byte for oam cells: make the OAM printer to support both HEC and non-HEC OAM cells
Diffstat (limited to 'print-atm.c')
| -rw-r--r-- | print-atm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-atm.c b/print-atm.c index 110d3881..919d5e07 100644 --- a/print-atm.c +++ b/print-atm.c @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.39 2005-05-18 20:24:04 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.40 2005-06-20 07:37:02 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -257,7 +257,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: @@ -288,13 +288,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+4) & 0x0f; + cell_type = ((*(p+4+hec))>>4) & 0x0f; + func_type = *(p+4+hec) & 0x0f; vpi = (cell_header>>20)&0xff; vci = (cell_header>>4)&0xffff; |