Changeset 9e429e8 for lib/format_dag24.c


Ignore:
Timestamp:
09/19/14 15:40:01 (7 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
11cf9b1
Parents:
d994324 (diff), ea602cd (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 remote-tracking branch 'upsteam/master' into develop

Conflicts:

README
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_dag24.c

    rb13b939 r9e429e8  
    473473                        } else {
    474474                                /* Do not sleep - try to read another packet */
     475                                trace->filtered_packets ++;
    475476                                continue;
    476477                        }
     
    483484                        trace_set_capture_length(packet, trace->snaplen);
    484485                }
    485 
     486                trace->accepted_packets ++;
    486487                return event;
    487488        } while (1);
Note: See TracChangeset for help on using the changeset viewer.