Fix check for MCS field being present.

[tcpdump] / print-rsvp.c

diff --git a/print-rsvp.c b/print-rsvp.c
index 263ef3d4656ac1f3d5d036ed36f930c36822ef68..6c807fe71b865e36d6053c4a3febd0cd2ed11531 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -15,14 +15,13 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"


@@ -723,7 +722,6 @@ _U_
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return -1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return -1;


@@ -762,7 +760,6 @@ _U_
                 obj_tlen-=26;
                 obj_tptr+=26;
                 break;
                 obj_tlen-=26;
                 obj_tptr+=26;
                 break;

-#endif

             case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */
                 if (obj_tlen < 12)
                     return -1;
             case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */
                 if (obj_tlen < 12)
                     return -1;


@@ -802,7 +799,6 @@ _U_
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                 break;
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;


@@ -812,7 +808,6 @@ _U_
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                 break;
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -829,7 +824,6 @@ _U_
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                 break;
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;


@@ -839,7 +833,6 @@ _U_
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                 break;
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -914,7 +907,6 @@ _U_
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;


@@ -939,7 +931,6 @@ _U_
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;

-#endif

             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;


@@ -1190,14 +1181,12 @@ _U_
                             ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
                                    ident, ipaddr_string(ndo, obj_tptr + 4)));
                             break;
                             ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
                                    ident, ipaddr_string(ndo, obj_tptr + 4)));
                             break;

-#ifdef INET6

                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
                                    ident, ip6addr_string(ndo, obj_tptr + 4)));
                             break;
                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
                                    ident, ip6addr_string(ndo, obj_tptr + 4)));
                             break;

-#endif

                         case AFNUM_NSAP:
                             if (subobj_len) {
                                 /* unless we have a TLV parser lets just hexdump */
                         case AFNUM_NSAP:
                             if (subobj_len) {
                                 /* unless we have a TLV parser lets just hexdump */


@@ -1271,7 +1260,6 @@ _U_
                 if (obj_tlen)
                     hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;
                 if (obj_tlen)
                     hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;

-#ifdef INET6

             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)


@@ -1284,7 +1272,6 @@ _U_
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -1360,7 +1347,6 @@ _U_
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;


@@ -1405,7 +1391,6 @@ _U_
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;

-#endif

             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
                     return-1;


@@ -1547,7 +1532,6 @@ _U_
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)


@@ -1574,7 +1558,6 @@ _U_
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }


@@ -1750,7 +1733,6 @@ _U_
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;

-#ifdef INET6

             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 16)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 16)
                     return-1;


@@ -1760,7 +1742,6 @@ _U_
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;

-#endif

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }