Patch #1621: Add tcpdump() calls to pcapif tapif, improve tcpdump_init().

This commit is contained in:
marcbou 2003-06-19 10:47:44 +00:00
parent 173949af92
commit 01c8eeed90
3 changed files with 17 additions and 6 deletions

View File

@ -61,7 +61,9 @@
#include "lwip/ip.h"
#if defined(LWIP_DEBUG) && defined(LWIP_TCPDUMP)
#include "netif/tcpdump.h"
#endif /* LWIP_DEBUG && LWIP_TCPDUMP */
struct pcapif {
pcap_t *pd;
@ -116,6 +118,10 @@ timeout(void *arg)
bufptr += q->len;
}
#if defined(LWIP_DEBUG) && defined(LWIP_TCPDUMP)
tcpdump(p);
#endif /* LWIP_DEBUG && LWIP_TCPDUMP */
ethhdr = p->payload;
switch (htons(ethhdr->type)) {
case ETHTYPE_IP:

View File

@ -51,6 +51,10 @@
#include "netif/etharp.h"
#if defined(LWIP_DEBUG) && defined(LWIP_TCPDUMP)
#include "netif/tcpdump.h"
#endif /* LWIP_DEBUG && LWIP_TCPDUMP */
#ifdef linux
#include <sys/ioctl.h>
#include <linux/if.h>
@ -310,6 +314,9 @@ tapif_input(struct netif *netif)
LWIP_DEBUGF(TAPIF_DEBUG, ("tapif_input: IP packet\n"));
q = etharp_ip_input(netif, p);
pbuf_header(p, -14);
#if defined(LWIP_DEBUG) && defined(LWIP_TCPDUMP)
tcpdump(p);
#endif /* LWIP_DEBUG && LWIP_TCPDUMP */
netif->input(p, netif);
break;
case ETHTYPE_ARP:

View File

@ -44,14 +44,12 @@ static FILE *file = NULL;
void
tcpdump_init(void)
{
char *fname;
fname = "/tmp/tcpdump";
file = fopen(fname, "w");
#define TCPDUMP_FNAME "/tmp/tcpdump"
file = fopen(TCPDUMP_FNAME, "w");
if (file == NULL) {
perror("tcpdump_init: fopen");
perror("tcpdump_init: cannot open \""TCPDUMP_FNAME"\" for writing");
}
LWIP_DEBUGF(TCPDUMP_DEBUG, ("tcpdump: file %s\n", fname));
LWIP_DEBUGF(TCPDUMP_DEBUG, ("tcpdump: file %s\n", TCPDUMP_FNAME));
}
/*-----------------------------------------------------------------------------------*/
void