rename the NOT_DECODED_YET macros to avoid a name clash

for those sources that include both packet-ber.h and packet-per.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10912 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-ber.h b/packet-ber.h
index f50a6623d54b472393ea52c31dfa694298a54c76..8196aee6e61abc0a250d82eb37c64667b2ff793c 100644 (file)
--- a/packet-ber.h
+++ b/packet-ber.h
@@ -2,7 +2,7 @@
  * Helpers for ASN.1/BER dissection
  * Ronnie Sahlberg (C) 2004
  *
- * $Id: packet-ber.h,v 1.6 2004/05/14 23:38:39 sahlberg Exp $
+ * $Id: packet-ber.h,v 1.7 2004/05/17 20:03:35 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,7 @@
 #ifndef __PACKET_BER_H__
 #define __PACKET_BER_H__
 
-#define NOT_DECODED_YET(x) \
+#define BER_NOT_DECODED_YET(x) \
 proto_tree_add_text(tree, tvb, offset, 0, "something unknown here [%s]",x); \
 fprintf(stderr,"Not decoded yet in packet : %d  [%s]\n", pinfo->fd->num,x); \
 if (check_col(pinfo->cinfo, COL_INFO)){ \

diff --git a/packet-h225.c b/packet-h225.c
index 1870e410f18e8225029275f63c5a0d46393bfe50..52985272c0d742e88584b1200ee92bf3fced9a7b 100644 (file)
--- a/packet-h225.c
+++ b/packet-h225.c
@@ -4,7 +4,7 @@
  *
  * Maintained by Andreas Sikkema (h323@ramdyne.nl)
  *
- * $Id: packet-h225.c,v 1.38 2004/04/09 03:51:30 sahlberg Exp $
+ * $Id: packet-h225.c,v 1.39 2004/05/17 20:03:35 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -3059,31 +3059,31 @@ dissect_h235_password(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h235_DHSet(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("DHSet");
+PER_NOT_DECODED_YET("DHSet");
        return offset;
 }
 static int
 dissect_h235_ChallengeString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("ChallengeString");
+PER_NOT_DECODED_YET("ChallengeString");
        return offset;
 }
 static int
 dissect_h235_RandomVal(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("RandomVal");
+PER_NOT_DECODED_YET("RandomVal");
        return offset;
 }
 static int
 dissect_h235_TypedCertificate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("TypedCertificate");
+PER_NOT_DECODED_YET("TypedCertificate");
        return offset;
 }
 static int
 dissect_h235_Identifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("Identifier");
+PER_NOT_DECODED_YET("Identifier");
        return offset;
 }
 static int
@@ -3123,13 +3123,13 @@ dissect_h235_nonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h235_ECKASDH(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("ECKASDH");
+PER_NOT_DECODED_YET("ECKASDH");
        return offset;
 }
 static int
 dissect_h235_H235Key(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("H235Key");
+PER_NOT_DECODED_YET("H235Key");
        return offset;
 }
 static per_sequence_t H235ClearToken_sequence[] = {
@@ -3164,7 +3164,7 @@ static per_sequence_t H235ClearToken_sequence[] = {
 static int
 dissect_h235_AuthenticationBES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("AuthenticationBES");
+PER_NOT_DECODED_YET("AuthenticationBES");
        return offset;
 }
 
@@ -3241,19 +3241,19 @@ dissect_h235_cryptoEncryptedToken(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h235_cryptoSignedToken(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoSignedToken");
+PER_NOT_DECODED_YET("cryptoSignedToken");
        return offset;
 }
 static int
 dissect_h235_cryptoHashedToken(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoHashedToken");
+PER_NOT_DECODED_YET("cryptoHashedToken");
        return offset;
 }
 static int
 dissect_h235_cryptoPwdEncr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoPwdEncr");
+PER_NOT_DECODED_YET("cryptoPwdEncr");
        return offset;
 }
 static const value_string CryptoToken_vals[] = {
@@ -3309,25 +3309,25 @@ dissect_h235_ranInt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 static int
 dissect_h235_iv8(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("iv8");
+PER_NOT_DECODED_YET("iv8");
        return offset;
 }
 static int
 dissect_h235_iv16(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("iv16");
+PER_NOT_DECODED_YET("iv16");
        return offset;
 }
 static int
 dissect_h235_iv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("iv");
+PER_NOT_DECODED_YET("iv");
        return offset;
 }
 static int
 dissect_h235_clearSalt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("clearSalt");
+PER_NOT_DECODED_YET("clearSalt");
        return offset;
 }
 
