Changeset 8ccb8536


Ignore:
Timestamp:
12/01/16 10:29:35 (5 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:
5e3f16c
Parents:
c94f107 (diff), 99351e3 (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@…> (12/01/16 10:29:35)
git-committer:
GitHub <noreply@…> (12/01/16 10:29:35)
Message:

Merge pull request #40 from EaseTheWorld?/patch-1

Support IPv6 in PPP

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/protocols_l2.c

    ree6e802 r99351e3  
    313313                switch(ntohs(ppp->protocol)) {
    314314                        case 0x0021: *type = TRACE_ETHERTYPE_IP; break;
     315                        case 0x0057: *type = TRACE_ETHERTYPE_IPV6; break;                               
    315316                        /* If it isn't IP, then it is probably PPP control and
    316317                         * I can't imagine anyone caring about that too much
     
    395396                        case 0x0021: /* IP */
    396397                                *type = TRACE_ETHERTYPE_IP;
     398                                break;
     399                        case 0x0057: /* IPV6 */
     400                                *type = TRACE_ETHERTYPE_IPV6;
    397401                                break;
    398402                        case 0xc021: /* Link Control Protocol */
Note: See TracChangeset for help on using the changeset viewer.