Changeset 088533a for lib/protocols.c
- Timestamp:
- 04/21/06 23:13:54 (16 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:
- a4bfbf0
- Parents:
- dd2eaee
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/protocols.c
r39e141f r088533a 123 123 } 124 124 125 static void *trace_get_payload_from_ legacy_pos(void *link,125 static void *trace_get_payload_from_pos(void *link, 126 126 uint16_t *type, uint32_t *remaining) 127 127 { … … 171 171 return trace_get_payload_from_80211(link,type,remaining); 172 172 case TRACE_TYPE_ETH: 173 case TRACE_TYPE_LEGACY_ETH:174 173 return trace_get_payload_from_ethernet(link,type,remaining); 175 174 case TRACE_TYPE_NONE: … … 179 178 case TRACE_TYPE_PFLOG: 180 179 return trace_get_payload_from_pflog(link,type,remaining); 181 case TRACE_TYPE_LEGACY_POS: 182 return trace_get_payload_from_legacy_pos(link,type,remaining); 183 case TRACE_TYPE_LEGACY_ATM: 180 case TRACE_TYPE_POS: 181 return trace_get_payload_from_pos(link,type,remaining); 184 182 case TRACE_TYPE_ATM: 185 183 return trace_get_payload_from_atm(link,type,remaining); … … 512 510 wifi=(libtrace_80211_t*)((char*)link+144); 513 511 return (uint8_t*)&wifi->mac2; 514 case TRACE_TYPE_LEGACY_ETH:515 512 case TRACE_TYPE_ETH: 516 513 return (uint8_t*)ðptr->ether_shost; 517 case TRACE_TYPE_LEGACY: 518 case TRACE_TYPE_LEGACY_POS: 514 case TRACE_TYPE_POS: 519 515 case TRACE_TYPE_NONE: 520 case TRACE_TYPE_ATM:521 516 case TRACE_TYPE_HDLC_POS: 522 517 case TRACE_TYPE_LINUX_SLL: 523 518 case TRACE_TYPE_PFLOG: 524 case TRACE_TYPE_ LEGACY_ATM:519 case TRACE_TYPE_ATM: 525 520 return NULL; 526 521 } … … 544 539 return (uint8_t*)&wifi->mac1; 545 540 case TRACE_TYPE_ETH: 546 case TRACE_TYPE_LEGACY_ETH:547 541 return (uint8_t*)ðptr->ether_dhost; 548 case TRACE_TYPE_LEGACY_ATM: 549 case TRACE_TYPE_LEGACY: 550 case TRACE_TYPE_LEGACY_POS: 542 case TRACE_TYPE_POS: 551 543 case TRACE_TYPE_NONE: 552 544 case TRACE_TYPE_ATM:
Note: See TracChangeset
for help on using the changeset viewer.