diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-18 11:52:52 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-18 13:56:40 +0100 |
| commit | 577621026df8d4a33a34d4e125f9ec964fc0e53c (patch) | |
| tree | a25ed4b22461cbb115c9e112935c28bcd57406bc /print-lisp.c | |
| parent | 0e854b0937199956478686ae610ff9f794aafc6b (diff) | |
| download | tcpdump-577621026df8d4a33a34d4e125f9ec964fc0e53c.tar.gz | |
Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS()
It indicates clearly that these macros are used to extract big-endian
integral values.
Diffstat (limited to 'print-lisp.c')
| -rw-r--r-- | print-lisp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/print-lisp.c b/print-lisp.c index e5b15077..8d064023 100644 --- a/print-lisp.c +++ b/print-lisp.c @@ -263,13 +263,13 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) xtr_present = is_xtr_data_present(type, lisp_hdr->type_and_flag); /* Extract the number of EID records present */ - auth_data_len = EXTRACT_16BITS(&lisp_hdr->auth_data_len); + auth_data_len = EXTRACT_BE_16BITS(&lisp_hdr->auth_data_len); packet_iterator = (const u_char *)(lisp_hdr); packet_offset = MAP_REGISTER_HDR_LEN; record_count = lisp_hdr->record_count; if (ndo->ndo_vflag) { - key_id = EXTRACT_16BITS(&lisp_hdr->key_id); + key_id = EXTRACT_BE_16BITS(&lisp_hdr->key_id); ND_PRINT((ndo, "\n %u record(s), ", record_count)); ND_PRINT((ndo, "Authentication %s,", tok2str(auth_type, "unknown-type", key_id))); @@ -292,11 +292,11 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) ((const u_char *)lisp_hdr + packet_offset); packet_offset += MAP_REGISTER_EID_LEN; mask_len = lisp_eid->eid_prefix_mask_length; - eid_afi = EXTRACT_16BITS(&lisp_eid->eid_prefix_afi); + eid_afi = EXTRACT_BE_16BITS(&lisp_eid->eid_prefix_afi); loc_count = lisp_eid->locator_count; if (ndo->ndo_vflag) { - ttl = EXTRACT_32BITS(&lisp_eid->ttl); + ttl = EXTRACT_BE_32BITS(&lisp_eid->ttl); ND_PRINT((ndo, " Record TTL %u,", ttl)); action_flag(ndo, lisp_eid->act_auth_inc_res); map_version = (((lisp_eid->reserved_version_hi) & 15 ) * 255) + @@ -332,7 +332,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset); loc_ip_pointer = (const u_char *) (lisp_loc + 1); packet_offset += MAP_REGISTER_LOC_LEN; - loc_afi = EXTRACT_16BITS(&lisp_loc->locator_afi); + loc_afi = EXTRACT_BE_16BITS(&lisp_loc->locator_afi); if (ndo->ndo_vflag) ND_PRINT((ndo, "\n ")); @@ -356,7 +356,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) " Multicast Priority/Weight %u/%u,", lisp_loc->priority, lisp_loc->weight, lisp_loc->m_priority, lisp_loc->m_weight)); - loc_hdr_flag(ndo, EXTRACT_16BITS(&lisp_loc->unused_and_flag)); + loc_hdr_flag(ndo, + EXTRACT_BE_16BITS(&lisp_loc->unused_and_flag)); } } } @@ -371,7 +372,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) goto invalid; hex_print_with_offset(ndo, "\n xTR-ID: ", packet_iterator + packet_offset, 16, 0); ND_PRINT((ndo, "\n SITE-ID: %" PRIu64, - EXTRACT_64BITS(packet_iterator + packet_offset + 16))); + EXTRACT_BE_64BITS(packet_iterator + packet_offset + 16))); } else { /* Check if packet isn't over yet */ if (packet_iterator + packet_offset < ndo->ndo_snapend) { @@ -418,10 +419,10 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr * if (type == LISP_MAP_REGISTER) { ND_PRINT((ndo, " flags [%s],", bittok2str(map_register_hdr_flag, - "none", EXTRACT_32BITS(lisp_hdr)))); + "none", EXTRACT_BE_32BITS(lisp_hdr)))); } else if (type == LISP_MAP_NOTIFY) { ND_PRINT((ndo, " flags [%s],", bittok2str(map_notify_hdr_flag, - "none", EXTRACT_32BITS(lisp_hdr)))); + "none", EXTRACT_BE_32BITS(lisp_hdr)))); } return; |