Changeset 387d299 for libpacketdump

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.

Location:

libpacketdump

Files:

• eth_2048.c (modified) (4 diffs)
• ip_1.c (modified) (1 diff)
• ip_17.c (modified) (4 diffs)
• ip_33.c (modified) (4 diffs)
• ip_6.c (modified) (5 diffs)
• ip_89.c (modified) (2 diffs)
• libpacketdump.h (modified) (1 diff)

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;

libpacketdump/ip_1.c

@@ -3 +3 @@
 #include <dlfcn.h>
 #include "libpacketdump.h"
-
-#define STRUCT icmp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
 
 static char *unreach_types[]={

libpacketdump/ip_17.c

@@ -8 +8 @@
 #include <netdb.h>
 
-#define STRUCT udp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
-
 
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
@@ -29 +13 @@
         struct libtrace_udp *udp = (struct libtrace_udp*)packet;
         printf(" UDP:");
-        if (SAFE(source)) {
+        if (SAFE(udp, source)) {
                 struct servent *ent=getservbyport(udp->source,"udp");
                 if(ent) {
@@ -41 +25 @@
                 return;
         }
-        if (SAFE(dest)) {
+        if (SAFE(udp, dest)) {
                 struct servent *ent=getservbyport(udp->dest,"udp");
                 if(ent) {
@@ -54 +38 @@
         }
         printf("\n UDP:");
-        DISPLAYS(len," Len %u");
-        DISPLAYS(check," Checksum %u");
+        DISPLAYS(udp, len," Len %u");
+        DISPLAYS(udp, check," Checksum %u");
         printf("\n");
         if (htons(udp->source) < htons(udp->dest)) 

libpacketdump/ip_33.c

@@ -6 +6 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
-
-#define STRUCT dccp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
 
 struct dccphdr {
@@ -50 +34 @@
 {
         struct dccphdr *dccp = (struct dccphdr*)packet;
-        DISPLAYS(source," DCCP: Source %i");
-        DISPLAYS(dest," Dest %i");
+        DISPLAYS(dccp, source," DCCP: Source %i");
+        DISPLAYS(dccp, dest," Dest %i");
         if (len>4) {
                 printf("\n DCCP: Type %i",dccp->type);
@@ -69 +53 @@
         else
                 return;
-        DISPLAY(doff," DCCP: Dataoff: %i\n");
+        DISPLAY(dccp, doff," DCCP: Dataoff: %i\n");
         if (len>9)
                 printf(" DCCP: NDP %i CsLen: %i\n",dccp->ndp,dccp->cslen);
@@ -75 +59 @@
                 return;
         }
-        DISPLAY(check," DCCP: Checksum: %i\n");
+        /* Should this be byteswapped??? */
+        DISPLAY(dccp, check," DCCP: Checksum: %i\n");
         if (htons(dccp->source) < htons(dccp->dest)) 
                 decode_next(packet+dccp->doff*4,len-dccp->doff*4,"dccp",htons(dccp->source));

libpacketdump/ip_6.c

@@ -5 +5 @@
 #include <assert.h>
 #include <netdb.h>
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&tcp->x-(char*)tcp+sizeof(tcp->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,tcp->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(tcp->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(tcp->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&tcp->x))
 
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
@@ -27 +13 @@
         libtrace_tcp_t *tcp = (libtrace_tcp_t *)packet;
         printf(" TCP:");
-        if (SAFE(source)) {
+        if (SAFE(tcp, source)) {
                 struct servent *ent=getservbyport(tcp->source,"tcp");
                 if(ent) {
@@ -39 +25 @@
                 return;
         }
-        if (SAFE(dest)) {
+        if (SAFE(tcp, dest)) {
                 struct servent *ent=getservbyport(tcp->dest,"tcp");
                 if(ent) {
@@ -52 +38 @@
         }
         printf("\n TCP:");
-        DISPLAYL(seq," Seq %u");
+        DISPLAYL(tcp, seq," Seq %u");
         printf("\n TCP:");
-        DISPLAYL(ack_seq," Ack %u");
+        DISPLAYL(tcp, ack_seq," Ack %u");
         if ((char*)&tcp->window-(char *)tcp>len) {
                 printf("\n");
@@ -71 +57 @@
         if (tcp->ack) printf(" ACK");
         if (tcp->urg) printf(" URG");
-        DISPLAYS(window," Window %i");
+        DISPLAYS(tcp, window," Window %i");
         printf("\n TCP:");
-        DISPLAYS(check," Checksum %i");
-        DISPLAYS(urg_ptr," Urgent %i");
+        DISPLAYS(tcp, check," Checksum %i");
+        DISPLAYS(tcp, urg_ptr," Urgent %i");
         pkt = (unsigned char*)packet+sizeof(*tcp);
         plen = (len-sizeof *tcp) < (tcp->doff*4-sizeof(*tcp))?(len-sizeof(*tcp)):(tcp->doff*4-sizeof *tcp);

libpacketdump/ip_89.c

@@ -10 +10 @@
 static void dump_ospf_v2_header(libtrace_ospf_v2_t *hdr, unsigned len) {
 
-        printf(" OSPF Header: Version %u Type %u ",
-                        hdr->ospf_v, hdr->type);
+        DISPLAY(hdr, ospf_v, " OSPF Header: Version %u");
+        DISPLAY(hdr, type, " Type %u ");
         switch(hdr->type) {
                 case TRACE_OSPF_HELLO:
@@ -29 +29 @@
                         break;
         }
+        printf("\n");
 
-        printf("\n OSPF Header: Length %u \n", ntohs(hdr->len));
-        printf(" OSPF Header: Router Id %s ", inet_ntoa(hdr->router));
-        printf("Area Id %s\n", inet_ntoa(hdr->area));
-        printf(" OSPF Header: Checksum %u Auth Type %u\n", ntohs(hdr->sum),
-                        ntohs(hdr->au_type));
-
-        printf(" OSPF Header: Auth Key ID %u Auth Data Len %u\n", 
-                        hdr->au_key_id, hdr->au_data_len);
-        printf(" OSPF Header: Auth Crypto Seq %u\n", ntohl(hdr->au_seq_num));
-
+        DISPLAYS(hdr, ospf_len, "OSPF Header: Length %u \n");
+        DISPLAYIP(hdr, router, " OSPF Header: Router Id %s ");
+        DISPLAYIP(hdr, area, "Area Id %s\n");
+        DISPLAYS(hdr, sum, " OSPF Header: Checksum %u ");
+        DISPLAYS(hdr, au_type, "Auth Type %u\n");
+        DISPLAY(hdr, au_key_id, " OSPF Header: Auth Key ID %u ");
+        DISPLAY(hdr, au_data_len, "Auth Data Len %u\n");
+        DISPLAYL(hdr, au_seq_num, " OSPF Header: Auth Crypto Seq %u\n");
 
 }

libpacketdump/libpacketdump.h

@@ -6 +6 @@
 extern "C" {
 #endif
+
+#define SAFE(hdr,x) \
+        ((unsigned int)len>=((char*)&hdr->x-(char*)hdr+sizeof(hdr->x))) 
+
+#define DISPLAY_EXP(hdr,x,fmt,exp) \
+        if (SAFE(hdr, x)) \
+                printf(fmt,exp); \
+        else {\
+                printf("(Truncated)\n"); \
+                return; \
+        }
+
+#define DISPLAY(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,hdr->x)
+
+#define DISPLAYS(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htons(hdr->x))
+#define DISPLAYL(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htonl(hdr->x))
+#define DISPLAYIP(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,inet_ntoa(*(struct in_addr*)&hdr->x))
+
 
 void trace_hexdump_packet(libtrace_packet_t *packet);