2002-07-11 16:09:45 +08:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that: (1) source code distributions
|
|
|
|
* retain the above copyright notice and this paragraph in its entirety, (2)
|
|
|
|
* distributions including binary code include the above copyright notice and
|
|
|
|
* this paragraph in its entirety in the documentation or other materials
|
|
|
|
* provided with the distribution, and (3) all advertising materials mentioning
|
|
|
|
* features or use of this software display the following acknowledgement:
|
|
|
|
* ``This product includes software developed by the University of California,
|
|
|
|
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
|
|
|
|
* the University nor the names of its contributors may be used to endorse
|
|
|
|
* or promote products derived from this software without specific prior
|
|
|
|
* written permission.
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
|
|
|
|
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
*/
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
#define NETDISSECT_REWORKED
|
2002-07-11 16:09:45 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2002-08-01 16:52:55 +08:00
|
|
|
#include <tcpdump-stdinc.h>
|
2002-07-11 16:09:45 +08:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "addrtoname.h"
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
#include "interface.h"
|
2002-07-11 16:09:45 +08:00
|
|
|
#include "ethertype.h"
|
2004-10-07 22:53:09 +08:00
|
|
|
#include "nlpid.h"
|
2002-07-11 16:09:45 +08:00
|
|
|
#include "extract.h"
|
2005-04-07 04:09:07 +08:00
|
|
|
#include "oui.h"
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
static void frf15_print(netdissect_options *ndo, const u_char *, u_int);
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
/*
|
|
|
|
* the frame relay header has a variable length
|
|
|
|
*
|
|
|
|
* the EA bit determines if there is another byte
|
|
|
|
* in the header
|
|
|
|
*
|
|
|
|
* minimum header length is 2 bytes
|
|
|
|
* maximum header length is 4 bytes
|
|
|
|
*
|
|
|
|
* 7 6 5 4 3 2 1 0
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (6 bits) | CR | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (4 bits) |FECN|BECN| DE | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (7 bits) | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (6 bits) |SDLC| EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
*/
|
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
#define FR_EA_BIT 0x01
|
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
#define FR_CR_BIT 0x02000000
|
|
|
|
#define FR_DE_BIT 0x00020000
|
|
|
|
#define FR_BECN_BIT 0x00040000
|
|
|
|
#define FR_FECN_BIT 0x00080000
|
|
|
|
#define FR_SDLC_BIT 0x00000002
|
|
|
|
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok fr_header_flag_values[] = {
|
2004-10-10 01:55:26 +08:00
|
|
|
{ FR_CR_BIT, "C!" },
|
|
|
|
{ FR_DE_BIT, "DE" },
|
|
|
|
{ FR_BECN_BIT, "BECN" },
|
|
|
|
{ FR_FECN_BIT, "FECN" },
|
|
|
|
{ FR_SDLC_BIT, "sdlcore" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2005-07-27 17:01:03 +08:00
|
|
|
/* FRF.15 / FRF.16 */
|
|
|
|
#define MFR_B_BIT 0x80
|
|
|
|
#define MFR_E_BIT 0x40
|
|
|
|
#define MFR_C_BIT 0x20
|
|
|
|
#define MFR_BEC_MASK (MFR_B_BIT | MFR_E_BIT | MFR_C_BIT)
|
|
|
|
#define MFR_CTRL_FRAME (MFR_B_BIT | MFR_E_BIT | MFR_C_BIT)
|
|
|
|
#define MFR_FRAG_FRAME (MFR_B_BIT | MFR_E_BIT )
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok frf_flag_values[] = {
|
2005-07-27 17:01:03 +08:00
|
|
|
{ MFR_B_BIT, "Begin" },
|
|
|
|
{ MFR_E_BIT, "End" },
|
|
|
|
{ MFR_C_BIT, "Control" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
/* Finds out Q.922 address length, DLCI and flags. Returns 0 on success
|
|
|
|
* save the flags dep. on address length
|
|
|
|
*/
|
2006-02-12 06:11:40 +08:00
|
|
|
static int parse_q922_addr(const u_char *p, u_int *dlci,
|
2004-10-10 01:55:26 +08:00
|
|
|
u_int *addr_len, u_int8_t *flags)
|
|
|
|
{
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
if ((p[0] & FR_EA_BIT))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*addr_len = 2;
|
|
|
|
*dlci = ((p[0] & 0xFC) << 2) | ((p[1] & 0xF0) >> 4);
|
|
|
|
|
2004-10-13 05:02:00 +08:00
|
|
|
flags[0] = p[0] & 0x02; /* populate the first flag fields */
|
2004-10-10 01:55:26 +08:00
|
|
|
flags[1] = p[1] & 0x0c;
|
2005-11-13 19:53:19 +08:00
|
|
|
flags[2] = 0; /* clear the rest of the flags */
|
|
|
|
flags[3] = 0;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
|
|
|
if (p[1] & FR_EA_BIT)
|
|
|
|
return 0; /* 2-byte Q.922 address */
|
|
|
|
|
|
|
|
p += 2;
|
|
|
|
(*addr_len)++; /* 3- or 4-byte Q.922 address */
|
|
|
|
if ((p[0] & FR_EA_BIT) == 0) {
|
|
|
|
*dlci = (*dlci << 7) | (p[0] >> 1);
|
|
|
|
(*addr_len)++; /* 4-byte Q.922 address */
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((p[0] & FR_EA_BIT) == 0)
|
|
|
|
return -1; /* more than 4 bytes of Q.922 address? */
|
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
flags[3] = p[0] & 0x02;
|
|
|
|
|
2006-02-12 06:11:40 +08:00
|
|
|
*dlci = (*dlci << 6) | (p[0] >> 2);
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-12 06:11:40 +08:00
|
|
|
char *q922_string(const u_char *p) {
|
|
|
|
|
|
|
|
static u_int dlci, addr_len;
|
|
|
|
static u_int8_t flags[4];
|
|
|
|
static char buffer[sizeof("DLCI xxxxxxxxxx")];
|
|
|
|
memset(buffer, 0, sizeof(buffer));
|
|
|
|
|
|
|
|
if (parse_q922_addr(p, &dlci, &addr_len, flags) == 0){
|
|
|
|
snprintf(buffer, sizeof(buffer), "DLCI %u", dlci);
|
|
|
|
}
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
/* Frame Relay packet structure, with flags and CRC removed
|
2002-07-11 16:09:45 +08:00
|
|
|
|
|
|
|
+---------------------------+
|
|
|
|
| Q.922 Address* |
|
|
|
|
+-- --+
|
|
|
|
| |
|
|
|
|
+---------------------------+
|
|
|
|
| Control (UI = 0x03) |
|
|
|
|
+---------------------------+
|
|
|
|
| Optional Pad (0x00) |
|
|
|
|
+---------------------------+
|
|
|
|
| NLPID |
|
|
|
|
+---------------------------+
|
|
|
|
| . |
|
|
|
|
| . |
|
|
|
|
| . |
|
|
|
|
| Data |
|
|
|
|
| . |
|
|
|
|
| . |
|
|
|
|
+---------------------------+
|
|
|
|
|
|
|
|
* Q.922 addresses, as presently defined, are two octets and
|
|
|
|
contain a 10-bit DLCI. In some networks Q.922 addresses
|
|
|
|
may optionally be increased to three or four octets.
|
|
|
|
*/
|
|
|
|
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static u_int
|
2005-05-27 22:53:48 +08:00
|
|
|
fr_hdrlen(const u_char *p, u_int addr_len)
|
2002-07-11 16:09:45 +08:00
|
|
|
{
|
2005-05-27 22:53:48 +08:00
|
|
|
if (!p[addr_len + 1] /* pad exist */)
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
return addr_len + 1 /* UI */ + 1 /* pad */ + 1 /* NLPID */;
|
2014-01-02 10:27:54 +08:00
|
|
|
else
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
return addr_len + 1 /* UI */ + 1 /* NLPID */;
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2014-03-18 20:09:00 +08:00
|
|
|
fr_hdr_print(netdissect_options *ndo,
|
|
|
|
int length, u_int addr_len, u_int dlci, u_int8_t *flags, u_int16_t nlpid)
|
2002-07-11 16:09:45 +08:00
|
|
|
{
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_qflag) {
|
|
|
|
ND_PRINT((ndo, "Q.922, DLCI %u, length %u: ",
|
2004-10-10 01:55:26 +08:00
|
|
|
dlci,
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2004-10-10 01:55:26 +08:00
|
|
|
} else {
|
|
|
|
if (nlpid <= 0xff) /* if its smaller than 256 then its a NLPID */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "Q.922, hdr-len %u, DLCI %u, Flags [%s], NLPID %s (0x%02x), length %u: ",
|
2004-10-10 01:55:26 +08:00
|
|
|
addr_len,
|
|
|
|
dlci,
|
|
|
|
bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),
|
|
|
|
tok2str(nlpid_values,"unknown", nlpid),
|
|
|
|
nlpid,
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2004-10-10 01:55:26 +08:00
|
|
|
else /* must be an ethertype */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "Q.922, hdr-len %u, DLCI %u, Flags [%s], cisco-ethertype %s (0x%04x), length %u: ",
|
2004-10-10 01:55:26 +08:00
|
|
|
addr_len,
|
|
|
|
dlci,
|
|
|
|
bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),
|
|
|
|
tok2str(ethertype_values, "unknown", nlpid),
|
|
|
|
nlpid,
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2004-10-10 01:55:26 +08:00
|
|
|
}
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
|
|
|
|
2002-12-19 17:39:10 +08:00
|
|
|
u_int
|
2014-03-18 20:09:00 +08:00
|
|
|
fr_if_print(netdissect_options *ndo,
|
|
|
|
const struct pcap_pkthdr *h, register const u_char *p)
|
2002-07-11 16:09:45 +08:00
|
|
|
{
|
|
|
|
register u_int length = h->len;
|
|
|
|
register u_int caplen = h->caplen;
|
2005-05-27 22:53:48 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*p, 4); /* minimum frame header length */
|
2005-05-27 22:53:48 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if ((length = fr_print(ndo, p, length)) == 0)
|
2005-05-27 22:53:48 +08:00
|
|
|
return (0);
|
|
|
|
else
|
|
|
|
return length;
|
|
|
|
trunc:
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|fr]"));
|
2005-05-27 22:53:48 +08:00
|
|
|
return caplen;
|
|
|
|
}
|
|
|
|
|
|
|
|
u_int
|
2014-03-18 20:09:00 +08:00
|
|
|
fr_print(netdissect_options *ndo,
|
|
|
|
register const u_char *p, u_int length)
|
2005-05-27 22:53:48 +08:00
|
|
|
{
|
2004-10-10 01:55:26 +08:00
|
|
|
u_int16_t extracted_ethertype;
|
2003-12-15 11:36:05 +08:00
|
|
|
u_int dlci;
|
2004-04-02 14:53:19 +08:00
|
|
|
u_int addr_len;
|
2004-10-10 01:55:26 +08:00
|
|
|
u_int16_t nlpid;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
u_int hdr_len;
|
2004-10-10 01:55:26 +08:00
|
|
|
u_int8_t flags[4];
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2006-02-12 06:11:40 +08:00
|
|
|
if (parse_q922_addr(p, &dlci, &addr_len, flags)) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "Q.922, invalid address"));
|
2005-05-27 22:53:48 +08:00
|
|
|
return 0;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
}
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*p, addr_len+1+1);
|
2005-05-27 22:53:48 +08:00
|
|
|
hdr_len = fr_hdrlen(p, addr_len);
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*p, hdr_len);
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2004-10-18 20:11:34 +08:00
|
|
|
if (p[addr_len] != 0x03 && dlci != 0) {
|
2004-10-08 00:04:06 +08:00
|
|
|
|
|
|
|
/* lets figure out if we have cisco style encapsulation: */
|
|
|
|
extracted_ethertype = EXTRACT_16BITS(p+addr_len);
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_eflag)
|
|
|
|
fr_hdr_print(ndo, length, addr_len, dlci, flags, extracted_ethertype);
|
2004-10-08 00:04:06 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ethertype_print(ndo, extracted_ethertype,
|
2004-10-08 00:04:06 +08:00
|
|
|
p+addr_len+ETHERTYPE_LEN,
|
2004-10-10 01:55:26 +08:00
|
|
|
length-addr_len-ETHERTYPE_LEN,
|
2010-02-22 04:44:53 +08:00
|
|
|
length-addr_len-ETHERTYPE_LEN) == 0)
|
2004-10-08 00:04:06 +08:00
|
|
|
/* ether_type not known, probably it wasn't one */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "UI %02x! ", p[addr_len]));
|
2004-10-08 00:04:06 +08:00
|
|
|
else
|
2004-10-10 01:55:26 +08:00
|
|
|
return hdr_len;
|
2004-10-08 00:04:06 +08:00
|
|
|
}
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
|
|
|
if (!p[addr_len + 1]) { /* pad byte should be used with 3-byte Q.922 */
|
|
|
|
if (addr_len != 3)
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "Pad! "));
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
} else if (addr_len == 3)
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "No pad! "));
|
2002-07-11 16:09:45 +08:00
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
nlpid = p[hdr_len - 1];
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_eflag)
|
|
|
|
fr_hdr_print(ndo, length, addr_len, dlci, flags, nlpid);
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
p += hdr_len;
|
|
|
|
length -= hdr_len;
|
|
|
|
|
|
|
|
switch (nlpid) {
|
2002-07-11 16:09:45 +08:00
|
|
|
case NLPID_IP:
|
2014-03-18 20:09:00 +08:00
|
|
|
ip_print(ndo, p, length);
|
2002-07-11 16:09:45 +08:00
|
|
|
break;
|
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
#ifdef INET6
|
2004-10-07 22:53:09 +08:00
|
|
|
case NLPID_IP6:
|
2014-03-18 20:09:00 +08:00
|
|
|
ip6_print(ndo, p, length);
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
break;
|
|
|
|
#endif
|
2002-07-11 16:09:45 +08:00
|
|
|
case NLPID_CLNP:
|
|
|
|
case NLPID_ESIS:
|
|
|
|
case NLPID_ISIS:
|
2005-05-27 22:53:48 +08:00
|
|
|
isoclns_print(p-1, length+1, length+1); /* OSI printers need the NLPID field */
|
2002-07-11 16:09:45 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NLPID_SNAP:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (snap_print(ndo, p, length, length, 0) == 0) {
|
2002-07-11 16:09:45 +08:00
|
|
|
/* ether_type not known, print raw packet */
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_eflag)
|
|
|
|
fr_hdr_print(ndo, length + hdr_len, hdr_len,
|
2005-04-07 04:09:07 +08:00
|
|
|
dlci, flags, nlpid);
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_suppress_default_print)
|
2014-03-26 22:52:40 +08:00
|
|
|
ND_DEFAULTPRINT(p - hdr_len, length + hdr_len);
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2004-10-18 20:11:34 +08:00
|
|
|
case NLPID_Q933:
|
2014-03-18 20:09:00 +08:00
|
|
|
q933_print(ndo, p, length);
|
2002-07-11 16:09:45 +08:00
|
|
|
break;
|
|
|
|
|
2004-10-13 05:02:00 +08:00
|
|
|
case NLPID_MFR:
|
2014-03-18 20:09:00 +08:00
|
|
|
frf15_print(ndo, p, length);
|
2004-10-13 05:02:00 +08:00
|
|
|
break;
|
|
|
|
|
2005-11-04 15:16:58 +08:00
|
|
|
case NLPID_PPP:
|
|
|
|
ppp_print(p, length);
|
|
|
|
break;
|
|
|
|
|
2002-07-11 16:09:45 +08:00
|
|
|
default:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_eflag)
|
|
|
|
fr_hdr_print(ndo, length + hdr_len, addr_len,
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
dlci, flags, nlpid);
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_xflag)
|
2014-03-26 22:52:40 +08:00
|
|
|
ND_DEFAULTPRINT(p, length);
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
return hdr_len;
|
2005-05-27 22:53:48 +08:00
|
|
|
|
|
|
|
trunc:
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|fr]"));
|
2005-05-27 22:53:48 +08:00
|
|
|
return 0;
|
|
|
|
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
|
|
|
|
2005-12-13 21:44:29 +08:00
|
|
|
u_int
|
2014-03-18 20:09:00 +08:00
|
|
|
mfr_if_print(netdissect_options *ndo,
|
|
|
|
const struct pcap_pkthdr *h, register const u_char *p)
|
2005-12-13 21:44:29 +08:00
|
|
|
{
|
|
|
|
register u_int length = h->len;
|
|
|
|
register u_int caplen = h->caplen;
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*p, 2); /* minimum frame header length */
|
2005-12-13 21:44:29 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if ((length = mfr_print(ndo, p, length)) == 0)
|
2005-12-13 21:44:29 +08:00
|
|
|
return (0);
|
|
|
|
else
|
|
|
|
return length;
|
|
|
|
trunc:
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|mfr]"));
|
2005-12-13 21:44:29 +08:00
|
|
|
return caplen;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-07-21 06:12:38 +08:00
|
|
|
#define MFR_CTRL_MSG_ADD_LINK 1
|
|
|
|
#define MFR_CTRL_MSG_ADD_LINK_ACK 2
|
|
|
|
#define MFR_CTRL_MSG_ADD_LINK_REJ 3
|
|
|
|
#define MFR_CTRL_MSG_HELLO 4
|
|
|
|
#define MFR_CTRL_MSG_HELLO_ACK 5
|
|
|
|
#define MFR_CTRL_MSG_REMOVE_LINK 6
|
|
|
|
#define MFR_CTRL_MSG_REMOVE_LINK_ACK 7
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok mfr_ctrl_msg_values[] = {
|
2005-07-21 06:12:38 +08:00
|
|
|
{ MFR_CTRL_MSG_ADD_LINK, "Add Link" },
|
|
|
|
{ MFR_CTRL_MSG_ADD_LINK_ACK, "Add Link ACK" },
|
|
|
|
{ MFR_CTRL_MSG_ADD_LINK_REJ, "Add Link Reject" },
|
|
|
|
{ MFR_CTRL_MSG_HELLO, "Hello" },
|
|
|
|
{ MFR_CTRL_MSG_HELLO_ACK, "Hello ACK" },
|
|
|
|
{ MFR_CTRL_MSG_REMOVE_LINK, "Remove Link" },
|
|
|
|
{ MFR_CTRL_MSG_REMOVE_LINK_ACK, "Remove Link ACK" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
2005-07-21 16:26:45 +08:00
|
|
|
#define MFR_CTRL_IE_BUNDLE_ID 1
|
|
|
|
#define MFR_CTRL_IE_LINK_ID 2
|
|
|
|
#define MFR_CTRL_IE_MAGIC_NUM 3
|
|
|
|
#define MFR_CTRL_IE_TIMESTAMP 5
|
|
|
|
#define MFR_CTRL_IE_VENDOR_EXT 6
|
|
|
|
#define MFR_CTRL_IE_CAUSE 7
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok mfr_ctrl_ie_values[] = {
|
2005-07-21 19:52:00 +08:00
|
|
|
{ MFR_CTRL_IE_BUNDLE_ID, "Bundle ID"},
|
2005-07-21 16:26:45 +08:00
|
|
|
{ MFR_CTRL_IE_LINK_ID, "Link ID"},
|
|
|
|
{ MFR_CTRL_IE_MAGIC_NUM, "Magic Number"},
|
|
|
|
{ MFR_CTRL_IE_TIMESTAMP, "Timestamp"},
|
|
|
|
{ MFR_CTRL_IE_VENDOR_EXT, "Vendor Extension"},
|
|
|
|
{ MFR_CTRL_IE_CAUSE, "Cause"},
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MFR_ID_STRING_MAXLEN 50
|
|
|
|
|
|
|
|
struct ie_tlv_header_t {
|
|
|
|
u_int8_t ie_type;
|
|
|
|
u_int8_t ie_len;
|
|
|
|
};
|
|
|
|
|
2005-07-21 06:12:38 +08:00
|
|
|
u_int
|
2014-03-18 20:09:00 +08:00
|
|
|
mfr_print(netdissect_options *ndo,
|
|
|
|
register const u_char *p, u_int length)
|
2005-07-21 06:12:38 +08:00
|
|
|
{
|
2005-07-21 16:26:45 +08:00
|
|
|
u_int tlen,idx,hdr_len = 0;
|
2005-07-21 06:12:38 +08:00
|
|
|
u_int16_t sequence_num;
|
2005-07-21 16:26:45 +08:00
|
|
|
u_int8_t ie_type,ie_len;
|
2005-07-27 08:25:58 +08:00
|
|
|
const u_int8_t *tptr;
|
2005-07-21 16:26:45 +08:00
|
|
|
|
2005-07-21 06:12:38 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* FRF.16 Link Integrity Control Frame
|
2014-01-02 10:27:54 +08:00
|
|
|
*
|
2005-07-21 06:12:38 +08:00
|
|
|
* 7 6 5 4 3 2 1 0
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | B | E | C=1| 0 0 0 0 | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | 0 0 0 0 0 0 0 0 |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | message type |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
*/
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*p, 4); /* minimum frame header length */
|
2005-07-21 16:26:45 +08:00
|
|
|
|
2005-07-21 06:12:38 +08:00
|
|
|
if ((p[0] & MFR_BEC_MASK) == MFR_CTRL_FRAME && p[1] == 0) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "FRF.16 Control, Flags [%s], %s, length %u",
|
2005-07-27 17:01:03 +08:00
|
|
|
bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)),
|
2005-07-21 06:12:38 +08:00
|
|
|
tok2str(mfr_ctrl_msg_values,"Unknown Message (0x%02x)",p[2]),
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2005-07-21 16:26:45 +08:00
|
|
|
tptr = p + 3;
|
|
|
|
tlen = length -3;
|
2005-07-21 19:48:43 +08:00
|
|
|
hdr_len = 3;
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_vflag)
|
2005-07-21 19:48:43 +08:00
|
|
|
return hdr_len;
|
|
|
|
|
2005-07-21 16:26:45 +08:00
|
|
|
while (tlen>sizeof(struct ie_tlv_header_t)) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*tptr, sizeof(struct ie_tlv_header_t));
|
2005-07-21 16:26:45 +08:00
|
|
|
ie_type=tptr[0];
|
|
|
|
ie_len=tptr[1];
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "\n\tIE %s (%u), length %u: ",
|
2005-07-21 16:26:45 +08:00
|
|
|
tok2str(mfr_ctrl_ie_values,"Unknown",ie_type),
|
|
|
|
ie_type,
|
2014-03-18 20:09:00 +08:00
|
|
|
ie_len));
|
2005-07-21 16:26:45 +08:00
|
|
|
|
|
|
|
/* infinite loop check */
|
|
|
|
if (ie_type == 0 || ie_len <= sizeof(struct ie_tlv_header_t))
|
|
|
|
return hdr_len;
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_TCHECK2(*tptr, ie_len);
|
2005-07-21 16:26:45 +08:00
|
|
|
tptr+=sizeof(struct ie_tlv_header_t);
|
|
|
|
/* tlv len includes header */
|
|
|
|
ie_len-=sizeof(struct ie_tlv_header_t);
|
|
|
|
tlen-=sizeof(struct ie_tlv_header_t);
|
|
|
|
|
|
|
|
switch (ie_type) {
|
|
|
|
|
|
|
|
case MFR_CTRL_IE_MAGIC_NUM:
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "0x%08x", EXTRACT_32BITS(tptr)));
|
2005-07-21 16:26:45 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case MFR_CTRL_IE_BUNDLE_ID: /* same message format */
|
|
|
|
case MFR_CTRL_IE_LINK_ID:
|
2005-07-26 21:18:07 +08:00
|
|
|
for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {
|
|
|
|
if (*(tptr+idx) != 0) /* don't print null termination */
|
|
|
|
safeputchar(*(tptr+idx));
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2005-07-21 16:26:45 +08:00
|
|
|
break;
|
|
|
|
|
2005-07-21 19:48:43 +08:00
|
|
|
case MFR_CTRL_IE_TIMESTAMP:
|
|
|
|
if (ie_len == sizeof(struct timeval)) {
|
|
|
|
ts_print((const struct timeval *)tptr);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall through and hexdump if no unix timestamp */
|
|
|
|
|
2005-07-21 16:26:45 +08:00
|
|
|
/*
|
|
|
|
* FIXME those are the defined IEs that lack a decoder
|
|
|
|
* you are welcome to contribute code ;-)
|
|
|
|
*/
|
|
|
|
|
|
|
|
case MFR_CTRL_IE_VENDOR_EXT:
|
|
|
|
case MFR_CTRL_IE_CAUSE:
|
|
|
|
|
|
|
|
default:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag <= 1)
|
|
|
|
print_unknown_data(ndo, tptr, "\n\t ", ie_len);
|
2005-07-21 16:26:45 +08:00
|
|
|
break;
|
|
|
|
}
|
2005-07-21 19:48:43 +08:00
|
|
|
|
|
|
|
/* do we want to see a hexdump of the IE ? */
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag > 1 )
|
|
|
|
print_unknown_data(ndo, tptr, "\n\t ", ie_len);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2005-07-21 16:26:45 +08:00
|
|
|
tlen-=ie_len;
|
|
|
|
tptr+=ie_len;
|
2005-07-21 06:12:38 +08:00
|
|
|
}
|
|
|
|
return hdr_len;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* FRF.16 Fragmentation Frame
|
2014-01-02 10:27:54 +08:00
|
|
|
*
|
2005-07-21 06:12:38 +08:00
|
|
|
* 7 6 5 4 3 2 1 0
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | B | E | C=0|seq. (high 4 bits) | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | sequence (low 8 bits) |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (6 bits) | CR | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | DLCI (4 bits) |FECN|BECN| DE | EA |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
*/
|
|
|
|
|
2005-08-10 04:06:34 +08:00
|
|
|
sequence_num = (p[0]&0x1e)<<7 | p[1];
|
|
|
|
/* whole packet or first fragment ? */
|
|
|
|
if ((p[0] & MFR_BEC_MASK) == MFR_FRAG_FRAME ||
|
2005-08-23 11:15:32 +08:00
|
|
|
(p[0] & MFR_BEC_MASK) == MFR_B_BIT) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "FRF.16 Frag, seq %u, Flags [%s], ",
|
2005-08-10 04:06:34 +08:00
|
|
|
sequence_num,
|
2014-03-18 20:09:00 +08:00
|
|
|
bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))));
|
2005-07-21 06:12:38 +08:00
|
|
|
hdr_len = 2;
|
2014-03-18 20:09:00 +08:00
|
|
|
fr_print(ndo, p+hdr_len,length-hdr_len);
|
2005-08-10 04:06:34 +08:00
|
|
|
return hdr_len;
|
2005-07-21 06:12:38 +08:00
|
|
|
}
|
|
|
|
|
2005-08-10 04:06:34 +08:00
|
|
|
/* must be a middle or the last fragment */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "FRF.16 Frag, seq %u, Flags [%s]",
|
2005-08-10 04:06:34 +08:00
|
|
|
sequence_num,
|
2014-03-18 20:09:00 +08:00
|
|
|
bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))));
|
|
|
|
print_unknown_data(ndo, p, "\n\t", length);
|
2005-08-10 04:06:34 +08:00
|
|
|
|
2005-07-21 06:12:38 +08:00
|
|
|
return hdr_len;
|
2005-07-21 16:26:45 +08:00
|
|
|
|
|
|
|
trunc:
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|mfr]"));
|
2005-07-21 16:26:45 +08:00
|
|
|
return length;
|
2005-07-21 06:12:38 +08:00
|
|
|
}
|
|
|
|
|
2004-10-13 05:02:00 +08:00
|
|
|
/* an NLPID of 0xb1 indicates a 2-byte
|
|
|
|
* FRF.15 header
|
2014-01-02 10:27:54 +08:00
|
|
|
*
|
2004-10-13 05:02:00 +08:00
|
|
|
* 7 6 5 4 3 2 1 0
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* ~ Q.922 header ~
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | NLPID (8 bits) | NLPID=0xb1
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | B | E | C |seq. (high 4 bits) | R |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
* | sequence (low 8 bits) |
|
|
|
|
* +----+----+----+----+----+----+----+----+
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define FR_FRF15_FRAGTYPE 0x01
|
|
|
|
|
|
|
|
static void
|
2014-03-18 20:09:00 +08:00
|
|
|
frf15_print(netdissect_options *ndo,
|
|
|
|
const u_char *p, u_int length) {
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2004-10-13 05:02:00 +08:00
|
|
|
u_int16_t sequence_num, flags;
|
|
|
|
|
2005-07-27 17:01:03 +08:00
|
|
|
flags = p[0]&MFR_BEC_MASK;
|
2004-10-13 05:02:00 +08:00
|
|
|
sequence_num = (p[0]&0x1e)<<7 | p[1];
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "FRF.15, seq 0x%03x, Flags [%s],%s Fragmentation, length %u",
|
2004-10-13 05:02:00 +08:00
|
|
|
sequence_num,
|
2005-07-27 17:01:03 +08:00
|
|
|
bittok2str(frf_flag_values,"none",flags),
|
|
|
|
p[0]&FR_FRF15_FRAGTYPE ? "Interface" : "End-to-End",
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2004-10-13 05:02:00 +08:00
|
|
|
|
|
|
|
/* TODO:
|
|
|
|
* depending on all permutations of the B, E and C bit
|
|
|
|
* dig as deep as we can - e.g. on the first (B) fragment
|
|
|
|
* there is enough payload to print the IP header
|
|
|
|
* on non (B) fragments it depends if the fragmentation
|
|
|
|
* model is end-to-end or interface based wether we want to print
|
|
|
|
* another Q.922 header
|
|
|
|
*/
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2002-07-11 16:09:45 +08:00
|
|
|
/*
|
|
|
|
* Q.933 decoding portion for framerelay specific.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Q.933 packet format
|
2014-01-02 10:27:54 +08:00
|
|
|
Format of Other Protocols
|
2002-07-11 16:09:45 +08:00
|
|
|
using Q.933 NLPID
|
2014-01-02 10:27:54 +08:00
|
|
|
+-------------------------------+
|
|
|
|
| Q.922 Address |
|
|
|
|
+---------------+---------------+
|
|
|
|
|Control 0x03 | NLPID 0x08 |
|
2002-07-11 16:09:45 +08:00
|
|
|
+---------------+---------------+
|
|
|
|
| L2 Protocol ID |
|
|
|
|
| octet 1 | octet 2 |
|
|
|
|
+-------------------------------+
|
|
|
|
| L3 Protocol ID |
|
|
|
|
| octet 2 | octet 2 |
|
|
|
|
+-------------------------------+
|
|
|
|
| Protocol Data |
|
|
|
|
+-------------------------------+
|
|
|
|
| FCS |
|
|
|
|
+-------------------------------+
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* L2 (Octet 1)- Call Reference Usually is 0x0 */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* L2 (Octet 2)- Message Types definition 1 byte long.
|
|
|
|
*/
|
|
|
|
/* Call Establish */
|
|
|
|
#define MSG_TYPE_ESC_TO_NATIONAL 0x00
|
|
|
|
#define MSG_TYPE_ALERT 0x01
|
|
|
|
#define MSG_TYPE_CALL_PROCEEDING 0x02
|
|
|
|
#define MSG_TYPE_CONNECT 0x07
|
|
|
|
#define MSG_TYPE_CONNECT_ACK 0x0F
|
|
|
|
#define MSG_TYPE_PROGRESS 0x03
|
|
|
|
#define MSG_TYPE_SETUP 0x05
|
|
|
|
/* Call Clear */
|
|
|
|
#define MSG_TYPE_DISCONNECT 0x45
|
|
|
|
#define MSG_TYPE_RELEASE 0x4D
|
|
|
|
#define MSG_TYPE_RELEASE_COMPLETE 0x5A
|
|
|
|
#define MSG_TYPE_RESTART 0x46
|
|
|
|
#define MSG_TYPE_RESTART_ACK 0x4E
|
|
|
|
/* Status */
|
|
|
|
#define MSG_TYPE_STATUS 0x7D
|
|
|
|
#define MSG_TYPE_STATUS_ENQ 0x75
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok fr_q933_msg_values[] = {
|
2004-10-10 01:55:26 +08:00
|
|
|
{ MSG_TYPE_ESC_TO_NATIONAL, "ESC to National" },
|
|
|
|
{ MSG_TYPE_ALERT, "Alert" },
|
|
|
|
{ MSG_TYPE_CALL_PROCEEDING, "Call proceeding" },
|
|
|
|
{ MSG_TYPE_CONNECT, "Connect" },
|
|
|
|
{ MSG_TYPE_CONNECT_ACK, "Connect ACK" },
|
|
|
|
{ MSG_TYPE_PROGRESS, "Progress" },
|
|
|
|
{ MSG_TYPE_SETUP, "Setup" },
|
|
|
|
{ MSG_TYPE_DISCONNECT, "Disconnect" },
|
|
|
|
{ MSG_TYPE_RELEASE, "Release" },
|
|
|
|
{ MSG_TYPE_RELEASE_COMPLETE, "Release Complete" },
|
|
|
|
{ MSG_TYPE_RESTART, "Restart" },
|
|
|
|
{ MSG_TYPE_RESTART_ACK, "Restart ACK" },
|
|
|
|
{ MSG_TYPE_STATUS, "Status Reply" },
|
|
|
|
{ MSG_TYPE_STATUS_ENQ, "Status Enquiry" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
#define MSG_ANSI_LOCKING_SHIFT 0x95
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
#define FR_LMI_ANSI_REPORT_TYPE_IE 0x01
|
|
|
|
#define FR_LMI_ANSI_LINK_VERIFY_IE_91 0x19 /* details? */
|
|
|
|
#define FR_LMI_ANSI_LINK_VERIFY_IE 0x03
|
|
|
|
#define FR_LMI_ANSI_PVC_STATUS_IE 0x07
|
|
|
|
|
|
|
|
#define FR_LMI_CCITT_REPORT_TYPE_IE 0x51
|
|
|
|
#define FR_LMI_CCITT_LINK_VERIFY_IE 0x53
|
|
|
|
#define FR_LMI_CCITT_PVC_STATUS_IE 0x57
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok fr_q933_ie_values_codeset5[] = {
|
2004-10-10 01:55:26 +08:00
|
|
|
{ FR_LMI_ANSI_REPORT_TYPE_IE, "ANSI Report Type" },
|
|
|
|
{ FR_LMI_ANSI_LINK_VERIFY_IE_91, "ANSI Link Verify" },
|
|
|
|
{ FR_LMI_ANSI_LINK_VERIFY_IE, "ANSI Link Verify" },
|
|
|
|
{ FR_LMI_ANSI_PVC_STATUS_IE, "ANSI PVC Status" },
|
|
|
|
{ FR_LMI_CCITT_REPORT_TYPE_IE, "CCITT Report Type" },
|
|
|
|
{ FR_LMI_CCITT_LINK_VERIFY_IE, "CCITT Link Verify" },
|
|
|
|
{ FR_LMI_CCITT_PVC_STATUS_IE, "CCITT PVC Status" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
#define FR_LMI_REPORT_TYPE_IE_FULL_STATUS 0
|
|
|
|
#define FR_LMI_REPORT_TYPE_IE_LINK_VERIFY 1
|
|
|
|
#define FR_LMI_REPORT_TYPE_IE_ASYNC_PVC 2
|
|
|
|
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok fr_lmi_report_type_ie_values[] = {
|
2004-10-10 01:55:26 +08:00
|
|
|
{ FR_LMI_REPORT_TYPE_IE_FULL_STATUS, "Full Status" },
|
|
|
|
{ FR_LMI_REPORT_TYPE_IE_LINK_VERIFY, "Link verify" },
|
|
|
|
{ FR_LMI_REPORT_TYPE_IE_ASYNC_PVC, "Async PVC Status" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2002-07-11 16:09:45 +08:00
|
|
|
|
2005-07-21 19:48:43 +08:00
|
|
|
/* array of 16 codepages - currently we only support codepage 1,5 */
|
2013-09-25 00:46:24 +08:00
|
|
|
static const struct tok *fr_q933_ie_codesets[] = {
|
2005-03-21 19:35:55 +08:00
|
|
|
NULL,
|
2005-07-21 19:48:43 +08:00
|
|
|
fr_q933_ie_values_codeset5,
|
2005-03-21 19:35:55 +08:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
fr_q933_ie_values_codeset5,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
static int fr_q933_print_ie_codeset5(netdissect_options *ndo,
|
|
|
|
const struct ie_tlv_header_t *ie_p, const u_char *p);
|
2005-04-26 00:29:00 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
typedef int (*codeset_pr_func_t)(netdissect_options *,
|
|
|
|
const struct ie_tlv_header_t *ie_p, const u_char *p);
|
2005-04-26 00:29:00 +08:00
|
|
|
|
2005-07-21 19:48:43 +08:00
|
|
|
/* array of 16 codepages - currently we only support codepage 1,5 */
|
2013-12-19 18:05:59 +08:00
|
|
|
static const codeset_pr_func_t fr_q933_print_ie_codeset[] = {
|
2005-04-26 00:29:00 +08:00
|
|
|
NULL,
|
2005-07-21 19:48:43 +08:00
|
|
|
fr_q933_print_ie_codeset5,
|
2005-04-26 00:29:00 +08:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
fr_q933_print_ie_codeset5,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2005-01-27 18:13:51 +08:00
|
|
|
void
|
2014-03-18 20:09:00 +08:00
|
|
|
q933_print(netdissect_options *ndo,
|
|
|
|
const u_char *p, u_int length)
|
2002-07-11 16:09:45 +08:00
|
|
|
{
|
|
|
|
const u_char *ptemp = p;
|
2005-07-21 19:48:43 +08:00
|
|
|
struct ie_tlv_header_t *ie_p;
|
2004-10-10 01:55:26 +08:00
|
|
|
int olen;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
int is_ansi = 0;
|
2005-04-26 00:29:00 +08:00
|
|
|
u_int codeset;
|
2005-07-21 06:12:38 +08:00
|
|
|
u_int ie_is_known = 0;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
|
|
|
if (length < 9) { /* shortest: Q.933a LINK VERIFY */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|q.933]"));
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-03-21 19:35:55 +08:00
|
|
|
codeset = p[2]&0x0f; /* extract the codeset */
|
|
|
|
|
2006-06-24 06:20:32 +08:00
|
|
|
if (p[2] == MSG_ANSI_LOCKING_SHIFT) {
|
|
|
|
is_ansi = 1;
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "%s", ndo->ndo_eflag ? "" : "Q.933, "));
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
/* printing out header part */
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "%s, codeset %u", is_ansi ? "ANSI" : "CCITT", codeset));
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2006-06-24 06:20:32 +08:00
|
|
|
if (p[0]) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, ", Call Ref: 0x%02x", p[0]));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, ", %s (0x%02x), length %u",
|
2006-06-24 06:20:32 +08:00
|
|
|
tok2str(fr_q933_msg_values,
|
|
|
|
"unknown message", p[1]),
|
|
|
|
p[1],
|
2014-03-18 20:09:00 +08:00
|
|
|
length));
|
2006-06-24 06:20:32 +08:00
|
|
|
} else {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, ", %s",
|
2006-06-24 06:20:32 +08:00
|
|
|
tok2str(fr_q933_msg_values,
|
2014-03-18 20:09:00 +08:00
|
|
|
"unknown message 0x%02x", p[1])));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
olen = length; /* preserve the original length for non verbose mode */
|
2002-07-11 16:09:45 +08:00
|
|
|
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
if (length < (u_int)(2 - is_ansi)) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "[|q.933]"));
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
return;
|
|
|
|
}
|
2006-06-24 06:20:32 +08:00
|
|
|
length -= 2 + is_ansi;
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
ptemp += 2 + is_ansi;
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2002-07-11 16:09:45 +08:00
|
|
|
/* Loop through the rest of IE */
|
2006-06-24 06:20:32 +08:00
|
|
|
while (length > sizeof(struct ie_tlv_header_t)) {
|
2005-07-21 19:48:43 +08:00
|
|
|
ie_p = (struct ie_tlv_header_t *)ptemp;
|
2006-06-24 06:20:32 +08:00
|
|
|
if (length < sizeof(struct ie_tlv_header_t) ||
|
|
|
|
length < sizeof(struct ie_tlv_header_t) + ie_p->ie_len) {
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag) { /* not bark if there is just a trailer */
|
|
|
|
ND_PRINT((ndo, "\n[|q.933]"));
|
2006-06-24 06:20:32 +08:00
|
|
|
} else {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, ", length %u", olen));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2004-10-10 01:55:26 +08:00
|
|
|
return;
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2004-10-10 01:55:26 +08:00
|
|
|
/* lets do the full IE parsing only in verbose mode
|
|
|
|
* however some IEs (DLCI Status, Link Verify)
|
2006-06-24 06:20:32 +08:00
|
|
|
* are also interestting in non-verbose mode */
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, "\n\t%s IE (0x%02x), length %u: ",
|
2006-06-24 06:20:32 +08:00
|
|
|
tok2str(fr_q933_ie_codesets[codeset],
|
|
|
|
"unknown", ie_p->ie_type),
|
2005-07-21 19:48:43 +08:00
|
|
|
ie_p->ie_type,
|
2014-03-18 20:09:00 +08:00
|
|
|
ie_p->ie_len));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
|
|
|
|
2005-07-21 19:48:43 +08:00
|
|
|
/* sanity check */
|
2006-06-24 06:20:32 +08:00
|
|
|
if (ie_p->ie_type == 0 || ie_p->ie_len == 0) {
|
2005-07-21 19:48:43 +08:00
|
|
|
return;
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2005-07-21 19:48:43 +08:00
|
|
|
|
2006-06-24 06:20:32 +08:00
|
|
|
if (fr_q933_print_ie_codeset[codeset] != NULL) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ie_is_known = fr_q933_print_ie_codeset[codeset](ndo, ie_p, ptemp);
|
2014-01-02 10:27:54 +08:00
|
|
|
}
|
2006-06-24 06:20:32 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag >= 1 && !ie_is_known) {
|
|
|
|
print_unknown_data(ndo, ptemp+2, "\n\t", ie_p->ie_len);
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2004-10-10 01:55:26 +08:00
|
|
|
|
|
|
|
/* do we want to see a hexdump of the IE ? */
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag> 1 && ie_is_known) {
|
|
|
|
print_unknown_data(ndo, ptemp+2, "\n\t ", ie_p->ie_len);
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
From Krzysztof Halasa <khc@pm.waw.pl>:
1. Unused things (mbuf, rtentry) have been removed.
2. I've dropped FR_CR_BIT etc. definitions as they have only meaning in
specific location in Q.922 address. FR_EA_BIT is still there as it's
used by all Q.922 bytes.
3. a new parse_q922_addr() parses the whole Q.922 address structure
and produces DLCI, Q.922 byte count and flags in ASCII. While I can't
test 3- and 4-byte Q.922 addresses (using only default 2-byte ones),
they are supported.
4. I've trimmed comments regarding HDLC flags and CRC/FCS bytes in FR
packet. They are wire-only things and as such are never seen by
libpcap/tcpdump.
5. Changed NLPID_LMI into NLPID_CISCO_LMI and NLPID_Q933 into NLPID_LMI
(the latter is used by both ANSI (T1.617 annex D) and CCITT (Q.933
annex A) LMI).
6. fr_hdrlen() now correctly returns FR header length (4 - 6 bytes,
7 bytes with 4-byte Q.922 and incorrectly used pad byte).
7. I've changed output text formatting: "xxx-value-yyy-value" into
"xxx value, yyy value", to be consistent with Ethernet.
Not sure if it's correct.
8. added IPv6 support
9. q933_print() now reads lmi_print()
10. CCITT (Q.933 annex A) LMI is now supported, and both CCITT and ANSI
fields are now correctly displayed
10. lmi_print() no longer prints constant fields (such as always zeroed
Q.922 C/R bit or LMI Call Reference byte) unless they are set
incorrectly.
11. I've added ANSI_ and CCITT_ prefixes to appropriate #defines.
12. a new parse_dlci_el() should handle all (10, 16 and 23-bit)
DLCIs correctly (corresponding to 2, 3 and 4-byte Q.922 addresses,
respectively).
2003-10-16 17:50:36 +08:00
|
|
|
|
2002-07-11 16:09:45 +08:00
|
|
|
length = length - ie_p->ie_len - 2;
|
|
|
|
ptemp = ptemp + ie_p->ie_len + 2;
|
|
|
|
}
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, ", length %u", olen));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2002-07-11 16:09:45 +08:00
|
|
|
}
|
2005-04-26 00:29:00 +08:00
|
|
|
|
|
|
|
static int
|
2014-03-18 20:09:00 +08:00
|
|
|
fr_q933_print_ie_codeset5(netdissect_options *ndo,
|
|
|
|
const struct ie_tlv_header_t *ie_p, const u_char *p)
|
2005-04-26 00:29:00 +08:00
|
|
|
{
|
|
|
|
u_int dlci;
|
|
|
|
|
2005-07-21 19:48:43 +08:00
|
|
|
switch (ie_p->ie_type) {
|
2005-04-26 00:29:00 +08:00
|
|
|
|
|
|
|
case FR_LMI_ANSI_REPORT_TYPE_IE: /* fall through */
|
|
|
|
case FR_LMI_CCITT_REPORT_TYPE_IE:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, "%s (%u)",
|
2005-04-26 00:29:00 +08:00
|
|
|
tok2str(fr_lmi_report_type_ie_values,"unknown",p[2]),
|
2014-03-18 20:09:00 +08:00
|
|
|
p[2]));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2005-04-26 00:29:00 +08:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case FR_LMI_ANSI_LINK_VERIFY_IE: /* fall through */
|
|
|
|
case FR_LMI_CCITT_LINK_VERIFY_IE:
|
|
|
|
case FR_LMI_ANSI_LINK_VERIFY_IE_91:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, ", "));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "TX Seq: %3d, RX Seq: %3d", p[2], p[3]));
|
2005-04-26 00:29:00 +08:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case FR_LMI_ANSI_PVC_STATUS_IE: /* fall through */
|
|
|
|
case FR_LMI_CCITT_PVC_STATUS_IE:
|
2014-03-18 20:09:00 +08:00
|
|
|
if (!ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo, ", "));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
/* now parse the DLCI information element. */
|
2005-04-26 00:29:00 +08:00
|
|
|
if ((ie_p->ie_len < 3) ||
|
|
|
|
(p[2] & 0x80) ||
|
|
|
|
((ie_p->ie_len == 3) && !(p[3] & 0x80)) ||
|
|
|
|
((ie_p->ie_len == 4) && ((p[3] & 0x80) || !(p[4] & 0x80))) ||
|
|
|
|
((ie_p->ie_len == 5) && ((p[3] & 0x80) || (p[4] & 0x80) ||
|
|
|
|
!(p[5] & 0x80))) ||
|
|
|
|
(ie_p->ie_len > 5) ||
|
2006-06-24 06:20:32 +08:00
|
|
|
!(p[ie_p->ie_len + 1] & 0x80)) {
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "Invalid DLCI IE"));
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2005-04-26 00:29:00 +08:00
|
|
|
dlci = ((p[2] & 0x3F) << 4) | ((p[3] & 0x78) >> 3);
|
2006-06-24 06:20:32 +08:00
|
|
|
if (ie_p->ie_len == 4) {
|
2005-04-26 00:29:00 +08:00
|
|
|
dlci = (dlci << 6) | ((p[4] & 0x7E) >> 1);
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
|
|
|
else if (ie_p->ie_len == 5) {
|
2005-04-26 00:29:00 +08:00
|
|
|
dlci = (dlci << 13) | (p[4] & 0x7F) | ((p[5] & 0x7E) >> 1);
|
2006-06-24 06:20:32 +08:00
|
|
|
}
|
2005-04-26 00:29:00 +08:00
|
|
|
|
2014-03-18 20:09:00 +08:00
|
|
|
ND_PRINT((ndo, "DLCI %u: status %s%s", dlci,
|
2005-04-26 00:29:00 +08:00
|
|
|
p[ie_p->ie_len + 1] & 0x8 ? "New, " : "",
|
2014-03-18 20:09:00 +08:00
|
|
|
p[ie_p->ie_len + 1] & 0x2 ? "Active" : "Inactive"));
|
2005-04-26 00:29:00 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2014-01-02 09:43:45 +08:00
|
|
|
/*
|
|
|
|
* Local Variables:
|
|
|
|
* c-style: whitesmith
|
|
|
|
* c-basic-offset: 8
|
|
|
|
* End:
|
|
|
|
*/
|