Changeset 258c1fb

Timestamp:

08/24/04 13:25:38 (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:

882ff88a

Parents:

505c421

Message:

Fixes to TCP
Fixes to ASN1 parsing

Location:

examples/tracedump

Files:

• Makefile (modified) (4 diffs)
• asn1.cc (modified) (12 diffs)
• asn1.h (modified) (1 diff)
• eth_2048.cc (modified) (1 diff)
• ip_6.cc (modified) (3 diffs)
• tcp_1720.cc (modified) (1 diff)
• tracedump-lib.cc (modified) (4 diffs)

examples/tracedump/Makefile

@@ -5 +5 @@
 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)))
@@ -12 +12 @@
 PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS) $(TCP_LAYERS)
 
-all: tracedump $(PLUGINS) asn1-test
+all: tracedump $(PLUGINS) asn1-test links
 
 tracedump: tracedump.cc tracedump-libtrace.o tracedump-lib.o
@@ -25 +25 @@
 asn1-test: CXXFLAGS+=-DTEST
 asn1-test: asn1.cc
+        $(CXX) $(CXXFLAGS) $^ -o $@
+
+links: links.txt
+        ./make_links
 
 clean:
@@ -32 +36 @@
         cp *.so $(LIBDIR)
 
-.PHONY: clean all
+.PHONY: clean all links
 

examples/tracedump/asn1.cc

@@ -9 +9 @@
 #endif
 #include "asn1.h"
+#include <boost/format.hpp>
 
 
@@ -44 +45 @@
 };
 
-void ASN_data::toString(void) {
+void ASN_data::display(void) {
                         printf(" ASN: %s %s 0x%x\n",
                                         ASN_type_class_t_names[(int)type.getClass()],
@@ -77 +78 @@
                                 printf("\n");
                         }
-                }; // toString 
+                }; // display 
+
 ASN_data::~ASN_data() {};
 
+std::string ASN_data::toString(void) {
+        return std::string("Unknown");
+};
 
 bool ASN::eof(void) const { 
@@ -93 +98 @@
                         return *buffer.begin()!=0;
                 }