@@ -3443,37 +3443,37 @@ dissect_h225_cryptoEPPwdHash(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h225_cryptoGKPwdHash(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoGKPwdHash");
+PER_NOT_DECODED_YET("cryptoGKPwdHash");
        return offset;
 }
 static int
 dissect_h225_cryptoEPPwdEncr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoEPPwdEncr");
+PER_NOT_DECODED_YET("cryptoEPPwdEncr");
        return offset;
 }
 static int
 dissect_h225_cryptoGKPwdEncr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoGKPwdEncr");
+PER_NOT_DECODED_YET("cryptoGKPwdEncr");
        return offset;
 }
 static int
 dissect_h225_cryptoEPCert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoEPCert");
+PER_NOT_DECODED_YET("cryptoEPCert");
        return offset;
 }
 static int
 dissect_h225_cryptoGKCert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoGKCert");
+PER_NOT_DECODED_YET("cryptoGKCert");
        return offset;
 }
 static int
 dissect_h225_cryptoFastStart(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("cryptoFastStart");
+PER_NOT_DECODED_YET("cryptoFastStart");
        return offset;
 }
 static const value_string CryptoH323Token_vals[] = {
@@ -5867,7 +5867,7 @@ dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h225_EndpointType_set(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("EndpointType_set");
+PER_NOT_DECODED_YET("EndpointType_set");
        return offset;
 }
 
@@ -6122,7 +6122,7 @@ dissect_h225_EndPoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h225_icv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("icv");
+PER_NOT_DECODED_YET("icv");
        return offset;
 }
 
@@ -6771,7 +6771,7 @@ dissect_h225_ResourcesAvailableIndicate(tvbuff_t *tvb, int offset, packet_info *
 static int
 dissect_h225_amountString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("amountString");
+PER_NOT_DECODED_YET("amountString");
        return offset;
 }
 
@@ -7880,19 +7880,19 @@ dissect_h225_ServiceControlIndication(tvbuff_t *tvb, int offset, packet_info *pi
 static int
 dissect_h225_alertingTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("alertingTime");
+PER_NOT_DECODED_YET("alertingTime");
        return offset;
 }
 static int
 dissect_h225_connectTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("connectTime");
+PER_NOT_DECODED_YET("connectTime");
        return offset;
 }
 static int
 dissect_h225_endTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("endTime");
+PER_NOT_DECODED_YET("endTime");
        return offset;
 }
 

diff --git a/packet-h245.c b/packet-h245.c
index 4e5077d0eb8f6a545811a3ad330043abd62aaed9..417324dff23553d8bcbaf10c713cdcb6b06a80ec 100644 (file)
--- a/packet-h245.c
+++ b/packet-h245.c
@@ -6,7 +6,7 @@
  *
  * Maintained by Andreas Sikkema (h323@ramdyne.nl)
  *
