Changeset 6552540


Ignore:
Timestamp:
10/21/16 10:49:17 (4 years ago)
Author:
GitHub <noreply@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
4145a78, 631fdbc
Parents:
c46b7ea (diff), 4b64a045 (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.
git-author:
Shane Alcock <salcock@…> (10/21/16 10:49:17)
git-committer:
GitHub <noreply@…> (10/21/16 10:49:17)
Message:

Merge pull request #32 from rytilahti/master

Allow parsing SIT (ipv6-in-ipv4) packets inside SLL

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/linktypes.c

    ree6e802 r4b64a045  
    212212                case LIBTRACE_ARPHRD_PPP: return TRACE_TYPE_NONE;
    213213                case LIBTRACE_ARPHRD_LOOPBACK: return TRACE_TYPE_ETH;
     214                case LIBTRACE_ARPHRD_SIT: return TRACE_TYPE_ETH;
    214215                case LIBTRACE_ARPHRD_NONE: return TRACE_TYPE_NONE;
    215216        }
Note: See TracChangeset for help on using the changeset viewer.