Changeset 528eb6e for lib/Makefile.am


Ignore:
Timestamp:
12/04/12 15:24:34 (9 years ago)
Author:
Shane Alcock <salcock@…>
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:
b4c3f61
Parents:
fd87898
Message:
  • A very cut-down version of int: and ring: is now built on non-Linux systems, enabling them to be able to decode packets captured using those formats and exported via RT
  • Replaced arphrd.h with a new header file (libtrace_arphrd.h) that provides our own #defines for the various ARPHRD types. The inconsistency between what is available on different OS's was becoming problematic.
  • Increased RT buffer size so we can always fit a complete libtrace buffer into it - int: over RT tends to result in very large "packets".
  • Fixed copy-paste error in the failure case when creating a dummy linux trace in format_rt.c
  • Updated various bits of code to use the new LIBTRACE_ARPHRD types where sensible
  • Removed unneeded #include in protocols_pktmeta.c
  • Replaced u32 and u16 types in format_linux with more portable uint32_t and uint16_t types
  • Removed unneeded calls to linuxnative_init_input in the prepare_packet functions in format_linux.c
  • Don't call the fin_input function on a trace if the format does not provide one
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    r60f3c4c r528eb6e  
    11lib_LTLIBRARIES = libtrace.la
    2 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h
     2include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h  
    33
    44AM_CFLAGS=@LIBCFLAGS@
     
    66
    77extra_DIST = format_template.c
    8 if HAVE_NETPACKET_PACKET_H
    98NATIVEFORMATS=format_linux.c
    10 else
    11 NATIVEFORMATS=
    12 endif
    139
    1410if HAVE_BPF_CAPTURE
     
    4743                $(DAGSOURCE) format_erf.h \
    4844                $(BPFJITSOURCE) \
    49                 arphrd.h
     45                libtrace_arphrd.h
    5046
    5147if DAG2_4
Note: See TracChangeset for help on using the changeset viewer.