Changeset 5551415


Ignore:
Timestamp:
10/25/06 18:38:23 (14 years ago)
Author:
Daniel Lawson <dlawson@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
7d952cb
Parents:
212a748
Message:
  • wrapping lib/pcap*c with #ifdef HAVE_PCAP so they don't build if we don't have pcap
  • changed some types and defines in linktypes.c to use libtrace internal representations rather than libpcap's, in case we don't have pcap.
Location:
lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lib/linktypes.c

    rd5e1796 r5551415  
    195195                packet->payload=tmpbuffer+trace_get_framing_length(packet);
    196196                packet->type=pcap_dlt_to_rt(TRACE_DLT_LINUX_SLL);
    197                 ((struct pcap_pkthdr*) packet->header)->caplen+=
     197                ((struct libtrace_pcapfile_pkt_hdr_t*) packet->header)->caplen+=
    198198                        sizeof(libtrace_sll_header_t);
    199                 ((struct pcap_pkthdr*) packet->header)->len+=
     199                ((struct libtrace_pcapfile_pkt_hdr_t*) packet->header)->wirelen+=
    200200                        sizeof(libtrace_sll_header_t);
    201201                return;
     
    259259                                        ->hatype)) {
    260260                                case ARPHRD_PPP:
    261                                         packet->type=pcap_dlt_to_rt(DLT_NULL);
     261                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_NULL);
    262262                                        break;
    263263                                case ARPHRD_ETHER:
    264                                         packet->type=pcap_dlt_to_rt(DLT_EN10MB);
     264                                        packet->type=pcap_dlt_to_rt(TRACE_DLT_EN10MB);
    265265                                        break;
    266266                                default:
  • lib/pcap_dump_flush.c

    ra21af3d r5551415  
     1#ifdef HAVE_PCAP
    12#include "config.h"
    23
     
    1718
    1819#endif
     20
     21#endif // HAVE_PCAP
  • lib/pcap_next_ex.c

    ra21af3d r5551415  
     1#ifdef HAVE_PCAP
    12#include "config.h"
    23
     
    5556}
    5657#endif
     58
     59#endif //HAVE_PCAP
Note: See TracChangeset for help on using the changeset viewer.