Skip to content

Commit

Permalink
tcpdump-141
Browse files Browse the repository at this point in the history 
Imported from tcpdump-141.tar.gz
  • Loading branch information
@AppleOSSDistributions
AppleOSSDistributions committed Sep 24, 2024
1 parent d8d592b commit 8430c00
Show file tree
Hide file tree
Showing 3 changed files with 146 additions and 31 deletions.
33 changes: 18 additions & 15 deletions tcpdump/netdissect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,21 +323,24 @@ extern void nd_pop_all_packet_info(netdissect_options *);
/*
* Values of ndo_flags that control printing of packet metadata
*/
#define PRMD_NONE 0x0000
#define PRMD_IF 0x0001
#define PRMD_PNAME 0x0002
#define PRMD_PID 0x0004
#define PRMD_SVC 0x0008
#define PRMD_DIR 0x0010
#define PRMD_COMMENT 0x0020
#define PRMD_PUUID 0x0040
#define PRMD_VERBOSE 0x0800 /* print pcapng description blocks */
#define PRMD_FLAGS 0x1000
#define PRMD_FLOWID 0x2000
#define PRMD_TRACETAG 0x4000
#define PRMD_DLT 0x8000
#define PRMD_DEFAULT (PRMD_IF|PRMD_PNAME|PRMD_PID|PRMD_SVC|PRMD_DIR|PRMD_COMMENT|PRMD_FLAGS)
#define PRMD_ALL 0xffff
#define PRMD_NONE 0x0000
#define PRMD_IF 0x0001
#define PRMD_PNAME 0x0002
#define PRMD_PID 0x0004
#define PRMD_SVC 0x0008
#define PRMD_DIR 0x0010
#define PRMD_COMMENT 0x0020
#define PRMD_PUUID 0x0040
#define PRMD_VERBOSE 0x0800 /* print pcapng description blocks */
#define PRMD_FLAGS 0x1000
#define PRMD_FLOWID 0x2000
#define PRMD_TRACETAG 0x4000
#define PRMD_DLT 0x8000
#define PRMD_DROP_REASON 0x10000
#define PRMD_DROP_FUNC 0x20000
#define PRMD_DROP_LINE 0x40000
#define PRMD_DEFAULT (PRMD_IF|PRMD_PNAME|PRMD_PID|PRMD_SVC|PRMD_DIR|PRMD_COMMENT|PRMD_FLAGS|PRMD_DROP_REASON|PRMD_DROP_FUNC|PRMD_DROP_LINE)
#define PRMD_ALL 0x1ffff
#endif /* __APPLE__ */

/*
Expand Down
24 changes: 21 additions & 3 deletions tcpdump/print_pktap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,20 @@ print_pktap_header(struct netdissect_options *ndo, struct pktap_header *pktp_hdr
pktp_hdr->pth_dlt);
prsep = ", ";
}
if (pktp_hdr->pth_type_next == PTH_TYPE_DROP) {
struct droptap_header *dtap_hdr = (struct droptap_header *)pktp_hdr;
ND_PRINT("%s" "%s",
prsep,
drop_reason_str(dtap_hdr->dth_dropreason));
prsep = ", ";
if (dtap_hdr->dth_dropfunc_size > 0) {
ND_PRINT("%s" "%s:%u",
prsep,
dtap_hdr->dth_dropfunc,
dtap_hdr->dth_dropline);
prsep = ", ";
}
}
ND_PRINT(") ");
}
}
Expand Down Expand Up @@ -556,11 +570,15 @@ pktap_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h,
bcopy(h, &nhdr, sizeof(struct pcap_pkthdr));
nhdr.caplen -= pktp_hdr->pth_length;
nhdr.len -= pktp_hdr->pth_length;
p += pktp_hdr->pth_length;

if (pktp_hdr->pth_type_next == PTH_TYPE_DROP) {
p += DROPTAP_HDR_SIZE((struct droptap_header *)p);
} else {
p += pktp_hdr->pth_length;
}
dlt = pktp_hdr->pth_dlt;

if (pktp_hdr->pth_type_next == PTH_TYPE_PACKET) {
if (pktp_hdr->pth_type_next == PTH_TYPE_PACKET ||
pktp_hdr->pth_type_next == PTH_TYPE_DROP) {
if ((printer = lookup_printer(dlt)) != NULL) {
printer(ndo, &nhdr, p);
} else {
Expand Down
120 changes: 107 additions & 13 deletions tcpdump/tcpdump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ The Regents of the University of California. All rights reserved.\n";
#include <net/iptap.h>
#include <pcap/pcap-ng.h>
#include <pcap/pcap-util.h>
#include <os/log.h>
#endif /* __APPLE__ */

