@@ -189,30 +189,30 @@ lwapp_control_print(netdissect_options *ndo,
189
189
*/
190
190
if (LWAPP_EXTRACT_VERSION (version ) != LWAPP_VERSION ) {
191
191
ND_PRINT ("LWAPP version %u packet not supported" ,
192
- LWAPP_EXTRACT_VERSION (version ));
192
+ LWAPP_EXTRACT_VERSION (version ));
193
193
return ;
194
194
}
195
195
196
196
/* non-verbose */
197
197
if (ndo -> ndo_vflag < 1 ) {
198
198
ND_PRINT ("LWAPPv%u, %s frame, Flags [%s], length %u" ,
199
- LWAPP_EXTRACT_VERSION (version ),
200
- LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
201
- bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
202
- len );
199
+ LWAPP_EXTRACT_VERSION (version ),
200
+ LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
201
+ bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
202
+ len );
203
203
return ;
204
204
}
205
205
206
206
/* ok they seem to want to know everything - lets fully decode it */
207
207
tlen = GET_BE_U_2 (lwapp_trans_header -> length );
208
208
209
209
ND_PRINT ("LWAPPv%u, %s frame, Radio-id %u, Flags [%s], Frag-id %u, length %u" ,
210
- LWAPP_EXTRACT_VERSION (version ),
211
- LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
212
- LWAPP_EXTRACT_RID (version ),
213
- bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
214
- GET_U_1 (lwapp_trans_header -> frag_id ),
215
- tlen );
210
+ LWAPP_EXTRACT_VERSION (version ),
211
+ LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
212
+ LWAPP_EXTRACT_RID (version ),
213
+ bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
214
+ GET_U_1 (lwapp_trans_header -> frag_id ),
215
+ tlen );
216
216
217
217
if (has_ap_ident ) {
218
218
ND_PRINT ("\n\tAP identity: %s" , GET_MAC48_STRING (tptr ));
@@ -240,11 +240,11 @@ lwapp_control_print(netdissect_options *ndo,
240
240
/* print message header */
241
241
msg_type = GET_U_1 (lwapp_control_header -> msg_type );
242
242
ND_PRINT ("\n\t Msg type: %s (%u), Seqnum: %u, Msg len: %u, Session: 0x%08x" ,
243
- tok2str (lwapp_msg_type_values ,"Unknown" ,msg_type ),
244
- msg_type ,
245
- GET_U_1 (lwapp_control_header -> seq_num ),
246
- msg_tlen ,
247
- GET_BE_U_4 (lwapp_control_header -> session_id ));
243
+ tok2str (lwapp_msg_type_values ,"Unknown" ,msg_type ),
244
+ msg_type ,
245
+ GET_U_1 (lwapp_control_header -> seq_num ),
246
+ msg_tlen ,
247
+ GET_BE_U_4 (lwapp_control_header -> session_id ));
248
248
249
249
/* did we capture enough for fully decoding the message */
250
250
ND_TCHECK_LEN (tptr , msg_tlen );
@@ -318,39 +318,39 @@ lwapp_data_print(netdissect_options *ndo,
318
318
*/
319
319
if (LWAPP_EXTRACT_VERSION (version ) != LWAPP_VERSION ) {
320
320
ND_PRINT ("LWAPP version %u packet not supported" ,
321
- LWAPP_EXTRACT_VERSION (version ));
321
+ LWAPP_EXTRACT_VERSION (version ));
322
322
return ;
323
323
}
324
324
325
325
/* non-verbose */
326
326
if (ndo -> ndo_vflag < 1 ) {
327
327
ND_PRINT ("LWAPPv%u, %s frame, Flags [%s], length %u" ,
328
- LWAPP_EXTRACT_VERSION (version ),
329
- LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
330
- bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
331
- len );
328
+ LWAPP_EXTRACT_VERSION (version ),
329
+ LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
330
+ bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
331
+ len );
332
332
return ;
333
333
}
334
334
335
335
/* ok they seem to want to know everything - lets fully decode it */
336
336
tlen = GET_BE_U_2 (lwapp_trans_header -> length );
337
337
if (tlen < sizeof (struct lwapp_transport_header )) {
338
338
ND_PRINT ("LWAPPv%u, %s frame, Radio-id %u, Flags [%s], length %u < transport header length" ,
339
- LWAPP_EXTRACT_VERSION (version ),
340
- LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
341
- LWAPP_EXTRACT_RID (version ),
342
- bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
343
- tlen );
339
+ LWAPP_EXTRACT_VERSION (version ),
340
+ LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
341
+ LWAPP_EXTRACT_RID (version ),
342
+ bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
343
+ tlen );
344
344
return ;
345
345
}
346
346
347
347
ND_PRINT ("LWAPPv%u, %s frame, Radio-id %u, Flags [%s], Frag-id %u, length %u" ,
348
- LWAPP_EXTRACT_VERSION (version ),
349
- LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
350
- LWAPP_EXTRACT_RID (version ),
351
- bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
352
- GET_U_1 (lwapp_trans_header -> frag_id ),
353
- tlen );
348
+ LWAPP_EXTRACT_VERSION (version ),
349
+ LWAPP_EXTRACT_CONTROL_BIT (version ) ? "Control" : "Data" ,
350
+ LWAPP_EXTRACT_RID (version ),
351
+ bittok2str (lwapp_header_bits_values ,"none" ,version & 0x07 ),
352
+ GET_U_1 (lwapp_trans_header -> frag_id ),
353
+ tlen );
354
354
355
355
tptr += sizeof (struct lwapp_transport_header );
356
356
tlen -= sizeof (struct lwapp_transport_header );
0 commit comments