Changeset e5f1431 for lib


Ignore:
Timestamp:
05/04/06 14:15:52 (16 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:
431548c5
Parents:
81f9b6e
Message:

Updated build system to require version number changes in only two places
(format)_set_direction no longer takes a const libtrace_packet_t
Removed unnecessary #include <dagformat.h> from linktypes.c
libtrace.h and libtrace.doxygen are now .h.in files - a la libtrace2

Location:
lib
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    rc3e5f30 re5f1431  
    2424INCLUDES = @ADD_INCLS@
    2525libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
    26 libtrace_la_LDFLAGS=-version-info 3:0:0 @ADD_LDFLAGS@
     26libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
    2727
    2828dagapi.c:
  • lib/format_erf.c

    re6d963c re5f1431  
    781781}
    782782
    783 static int8_t erf_set_direction(const libtrace_packet_t *packet, int8_t direction) {
     783static int8_t erf_set_direction(libtrace_packet_t *packet, int8_t direction) {
    784784        dag_record_t *erfptr = 0;
    785785        erfptr = (dag_record_t *)packet->header;
  • lib/format_pcap.c

    r81f9b6e re5f1431  
    380380
    381381static int8_t pcap_get_direction(const libtrace_packet_t *packet) {
    382         int8_t direction  = -1;
     382        libtrace_direction_t direction  = -1;
    383383        switch(pcap_get_link_type(packet)) {
    384384                case TRACE_TYPE_LINUX_SLL:
  • lib/libtrace.h.in

    rc37ab9f re5f1431  
    2525 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2626 *
    27  * $Id$
     27 * $Id: libtrace.h 773 2006-05-01 12:58:09Z perry $
    2828 *
    2929 */
     
    3939 * @author Perry Lorier
    4040 *
    41  * @version $Id$
     41 * @version $Id: libtrace.h 773 2006-05-01 12:58:09Z perry $
    4242 *
    4343 * This library provides a per packet interface into a trace file, or a live
     
    101101
    102102/** API version as 2 byte hex digits, eg 0xXXYYZZ */
    103 #define LIBTRACE_API_VERSION 0x030000  /* 3.0.00 */
     103#define LIBTRACE_API_VERSION \
     104            ((@LIBTRACE_MAJOR@<<16)|(@LIBTRACE_MID@<<8)|(@LIBTRACE_MINOR@))
    104105
    105106#ifdef __cplusplus
  • lib/libtrace_int.h

    r81f9b6e re5f1431  
    244244         * @note This callback may be NULL if not supported.
    245245         */
    246         int8_t (*set_direction)(const libtrace_packet_t *packet, int8_t direction);
     246        int8_t (*set_direction)(libtrace_packet_t *packet, int8_t direction);
    247247        /** return the erf timestamp of the packet.
    248248         * @return the 64bit erf timestamp
  • lib/linktypes.c

    r81f9b6e re5f1431  
    44#include <pcap.h>
    55#endif
    6 #include "dagformat.h"
     6
    77#include "rt_protocol.h"
    88#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.