Skip to content

Commit a0372c3

Browse files
sebastien-meterinfrastation
authored andcommitted
802.11: change name of +HTC bit to follow IEEE standard
This follows the IEEE 802.11-2020 that names this bit +HTC (see Section 9.2.4.1.1).
1 parent 3d92cb0 commit a0372c3

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

print-802_11.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,7 @@ ieee_802_11_hdr_print(netdissect_options *ndo,
21792179
if (FC_RETRY(fc))
21802180
ND_PRINT("Retry ");
21812181
if (FC_ORDER(fc))
2182-
ND_PRINT("Strictly Ordered ");
2182+
ND_PRINT("+HTC ");
21832183
if (FC_PROTECTED(fc))
21842184
ND_PRINT("Protected ");
21852185
if (FC_TYPE(fc) != T_CTRL || FC_SUBTYPE(fc) != CTRL_PS_POLL)

tests/TESTLIST

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ scps_invalid scps_invalid.pcap scps_invalid.out
337337
802.11_exthdr ieee802.11_exthdr.pcap ieee802.11_exthdr.out -v
338338
802.11_rx-stbc ieee802.11_rx-stbc.pcap ieee802.11_rx-stbc.out
339339
802.11_meshid ieee802.11_meshid.pcap ieee802.11_meshid.out
340-
802.11_htc ieee802.11_htc.pcap ieee802.11_htc.out -e
340+
802.11_htc ieee802.11_htc.pcap ieee802.11_htc.out -ve
341341

342342
# OpenFlow tests
343343
of10_p3295-vv of10_p3295.pcap of10_p3295-vv.out -vv

tests/ieee802.11_htc.out

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
1-
1 2025-09-30 12:22:28.668829 967750278us tsft wep 5180 MHz 11a -45dBm signal -107dBm noise antenna 0 [bit 23] CF +QoS BSSID:36:80:94:c0:22:8b SA:b0:be:83:5b:4b:40 DA:ff:ff:ff:ff:ff:ff LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Ethernet (0x000000), ethertype IPv4 (0x0800), length 328: 0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from b0:be:83:5b:4b:40, length 300
1+
1 2025-09-30 12:22:28.668829 967750278us tsft wep 5180 MHz 11a -45dBm signal -107dBm noise antenna 0 [bit 23] +HTC 48us CF +QoS BSSID:36:80:94:c0:22:8b SA:b0:be:83:5b:4b:40 DA:ff:ff:ff:ff:ff:ff LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Ethernet (0x000000), ethertype IPv4 (0x0800), length 328: (tos 0x0, ttl 255, id 23296, offset 0, flags [none], proto UDP (17), length 328)
2+
0.0.0.0.68 > 255.255.255.255.67: BOOTP/DHCP, Request from b0:be:83:5b:4b:40, length 300, xid 0xf6afdddd, Flags [none]
3+
Client-Ethernet-Address b0:be:83:5b:4b:40
4+
Vendor-rfc1048 Extensions
5+
Magic Cookie 0x63825363
6+
DHCP-Message (53), length 1: Discover
7+
Parameter-Request (55), length 12:
8+
Subnet-Mask (1), Classless-Static-Route (121), Default-Gateway (3), Domain-Name-Server (6)
9+
Domain-Name (15), IPv6-Only-Preferred (108), URL (114), Unknown (119)
10+
Unknown (252), LDAP (95), Netbios-Name-Server (44), Netbios-Node (46)
11+
MSZ (57), length 2: 1500
12+
Client-ID (61), length 7: ether b0:be:83:5b:4b:40
13+
Lease-Time (51), length 4: 7776000
14+
Hostname (12), length 15: "SebastiestMBP13"

0 commit comments

Comments
 (0)