From Lars Roland: export the value_string tables from packet-h225.c and

use them in the H.225 taps.

svn path=/trunk/; revision=9287
This commit is contained in:
Guy Harris 2003-12-15 04:23:55 +00:00
parent 6ded357e29
commit 524203fddf
4 changed files with 37 additions and 488 deletions

View File

@ -2,7 +2,7 @@
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
* $Id: h225_counter.c,v 1.2 2003/12/04 00:45:38 guy Exp $
* $Id: h225_counter.c,v 1.3 2003/12/15 04:23:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -73,241 +73,6 @@ static GtkWidget *filter_entry;
#define FACILITY_REASONS 11
static const value_string RasMessage_vals[] = {
{ 0, "gatekeeperRequest" },
{ 1, "gatekeeperConfirm" },
{ 2, "gatekeeperReject" },
{ 3, "registrationRequest" },
{ 4, "registrationConfirm" },
{ 5, "registrationReject" },
{ 6, "unregistrationRequest" },
{ 7, "unregistrationConfirm" },
{ 8, "unregistrationReject" },
{ 9, "admissionRequest" },
{10, "admissionConfirm" },
{11, "admissionReject" },
{12, "bandwidthRequest" },
{13, "bandwidthConfirm" },
{14, "bandwidthReject" },
{15, "disengageRequest" },
{16, "disengageConfirm" },
{17, "disengageReject" },
{18, "locationRequest" },
{19, "locationConfirm" },
{20, "locationReject" },
{21, "infoRequest" },
{22, "infoRequestResponse" },
{23, "nonStandardMessage" },
{24, "unknownMessageResponse" },
{25, "requestInProgress" },
{26, "resourcesAvailableIndicate" },
{27, "resourcesAvailableConfirm" },
{28, "infoRequestAck" },
{29, "infoRequestNak" },
{30, "serviceControlIndication" },
{31, "serviceControlResponse" },
{32, "admissionConfirmSequence" },
{ 0, NULL}
};
static const value_string h323_message_body_vals[] = {
{ 0, "setup" },
{ 1, "callProceeding" },
{ 2, "connect" },
{ 3, "alerting" },
{ 4, "information" },
{ 5, "releaseComplete" },
{ 6, "facility" },
{ 7, "progress" },
{ 8, "empty" },
{ 9, "status" },
{ 10, "statusInquiry" },
{ 11, "setupAcknowledge" },
{ 12, "notify" },
{ 0, NULL}
};
static const value_string FacilityReason_vals[] = {
{ 0, "routeCallToGatekeeper" },
{ 1, "callForwarded" },
{ 2, "routeCallToMC" },
{ 3, "undefinedReason" },
{ 4, "conferenceListChoice" },
{ 5, "startH245" },
{ 6, "noH245" },
{ 7, "newTokens" },
{ 8, "featureSetUpdate" },
{ 9, "forwardedElements" },
{ 10, "transportedInformation" },
{ 0, NULL}
};
static const value_string GatekeeperRejectReason_vals[] = {
{ 0, "resourceUnavailable" },
{ 1, "terminalExcluded" },
{ 2, "invalidRevision" },
{ 3, "undefinedReason" },
{ 4, "securityDenial" },
{ 5, "genericDataReason" },
{ 6, "neededFeatureNotSupported" },
{ 7, "securityError" },
{ 0, NULL}
};
static const value_string UnregRequestReason_vals[] = {
{ 0, "reregistrationRequired" },
{ 1, "ttlExpired" },
{ 2, "securityDenial" },
{ 3, "undefinedReason" },
{ 4, "maintenance" },
{ 5, "securityError" },
{ 0, NULL}
};
static const value_string UnregRejectReason_vals[] = {
{ 0, "notCurrentlyRegistered" },
{ 1, "callInProgress" },
{ 2, "undefinedReason" },
{ 3, "permissionDenied" },
{ 4, "securityDenial" },
{ 5, "securityError" },
{ 0, NULL}
};
static const value_string BandRejectReason_vals[] = {
{ 0, "notBound" },
{ 1, "invalidConferenceID" },
{ 2, "invalidPermission" },
{ 3, "insufficientResources" },
{ 4, "invalidRevision" },
{ 5, "undefinedReason" },
{ 6, "securityDenial" },
{ 7, "securityError" },
{ 0, NULL}
};
static const value_string DisengageReason_vals[] = {
{ 0, "forcedDrop" },
{ 1, "normalDrop" },
{ 2, "undefinedReason" },
{ 0, NULL}
};
static const value_string DisengageRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "requestToDropOther" },
{ 2, "securityDenial" },
{ 3, "securityError" },
{ 0, NULL}
};
static const value_string InfoRequestNakReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "securityDenial" },
{ 2, "undefinedReason" },
{ 3, "securityError" },
{ 0, NULL}
};
static const value_string ReleaseCompleteReason_vals[] = {
{ 0, "noBandwidth" },
{ 1, "gatekeeperResources" },
{ 2, "unreachableDestination" },
{ 3, "destinationRejection" },
{ 4, "invalidRevision" },
{ 5, "noPermission" },
{ 6, "unreachableGatekeeper" },
{ 7, "gatewayResources" },
{ 8, "badFormatAddress" },
{ 9, "adaptiveBusy" },
{ 10, "inConf" },
{ 11, "undefinedReason" },
{ 12, "facilityCallDeflection" },
{ 13, "securityDenied" },
{ 14, "calledPartyNotRegistered" },
{ 15, "callerNotRegistered" },
{ 16, "newConnectionNeeded" },
{ 17, "nonStandardReason" },
{ 18, "replaceWithConferenceInvite" },
{ 19, "genericDataReason" },
{ 20, "neededFeatureNotSupported" },
{ 21, "tunnelledSignallingRejected" },
{ 22, "invalidCID" },
{ 23, "invalidCID" },
{ 24, "securityError" },
{ 25, "hopCountExceeded" },
{ 0, NULL}
};
static const value_string AdmissionRejectReason_vals[] = {
{ 0, "calledPartyNotRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
{ 3, "undefinedReason" },
{ 4, "callerNotRegistered" },
{ 5, "routeCallToGatekeeper" },
{ 6, "invalidEndpointIdentifier" },
{ 7, "resourceUnavailable" },
{ 8, "securityDenial" },
{ 9, "qosControlNotSupported" },
{ 10, "incompleteAddress" },
{ 11, "aliasesInconsistent" },
{ 12, "routeCallToSCN" },
{ 13, "exceedsCallCapacity" },
{ 14, "collectDestination" },
{ 15, "collectPIN" },
{ 16, "genericDataReason" },
{ 17, "neededFeatureNotSupported" },
{ 18, "securityErrors" },
{ 19, "securityDHmismatch" },
{ 20, "noRouteToDestination" },
{ 21, "unallocatedNumber" },
{ 0, NULL}
};
static const value_string LocationRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
{ 3, "undefinedReason" },
{ 4, "securityDenial" },
{ 5, "aliasesInconsistent" },
{ 6, "routeCalltoSCN" },
{ 7, "resourceUnavailable" },
{ 8, "genericDataReason" },
{ 9, "neededFeatureNotSupported" },
{10, "hopCountExceeded" },
{11, "incompleteAddress" },
{12, "securityError" },
{13, "securityDHmismatch" },
{14, "noRouteToDestination" },
{15, "unallocatedNumber" },
{ 0, NULL}
};
static const value_string RegistrationRejectReason_vals[] = {
{ 0, "discoveryRequired" },
{ 1, "invalidRevision" },
{ 2, "invalidCallSignalAddress" },
{ 3, "invalidRASAddress" },
{ 4, "duplicateAlias" },
{ 5, "invalidTerminalType" },
{ 6, "undefinedReason" },
{ 7, "transportNotSupported" },
{ 8, "transportQOSNotSupported" },
{ 9, "resourceUnavailable" },
{ 10, "invalidAlias" },
{ 11, "securityDenial" },
{ 12, "fullRegistrationRequired" },
{ 13, "additiveRegistrationNotSupported" },
{ 14, "invalidTerminalAliases" },
{ 15, "genericDataReason" },
{ 16, "neededFeatureNotSupported" },
{ 17, "securityError" },
{ 0, NULL}
};
/* used to keep track of the statistics for an entire program interface */
typedef struct _h225counter_t {
GtkWidget *win;

View File

@ -4,7 +4,7 @@
*
* Maintained by Andreas Sikkema (andreas.sikkema@philips.com)
*
* $Id: packet-h225.c,v 1.25 2003/11/16 23:11:18 sahlberg Exp $
* $Id: packet-h225.c,v 1.26 2003/12/15 04:23:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1237,7 +1237,7 @@ dissect_h225_ScnConnectionAggregation(tvbuff_t *tvb, int offset, packet_info *pi
}
static const value_string FacilityReason_vals[] = {
const value_string FacilityReason_vals[] = {
{ 0, "routeCallToGatekeeper" },
{ 1, "callForwarded" },
{ 2, "routeCallToMC" },
@ -1535,7 +1535,7 @@ dissect_h225_CCSCcallStartingPoint(tvbuff_t *tvb, int offset, packet_info *pinfo
static const value_string GatekeeperRejectReason_vals[] = {
const value_string GatekeeperRejectReason_vals[] = {
{ 0, "resourceUnavailable" },
{ 1, "terminalExcluded" },
{ 2, "invalidRevision" },
@ -1574,7 +1574,7 @@ dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinf
static const value_string UnregRequestReason_vals[] = {
const value_string UnregRequestReason_vals[] = {
{ 0, "reregistrationRequired" },
{ 1, "ttlExpired" },
{ 2, "securityDenial" },
@ -1607,7 +1607,7 @@ dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo, p
static const value_string UnregRejectReason_vals[] = {
const value_string UnregRejectReason_vals[] = {
{ 0, "notCurrentlyRegistered" },
{ 1, "callInProgress" },
{ 2, "undefinedReason" },
@ -1710,7 +1710,7 @@ dissect_h225_TransportQOS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
}
static const value_string BandRejectReason_vals[] = {
const value_string BandRejectReason_vals[] = {
{ 0, "notBound" },
{ 1, "invalidConferenceID" },
{ 2, "invalidPermission" },
@ -1749,7 +1749,7 @@ dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
static const value_string DisengageReason_vals[] = {
const value_string DisengageReason_vals[] = {
{ 0, "forcedDrop" },
{ 1, "normalDrop" },
{ 2, "undefinedReason" },
@ -1773,7 +1773,7 @@ dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
static const value_string DisengageRejectReason_vals[] = {
const value_string DisengageRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "requestToDropOther" },
{ 2, "securityDenial" },
@ -1801,7 +1801,7 @@ dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
static const value_string InfoRequestNakReason_vals[] = {
const value_string InfoRequestNakReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "securityDenial" },
{ 2, "undefinedReason" },
@ -2305,7 +2305,7 @@ dissect_h225_nonStandardReason(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
return offset;
}
static const value_string ReleaseCompleteReason_vals[] = {
const value_string ReleaseCompleteReason_vals[] = {
{ 0, "noBandwidth" },
{ 1, "gatekeeperResources" },
{ 2, "unreachableDestination" },
@ -5070,7 +5070,7 @@ dissect_h225_routeCallToSCN(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
return offset;
}
static const value_string AdmissionRejectReason_vals[] = {
const value_string AdmissionRejectReason_vals[] = {
{ 0, "calledPartyNotRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
@ -5246,7 +5246,7 @@ dissect_h225_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo, p
return offset;
}
static const value_string LocationRejectReason_vals[] = {
const value_string LocationRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
@ -6029,7 +6029,7 @@ dissect_h225_duplicateAlias(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
static const value_string RegistrationRejectReason_vals[] = {
const value_string RegistrationRejectReason_vals[] = {
{ 0, "discoveryRequired" },
{ 1, "invalidRevision" },
{ 2, "invalidCallSignalAddress" },
@ -7097,7 +7097,7 @@ dissect_h225_ConnectUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
}
static const value_string h323_message_body_vals[] = {
const value_string h323_message_body_vals[] = {
{ 0, "setup" },
{ 1, "callProceeding" },
{ 2, "connect" },
@ -8326,7 +8326,7 @@ dissect_h225_user_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
static const value_string RasMessage_vals[] = {
const value_string RasMessage_vals[] = {
{ 0, "gatekeeperRequest" },
{ 1, "gatekeeperConfirm" },
{ 2, "gatekeeperReject" },

View File

@ -2,7 +2,7 @@
* Routines for H.225 packet dissection
* 2003 Tomas Kukosa
*
* $Id: packet-h225.h,v 1.5 2003/11/16 23:11:18 sahlberg Exp $
* $Id: packet-h225.h,v 1.6 2003/12/15 04:23:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -47,4 +47,23 @@ typedef struct _h225_packet_info {
nstime_t delta_time; /* this is the RAS response time delay */
} h225_packet_info;
/*
* the following allows TAP code access to the messages
* without having to duplicate it
*/
extern const value_string RasMessage_vals[];
extern const value_string h323_message_body_vals[];
extern const value_string FacilityReason_vals[];
extern const value_string GatekeeperRejectReason_vals[];
extern const value_string UnregRequestReason_vals[];
extern const value_string UnregRejectReason_vals[];
extern const value_string BandRejectReason_vals[];
extern const value_string DisengageReason_vals[];
extern const value_string DisengageRejectReason_vals[];
extern const value_string InfoRequestNakReason_vals[];
extern const value_string ReleaseCompleteReason_vals[];
extern const value_string AdmissionRejectReason_vals[];
extern const value_string LocationRejectReason_vals[];
extern const value_string RegistrationRejectReason_vals[];
#endif /* __H225_H__ */

View File

@ -2,7 +2,7 @@
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
* $Id: tap-h225counter.c,v 1.1 2003/10/28 00:31:16 guy Exp $
* $Id: tap-h225counter.c,v 1.2 2003/12/15 04:23:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -59,241 +59,6 @@
#define FACILITY_REASONS 11
static const value_string RasMessage_vals[] = {
{ 0, "gatekeeperRequest" },
{ 1, "gatekeeperConfirm" },
{ 2, "gatekeeperReject" },
{ 3, "registrationRequest" },
{ 4, "registrationConfirm" },
{ 5, "registrationReject" },
{ 6, "unregistrationRequest" },
{ 7, "unregistrationConfirm" },
{ 8, "unregistrationReject" },
{ 9, "admissionRequest" },
{10, "admissionConfirm" },
{11, "admissionReject" },
{12, "bandwidthRequest" },
{13, "bandwidthConfirm" },
{14, "bandwidthReject" },
{15, "disengageRequest" },
{16, "disengageConfirm" },
{17, "disengageReject" },
{18, "locationRequest" },
{19, "locationConfirm" },
{20, "locationReject" },
{21, "infoRequest" },
{22, "infoRequestResponse" },
{23, "nonStandardMessage" },
{24, "unknownMessageResponse" },
{25, "requestInProgress" },
{26, "resourcesAvailableIndicate" },
{27, "resourcesAvailableConfirm" },
{28, "infoRequestAck" },
{29, "infoRequestNak" },
{30, "serviceControlIndication" },
{31, "serviceControlResponse" },
{32, "admissionConfirmSequence" },
{ 0, NULL}
};
static const value_string h323_message_body_vals[] = {
{ 0, "setup" },
{ 1, "callProceeding" },
{ 2, "connect" },
{ 3, "alerting" },
{ 4, "information" },
{ 5, "releaseComplete" },
{ 6, "facility" },
{ 7, "progress" },
{ 8, "empty" },
{ 9, "status" },
{ 10, "statusInquiry" },
{ 11, "setupAcknowledge" },
{ 12, "notify" },
{ 0, NULL}
};
static const value_string FacilityReason_vals[] = {
{ 0, "routeCallToGatekeeper" },
{ 1, "callForwarded" },
{ 2, "routeCallToMC" },
{ 3, "undefinedReason" },
{ 4, "conferenceListChoice" },
{ 5, "startH245" },
{ 6, "noH245" },
{ 7, "newTokens" },
{ 8, "featureSetUpdate" },
{ 9, "forwardedElements" },
{ 10, "transportedInformation" },
{ 0, NULL}
};
static const value_string GatekeeperRejectReason_vals[] = {
{ 0, "resourceUnavailable" },
{ 1, "terminalExcluded" },
{ 2, "invalidRevision" },
{ 3, "undefinedReason" },
{ 4, "securityDenial" },
{ 5, "genericDataReason" },
{ 6, "neededFeatureNotSupported" },
{ 7, "securityError" },
{ 0, NULL}
};
static const value_string UnregRequestReason_vals[] = {
{ 0, "reregistrationRequired" },
{ 1, "ttlExpired" },
{ 2, "securityDenial" },
{ 3, "undefinedReason" },
{ 4, "maintenance" },
{ 5, "securityError" },
{ 0, NULL}
};
static const value_string UnregRejectReason_vals[] = {
{ 0, "notCurrentlyRegistered" },
{ 1, "callInProgress" },
{ 2, "undefinedReason" },
{ 3, "permissionDenied" },
{ 4, "securityDenial" },
{ 5, "securityError" },
{ 0, NULL}
};
static const value_string BandRejectReason_vals[] = {
{ 0, "notBound" },
{ 1, "invalidConferenceID" },
{ 2, "invalidPermission" },
{ 3, "insufficientResources" },
{ 4, "invalidRevision" },
{ 5, "undefinedReason" },
{ 6, "securityDenial" },
{ 7, "securityError" },
{ 0, NULL}
};
static const value_string DisengageReason_vals[] = {
{ 0, "forcedDrop" },
{ 1, "normalDrop" },
{ 2, "undefinedReason" },
{ 0, NULL}
};
static const value_string DisengageRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "requestToDropOther" },
{ 2, "securityDenial" },
{ 3, "securityError" },
{ 0, NULL}
};
static const value_string InfoRequestNakReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "securityDenial" },
{ 2, "undefinedReason" },
{ 3, "securityError" },
{ 0, NULL}
};
static const value_string ReleaseCompleteReason_vals[] = {
{ 0, "noBandwidth" },
{ 1, "gatekeeperResources" },
{ 2, "unreachableDestination" },
{ 3, "destinationRejection" },
{ 4, "invalidRevision" },
{ 5, "noPermission" },
{ 6, "unreachableGatekeeper" },
{ 7, "gatewayResources" },
{ 8, "badFormatAddress" },
{ 9, "adaptiveBusy" },
{ 10, "inConf" },
{ 11, "undefinedReason" },
{ 12, "facilityCallDeflection" },
{ 13, "securityDenied" },
{ 14, "calledPartyNotRegistered" },
{ 15, "callerNotRegistered" },
{ 16, "newConnectionNeeded" },
{ 17, "nonStandardReason" },
{ 18, "replaceWithConferenceInvite" },
{ 19, "genericDataReason" },
{ 20, "neededFeatureNotSupported" },
{ 21, "tunnelledSignallingRejected" },
{ 22, "invalidCID" },
{ 23, "invalidCID" },
{ 24, "securityError" },
{ 25, "hopCountExceeded" },
{ 0, NULL}
};
static const value_string AdmissionRejectReason_vals[] = {
{ 0, "calledPartyNotRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
{ 3, "undefinedReason" },
{ 4, "callerNotRegistered" },
{ 5, "routeCallToGatekeeper" },
{ 6, "invalidEndpointIdentifier" },
{ 7, "resourceUnavailable" },
{ 8, "securityDenial" },
{ 9, "qosControlNotSupported" },
{ 10, "incompleteAddress" },
{ 11, "aliasesInconsistent" },
{ 12, "routeCallToSCN" },
{ 13, "exceedsCallCapacity" },
{ 14, "collectDestination" },
{ 15, "collectPIN" },
{ 16, "genericDataReason" },
{ 17, "neededFeatureNotSupported" },
{ 18, "securityErrors" },
{ 19, "securityDHmismatch" },
{ 20, "noRouteToDestination" },
{ 21, "unallocatedNumber" },
{ 0, NULL}
};
static const value_string LocationRejectReason_vals[] = {
{ 0, "notRegistered" },
{ 1, "invalidPermission" },
{ 2, "requestDenied" },
{ 3, "undefinedReason" },
{ 4, "securityDenial" },
{ 5, "aliasesInconsistent" },
{ 6, "routeCalltoSCN" },
{ 7, "resourceUnavailable" },
{ 8, "genericDataReason" },
{ 9, "neededFeatureNotSupported" },
{10, "hopCountExceeded" },
{11, "incompleteAddress" },
{12, "securityError" },
{13, "securityDHmismatch" },
{14, "noRouteToDestination" },
{15, "unallocatedNumber" },
{ 0, NULL}
};
static const value_string RegistrationRejectReason_vals[] = {
{ 0, "discoveryRequired" },
{ 1, "invalidRevision" },
{ 2, "invalidCallSignalAddress" },
{ 3, "invalidRASAddress" },
{ 4, "duplicateAlias" },
{ 5, "invalidTerminalType" },
{ 6, "undefinedReason" },
{ 7, "transportNotSupported" },
{ 8, "transportQOSNotSupported" },
{ 9, "resourceUnavailable" },
{ 10, "invalidAlias" },
{ 11, "securityDenial" },
{ 12, "fullRegistrationRequired" },
{ 13, "additiveRegistrationNotSupported" },
{ 14, "invalidTerminalAliases" },
{ 15, "genericDataReason" },
{ 16, "neededFeatureNotSupported" },
{ 17, "securityError" },
{ 0, NULL}
};
/* used to keep track of the statistics for an entire program interface */
typedef struct _h225counter_t {
char *filter;