#include <signal.h>
Expand Down Expand Up @@ -477,6 +478,39 @@ reset_signal(int sig)
new.sa_handler = SIG_DFL;
(void) sigaction(sig, &new, &old);
}

static void
log_arguments(int argc, char **argv)
{
int i;
char *log_line;
char *ptr;
size_t remaining_size = LINE_MAX;

log_line = calloc(LINE_MAX, sizeof(char));

if (log_line == NULL) {
os_log(OS_LOG_DEFAULT, "cannot log arguments - calloc(LINE_MAX, 1) failed");
return;
}

ptr = log_line;

for (i = 0; i < argc; i++) {
int result = snprintf(ptr, remaining_size, "%s ", argv[i]);

if (result >= remaining_size) {
break;
}
remaining_size -= result;
ptr += result;

}

os_log(OS_LOG_DEFAULT, "%s", log_line);

free(log_line);
}
#endif /* __APPLE__ */

static void
Expand Down Expand Up @@ -1507,22 +1541,18 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
if (truncation_mode != 0) {
pcap_set_truncation_mode(pc, 1);
}
#ifdef HAS_PCAP_SET_COMPRESSION
if (compression_mode != 0) {
if (pcap_set_compression(pc, compression_mode) != 0) {
error("Can't set compression mode: %d", compression_mode);
}
}
#endif /* HAS_PCAP_SET_COMPRESSION */
if (pktapv2 != 0) {
ndo->ndo_pktapv2 = 1;
pcap_set_pktap_hdr_v2(pc, true);
}
#if HAS_PCAP_HEAD_DROP
if (head_drop != 0) {
pcap_set_head_drop(pc, 1);
}
#endif /* HAS_PCAP_HEAD_DROP */
#endif /* __APPLE__ */

status = pcap_activate(pc);
Expand Down Expand Up @@ -1680,11 +1710,13 @@ main(int argc, char **argv)
ndo_set_function_pointers(ndo);

#ifdef __APPLE__
int on = 1;
int no_loopkupnet_warning = 0;
ndo->ndo_ext_fmt = 1;
ndo->ndo_tflag = 0;
ndo->ndo_t0flag = 0;
int on = 1;
int no_loopkupnet_warning = 0;
ndo->ndo_ext_fmt = 1;
ndo->ndo_tflag = 0;
ndo->ndo_t0flag = 0;

log_arguments(argc, argv);
#endif /* __APPLE__ */

