Changeset 5bbe424 for lib/trace.c
- Timestamp:
- 09/08/05 18:17:36 (17 years ago)
- 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:
- 12290e6
- Parents:
- de8c420b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/trace.c
rde8c420b r5bbe424 527 527 else { 528 528 struct ieee_802_11_payload *eth = (void*)wifi->data; 529 i f (eth->type != 0x0008) {530 ipptr=NULL; 531 } else{529 ipptr = NULL; 530 531 if (eth->type == 0x0008) { 532 532 ipptr=(void*)eth->data; 533 } else if (eth->type = 0x0081) { 534 // VLAN 535 if ((*(uint16_t *)(eth + 16)) == 0x0008) { 536 ipptr = (void*)eth->data + 4; 537 } 533 538 } 534 539 } … … 543 548 break; 544 549 } 545 if (ntohs(eth->ether_type)!=0x0800) { 546 ipptr = NULL; 547 } 548 else { 550 ipptr = NULL; 551 552 if (eth->ether_type==0x0008) { 549 553 ipptr = ((void *)eth) + 14; 554 } else if (eth->ether_type == 0x0081) { 555 struct libtrace_8021q *vlanhdr = 556 (struct libtrace_8021q *)eth; 557 if (vlanhdr->vlan_ether_type == 0x0008) { 558 ipptr = ((void *)eth) + 18; 559 } 550 560 } 551 561 break;
Note: See TracChangeset
for help on using the changeset viewer.