- * $Id: packet-h245.c,v 1.46 2004/02/14 22:48:52 guy Exp $
+ * $Id: packet-h245.c,v 1.47 2004/05/17 20:03:36 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -14270,7 +14270,7 @@ dissect_h245_DataApplicationCapability(tvbuff_t *tvb, int offset, packet_info *p
 static int
 dissect_h245_iPSourceRouteAddress_route(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree _U_)
 {
-NOT_DECODED_YET("iPSourceRouteAddress");
+PER_NOT_DECODED_YET("iPSourceRouteAddress");
 /* XXX
        offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h245_iPSourceRouteAddress_route, ett_h245_iPSourceRouteAddress_route, dissect_h245_ );
 */
@@ -18245,7 +18245,7 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_escrowValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("escrowValue");
+PER_NOT_DECODED_YET("escrowValue");
        return offset;
 }
 
@@ -18759,7 +18759,7 @@ dissect_h245_T38FaxUdpOptions(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 static int
 dissect_h245_sessionDescription(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("sessionDescription");
+PER_NOT_DECODED_YET("sessionDescription");
        return offset;
 }
 

diff --git a/packet-h450.c b/packet-h450.c
index 811b591014283ef3a8736664f16a28586bc47b7a..6d2161a06f37dfd347b8ac65e6210941b4999155 100644 (file)
--- a/packet-h450.c
+++ b/packet-h450.c
@@ -4,7 +4,7 @@
  *
  * Copied from packet-h225.c and packet-h245.c
  *
- * $Id: packet-h450.c,v 1.8 2004/02/16 18:23:25 sahlberg Exp $
+ * $Id: packet-h450.c,v 1.9 2004/05/17 20:03:36 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -349,7 +349,7 @@ dissect_h4501_opcode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h4501_ExtensionSeq(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-NOT_DECODED_YET("H.450.1 ExtensionSeq");
+PER_NOT_DECODED_YET("H.450.1 ExtensionSeq");
    return offset;
 }
 
@@ -689,7 +689,7 @@ dissect_h4501_argument(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
       /* TODO - decode other H.450.x invoke arguments here */
 
       default:
-NOT_DECODED_YET("Unrecognized H.450.x operation");
+PER_NOT_DECODED_YET("Unrecognized H.450.x operation");
          break;
       }
    }
@@ -772,7 +772,7 @@ dissect_h4501_ReturnResult_result(tvbuff_t *tvb, int offset, packet_info *pinfo,
          break;
 
       default:
-NOT_DECODED_YET("Unrecognized H.450.x return result");
+PER_NOT_DECODED_YET("Unrecognized H.450.x return result");
          break;
       }
    }

diff --git a/packet-kerberos.c b/packet-kerberos.c
index 97d43477d38e1571ef2366bf6e72b613533c15e6..0f4242fbbd9362dbca62c6362220ebf20df82888 100644 (file)
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -23,7 +23,7 @@
  *
  * Some structures from RFC2630
  *
- * $Id: packet-kerberos.c,v 1.61 2004/05/14 23:38:39 sahlberg Exp $
+ * $Id: packet-kerberos.c,v 1.62 2004/05/17 20:03:36 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1368,21 +1368,21 @@ dissect_krb5_PA_PK_AS_REQ_signedAuthPack(packet_info *pinfo, proto_tree *tree, t
 static int
 dissect_krb5_PA_PK_AS_REQ_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       NOT_DECODED_YET("trustedCertifiers");
+       BER_NOT_DECODED_YET("trustedCertifiers");
 
        return offset;
 }
 static int
 dissect_krb5_PA_PK_AS_REQ_kdcCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       NOT_DECODED_YET("kdcCert");
+       BER_NOT_DECODED_YET("kdcCert");
 
        return offset;
 }
 static int
 dissect_krb5_PA_PK_AS_REQ_encryptionCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       NOT_DECODED_YET("encryptionCert");
+       BER_NOT_DECODED_YET("encryptionCert");
 
        return offset;
 }

diff --git a/packet-per.c b/packet-per.c
index 20f74b2dafd68e0b760aaa8b0b62d8bcf31ffea3..e2dc66f647bf2100b8b0a1f5f8f3d9b49b7085a4 100644 (file)
--- a/packet-per.c
+++ b/packet-per.c
@@ -7,7 +7,7 @@ proper helper routines
  * Routines for dissection of ASN.1 Aligned PER
  * 2003  Ronnie Sahlberg
  *
- * $Id: packet-per.c,v 1.27 2004/04/26 07:34:12 sahlberg Exp $
+ * $Id: packet-per.c,v 1.28 2004/05/17 20:03:36 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -130,7 +130,7 @@ dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, packet_info *pinfo
                }
                return offset;
        }
-       NOT_DECODED_YET("10.9.3.8.1");
+       PER_NOT_DECODED_YET("10.9.3.8.1");
        return offset;
 }
 
@@ -325,7 +325,7 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
 
 
        if(length>=1024){
-               NOT_DECODED_YET("restricted char string too long");
+               PER_NOT_DECODED_YET("restricted char string too long");
                length=1024;
        }
 
