Changeset b86f8d3
- Timestamp:
- 03/30/05 17:36:39 (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:
- e92d11f
- Parents:
- 461a518
- Location:
- lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/Makefile.am
rd86b8d7 rb86f8d3 8 8 libtrace_la_CFLAGS = @ADD_INCLS@ 9 9 libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a 10 libtrace_la_LDFLAGS=-version-info 2:15 :0 @ADD_LDFLAGS@10 libtrace_la_LDFLAGS=-version-info 2:15a:0 @ADD_LDFLAGS@ 11 11 12 12 dagapi.c: -
lib/trace.c
r461a518 rb86f8d3 903 903 904 904 struct ieee_802_11_header *wifi = trace_get_link(packet); 905 if (!wifi) { 906 ipptr = NULL; 907 break; 908 } 905 909 906 910 // Data packet? … … 922 926 struct ether_header *eth = 923 927 trace_get_link(packet); 928 if (!eth) { 929 ipptr = NULL; 930 break; 931 } 924 932 if (ntohs(eth->ether_type)!=0x0800) { 925 933 ipptr = NULL; … … 938 946 939 947 sll = trace_get_link(packet); 948 if (!sll) { 949 ipptr = NULL; 950 break; 951 } 940 952 if (ntohs(sll->protocol)!=0x0800) { 941 953 ipptr = NULL; … … 953 965 // NULL for non IP data 954 966 // Presumably it uses the normal stuff 967 if (!acm) { 968 ipptr = NULL; 969 break; 970 } 955 971 ipptr = (void*)&atm->pload; 956 972 break; … … 1553 1569 assert(filter); 1554 1570 assert(packet); 1555 linkptr = trace_get_link(packet); 1556 assert(linkptr); 1571 linkptr = trace_get_link(packet); 1572 if (!linkptr) { 1573 return 0; 1574 } 1575 1557 1576 clen = trace_get_capture_length(packet); 1558 1577 … … 1649 1668 struct trace_sll_header_t *sll; 1650 1669 sll = trace_get_link(packet); 1670 if (!sll) { 1671 return -1; 1672 } 1651 1673 /* 0 == LINUX_SLL_HOST */ 1652 1674 /* the Waikato Capture point defines "packets
Note: See TracChangeset
for help on using the changeset viewer.