Use more the EXTRACT_U_1() macro (46/n)

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index 2db946067be3600538da0c9a98e581bd877548a8..89f0fd6b8a0f89d9e40a05be56148562768ac989 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -203,7 +203,7 @@ print_trans2(netdissect_options *ndo,
     ND_PRINT((ndo, "%s param_length=%d data_length=%d\n", fn->name, pcnt, dcnt));
 
     if (request) {
     ND_PRINT((ndo, "%s param_length=%d data_length=%d\n", fn->name, pcnt, dcnt));
 
     if (request) {

-       if (words[0] == 8) {
+       if (EXTRACT_U_1(words) == 8) {

            smb_fdata(ndo, words + 1,
                "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
                maxbuf, unicodestr);
            smb_fdata(ndo, words + 1,
                "Trans2Secondary\nTotParam=[d]\nTotData=[d]\nParamCnt=[d]\nParamOff=[d]\nParamDisp=[d]\nDataCnt=[d]\nDataOff=[d]\nDataDisp=[d]\nHandle=[d]\n",
                maxbuf, unicodestr);


@@ -493,7 +493,7 @@ print_lockingandx(netdissect_options *ndo,
     if (request) {
        f1 = "Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n";
        ND_TCHECK(words[7]);
     if (request) {
        f1 = "Com2=[w]\nOff2=[d]\nHandle=[d]\nLockType=[w]\nTimeOut=[D]\nUnlockCount=[d]\nLockCount=[d]\n";
        ND_TCHECK(words[7]);

-       if (words[7] & 0x10)
+       if (EXTRACT_U_1(words + 7) & 0x10)

            f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
        else
            f2 = "*Process=[d]\nOffset=[D]\nLength=[D]\n";
            f2 = "*Process=[d]\n[P2]Offset=[M]\nLength=[M]\n";
        else
            f2 = "*Process=[d]\nOffset=[D]\nLength=[D]\n";