sockaddr: use printxval_index lookup instead of printxval
* xlat/addrfams.in: Add "#value_indexed" directive. * xlat/af_packet_types.in: Likewise. * xlat/hci_channels.in: Likewise. * sockaddr.c (print_sockaddr_data_bt, print_sockaddr, * print_sockaddr_data_ll): Use printxval_index instead of printxval.
This commit is contained in:
parent
c89c8faa63
commit
3ab43e0228
@ -226,7 +226,7 @@ print_sockaddr_data_ll(const void *const buf, const int addrlen)
|
||||
tprints(", sll_hatype=");
|
||||
printxval_search(arp_hardware_types, sa_ll->sll_hatype, "ARPHRD_???");
|
||||
tprints(", sll_pkttype=");
|
||||
printxval(af_packet_types, sa_ll->sll_pkttype, "PACKET_???");
|
||||
printxval_index(af_packet_types, sa_ll->sll_pkttype, "PACKET_???");
|
||||
tprintf(", sll_halen=%u", sa_ll->sll_halen);
|
||||
if (sa_ll->sll_halen) {
|
||||
const unsigned int oob_halen =
|
||||
@ -378,8 +378,8 @@ print_sockaddr_data_bt(const void *const buf, const int addrlen)
|
||||
const struct sockaddr_hci *const hci = buf;
|
||||
tprintf("hci_dev=htobs(%hu), hci_channel=",
|
||||
btohs(hci->hci_dev));
|
||||
printxval(hci_channels, hci->hci_channel,
|
||||
"HCI_CHANNEL_???");
|
||||
printxval_index(hci_channels, hci->hci_channel,
|
||||
"HCI_CHANNEL_???");
|
||||
break;
|
||||
}
|
||||
case sizeof(struct sockaddr_sco): {
|
||||
@ -433,7 +433,7 @@ print_sockaddr(const void *const buf, const int addrlen)
|
||||
const struct sockaddr *const sa = buf;
|
||||
|
||||
tprints("{sa_family=");
|
||||
printxval(addrfams, sa->sa_family, "AF_???");
|
||||
printxval_index(addrfams, sa->sa_family, "AF_???");
|
||||
|
||||
if (addrlen > (int) SIZEOF_SA_FAMILY) {
|
||||
tprints(", ");
|
||||
|
@ -1,3 +1,4 @@
|
||||
#value_indexed
|
||||
AF_UNSPEC 0
|
||||
AF_UNIX 1
|
||||
AF_INET 2
|
||||
|
@ -1,3 +1,4 @@
|
||||
#value_indexed
|
||||
PACKET_HOST 0
|
||||
PACKET_BROADCAST 1
|
||||
PACKET_MULTICAST 2
|
||||
|
@ -1,3 +1,4 @@
|
||||
#value_indexed
|
||||
HCI_CHANNEL_RAW 0
|
||||
HCI_CHANNEL_USER 1
|
||||
HCI_CHANNEL_MONITOR 2
|
||||
|
Loading…
x
Reference in New Issue
Block a user