Changeset 41ab052 for libpacketdump

Timestamp:

05/25/06 18:46:51 (15 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:

701e164

Parents:

49e3fff

Message:

Fix bitordering issues

Location:

libpacketdump/parser

Files:

• Makefile.am (modified) (1 diff)
• parser.h (modified) (1 diff)
• parser.y (modified) (4 diffs)

libpacketdump/parser/Makefile.am

@@ -3 +3 @@
 
 #libparser_la_SOURCES = libconfig.c libconfig.h config_internal.h config.lexer.c config.parser.h configuration.h config.parser.c
-libparser_la_SOURCES = parser.lexer.c parser.tab.c parser.h
+libparser_la_SOURCES = parser.lexer.c parser.tab.c parser.h bitbuffer.c
 libparser_la_LIBADD = @ADD_LIBS@ @LEXLIB@
 libparser_la_LDFLAGS = @ADD_LDFLAGS@ -L../

libpacketdump/parser/parser.h

@@ -53 +53 @@
 void decode_protocol_file(uint16_t link_type,char *packet,int len, element_t* el);
 
+typedef uint64_t bitbuffer_t;
 #endif

libpacketdump/parser/parser.y

@@ -12 +12 @@
     #define YYERROR_VERBOSE 1
 
-    typedef uint64_t bitbuffer_t;
     
     int yylex(void);
@@ -150 +149 @@
 %%
 
+#include "bitbuffer.h"
+
 element_t* parse_protocol_file(char *filename)
 {
@@ -172 +173 @@
 
 
-bitbuffer_t getbit(void **packet, int *packlen, uint64_t numbits)
-{
-    bitbuffer_t ret;
-    bitbuffer_t one = 1;
-
-    /* While the buffer is not filled up and there is still
-     * data in the packet to read, read a byte...
-     * 
-     * The buffer gets filled from right to left
-     */
-    while(bits < (sizeof(bitbuffer_t)-1)*8 && *packlen > 0)
-    {
-        /* read in one byte from the packet */
-        buffer |= ((*  ((bitbuffer_t*)*packet)   )&0xff) << bits;
-        /* update the position within the packet */
-        *packet = ((char*)*packet) + 1;
-
-        bits += 8;
-        *packlen -= 1;
-    }
-
-    /* our return value is the last <numbits> of the buffer */
-    ret = buffer & (   (one<<numbits)   -1);
-    
-    /* remove the bits that are being returned from out buffer */
-    buffer >>= numbits;
-
-    /* and update our position inside this buffer */
-    bits -= numbits;
-
-    return ret;
-}
 
 
@@ -371 +340 @@
 
                 decode_next(packet, len, el->data->nextheader->prefix, 
-                        el->data->nextheader->target->value);
+                        ntohs(el->data->nextheader->target->value));
                 break;
         };