Changeset 204d65b


Ignore:
Timestamp:
03/01/17 10:46:59 (4 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance
Children:
33a106a, 6463f32
Parents:
6fb691b (diff), 4db5b98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'rc-4.0.1' into develop

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • AUTHORS

    r78fe0d2 r6450950  
    2828 * Robert Edmonds for tidying up the libpacketdump plugin install
    2929 * Martin Bligh for patching in support for nanosecond pcap traces
     30 * Teemu Rytilahti for adding support for SIT
     31 * "EaseTheWorld" for their work with improving the packet statistics API, as
     32   well as reporting several bugs
     33 * Richard Cziva for contributing to the DPDK support
    3034 * Jamie Curtis for fixing a couple of bugs many many years ago
    3135 * Brendon Jones for creating the original Windows DLLs and writing bits of
  • README

    r864bd71 rd759ee1  
    1 libtrace 4.0.0
     1libtrace 4.0.1
    22
    33---------------------------------------------------------------------------
    4 Copyright (c) 2007-2016 The University of Waikato, Hamilton, New Zealand.
     4Copyright (c) 2007-2017 The University of Waikato, Hamilton, New Zealand.
    55All rights reserved.
    66
  • configure.in

    r571e2f9 rd759ee1  
    44# and in the README
    55
    6 AC_INIT([libtrace],[4.0.0],[contact@wand.net.nz],[libtrace])
     6AC_INIT([libtrace],[4.0.1],[contact@wand.net.nz],[libtrace])
    77
    88LIBTRACE_MAJOR=4
    99LIBTRACE_MID=0
    10 LIBTRACE_MINOR=0
     10LIBTRACE_MINOR=1
    1111
    1212# OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
  • lib/Makefile.am

    rc9ce7ab r4db5b98  
    66        data-struct/vector.h \
    77        data-struct/deque.h data-struct/linked_list.h \
    8         data-struct/buckets.h
     8        data-struct/buckets.h data-struct/sliding_window.h \
     9        data-struct/message_queue.h hash_toeplitz.h
    910
    1011AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@ -pthread
  • lib/libtrace.h.in

    rb148e3b r317e903  
    869869#define LIBTRACE_GRE_FLAG_VERMASK  0x0007
    870870
     871
     872/* PPTP GRE (RFC2637) */
     873#define LIBTRACE_GRE_FLAG_ACK      0x0080
     874#define LIBTRACE_GRE_PPTP_VERSION  0x0001
     875
    871876/** Libtrace local definition of VXLAN Header
    872877 * (draft-mahalingam-dutt-dcops-vxlan)
  • lib/protocols_transport.c

    ree6e802 r317e903  
    549549        uint32_t *remaining)
    550550{
     551    uint8_t flags = ntohs(gre->flags);
    551552    uint32_t size = 4; /* GRE is 4 bytes long by default */
    552553    if (remaining && *remaining < size) {
     
    555556    }
    556557
    557     if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_CHECKSUM) != 0) {
    558         size += 4;  /* An extra 4 bytes. */
    559     }
    560 
    561     if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_KEY) != 0) {
    562         size += 4;  /* An extra 4 bytes. */
    563     }
    564 
    565     if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_SEQ) != 0) {
    566         size += 4;  /* An extra 4 bytes. */
     558    if((flags & LIBTRACE_GRE_FLAG_VERMASK) == LIBTRACE_GRE_PPTP_VERSION) {
     559        size += 4;
     560
     561        if ((flags & LIBTRACE_GRE_FLAG_SEQ) != 0) {
     562            size += 4;
     563        }
     564        if ((flags & LIBTRACE_GRE_FLAG_ACK) != 0) {
     565            size += 4;
     566        }
     567    } else {
     568
     569        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_CHECKSUM) != 0) {
     570            size += 4;  /* An extra 4 bytes. */
     571        }
     572
     573        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_KEY) != 0) {
     574           size += 4;  /* An extra 4 bytes. */
     575        }
     576
     577        if ((ntohs(gre->flags) & LIBTRACE_GRE_FLAG_SEQ) != 0) {
     578            size += 4;  /* An extra 4 bytes. */
     579        }
    567580    }
    568581
Note: See TracChangeset for help on using the changeset viewer.