summaryrefslogtreecommitdiff
path: root/print-sl.c
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2017-11-22 23:54:09 +0100
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2017-11-22 23:54:09 +0100
commitda20bc56d6100b5275d6f85c4a25bac1dab4e57e (patch)
tree643c746e737c54d5a13d0b0083049d847d2cff24 /print-sl.c
parent3c8f3e13b03380742c24070f8a7b56fe12c6b8ee (diff)
downloadtcpdump-da20bc56d6100b5275d6f85c4a25bac1dab4e57e.tar.gz
Rename EXTRACT_ macros
Now all the macros have a name meaning a count in bytes. With _S_: signed, _U_: unsigned e.g.: EXTRACT_BE_32BITS -> EXTRACT_BE_U_4 EXTRACT_LE_32BITS -> EXTRACT_LE_U_4 ... EXTRACT_BE_INT32 -> EXTRACT_BE_S_4 and have: EXTRACT_8BITS -> EXTRACT_U_1 EXTRACT_INT8 -> EXTRACT_S_1
Diffstat (limited to 'print-sl.c')
-rw-r--r--print-sl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/print-sl.c b/print-sl.c
index a4a05fb1..1e329cf4 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -199,7 +199,7 @@ print_sl_change(netdissect_options *ndo,
register u_int i;
if ((i = *cp++) == 0) {
- i = EXTRACT_BE_16BITS(cp);
+ i = EXTRACT_BE_U_2(cp);
cp += 2;
}
ND_PRINT((ndo, " %s%d", str, i));
@@ -213,7 +213,7 @@ print_sl_winchange(netdissect_options *ndo,
register short i;
if ((i = *cp++) == 0) {
- i = EXTRACT_BE_16BITS(cp);
+ i = EXTRACT_BE_U_2(cp);
cp += 2;
}
if (i >= 0)
@@ -231,10 +231,10 @@ compressed_sl_print(netdissect_options *ndo,
register const u_char *cp = chdr;
register u_int flags, hlen;
- flags = EXTRACT_8BITS(cp);
+ flags = EXTRACT_U_1(cp);
cp++;
if (flags & NEW_C) {
- lastconn = EXTRACT_8BITS(cp);
+ lastconn = EXTRACT_U_1(cp);
cp++;
ND_PRINT((ndo, "ctcp %d", lastconn));
} else