diff --git a/ports/unix/netif/tcpdump.c b/ports/unix/netif/tcpdump.c index fe108bb..7699480 100644 --- a/ports/unix/netif/tcpdump.c +++ b/ports/unix/netif/tcpdump.c @@ -85,11 +85,11 @@ tcpdump(struct pbuf *p) (ip_addr_t *)&(iphdr->src), (ip_addr_t *)&(iphdr->dest)) != 0) { LWIP_DEBUGF(TCPDUMP_DEBUG, ("tcpdump: IP checksum failed!\n")); - /* fprintf(file, "chksum 0x%lx ", tcphdr->chksum); - tcphdr->chksum = 0; - fprintf(file, "should be 0x%lx ", inet_chksum_pseudo(p, (ip_addr_t *)&(iphdr->src), - (ip_addr_t *)&(iphdr->dest), - IP_PROTO_TCP, p->tot_len));*/ + /* + fprintf(file, "chksum 0x%lx ", tcphdr->chksum); + tcphdr->chksum = 0; + fprintf(file, "should be 0x%lx ", inet_chksum_pseudo(p, (ip_addr_t *)&(iphdr->src), + (ip_addr_t *)&(iphdr->dest), IP_PROTO_TCP, p->tot_len));*/ fprintf(file, "!chksum "); } @@ -114,32 +114,27 @@ tcpdump(struct pbuf *p) fprintf(file, "%d.%d.%d.%d.%u > %d.%d.%d.%d.%u: ", - (int)(ntohl(iphdr->src.addr) >> 24) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 16) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 8) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 0) & 0xff, - ntohs(tcphdr->src), - (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff, - ntohs(tcphdr->dest)); + (int)(ntohl(iphdr->src.addr) >> 24) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 16) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 8) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 0) & 0xff, + ntohs(tcphdr->src), + (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff, + ntohs(tcphdr->dest)); offset = TCPH_HDRLEN(tcphdr); len = ntohs(IPH_LEN(iphdr)) - offset * 4 - IP_HLEN; if (len != 0 || flags[0] != '.') { - fprintf(file, "%s %u:%u(%u) ", - flags, - ntohl(tcphdr->seqno), - ntohl(tcphdr->seqno) + len, - len); + fprintf(file, "%s %u:%u(%u) ", flags, ntohl(tcphdr->seqno), + ntohl(tcphdr->seqno) + len, len); } if (TCPH_FLAGS(tcphdr) & TCP_ACK) { - fprintf(file, "ack %u ", - ntohl(tcphdr->ackno)); + fprintf(file, "ack %u ", ntohl(tcphdr->ackno)); } - fprintf(file, "wnd %u\n", - ntohs(tcphdr->wnd)); + fprintf(file, "wnd %u\n", ntohs(tcphdr->wnd)); fflush(file); @@ -156,25 +151,25 @@ tcpdump(struct pbuf *p) (ip_addr_t *)&(iphdr->src), (ip_addr_t *)&(iphdr->dest)) != 0) { LWIP_DEBUGF(TCPDUMP_DEBUG, ("tcpdump: IP checksum failed!\n")); - /* fprintf(file, "chksum 0x%lx ", tcphdr->chksum); - tcphdr->chksum = 0; - fprintf(file, "should be 0x%lx ", inet_chksum_pseudo(p, (ip_addr_t *)&(iphdr->src), - (ip_addr_t *)&(iphdr->dest), - IP_PROTO_TCP, p->tot_len));*/ + /* + fprintf(file, "chksum 0x%lx ", tcphdr->chksum); + tcphdr->chksum = 0; + fprintf(file, "should be 0x%lx ", inet_chksum_pseudo(p, (ip_addr_t *)&(iphdr->src), + (ip_addr_t *)&(iphdr->dest), IP_PROTO_TCP, p->tot_len));*/ fprintf(file, "!chksum "); } fprintf(file, "%d.%d.%d.%d.%u > %d.%d.%d.%d.%u: ", - (int)(ntohl(iphdr->src.addr) >> 24) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 16) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 8) & 0xff, - (int)(ntohl(iphdr->src.addr) >> 0) & 0xff, - ntohs(udphdr->src), - (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff, - (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff, - ntohs(udphdr->dest)); + (int)(ntohl(iphdr->src.addr) >> 24) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 16) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 8) & 0xff, + (int)(ntohl(iphdr->src.addr) >> 0) & 0xff, + ntohs(udphdr->src), + (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff, + (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff, + ntohs(udphdr->dest)); fprintf(file, "U "); len = ntohs(IPH_LEN(iphdr)) - sizeof(struct udp_hdr) - IP_HLEN; fprintf(file, " %d\n", len);