Add program_name field in the netdissect_options structure

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index d3f0eb7752d5687647ec334e6a4cc64a119da6c8..158b25843479f3bff2377db9a9b97f892c109da7 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -43,9 +43,9 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

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

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "extract.h"                    /* must come after interface.h */
+#include "extract.h"

 
 #include "ip.h"
 #ifdef INET6
 
 #include "ip.h"
 #ifdef INET6


@@ -354,7 +354,7 @@ enum ikev2_t_type {
        IV2_T_PRF  = 2,
        IV2_T_INTEG= 3,
        IV2_T_DH   = 4,
        IV2_T_PRF  = 2,
        IV2_T_INTEG= 3,
        IV2_T_DH   = 4,

-       IV2_T_ESN  = 5,
+       IV2_T_ESN  = 5

 };
 
 /* 3.4.  Key Exchange Payload */
 };
 
 /* 3.4.  Key Exchange Payload */


@@ -374,7 +374,7 @@ enum ikev2_id_type {
        ID_IPV6_ADDR=5,
        ID_DER_ASN1_DN=9,
        ID_DER_ASN1_GN=10,
        ID_IPV6_ADDR=5,
        ID_DER_ASN1_DN=9,
        ID_DER_ASN1_GN=10,

-       ID_KEY_ID=11,
+       ID_KEY_ID=11

 };
 struct ikev2_id {
        struct isakmp_gen h;
 };
 struct ikev2_id {
        struct isakmp_gen h;


@@ -438,7 +438,7 @@ struct ikev2_auth {
 enum ikev2_auth_type {
        IV2_RSA_SIG = 1,
        IV2_SHARED  = 2,
 enum ikev2_auth_type {
        IV2_RSA_SIG = 1,
        IV2_SHARED  = 2,

-       IV2_DSS_SIG = 3,
+       IV2_DSS_SIG = 3

 };
 
 /* refer to RFC 2409 */
 };
 
 /* refer to RFC 2409 */


@@ -1354,27 +1354,27 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
 #endif
        case 2:
            {
 #endif
        case 2:
            {

-               const struct ipsecdoi_id *p;
-               struct ipsecdoi_id id;
+               const struct ipsecdoi_id *doi_p;
+               struct ipsecdoi_id doi_id;

                struct protoent *pe;
 
                struct protoent *pe;
 

-               p = (const struct ipsecdoi_id *)ext;
-               ND_TCHECK(*p);
-               UNALIGNED_MEMCPY(&id, ext, sizeof(id));
-               ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.type, ipsecidtypestr)));
+               doi_p = (const struct ipsecdoi_id *)ext;
+               ND_TCHECK(*doi_p);
+               UNALIGNED_MEMCPY(&doi_id, ext, sizeof(doi_id));
+               ND_PRINT((ndo," idtype=%s", STR_OR_ID(doi_id.type, ipsecidtypestr)));

                /* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */
                /* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */

-               pe = id.proto_id ? getprotobynumber(id.proto_id) : NULL;
+               pe = doi_id.proto_id ? getprotobynumber(doi_id.proto_id) : NULL;

                if (pe)
                        ND_PRINT((ndo," protoid=%s", pe->p_name));
                else
                if (pe)
                        ND_PRINT((ndo," protoid=%s", pe->p_name));
                else

-                       ND_PRINT((ndo," protoid=%u", id.proto_id));
-               ND_PRINT((ndo," port=%d", ntohs(id.port)));
+                       ND_PRINT((ndo," protoid=%u", doi_id.proto_id));
+               ND_PRINT((ndo," port=%d", ntohs(doi_id.port)));

                if (!len)
                        break;
                if (data == NULL)
                        goto trunc;
                ND_TCHECK2(*data, len);
                if (!len)
                        break;
                if (data == NULL)
                        goto trunc;
                ND_TCHECK2(*data, len);

-               switch (id.type) {
+               switch (doi_id.type) {

                case IPSECDOI_ID_IPV4_ADDR:
                        if (len < 4)
                                ND_PRINT((ndo," len=%d [bad: < 4]", len));
                case IPSECDOI_ID_IPV4_ADDR:
                        if (len < 4)
                                ND_PRINT((ndo," len=%d [bad: < 4]", len));