cnt = -1;
Expand Down Expand Up @@ -2569,6 +2601,7 @@ main(int argc, char **argv)
device = PKTAP_IFNAME;
if (strncmp(device, PKTAP_IFNAME, strlen(PKTAP_IFNAME)) == 0 ||
strncmp(device, IPTAP_IFNAME, strlen(IPTAP_IFNAME)) == 0 ||
strncmp(device, DROPTAP_IFNAME, strlen(DROPTAP_IFNAME)) == 0 ||
strcmp(device, "any") == 0 ||
strcmp(device, "all") == 0) {

Expand Down Expand Up @@ -3455,12 +3488,18 @@ info(int verbose)
putc('\n', stderr);

#ifdef __APPLE__
#ifdef HAS_PCAP_SET_COMPRESSION
if (verbose) {
os_log(OS_LOG_DEFAULT, "%lu packet%s captured, %u packet%s received by filter, %u packet%s dropped by kernel, %u drop%s by metadata filter",
packets_captured, PLURAL_SUFFIX(packets_captured),
stats.ps_recv, PLURAL_SUFFIX(stats.ps_recv),
stats.ps_drop, PLURAL_SUFFIX(stats.ps_drop),
packets_mtdt_fltr_drop, PLURAL_SUFFIX(packets_mtdt_fltr_drop));
}

char buffer[256];
if (pcap_get_compression_stats(pd, buffer, sizeof(buffer)) == 0) {
(void)fprintf(stderr, "comp_stats: %s\n", buffer);
}
#endif /* HAS_PCAP_SET_COMPRESSION */
#endif /* __APPLE */
infoprint = 0;
}
Expand Down Expand Up @@ -4518,6 +4557,11 @@ print_pcap_ng_block(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
#ifdef PCAPNG_EPB_TRACE_TAG
uint16_t trace_tag = 0;
#endif /* PCAPNG_EPB_TRACE_TAG */
bool droptap_used = false;
uint32_t drop_reason = 0;
const char *drop_func = NULL;
uint16_t drop_line = 0;
uint16_t drop_func_len = 0;
struct pcapng_option_info option_info;

block = pcap_ng_block_alloc_with_raw_block(ndo->ndo_pcap, (u_char *)sp);
Expand Down Expand Up @@ -4671,7 +4715,34 @@ print_pcap_ng_block(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
}
}
#endif /* PCAPNG_EPB_TRACE_TAG */

/*
* PCAPNG_EPB_DROP_REASON option is set only for droptap.
*/
if (pcap_ng_block_get_option(block, PCAPNG_EPB_DROP_REASON, &option_info) == 1) {
if (option_info.length != 4) {
warning("%s: Drop reason option length %u != 4", __func__, option_info.length);
goto done;
}
drop_reason = *(uint32_t *)(option_info.value);
droptap_used = true;
if (pcap_is_swapped(ndo->ndo_pcap)) {
drop_reason = SWAPLONG(drop_reason);
}
}
if (pcap_ng_block_get_option(block, PCAPNG_EPB_DROP_LINE, &option_info) == 1) {
if (option_info.length != 2) {
warning("%s: Drop line option length %u != 2", __func__, option_info.length);
goto done;
}
drop_line = *(uint16_t *)(option_info.value);
if (pcap_is_swapped(ndo->ndo_pcap)) {
drop_line = SWAPSHORT(drop_line);
}
}
if (pcap_ng_block_get_option(block, PCAPNG_EPB_DROP_FUNC, &option_info) == 1) {
drop_func = (const char *)(option_info.value);
drop_func_len = option_info.length;
}
if_id = epbp->interface_id;

pack_flags_code = PCAPNG_EPB_FLAGS;
Expand Down Expand Up @@ -4959,7 +5030,30 @@ print_pcap_ng_block(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
}
}
}

if (droptap_used) {
if (ndo->ndo_kflag & PRMD_DROP_REASON) {
ND_PRINT("%s" "%s",
prsep,
drop_reason_str(drop_reason));
prsep = ", ";
}
/*
* Function name and line number where the drop happened.
* Do not print this if drop_func_len is 0, which means
* we intended not to store function name and line number
* in the first place.
*/
if (ndo->ndo_kflag & PRMD_DROP_FUNC &&
ndo->ndo_kflag & PRMD_DROP_LINE &&
drop_func_len > 0) {
ND_PRINT("%s" "%.*s:%u",
prsep,
drop_func_len,
drop_func,
drop_line);
prsep = ", ";
}
}
ND_PRINT(") ");
}

Expand Down

0 comments on commit 8430c00

Please # to comment.