Changeset 5d6ebe1 for examples

Timestamp:

08/20/04 11:45:32 (17 years ago)

Author:

Perry Lorier <perry@…>

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:

d2e3359

Parents:

d907ff5

Message:

Added asn1 parsing
Started fixing bug with tcp option parsing

Location:

examples/tracedump

Files:

• Makefile (modified) (1 diff)
• ip_6.cc (modified) (3 diffs)
• tracedump-libtrace.cc (modified) (1 diff)

examples/tracedump/Makefile

@@ -3 +3 @@
 CXXFLAGS=-g -Wall $(INCLUDES) -rdynamic
 LDFLAGS=-L/usr/local/wand/lib
-LDLIBS=-ltrace -ldl
+LDLIBS=-ltrace -ldl -lpcap -lz
 LINK_LAYERS=$(addsuffix .so,$(basename $(wildcard link_*.cc)))
 ETH_LAYERS=$(addsuffix .so,$(basename $(wildcard eth_*.cc)))
 IP_LAYERS=$(addsuffix .so,$(basename $(wildcard ip_*.cc)))
-PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS)
+TCP_LAYERS=$(addsuffix .so,$(basename $(wildcard tcp_*.cc)))
+PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS) $(TCP_LAYERS)
 
-all: tracedump $(PLUGINS)
+all: tracedump $(PLUGINS) asn1-test
 
 tracedump: tracedump.cc tracedump-libtrace.o tracedump-lib.o
 
+tcp_1720.so: tcp_1720.cc asn1.o
+
 %.so:%.cc
-        $(CXX) $(CXXFLAGS) -fpic -shared $< -o $@
+        $(CXX) $(CXXFLAGS) -fpic -shared $^ -o $@
+
+asn1-test: CXXFLAGS+=-DTEST
+asn1-test: asn1.cc
 
 clean:
         rm -f *.o tracedump *.so
 
+install:
+        cp *.so $(LIBDIR)
+
 .PHONY: clean all
 

examples/tracedump/ip_6.cc

@@ -6 +6 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
+#include <assert.h>
 
 #define SAFE(x) \
@@ -31 +32 @@
         switch(*type) {
                 case 0:
+                        printf(" DEBUG: End of options\n");
                         return 0;
                 case 1:
+                        printf(" DEBUG: NOP\n");
                         (*ptr)++;
                         (*len)--;
                         return 1;
                 default:
+                        printf(" DEBUG: Type %i len %i\n",
+                                        *type,*(*ptr+1));
                         *optlen = *(*ptr+1);
+                        assert(*optlen>0);
                         (*len)-=*optlen;
                         (*data)=(*ptr+2);
@@ -76 +82 @@
         DISPLAYS(urg_ptr," Urgent %i");
         unsigned char *pkt = (unsigned char*)packet+sizeof(*tcp);
-        int plen = len-sizeof *tcp;
+        int plen = (len-sizeof *tcp) <? (tcp->doff*4);
         unsigned char type,optlen,*data;
         while(get_next_option(&pkt,&plen,&type,&optlen,&data)) {

examples/tracedump/tracedump-libtrace.cc

@@ -9 +9 @@
         struct libtrace_t *trace = trace_create(argv[1]);
         struct libtrace_packet_t packet;
-
+        struct libtrace_filter_t *filter=NULL;
+        
         if (!trace) {
                 errx(1,"Failed to open trace");
         }
 
+        if (argc>2)
+                filter=trace_bpf_setfilter(argv[2]);
+
         while(trace_read_packet(trace,&packet)!=-1) {
                 time_t sec = (time_t)trace_get_seconds(&packet);
                 char *link=(char *)trace_get_link(&packet);
+                if (filter && !trace_bpf_filter(filter,&packet))
+                        continue;
+
                 printf("%s",ctime(&sec));
                 per_packet(trace_get_link_type(&packet),