kingkevin
/
espressif_idf-extra-components
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcap: Fix format warnings 

Related to https://github.com/espressif/idf-extra-components/issues/65
This commit is contained in:
Tomas Rezucha 2022-09-02 08:24:52 +02:00
parent a45de9cf24
commit 4691e54ffb
4 changed files with 228 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcap/CMakeLists.txt
View File

@ -1,3 +1,2 @@
idf_component_register(SRCS "src/pcap.c"
INCLUDE_DIRS "include")
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

2
pcap/idf_component.yml
View File

@ -1,4 +1,4 @@
version: "1.0.1"
version: "1.0.2"
description: PCAP file writer
url: https://github.com/espressif/idf-extra-components/tree/master/pcap
dependencies:

5
pcap/include/pcap.h
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -41,7 +41,8 @@ typedef enum {
PCAP_LINK_TYPE_CISCO_HDLC = 104, /*!< Cisco HDLC */
PCAP_LINK_TYPE_802_11 = 105, /*!< 802.11 */
PCAP_LINK_TYPE_BSD_LOOPBACK = 108, /*!< OpenBSD loopback devices(with AF_value in network byte order) */
PCAP_LINK_TYPE_LOCAL_TALK = 114 /*!< LocalTalk */
PCAP_LINK_TYPE_LOCAL_TALK = 114, /*!< LocalTalk */
PCAP_LINK_TYPE_USBPCAP = 249, /*!< USB packets, beginning with a USBPcap header */
} pcap_link_type_t;
/**

23
pcap/src/pcap.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include "esp_log.h"
#include "esp_check.h"
#include "pcap.h"
@ -152,11 +153,11 @@ esp_err_t pcap_print_summary(pcap_file_handle_t pcap, FILE *print_file)
fprintf(print_file, "------------------------------------------------------------------------\n");
fprintf(print_file, "Pcap packet Head:\n");
fprintf(print_file, "------------------------------------------------------------------------\n");
fprintf(print_file, "Magic Number: %x\n", file_header.magic);
fprintf(print_file, "Magic Number: %"PRIx32"\n", file_header.magic);
fprintf(print_file, "Major Version: %d\n", file_header.major);
fprintf(print_file, "Minor Version: %d\n", file_header.minor);
fprintf(print_file, "SnapLen: %d\n", file_header.snaplen);
fprintf(print_file, "LinkType: %d\n", file_header.link_type);
fprintf(print_file, "SnapLen: %"PRIu32"\n", file_header.snaplen);
fprintf(print_file, "LinkType: %"PRIu32"\n", file_header.link_type);
fprintf(print_file, "------------------------------------------------------------------------\n");
uint32_t packet_num = 0;
pcap_packet_header_t packet_header;
@ -164,11 +165,11 @@ esp_err_t pcap_print_summary(pcap_file_handle_t pcap, FILE *print_file)
real_read = fread(&packet_header, sizeof(pcap_packet_header_t), 1, pcap->file);
ESP_GOTO_ON_FALSE(real_read == 1, ESP_FAIL, err, TAG, "read pcap packet header failed");
// print packet header information
fprintf(print_file, "Packet %d:\n", packet_num);
fprintf(print_file, "Timestamp (Seconds): %d\n", packet_header.seconds);
fprintf(print_file, "Timestamp (Microseconds): %d\n", packet_header.microseconds);
fprintf(print_file, "Capture Length: %d\n", packet_header.capture_length);
fprintf(print_file, "Packet Length: %d\n", packet_header.packet_length);
fprintf(print_file, "Packet %"PRIu32":\n", packet_num);
fprintf(print_file, "Timestamp (Seconds): %"PRIu32"\n", packet_header.seconds);
fprintf(print_file, "Timestamp (Microseconds): %"PRIu32"\n", packet_header.microseconds);
fprintf(print_file, "Capture Length: %"PRIu32"\n", packet_header.capture_length);
fprintf(print_file, "Packet Length: %"PRIu32"\n", packet_header.packet_length);
size_t payload_length = packet_header.capture_length;
packet_payload = malloc(payload_length);
ESP_GOTO_ON_FALSE(packet_payload, ESP_ERR_NO_MEM, err, TAG, "no mem to save packet payload");
@ -204,7 +205,7 @@ esp_err_t pcap_print_summary(pcap_file_handle_t pcap, FILE *print_file)
fprintf(print_file, "Type: 0x%x\n", packet_payload[13] | (packet_payload[12] << 8));
fprintf(print_file, "------------------------------------------------------------------------\n");
} else {
fprintf(print_file, "Unknown link type:%d\n", file_header.link_type);
fprintf(print_file, "Unknown link type:%"PRIu32"\n", file_header.link_type);
fprintf(print_file, "------------------------------------------------------------------------\n");
}
free(packet_payload);
@ -212,7 +213,7 @@ esp_err_t pcap_print_summary(pcap_file_handle_t pcap, FILE *print_file)
index += packet_header.capture_length + sizeof(pcap_packet_header_t);
packet_num ++;
}
fprintf(print_file, "Pcap packet Number: %d\n", packet_num);
fprintf(print_file, "Pcap packet Number: %"PRIu32"\n", packet_num);
fprintf(print_file, "------------------------------------------------------------------------\n");
return ret;
err: