@@ -50,7 +50,6 @@ public class CmdPacket implements Packet {
50
50
51
51
private static final int DEFAULT_BYTES_SIZE = 0x38 ; // 56-bytes
52
52
53
- private final byte [] headerdata ;
54
53
private final byte [] data ;
55
54
56
55
/**
@@ -78,6 +77,7 @@ public CmdPacket(Mac targetMac, int count, byte[] id, byte[] iv, byte[] key, Cmd
78
77
79
78
byte cmd = cmdPayload .getCommand ();
80
79
byte [] payload = cmdPayload .getPayload ().getData ();
80
+ byte [] headerdata ;
81
81
82
82
log .debug ("Constructor CmdPacket starts" );
83
83
log .debug ("count=" + count + " cmdPayload.cmd=" + Integer .toHexString (cmd ) + " payload.len=" + payload .length );
@@ -139,16 +139,16 @@ public CmdPacket(Mac targetMac, int count, byte[] id, byte[] iv, byte[] key, Cmd
139
139
140
140
log .debug ("Running checksum for un-encrypted payload" );
141
141
142
- int checksum = 0xbeaf ;
142
+ int checksumpayload = 0xbeaf ;
143
143
for (int i = 0 ; i < payloadPad .length ; i ++) {
144
- checksum = checksum + (int ) payloadPad [i ];
145
- checksum = checksum & 0xffff ;
144
+ checksumpayload = checksumpayload + (int ) payloadPad [i ];
145
+ checksumpayload = checksumpayload & 0xffff ;
146
146
}
147
147
148
- headerdata [0x34 ] = (byte ) (checksum & 0xff );
149
- headerdata [0x35 ] = (byte ) (checksum >> 8 );
148
+ headerdata [0x34 ] = (byte ) (checksumpayload & 0xff );
149
+ headerdata [0x35 ] = (byte ) (checksumpayload >> 8 );
150
150
151
- log .debug ("Un-encrypted payload checksum: " + Integer .toHexString (checksum ));
151
+ log .debug ("Un-encrypted payload checksum: " + Integer .toHexString (checksumpayload ));
152
152
log .debug ("Creating AES instance with provided key {}, iv {}" , key , iv );
153
153
154
154
AES aes = new AES (iv , key );
@@ -177,17 +177,17 @@ public CmdPacket(Mac targetMac, int count, byte[] id, byte[] iv, byte[] key, Cmd
177
177
178
178
log .debug ("Running whole packet checksum" );
179
179
180
- checksum = 0xbeaf ;
180
+ int checksumpkt = 0xbeaf ;
181
181
for (int i = 0 ; i < data .length ; i ++) {
182
- checksum = checksum + (int ) data [i ];
183
- checksum = checksum & 0xffff ;
184
- log .debug ("index: " + i + ", checksum : " + checksum );
182
+ checksumpkt = checksumpkt + (int ) data [i ];
183
+ checksumpkt = checksumpkt & 0xffff ;
184
+ log .debug ("index: " + i + ", data byte : " + ( byte ) data [ i ] + ", checksum: " + checksumpkt );
185
185
}
186
186
187
- log .debug ("Whole packet checksum: " + Integer .toHexString (checksum ));
187
+ log .debug ("Whole packet checksum: " + Integer .toHexString (checksumpkt ));
188
188
189
- data [0x20 ] = (byte ) (checksum & 0xff );
190
- data [0x21 ] = (byte ) (checksum >> 8 );
189
+ data [0x20 ] = (byte ) (checksumpkt & 0xff );
190
+ data [0x21 ] = (byte ) (checksumpkt >> 8 );
191
191
192
192
log .debug ("End of CmdPacket constructor" );
193
193
}
0 commit comments