@@ -431,7 +431,7 @@ dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_t
        }
 
        if(length>=1024){
-               NOT_DECODED_YET("BMPString too long");
+               PER_NOT_DECODED_YET("BMPString too long");
                length=1024;
        }
 
@@ -551,7 +551,7 @@ DEBUG_ENTRY("dissect_per_object_identifier");
                offset+=8;
 
                if((strp-str)>200){
-NOT_DECODED_YET("too long octet_string");
+PER_NOT_DECODED_YET("too long octet_string");
                        /*XXX assert here */
                        return offset;
                }
@@ -650,7 +650,7 @@ dissect_per_integer(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tre
        offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, -1, &length);
        /* gassert here? */
        if(length>4){
-NOT_DECODED_YET("too long integer");
+PER_NOT_DECODED_YET("too long integer");
                length=4;
        }
 
@@ -898,7 +898,7 @@ DEBUG_ENTRY("dissect_per_constrained_integer");
                return offset;
        }
 
-       NOT_DECODED_YET("10.5");
+       PER_NOT_DECODED_YET("10.5");
        return offset;
 }
 
@@ -995,7 +995,7 @@ DEBUG_ENTRY("dissect_per_choice");
                                        offset=choice[i].func(tvb, offset, pinfo, choicetree);
                                        break;
                                } else {
-                                       NOT_DECODED_YET(choice[i].name);
+                                       PER_NOT_DECODED_YET(choice[i].name);
                                        break;
                                }
                        }
@@ -1042,7 +1042,7 @@ DEBUG_ENTRY("dissect_per_choice");
                if(index==-1){
                        /* if we dont know how to decode this one, just step offset to the next structure */
                        offset+=length*8;
-                       NOT_DECODED_YET("unknown choice extension");
+                       PER_NOT_DECODED_YET("unknown choice extension");
                } else {
                        guint32 new_offset;
 
@@ -1185,7 +1185,7 @@ DEBUG_ENTRY("dissect_per_sequence");
                        if(sequence[i].func){
                                offset=sequence[i].func(tvb, offset, pinfo, tree);
                        } else {
-                               NOT_DECODED_YET(sequence[i].name);
+                               PER_NOT_DECODED_YET(sequence[i].name);
                        }
                }
        }
@@ -1260,7 +1260,7 @@ DEBUG_ENTRY("dissect_per_sequence");
                        if(i>=num_known_extensions){
                                /* we dont know how to decode this extension */
                                offset+=length*8;
-                               NOT_DECODED_YET("unknown sequence extension");
+                               PER_NOT_DECODED_YET("unknown sequence extension");
                                continue;
                        }
 
@@ -1278,7 +1278,7 @@ DEBUG_ENTRY("dissect_per_sequence");
                        if(sequence[extension_index].func){
                                new_offset=sequence[extension_index].func(tvb, offset, pinfo, tree);
                        } else {
-                               NOT_DECODED_YET(sequence[extension_index].name);
+                               PER_NOT_DECODED_YET(sequence[extension_index].name);
                        }
                        offset+=length*8;
 

diff --git a/packet-per.h b/packet-per.h
index f8ebdb506a6e7574f9e8203a0a8f661de0a49da9..78c49733190418d978d38b1b180a1725f4be156e 100644 (file)
--- a/packet-per.h
+++ b/packet-per.h
@@ -2,7 +2,7 @@
  * Routines for dissection of ASN.1 Aligned PER
  * 2003  Ronnie Sahlberg
  *
- * $Id: packet-per.h,v 1.14 2004/04/09 00:31:41 sahlberg Exp $
+ * $Id: packet-per.h,v 1.15 2004/05/17 20:03:36 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,7 @@
 #ifndef __PACKET_PER_H__
 #define __PACKET_PER_H__
 
-#define NOT_DECODED_YET(x) \
+#define PER_NOT_DECODED_YET(x) \
 proto_tree_add_text(tree, tvb, offset, 0, "something unknown here [%s]",x); \
 fprintf(stderr,"Not decoded yet in packet : %d  [%s]\n", pinfo->fd->num,x); \
 if (check_col(pinfo->cinfo, COL_INFO)){ \