-                void toString(void) const {
+                void display(void) const {
                         printf(" ASN: Bool:\t%s\n",getValue()
                                                 ?"True":
@@ -113 +118 @@
                         return val;
                 }
-                void toString(void) {
+                void display(void) {
                         printf(" ASN: Int:\t0x");
                         // Yeah, this is a dirty trick
@@ -125 +130 @@
 };
 
+// Type 3 -- Bitstring
+class ASN_bitstring : public ASN_data {
+        public:
+                ASN_bitstring(ASN_type t,uint64_t l) : ASN_data(t,l) {};
+                void display(void) {
+                        printf(" DEBUG: %i bytes\n",buffer.size());
+                        printf(" ASN: Bitstring:\t0b");
+                        buffer_t::const_iterator i=buffer.begin();
+                        //int bits=*i;
+                        i++;
+                        for( ;
+                                        i!=buffer.end();
+                                        i++) {
+                                for (int j=0;j<7;j++) {
+                                        if (*i & (1<<(7-j))) {
+                                                printf("1");
+                                        }
+                                        else {
+                                                printf("0");
+                                        }
+                                }
+                                printf(" ");
+                        }
+                        printf("\n");
+                }
+};
 // Types - Simple Strings
 class ASN_string : public ASN_data {
@@ -138 +169 @@
                         return s;
                 }
-                void toString(void) {
+                void display(void) {
                         printf(" ASN: String:\t%s\n",getValue().c_str());
                 }
@@ -146 +177 @@
         public:
                 ASN_null(ASN_type t,uint64_t l) : ASN_data(t,l) {};
-                void toString(void) { printf(" ASN: NULL\n"); }
-};
-
-// Abstract Container for sets and sequences
-class ASN_container : public ASN_data {
-        private:
-                std::vector<ASN_data *> subencodings;
-        public:
-                typedef std::vector<ASN_data *>::const_iterator const_iterator;
-                ASN_container(ASN_type t,uint64_t l) : ASN_data(t,l) {};
-                void parse() {
-                        ASN n;
-                        n.feed(buffer,len);
-                        while (!n.eof()) {
-                                subencodings.push_back(n.getEncoding());
-                        }
-                };
-                const_iterator begin(void) { return (const_iterator)subencodings.begin(); }
-                const_iterator end(void) { return (const_iterator)subencodings.end(); }
-};
-
-// Type 16 - Sequence 
-class ASN_sequence : public ASN_container {
-        public:
-                ASN_sequence(ASN_type t,uint64_t l) : ASN_container(t,l) {};
-                void toString(void) {
-                        printf(" ASN: Sequence begin\n");
-                        for(const_iterator i=begin();
-                                        i!=end();
-                                        i++)
-                                (*i)->toString();
-                        printf(" ASN: Sequence end\n");
-                }
-};
-// Type 17 - Set
-class ASN_set : public ASN_container {
-        public:
-                ASN_set(ASN_type t,uint64_t l) : ASN_container(t,l) {};
-                void toString(void) {
-                        printf(" ASN: Set begin\n");
-                        for(const_iterator i=begin();
-                                        i!=end();
-                                        i++)
-                                (*i)->toString();
-                        printf(" ASN: Set end\n");
-                }
+                void display(void) { printf(" ASN: NULL\n"); }
 };
 
@@ -217 +203 @@
                                 oid.push_back(decodeInt());
                 };
-                void toString(void) {
+                void display(void) {
                         printf(" ASN: OID");
                         for(std::vector<uint64_t>::const_iterator i=oid.begin();
@@ -226 +212 @@
                         printf("\n");
                 };
+                std::string toString(void) {
+                        std::string ret;
+                        for(std::vector<uint64_t>::const_iterator i=oid.begin();
+                                        i!=oid.end();
+                                        i++) {
+                                ret+=(boost::format(" %i") % *i).str();
+                        }
+                        return ret;
+                }
+};
+
+
+// Abstract Container for sets and sequences
+class ASN_container : public ASN_data {
+        protected:
+                std::vector<ASN_data *> subencodings;
+        public:
+                typedef std::vector<ASN_data *>::const_iterator const_iterator;
+                ASN_container(ASN_type t,uint64_t l) : ASN_data(t,l) {};
+                void parse() {
+                        ASN n;
+                        n.feed(buffer,len);
+                        while (!n.eof()) {
+                                subencodings.push_back(n.getEncoding());
+                        }
+                };
+                const_iterator begin(void) { return (const_iterator)subencodings.begin(); }
+                const_iterator end(void) { return (const_iterator)subencodings.end(); }
+};
+
+// Type 16 - Sequence 
+class ASN_sequence : public ASN_container {
+        public:
+                ASN_sequence(ASN_type t,uint64_t l) : ASN_container(t,l) {};
+                void display(void) {
+                        if (subencodings.size()==2 
+                          &&subencodings[0]->type.getTag() == 6) {
+                                printf(" ASN: Sequence OID (%s)\n",subencodings[0]->toString().c_str());
+                                subencodings[1]->display();
+                                return;
+                        }
+
+                        printf(" ASN: Sequence begin (%i items)\n",subencodings.size());
+                        for(const_iterator i=begin();
+                                        i!=end();
+                                        i++)
+                                (*i)->display();
+                        printf(" ASN: Sequence end\n");
+                }
+};
+// Type 17 - Set
+class ASN_set : public ASN_container {
+        public:
+                ASN_set(ASN_type t,uint64_t l) : ASN_container(t,l) {};
+                void display(void) {
+                        if (subencodings.size()==1) {
+                                printf(" ASN: Single item set\n");
+                                subencodings[0]->display();
+                                return;
+                        }
+                        printf(" ASN: Set begin\n");
+                        for(const_iterator i=begin();
+                                        i!=end();
+                                        i++)
+                                (*i)->display();
+                        printf(" ASN: Set end\n");
+                }
 };
 
@@ -268 +321 @@
         uint64_t l=getLength();
         ASN_data *ret;
-        switch(t.getTag()) {
-                case 1:
-                        ret=new ASN_bool(t,l);
-                        break;
-                case 2:
-                        ret=new ASN_int(t,l);
-                        break;
-                case 5:
-                        ret=new ASN_null(t,l);
-                        break;
-                case 6:
-                        ret=new ASN_oid(t,l);
-                        break;
-                case 16:
-                        ret=new ASN_sequence(t,l);
-                        break;
-                case 17:
-                        ret=new ASN_set(t,l);
-                        break;
-                case 18:
-                case 19:
-                case 20:
-                case 21:
-                case 22:
-                case 25:
-                case 26:
-                case 27:
-                        ret=new ASN_string(t,l);
+        switch(t.getClass()) {
+                case Universal:
+                        switch(t.getTag()) {
+                                case 1:
+                                        ret=new ASN_bool(t,l);
+                                        break;
+                                case 2:
+                                        ret=new ASN_int(t,l);
+                                        break;
+                                case 3:
+                                        ret=new ASN_bitstring(t,l);
+                                        break;
+                                case 5:
+                                        ret=new ASN_null(t,l);
+                                        break;
+                                case 6:
+                                        ret=new ASN_oid(t,l);
+                                        break;
+                                case 16:
+                                        ret=new ASN_sequence(t,l);
+                                        break;
+                                case 17:
+                                        ret=new ASN_set(t,l);
+                                        break;
+                                case 18:
+                                case 19:
+                                case 20:
+                                case 21:
+                                case 22:
+                                case 25:
+                                case 26:
+                                case 27:
+                                        ret=new ASN_string(t,l);
+                                        break;
+                                default:
+                                        ret=new ASN_data(t,l);
+                                        break;
+                        }
                         break;
                 default:
@@ -334 +397 @@
         asn->feed(buffer,size);
 
-        ASN_data *data= asn->getEncoding();
-        
-        data->toString();
-        data->toString();
+        while(!asn->eof()) {
+                ASN_data *data= asn->getEncoding();
+
+                data->display();
+        }
 
         return 0;

examples/tracedump/asn1.h

@@ -32 +32 @@
                 virtual void parse(void);
 
-                virtual void toString(void);
+                virtual void display(void);
+                virtual std::string toString(void);
                 virtual ~ASN_data();
 };

examples/tracedump/eth_2048.cc

@@ -31 +31 @@
         }
         DISPLAY(tos," TOS %02x")
-        DISPLAY(tot_len," Total Length %i")
+        DISPLAYS(tot_len," Total Length %i")
         printf("\n IP:");
         DISPLAY(id," Id %i");

examples/tracedump/ip_6.cc

@@ -32 +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);
+                        assert(*optlen>=2);
                         (*len)-=*optlen;
                         (*data)=(*ptr+2);
-                        (*ptr)+=*optlen;
+                        (*ptr)+=*optlen+2;
                         if (*len<0)
                                 return 0;
@@ -82 +78 @@
         DISPLAYS(urg_ptr," Urgent %i");
         unsigned char *pkt = (unsigned char*)packet+sizeof(*tcp);
-        int plen = (len-sizeof *tcp) <? (tcp->doff*4);
+        int plen = (len-sizeof *tcp) <? (tcp->doff*4-sizeof *tcp);
         unsigned char type,optlen,*data;
         while(get_next_option(&pkt,&plen,&type,&optlen,&data)) {
@@ -94 +90 @@
                                 break;
                         case 2:
-                                printf("MSS %i",htonl(*(uint32_t *)(data)));
+                                printf("MSS %i",htons(*(uint32_t *)(data)));
                                 break;
                         case 3:

examples/tracedump/tcp_1720.cc

@@ -30 +30 @@
                 return;
         asn.feed(packet,len);
-        asn.getEncoding()->toString();
+        while (!asn.eof())
+                asn.getEncoding()->display();
         return;
 }

examples/tracedump/tracedump-lib.cc

@@ -17 +17 @@
 static std::map<std::string,std::map<uint16_t,decode_t> > decoders;
 
+#define WIDTH 16
+
 static void generic_decode(uint16_t type,char *packet, int len) {
         int i;
@@ -23 +25 @@
                 int j;
                 printf("\n ");
-                for(j=0;j<8;j++) {
+                for(j=0;j<WIDTH;j++) {
                         if (i+j<len)
                                 printf(" %02x",(unsigned char)packet[i+j]);
@@ -30 +32 @@
                 }
                 printf("    ");
-                for(j=0;j<8;j++) {
+                for(j=0;j<WIDTH;j++) {
                         if (i+j<len)
                                 if (isprint((unsigned char)packet[i+j]))
@@ -39 +41 @@
                                 printf("   ");
                 }
-                if (i+8>len)
+                if (i+WIDTH>len)
                         break;
                 else
-                        i+=8;
+                        i+=WIDTH;
         }
         printf("\n");