Changeset 978

Timestamp:

09/08/06 16:44:06 (7 years ago)

Author:

spa1

Message:

Fixed build error for the libpacketdump parser which crops up if you specify --with-dag
Might have also added/removed some braces and newlines that I couldn't be bothered reverting before commit :]

Location:

trunk

Files:

• lib/format_wag.c (modified) (2 diffs)
• lib/protocols.c (modified) (1 diff)
• libpacketdump/parser/Makefile.am (modified) (1 diff)

trunk/lib/format_wag.c

@@ -450 +450 @@
         
         struct frame_t * wag_frame_data = (struct frame_t *)packet->header;
-
         
         if (wag_frame_data->subtype == FRAME_SUBTYPE_DATA_RX) {
@@ -463 +462 @@
                 return ntohs(wag_hdr->txinfo.length);
         }
-        
+
         /* default option - not optimal as there tends to be an
          * extra 2 bytes floating around somewhere */

trunk/lib/protocols.c

@@ -282 +282 @@
         void *trans_ptr = 0;
 
-        if ((ipptr->ip_off & SW_IP_OFFMASK) != 0)
-                return NULL;
+        if ((ipptr->ip_off & SW_IP_OFFMASK) != 0) {
+                return NULL;
+        }
 
         if (remaining) {

trunk/libpacketdump/parser/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libparser.a
 libparser_a_SOURCES = lexer.l parser.y bitbuffer.c bitbuffer.h grammar.h
-libparser_a_LIBADD = @ADD_LIBS@ 
+#libparser_a_LIBADD = @ADD_LIBS@ 
 INCLUDES = @ADD_INCLS@ -I../ -I../../lib