Changeset 387d299 for libpacketdump/eth_2048.c

Timestamp:

07/04/14 11:37:25 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

d14e23d

Parents:

9ad7a35

Message:

Remove duplicate macros in libpacketdump

Ensure OSPF libpacketdump module won't segfault or print garbage
if a truncated OSPF header is passed into it.

Renamed 'len' field in OSPF header to 'ospf_len' to avoid
potential conflict with variables named len in libpacketdump
code.

File:

• libpacketdump/eth_2048.c (modified) (4 diffs)

libpacketdump/eth_2048.c

@@ -10 +10 @@
 #include <netdb.h>
 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if ((unsigned int)len>=((char*)&ip->x-(char*)ip+sizeof(ip->x))) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,ip->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(ip->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&ip->x))
-
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
 {
@@ -29 +18 @@
         }
         //DISPLAY(ip_tos," TOS %02x")
-        DISPLAY_EXP(ip_tos," DSCP %02x",ip->ip_tos >> 2)
-        DISPLAY_EXP(ip_tos," ECN %x",ip->ip_tos & 0x2)
-        DISPLAYS(ip_len," Total Length %i")
+        DISPLAY_EXP(ip, ip_tos," DSCP %02x",ip->ip_tos >> 2);
+        DISPLAY_EXP(ip, ip_tos," ECN %x",ip->ip_tos & 0x2);
+        DISPLAYS(ip, ip_len," Total Length %i");
         printf("\n IP:");
-        DISPLAYS(ip_id," Id %u");
+        DISPLAYS(ip, ip_id," Id %u");
         
         if ((unsigned int)len >= ((char *)&ip->ip_ttl - (char *)ip - 2)) {
@@ -42 +31 @@
         }
         //printf("\n IP:");
-        DISPLAY(ip_ttl,"\n IP: TTL %i");
+        DISPLAY(ip, ip_ttl,"\n IP: TTL %i");
         if ((unsigned int)len>=((char*)&ip->ip_p-(char*)ip+sizeof(ip->ip_p))) {
                 struct protoent *ent=getprotobynumber(ip->ip_p);
@@ -55 +44 @@
                 return;
         }
-        DISPLAYS(ip_sum," Checksum %i\n");
-        DISPLAYIP(ip_src," IP: Source %s ");
-        DISPLAYIP(ip_dst,"Destination %s\n");
+        DISPLAYS(ip, ip_sum," Checksum %i\n");
+        DISPLAYIP(ip, ip_src," IP: Source %s ");
+        DISPLAYIP(ip, ip_dst,"Destination %s\n");
         decode_next(packet+ip->ip_hl*4,len-ip->ip_hl*4,"ip",ip->ip_p);
         return;