aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-skinny.c546
-rw-r--r--epan/dissectors/packet-skinny.c.in10
-rw-r--r--epan/dissectors/packet-skinny.h4
-rw-r--r--epan/dissectors/packet-skinny.h.in4
-rw-r--r--tools/SkinnyProtocolOptimized.xml277
-rwxr-xr-xtools/parse_xml2skinny_dissector.py2
-rw-r--r--ui/voip_calls.c14
7 files changed, 423 insertions, 434 deletions
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 635fff6cf4..09409b5c3a 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -42,6 +42,7 @@
* :indentSize=2:tabSize=8:noTabs=true:
*/
+
#include "config.h"
#include <epan/packet.h>
@@ -1804,7 +1805,6 @@ static int hf_skinny_PhoneFeatures_RFC2833 = -1;
static int hf_skinny_PhoneFeatures_UTF8 = -1;
static int hf_skinny_RFC2833PayloadType = -1;
static int hf_skinny_RTCPPortNumber = -1;
-static int hf_skinny_RTPPayloadFormat = -1;
static int hf_skinny_RedirDialed = -1;
static int hf_skinny_RestrictInformationType_BitsReserved = -1;
static int hf_skinny_RestrictInformationType_CalledParty = -1;
@@ -1853,12 +1853,11 @@ static int hf_skinny_annStatus = -1;
static int hf_skinny_annexNandWFutureUse = -1;
static int hf_skinny_appConfID = -1;
static int hf_skinny_appData = -1;
-static int hf_skinny_appID = -1;
static int hf_skinny_appInstanceID = -1;
static int hf_skinny_appName = -1;
-static int hf_skinny_applicationID = -1;
+static int hf_skinny_applicationId = -1;
static int hf_skinny_areMessagesWaiting = -1;
-static int hf_skinny_associatedStreamID = -1;
+static int hf_skinny_associatedStreamId = -1;
static int hf_skinny_audioCapCount = -1;
static int hf_skinny_audioLevelAdjustment = -1;
static int hf_skinny_audit_participant_result = -1;
@@ -1900,7 +1899,7 @@ static int hf_skinny_codecParam2 = -1;
static int hf_skinny_command = -1;
static int hf_skinny_compressionType = -1;
static int hf_skinny_confServiceNum = -1;
-static int hf_skinny_conferenceID = -1;
+static int hf_skinny_conferenceId = -1;
static int hf_skinny_conferenceName = -1;
static int hf_skinny_configVersionStamp = -1;
static int hf_skinny_confirmRequired = -1;
@@ -2008,7 +2007,7 @@ static int hf_skinny_mediaTransmissionStatus = -1;
static int hf_skinny_mediaTransportType = -1;
static int hf_skinny_mediaType = -1;
static int hf_skinny_micMode = -1;
-static int hf_skinny_millisecondPacketSize = -1;
+static int hf_skinny_milliSecondPacketSize = -1;
static int hf_skinny_minBitRate = -1;
static int hf_skinny_mixingMode = -1;
static int hf_skinny_modAnd2833 = -1;
@@ -2055,8 +2054,8 @@ static int hf_skinny_participantEntry = -1;
static int hf_skinny_participantName = -1;
static int hf_skinny_participantNumber = -1;
static int hf_skinny_partyDirection = -1;
+static int hf_skinny_passThroughPartyId = -1;
static int hf_skinny_passThruData = -1;
-static int hf_skinny_passThruPartyId = -1;
static int hf_skinny_passthruPartyID = -1;
static int hf_skinny_payloadCapability = -1;
static int hf_skinny_payloadDtmf = -1;
@@ -2100,6 +2099,7 @@ static int hf_skinny_rsvpErrorCode = -1;
static int hf_skinny_rsvpErrorFlag = -1;
static int hf_skinny_rsvpErrorSubCodeVal = -1;
static int hf_skinny_rtpMediaPort = -1;
+static int hf_skinny_rtpPayloadFormat = -1;
static int hf_skinny_salt = -1;
static int hf_skinny_saltlen = -1;
static int hf_skinny_secondaryKeepAliveInterval = -1;
@@ -2145,7 +2145,7 @@ static int hf_skinny_stillImageTransmission = -1;
static int hf_skinny_stimulus = -1;
static int hf_skinny_stimulusInstance = -1;
static int hf_skinny_stimulusStatus = -1;
-static int hf_skinny_streamPassThroughID = -1;
+static int hf_skinny_streamPassThroughId = -1;
static int hf_skinny_subAppID = -1;
static int hf_skinny_subcriptionFeatureID = -1;
static int hf_skinny_subscriptionFeatureID = -1;
@@ -2163,7 +2163,7 @@ static int hf_skinny_totalButtonCount = -1;
static int hf_skinny_totalNumOfConfiguredLines = -1;
static int hf_skinny_totalSoftKeyCount = -1;
static int hf_skinny_totalSoftKeySetCount = -1;
-static int hf_skinny_transactionID = -1;
+static int hf_skinny_transactionId = -1;
static int hf_skinny_transmitIpAddr_ipv4 = -1;
static int hf_skinny_transmitIpAddr_ipv6 = -1;
static int hf_skinny_transmitPreference = -1;
@@ -2178,6 +2178,7 @@ static int hf_skinny_v150sprt = -1;
static int hf_skinny_vendor = -1;
static int hf_skinny_vendorID = -1;
static int hf_skinny_version = -1;
+static int hf_skinny_versionStr = -1;
static int hf_skinny_videoCapCount = -1;
static int hf_skinny_videoCapabilityDirection = -1;
static int hf_skinny_wDay = -1;
@@ -2423,7 +2424,7 @@ handle_RegisterReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c
ptvcursor_add(cursor, hf_skinny_activeStreams, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_protocolVer, 1, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_unknown, 1, ENC_LITTLE_ENDIAN);
- ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "PhoneFeatures");
+ ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "phoneFeatures");
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit1, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit2, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit3, 2, ENC_LITTLE_ENDIAN);
@@ -2441,7 +2442,7 @@ handle_RegisterReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit15, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Abbreviated_Dial, 2, ENC_LITTLE_ENDIAN);
ptvcursor_advance(cursor, 2);
- ptvcursor_pop_subtree(cursor); /* end bitfield: PhoneFeatures */
+ ptvcursor_pop_subtree(cursor); /* end bitfield: phoneFeatures */
ptvcursor_add(cursor, hf_skinny_maxConferences, 4, ENC_LITTLE_ENDIAN);
}
if (hdr_data_length > 100) {
@@ -2761,15 +2762,15 @@ handle_AlarmMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_in
static void
handle_MulticastMediaReceptionAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
si->multicastReceptionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_multicastReceptionStatus, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0101 ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0101 ^ passThroughPartyId);
}
/*
@@ -2784,20 +2785,20 @@ static void
handle_OpenReceiveChannelAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
guint32 hdr_data_length = tvb_get_letohl(ptvcursor_tvbuff(cursor), 0);
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
si->mediaReceptionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_mediaReceptionStatus, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_ipAddr_ipv4, hf_skinny_ipAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
if (hdr_data_length > 20) {
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
}
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0105 ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0105 ^ passThroughPartyId);
}
/*
@@ -2816,21 +2817,14 @@ handle_ConnectionStatisticsResMessage(ptvcursor_t *cursor, packet_info * pinfo _
guint32 callReference = 0;
guint32 dataSize = 0;
- if (hdr_version <= V16_MSG_TYPE) {
+ if (hdr_version <= V17_MSG_TYPE) {
ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII|ENC_NA);
callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_statsProcessingMode, 4, ENC_LITTLE_ENDIAN);
}
- if (hdr_version >= V17_MSG_TYPE && hdr_version <= V20_MSG_TYPE) {
- ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII|ENC_NA);
- callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_statsProcessingMode, 4, ENC_LITTLE_ENDIAN);
- }
- if (hdr_version >= V21_MSG_TYPE) {
+ if (hdr_version >= V18_MSG_TYPE) {
ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII|ENC_NA);
callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
@@ -2943,16 +2937,16 @@ handle_RegisterTokenReq(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
static void
handle_MediaTransmissionFailureMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ guint32 passThroughPartyId = 0;
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x008a ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x008a ^ passThroughPartyId);
}
/*
@@ -3014,12 +3008,12 @@ handle_DeviceToUserDataMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ski
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "deviceToUserData");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -3042,12 +3036,12 @@ handle_DeviceToUserDataResponseMessage(ptvcursor_t *cursor, packet_info * pinfo
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "deviceToUserData");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -3081,7 +3075,7 @@ handle_UpdateCapabilitiesMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
ptvcursor_add(cursor, hf_skinny_videoCapCount, 4, ENC_LITTLE_ENDIAN);
dataCapCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataCapCount, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_RTPPayloadFormat, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_rtpPayloadFormat, 4, ENC_LITTLE_ENDIAN);
customPictureFormatCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_customPictureFormatCount, 4, ENC_LITTLE_ENDIAN);
if (customPictureFormatCount <= 6) {
@@ -3359,17 +3353,17 @@ handle_UpdateCapabilitiesMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
static void
handle_OpenMultiMediaReceiveChannelAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
si->multimediaReceptionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_multimediaReceptionStatus, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_ipAddr_ipv4, hf_skinny_ipAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0131 ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0131 ^ passThroughPartyId);
}
/*
@@ -3383,7 +3377,7 @@ handle_OpenMultiMediaReceiveChannelAckMessage(ptvcursor_t *cursor, packet_info *
static void
handle_ClearConferenceMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_serviceNum, 4, ENC_LITTLE_ENDIAN);
}
@@ -3437,15 +3431,15 @@ handle_FeatureStatReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn
static void
handle_CreateConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
+ guint32 conferenceId = 0;
guint32 dataLength = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_result, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceId);
}
/*
@@ -3459,11 +3453,11 @@ handle_CreateConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_DeleteConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_delete_conf_result, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0138 ^ conferenceID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0138 ^ conferenceId);
}
/*
@@ -3477,15 +3471,15 @@ handle_DeleteConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_ModifyConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
+ guint32 conferenceId = 0;
guint32 dataLength = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_modify_conf_result, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceId);
}
/*
@@ -3499,14 +3493,14 @@ handle_ModifyConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_AddParticipantResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_add_participant_result, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_bridgeParticipantId, 257, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x013a ^ conferenceID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x013a ^ conferenceId);
}
/*
@@ -3531,11 +3525,11 @@ handle_AuditConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
for (counter_1 = 0; counter_1 < 32; counter_1++) {
if (counter_1 < numberOfEntries) {
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "conferenceEntry [%d / %d]", counter_1 + 1, numberOfEntries);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_resourceType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_numberOfActiveParticipants, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_appID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA);
} else {
@@ -3562,12 +3556,12 @@ handle_AuditConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
static void
handle_AuditParticipantResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
+ guint32 conferenceId = 0;
guint32 numberOfEntries = 0;
ptvcursor_add(cursor, hf_skinny_audit_participant_result, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_last, 4, ENC_LITTLE_ENDIAN);
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
numberOfEntries = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_numberOfEntries, 4, ENC_LITTLE_ENDIAN);
if (numberOfEntries <= 256) {
@@ -3584,7 +3578,7 @@ handle_AuditParticipantResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
} else {
ptvcursor_advance(cursor, (256 * 4));
}
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x013d ^ conferenceID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x013d ^ conferenceId);
}
/*
@@ -3601,17 +3595,17 @@ handle_DeviceToUserDataMessageVersion1(ptvcursor_t *cursor, packet_info * pinfo
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "deviceToUserDataVersion1");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_sequenceFlag, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_displayPriority, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appInstanceID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_routingID, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -3634,17 +3628,17 @@ handle_DeviceToUserDataResponseMessageVersion1(ptvcursor_t *cursor, packet_info
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "deviceToUserDataVersion1");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_sequenceFlag, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_displayPriority, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appInstanceID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_routingID, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -3678,7 +3672,7 @@ handle_CapabilitiesV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
ptvcursor_add(cursor, hf_skinny_videoCapCount, 4, ENC_LITTLE_ENDIAN);
dataCapCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataCapCount, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_RTPPayloadFormat, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_rtpPayloadFormat, 4, ENC_LITTLE_ENDIAN);
customPictureFormatCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_customPictureFormatCount, 4, ENC_LITTLE_ENDIAN);
if (customPictureFormatCount <= 6) {
@@ -3988,7 +3982,7 @@ handle_CapabilitiesV3ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
ptvcursor_add(cursor, hf_skinny_videoCapCount, 4, ENC_LITTLE_ENDIAN);
dataCapCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataCapCount, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_RTPPayloadFormat, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_rtpPayloadFormat, 4, ENC_LITTLE_ENDIAN);
customPictureFormatCount = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_customPictureFormatCount, 4, ENC_LITTLE_ENDIAN);
if (customPictureFormatCount <= 6) {
@@ -4264,12 +4258,12 @@ handle_PortResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
guint32 callReference = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_ipAddr_ipv4, hf_skinny_ipAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_RTCPPortNumber, 4, ENC_LITTLE_ENDIAN);
@@ -4290,11 +4284,11 @@ handle_PortResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_
static void
handle_QoSResvNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN);
@@ -4311,11 +4305,11 @@ handle_QoSResvNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny
static void
handle_QoSErrorNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN);
@@ -4337,13 +4331,13 @@ handle_QoSErrorNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn
static void
handle_SubscriptionStatReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 transactionID = 0;
- transactionID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ guint32 transactionId = 0;
+ transactionId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_subcriptionFeatureID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_timer, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_subscriptionID, 64, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0048 ^ transactionID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0048 ^ transactionId);
}
/*
@@ -4434,7 +4428,7 @@ handle_RegisterAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c
ptvcursor_add(cursor, hf_skinny_secondaryKeepAliveInterval, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_maxProtocolVer, 1, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_unknown, 1, ENC_LITTLE_ENDIAN);
- ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "PhoneFeatures");
+ ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "phoneFeatures");
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit1, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit2, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit3, 2, ENC_LITTLE_ENDIAN);
@@ -4452,7 +4446,7 @@ handle_RegisterAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Bit15, 2, ENC_LITTLE_ENDIAN);
ptvcursor_add_no_advance(cursor, hf_skinny_PhoneFeatures_Abbreviated_Dial, 2, ENC_LITTLE_ENDIAN);
ptvcursor_advance(cursor, 2);
- ptvcursor_pop_subtree(cursor); /* end bitfield: PhoneFeatures */
+ ptvcursor_pop_subtree(cursor); /* end bitfield: phoneFeatures */
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0001);
}
@@ -4572,18 +4566,18 @@ static void
handle_StartMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
guint32 compressionType = 0;
guint16 keylen = 0;
guint16 saltlen = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
{
@@ -4656,8 +4650,8 @@ handle_StartMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U
ptvcursor_add(cursor, hf_skinny_keyDerivationRate, 4, ENC_LITTLE_ENDIAN);
ptvcursor_pop_subtree(cursor);
}
- ptvcursor_add(cursor, hf_skinny_streamPassThroughID, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_associatedStreamID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_streamPassThroughId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_associatedStreamId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_RFC2833PayloadType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_dtmfType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_mixingMode, 4, ENC_LITTLE_ENDIAN);
@@ -4703,7 +4697,7 @@ handle_StartMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U
ptvcursor_pop_subtree(cursor);
}
}
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x008a ^ passThruPartyId);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x008a ^ passThroughPartyId);
}
/*
@@ -4717,9 +4711,9 @@ handle_StartMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U
static void
handle_StopMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_portHandlingFlag, 4, ENC_LITTLE_ENDIAN);
@@ -4978,7 +4972,7 @@ handle_ButtonTemplateResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
static void
handle_VersionResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA);
+ ptvcursor_add(cursor, hf_skinny_versionStr, 16, ENC_ASCII|ENC_NA);
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x000f);
}
@@ -5093,16 +5087,16 @@ handle_Reset(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t *
static void
handle_StartMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
guint32 compressionType = 0;
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_multicastIpAddr_ipv4, hf_skinny_multicastIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_multicastPortNumber, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
{
@@ -5133,7 +5127,7 @@ handle_StartMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pi
}
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0101 ^ passThruPartyId);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0101 ^ passThroughPartyId);
}
/*
@@ -5147,16 +5141,16 @@ handle_StartMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pi
static void
handle_StartMulticastMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
guint32 compressionType = 0;
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_multicastIpAddr_ipv4, hf_skinny_multicastIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_multicastPortNumber, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
{
@@ -5190,7 +5184,7 @@ handle_StartMulticastMediaTransmissionMessage(ptvcursor_t *cursor, packet_info *
}
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0102 ^ passThruPartyId);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0102 ^ passThroughPartyId);
}
/*
@@ -5204,9 +5198,9 @@ handle_StartMulticastMediaTransmissionMessage(ptvcursor_t *cursor, packet_info *
static void
handle_StopMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
}
@@ -5222,9 +5216,9 @@ handle_StopMulticastMediaReceptionMessage(ptvcursor_t *cursor, packet_info * pin
static void
handle_StopMulticastMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
}
@@ -5241,17 +5235,17 @@ static void
handle_OpenReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
guint32 hdr_data_length = tvb_get_letohl(ptvcursor_tvbuff(cursor), 0);
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
guint32 compressionType = 0;
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
guint16 keylen = 0;
guint16 saltlen = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
{
@@ -5321,8 +5315,8 @@ handle_OpenReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
ptvcursor_add(cursor, hf_skinny_keyDerivationRate, 4, ENC_LITTLE_ENDIAN);
ptvcursor_pop_subtree(cursor);
}
- ptvcursor_add(cursor, hf_skinny_streamPassThroughID, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_associatedStreamID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_streamPassThroughId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_associatedStreamId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_RFC2833PayloadType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_dtmfType, 4, ENC_LITTLE_ENDIAN);
if (hdr_version >= V11_MSG_TYPE) {
@@ -5380,7 +5374,7 @@ handle_OpenReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
}
}
}
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0105 ^ passThruPartyId);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0105 ^ passThroughPartyId);
}
/*
@@ -5394,9 +5388,9 @@ handle_OpenReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
static void
handle_CloseReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_portHandlingFlag, 4, ENC_LITTLE_ENDIAN);
@@ -5416,10 +5410,10 @@ handle_ConnectionStatisticsReqMessage(ptvcursor_t *cursor, packet_info * pinfo _
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
guint32 callReference = 0;
- if (hdr_version <= V16_MSG_TYPE) {
+ if (hdr_version <= V17_MSG_TYPE) {
ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII|ENC_NA);
}
- if (hdr_version >= V17_MSG_TYPE) {
+ if (hdr_version >= V18_MSG_TYPE) {
ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII|ENC_NA);
}
callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
@@ -5716,10 +5710,10 @@ handle_StartMediaFailureDetectionMessage(ptvcursor_t *cursor, packet_info * pinf
{
guint32 compressionType = 0;
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
{
@@ -5796,12 +5790,12 @@ handle_UserToDeviceDataMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ski
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "userToDeviceData");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -5883,7 +5877,7 @@ handle_StartAnnouncementMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
ptvcursor_pop_subtree(cursor);
}
ptvcursor_add(cursor, hf_skinny_annAckReq, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
{
guint32 counter_2 = 0;
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "matrixConfPartyID [max:16]");
@@ -5907,7 +5901,7 @@ handle_StartAnnouncementMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
static void
handle_StopAnnouncementMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
}
/*
@@ -5921,7 +5915,7 @@ handle_StopAnnouncementMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ski
static void
handle_AnnouncementFinishMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_annStatus, 4, ENC_LITTLE_ENDIAN);
}
@@ -5937,7 +5931,7 @@ static void
handle_NotifyDtmfToneMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
ptvcursor_add(cursor, hf_skinny_tone, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
}
@@ -5953,7 +5947,7 @@ static void
handle_SendDtmfToneMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
ptvcursor_add(cursor, hf_skinny_tone, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
}
@@ -5969,7 +5963,7 @@ static void
handle_SubscribeDtmfPayloadReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_dtmfType, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0129);
@@ -5988,7 +5982,7 @@ handle_SubscribeDtmfPayloadResMessage(ptvcursor_t *cursor, packet_info * pinfo _
{
guint32 passthruPartyID = 0;
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0129 ^ passthruPartyID);
@@ -6007,7 +6001,7 @@ handle_SubscribeDtmfPayloadErrMessage(ptvcursor_t *cursor, packet_info * pinfo _
{
guint32 passthruPartyID = 0;
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0129 ^ passthruPartyID);
@@ -6026,7 +6020,7 @@ handle_UnSubscribeDtmfPayloadReqMessage(ptvcursor_t *cursor, packet_info * pinfo
{
guint32 passthruPartyID = 0;
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_dtmfType, 4, ENC_LITTLE_ENDIAN);
@@ -6046,7 +6040,7 @@ handle_UnSubscribeDtmfPayloadResMessage(ptvcursor_t *cursor, packet_info * pinfo
{
guint32 passthruPartyID = 0;
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x012d ^ passthruPartyID);
@@ -6065,7 +6059,7 @@ handle_UnSubscribeDtmfPayloadErrMessage(ptvcursor_t *cursor, packet_info * pinfo
{
guint32 passthruPartyID = 0;
ptvcursor_add(cursor, hf_skinny_payloadDtmf, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x012d ^ passthruPartyID);
@@ -6120,17 +6114,17 @@ static void
handle_OpenMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4);
- guint32 passThruPartyId = 0;
+ guint32 passThroughPartyId = 0;
guint32 compressionType = 0;
guint32 payloadType = 0;
guint32 pictureFormatCount = 0;
guint16 keylen = 0;
guint16 saltlen = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_compressionType, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
@@ -6149,7 +6143,7 @@ handle_OpenMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pi
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "payloadType <= Media_Payload_AMR_WB");
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "audioParameters");
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "qualifierIn");
ptvcursor_add(cursor, hf_skinny_ecValue, 4, ENC_LITTLE_ENDIAN);
@@ -6338,8 +6332,8 @@ handle_OpenMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pi
ptvcursor_add(cursor, hf_skinny_keyDerivationRate, 4, ENC_LITTLE_ENDIAN);
ptvcursor_pop_subtree(cursor);
}
- ptvcursor_add(cursor, hf_skinny_streamPassThroughID, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_associatedStreamID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_streamPassThroughId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_associatedStreamId, 4, ENC_LITTLE_ENDIAN);
if (hdr_version >= V11_MSG_TYPE) {
dissect_skinny_ipv4or6(cursor, hf_skinny_sourceIpAddr_ipv4, hf_skinny_sourceIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_sourcePortNumber, 4, ENC_LITTLE_ENDIAN);
@@ -6347,7 +6341,7 @@ handle_OpenMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pi
if (hdr_version >= V16_MSG_TYPE) {
ptvcursor_add(cursor, hf_skinny_requestedIpAddrType, 4, ENC_LITTLE_ENDIAN);
}
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0131 ^ passThruPartyId);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0131 ^ passThroughPartyId);
}
/*
@@ -6368,7 +6362,7 @@ handle_StartMultiMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pin
guint32 pictureFormatCount = 0;
guint16 keylen = 0;
guint16 saltlen = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
passthruPartyID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
compressionType = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
@@ -6389,7 +6383,7 @@ handle_StartMultiMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pin
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "payloadType <= Media_Payload_AMR_WB");
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "audioParameters");
- ptvcursor_add(cursor, hf_skinny_millisecondPacketSize, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_milliSecondPacketSize, 4, ENC_LITTLE_ENDIAN);
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "qualifierIn");
ptvcursor_add(cursor, hf_skinny_ecValue, 4, ENC_LITTLE_ENDIAN);
@@ -6578,8 +6572,8 @@ handle_StartMultiMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pin
ptvcursor_add(cursor, hf_skinny_keyDerivationRate, 4, ENC_LITTLE_ENDIAN);
ptvcursor_pop_subtree(cursor);
}
- ptvcursor_add(cursor, hf_skinny_streamPassThroughID, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_associatedStreamID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_streamPassThroughId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_associatedStreamId, 4, ENC_LITTLE_ENDIAN);
skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0132 ^ passthruPartyID);
}
@@ -6594,9 +6588,9 @@ handle_StartMultiMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pin
static void
handle_StopMultiMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_portHandlingFlag, 4, ENC_LITTLE_ENDIAN);
@@ -6615,7 +6609,7 @@ handle_MiscellaneousCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
{
guint32 command = 0;
guint32 recoveryReferencePictureCount = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
@@ -6730,7 +6724,7 @@ handle_MiscellaneousCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_FlowControlCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
@@ -6748,9 +6742,9 @@ handle_FlowControlCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
static void
handle_CloseMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_portHandlingFlag, 4, ENC_LITTLE_ENDIAN);
@@ -6767,19 +6761,19 @@ handle_CloseMultiMediaReceiveChannelMessage(ptvcursor_t *cursor, packet_info * p
static void
handle_CreateConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
+ guint32 conferenceId = 0;
guint32 dataLength = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_resourceType, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_appID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceId);
}
/*
@@ -6793,10 +6787,10 @@ handle_CreateConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_DeleteConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0138 ^ conferenceID);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0138 ^ conferenceId);
}
/*
@@ -6810,18 +6804,18 @@ handle_DeleteConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_ModifyConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
+ guint32 conferenceId = 0;
guint32 dataLength = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_appID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceId);
}
/*
@@ -6835,9 +6829,9 @@ handle_ModifyConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_AddParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "partyPIRestrictionBits");
@@ -6859,7 +6853,7 @@ handle_AddParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013a ^ conferenceID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013a ^ conferenceId);
}
/*
@@ -6873,12 +6867,12 @@ handle_AddParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk
static void
handle_DropParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013b ^ conferenceID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013b ^ conferenceId);
}
/*
@@ -6892,10 +6886,10 @@ handle_DropParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s
static void
handle_AuditParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013d ^ conferenceID);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013d ^ conferenceId);
}
/*
@@ -6909,9 +6903,9 @@ handle_AuditParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_ChangeParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 conferenceID = 0;
- conferenceID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ guint32 conferenceId = 0;
+ conferenceId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "partyPIRestrictionBits");
@@ -6933,7 +6927,7 @@ handle_ChangeParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII|ENC_NA);
- skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013e ^ conferenceID);
+ skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013e ^ conferenceId);
}
/*
@@ -6950,17 +6944,17 @@ handle_UserToDeviceDataMessageVersion1(ptvcursor_t *cursor, packet_info * pinfo
guint32 dataLength = 0;
{
ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "userToDeviceDataVersion1");
- ptvcursor_add(cursor, hf_skinny_applicationID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_sequenceFlag, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_displayPriority, 4, ENC_LITTLE_ENDIAN);
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_appInstanceID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_routingID, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_xml(cursor, hf_skinny_xmldata, pinfo, dataLength, 2000);
@@ -6979,7 +6973,7 @@ handle_UserToDeviceDataMessageVersion1(ptvcursor_t *cursor, packet_info * pinfo
static void
handle_VideoDisplayCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_layoutID, 4, ENC_LITTLE_ENDIAN);
@@ -6996,7 +6990,7 @@ handle_VideoDisplayCommandMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_FlowControlNotifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_passthruPartyID, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
@@ -7373,11 +7367,11 @@ handle_CallInfoV2Message(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co
static void
handle_PortReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_mediaTransportType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_ipAddressType, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_mediaType, 4, ENC_LITTLE_ENDIAN);
@@ -7395,11 +7389,11 @@ handle_PortReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_
static void
handle_PortCloseMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_mediaType, 4, ENC_LITTLE_ENDIAN);
}
@@ -7414,11 +7408,11 @@ handle_PortCloseMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
static void
handle_QoSListenMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_resvStyle, 4, ENC_LITTLE_ENDIAN);
@@ -7432,7 +7426,7 @@ handle_QoSListenMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
ptvcursor_add(cursor, hf_skinny_burstSize, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN);
{
- ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "appID");
+ ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID");
ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA);
@@ -7452,11 +7446,11 @@ handle_QoSListenMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
static void
handle_QoSPathMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_resvStyle, 4, ENC_LITTLE_ENDIAN);
@@ -7469,7 +7463,7 @@ handle_QoSPathMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_
ptvcursor_add(cursor, hf_skinny_burstSize, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN);
{
- ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "appID");
+ ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID");
ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA);
@@ -7489,11 +7483,11 @@ handle_QoSPathMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_
static void
handle_QoSTeardownMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN);
@@ -7510,11 +7504,11 @@ handle_QoSTeardownMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c
static void
handle_UpdateDSCPMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_DSCPValue, 4, ENC_LITTLE_ENDIAN);
@@ -7531,11 +7525,11 @@ handle_UpdateDSCPMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co
static void
handle_QoSModifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_remoteIpAddr_ipv4, hf_skinny_remoteIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_remotePortNumber, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_direction, 4, ENC_LITTLE_ENDIAN);
@@ -7544,7 +7538,7 @@ handle_QoSModifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
ptvcursor_add(cursor, hf_skinny_burstSize, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN);
{
- ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "appID");
+ ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID");
ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA);
ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA);
@@ -7564,13 +7558,13 @@ handle_QoSModifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con
static void
handle_SubscriptionStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 transactionID = 0;
- transactionID = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ guint32 transactionId = 0;
+ transactionId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_subscriptionFeatureID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_timer, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_cause, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0048 ^ transactionID);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0048 ^ transactionId);
}
/*
@@ -7584,7 +7578,7 @@ handle_SubscriptionStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_,
static void
handle_NotificationMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- ptvcursor_add(cursor, hf_skinny_transactionID, 4, ENC_LITTLE_ENDIAN);
+ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_subscriptionFeatureID, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_notificationStatus, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(cursor, hf_skinny_text, 97, ENC_ASCII|ENC_NA);
@@ -7601,18 +7595,18 @@ handle_NotificationMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_
static void
handle_StartMediaTransmissionAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ guint32 passThroughPartyId = 0;
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_transmitIpAddr_ipv4, hf_skinny_transmitIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN);
si->mediaTransmissionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_mediaTransmissionStatus, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x008a ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x008a ^ passThroughPartyId);
}
/*
@@ -7626,18 +7620,18 @@ handle_StartMediaTransmissionAckMessage(ptvcursor_t *cursor, packet_info * pinfo
static void
handle_StartMultiMediaTransmissionAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_)
{
- guint32 passThruPartyId = 0;
- ptvcursor_add(cursor, hf_skinny_conferenceID, 4, ENC_LITTLE_ENDIAN);
- passThruPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- si->passThruId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
- ptvcursor_add(cursor, hf_skinny_passThruPartyId, 4, ENC_LITTLE_ENDIAN);
+ guint32 passThroughPartyId = 0;
+ ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN);
+ passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ si->passThroughPartyId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
+ ptvcursor_add(cursor, hf_skinny_passThroughPartyId, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN);
dissect_skinny_ipv4or6(cursor, hf_skinny_transmitIpAddr_ipv4, hf_skinny_transmitIpAddr_ipv6);
ptvcursor_add(cursor, hf_skinny_portNumber, 4, ENC_LITTLE_ENDIAN);
si->multimediaTransmissionStatus = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
ptvcursor_add(cursor, hf_skinny_multimediaTransmissionStatus, 4, ENC_LITTLE_ENDIAN);
- skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0132 ^ passThruPartyId);
+ skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0132 ^ passThroughPartyId);
}
/*
@@ -8070,7 +8064,7 @@ static int dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
si->messageName = val_to_str_ext(hdr_opcode, &message_id_ext, "0x%08X (Unknown)");
si->callId = 0;
si->lineId = 0;
- si->passThruId = 0;
+ si->passThroughPartyId = 0;
si->callState = 0;
g_free(si->callingParty);
si->callingParty = NULL;
@@ -8439,10 +8433,6 @@ proto_register_skinny(void)
{
"RTCPPortNumber", "skinny.RTCPPortNumber", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_RTPPayloadFormat,
- {
- "RTPPayloadFormat", "skinny.RTPPayloadFormat", FT_UINT32, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
{ &hf_skinny_RedirDialed,
{
"Redirected Dialed", "skinny.RedirDialed", FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0002,
@@ -8599,25 +8589,21 @@ proto_register_skinny(void)
{
"annexNandWFutureUse", "skinny.annexNandWFutureUse", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_appID,
- {
- "appID", "skinny.appID", FT_UINT32, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
{ &hf_skinny_appInstanceID,
{
"appInstanceID", "skinny.appInstanceID", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_applicationID,
+ { &hf_skinny_applicationId,
{
- "applicationID", "skinny.applicationID", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "applicationId", "skinny.applicationId", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_skinny_areMessagesWaiting,
{
"areMessagesWaiting", "skinny.areMessagesWaiting", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_associatedStreamID,
+ { &hf_skinny_associatedStreamId,
{
- "associatedStreamID", "skinny.associatedStreamID", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "associatedStreamId", "skinny.associatedStreamId", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_skinny_audioCapCount,
{
@@ -8715,9 +8701,9 @@ proto_register_skinny(void)
{
"confServiceNum", "skinny.confServiceNum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_conferenceID,
+ { &hf_skinny_conferenceId,
{
- "conferenceID", "skinny.conferenceID", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "conferenceId", "skinny.conferenceId", FT_UINT32, BASE_DEC, NULL, 0x0,
"Conference ID", HFILL }},
{ &hf_skinny_confirmRequired,
{
@@ -8983,9 +8969,9 @@ proto_register_skinny(void)
{
"maximumBitRate", "skinny.maximumBitRate", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_millisecondPacketSize,
+ { &hf_skinny_milliSecondPacketSize,
{
- "millisecondPacketSize", "skinny.millisecondPacketSize", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "milliSecondPacketSize", "skinny.milliSecondPacketSize", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_skinny_minBitRate,
{
@@ -9119,9 +9105,9 @@ proto_register_skinny(void)
{
"partyDirection", "skinny.partyDirection", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_passThruPartyId,
+ { &hf_skinny_passThroughPartyId,
{
- "passThruPartyId", "skinny.passThruPartyId", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "passThroughPartyId", "skinny.passThroughPartyId", FT_UINT32, BASE_DEC, NULL, 0x0,
"PassThrough PartyId", HFILL }},
{ &hf_skinny_passthruPartyID,
{
@@ -9243,6 +9229,10 @@ proto_register_skinny(void)
{
"rtpMediaPort", "skinny.rtpMediaPort", FT_UINT32, BASE_DEC, NULL, 0x0,
"RTP Media Port", HFILL }},
+ { &hf_skinny_rtpPayloadFormat,
+ {
+ "rtpPayloadFormat", "skinny.rtpPayloadFormat", FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
{ &hf_skinny_salt,
{
"salt", "skinny.salt", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -9355,9 +9345,9 @@ proto_register_skinny(void)
{
"stimulusStatus", "skinny.stimulusStatus", FT_UINT32, BASE_DEC, NULL, 0x0,
"Stimulus Status", HFILL }},
- { &hf_skinny_streamPassThroughID,
+ { &hf_skinny_streamPassThroughId,
{
- "streamPassThroughID", "skinny.streamPassThroughID", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "streamPassThroughId", "skinny.streamPassThroughId", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_skinny_systemTime,
{
@@ -9395,9 +9385,9 @@ proto_register_skinny(void)
{
"totalSoftKeySetCount", "skinny.totalSoftKeySetCount", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_skinny_transactionID,
+ { &hf_skinny_transactionId,
{
- "transactionID", "skinny.transactionID", FT_UINT32, BASE_DEC, NULL, 0x0,
+ "transactionId", "skinny.transactionId", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_skinny_transmitIpAddr_ipv4,
{
@@ -9995,6 +9985,10 @@ proto_register_skinny(void)
{
"version", "skinny.version", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
+ {&hf_skinny_versionStr,
+ {
+ "versionStr", "skinny.versionStr", FT_STRING, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
{&hf_skinny_videoCapabilityDirection,
{
"videoCapabilityDirection", "skinny.videoCapabilityDirection", FT_UINT32, BASE_HEX | BASE_EXT_STRING, &TransmitOrReceive_ext, 0x0,
diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in
index 10f6adfb72..a84a507691 100644
--- a/epan/dissectors/packet-skinny.c.in
+++ b/epan/dissectors/packet-skinny.c.in
@@ -46,8 +46,7 @@ cog.out('/*\n')
cog.out(' * Generated Automatically Using (from wireshark base directory):\n')
cog.out(' * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in\n')
cog.out(' */\n')
-]]]*/
-
+/*]]]*/
/*[[[end]]]*/
/* c-basic-offset: 2; tab-width: 8; indent-tabs-mode: nil
@@ -55,6 +54,7 @@ cog.out(' */\n')
* :indentSize=2:tabSize=8:noTabs=true:
*/
+
#include "config.h"
#include <epan/packet.h>
@@ -127,7 +127,7 @@ for message in skinny.message:
cog.out(' {0 , NULL}\n')
cog.out('};\n')
cog.out('static value_string_ext message_id_ext = VALUE_STRING_EXT_INIT(message_id);\n')
-]]]*/
+/*]]]*/
/*[[[end]]]*/
/* Declare Enums and Defines */
@@ -152,7 +152,7 @@ for enum in skinny.enum:
cog.out(' { 0x00000, NULL }\n')
cog.out('};\n')
cog.out('static value_string_ext %s_ext = VALUE_STRING_EXT_INIT(%s);\n\n' %(name, name))
-]]]*/
+/*]]]*/
/*[[[end]]]*/
/* Staticly Declared Variables */
@@ -462,7 +462,7 @@ static int dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
si->messageName = val_to_str_ext(hdr_opcode, &message_id_ext, "0x%08X (Unknown)");
si->callId = 0;
si->lineId = 0;
- si->passThruId = 0;
+ si->passThroughPartyId = 0;
si->callState = 0;
g_free(si->callingParty);
si->callingParty = NULL;
diff --git a/epan/dissectors/packet-skinny.h b/epan/dissectors/packet-skinny.h
index 6e71e04acf..6315b42479 100644
--- a/epan/dissectors/packet-skinny.h
+++ b/epan/dissectors/packet-skinny.h
@@ -34,7 +34,7 @@
/*
* Generated Automatically Using (from wireshark base directory):
- * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in
+ * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.h epan/dissectors/packet-skinny.h.in
*/
#include <epan/wmem/wmem.h>
@@ -74,7 +74,7 @@ typedef struct _skinny_info_t
guint32 maxProtocolVersion;
gint32 lineId;
guint32 callId;
- guint32 passThruId;
+ guint32 passThroughPartyId;
const gchar * messageName;
guint32 callState;
gboolean hasCallInfo;
diff --git a/epan/dissectors/packet-skinny.h.in b/epan/dissectors/packet-skinny.h.in
index 368c2e5c96..762ec1eb60 100644
--- a/epan/dissectors/packet-skinny.h.in
+++ b/epan/dissectors/packet-skinny.h.in
@@ -44,7 +44,7 @@
#
cog.out('/*\n')
cog.out(' * Generated Automatically Using (from wireshark base directory):\n')
-cog.out(' * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in\n')
+cog.out(' * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.h epan/dissectors/packet-skinny.h.in\n')
cog.out(' */\n')
/*]]]*/
/*[[[end]]]*/
@@ -86,7 +86,7 @@ typedef struct _skinny_info_t
guint32 maxProtocolVersion;
gint32 lineId;
guint32 callId;
- guint32 passThruId;
+ guint32 passThroughPartyId;
const gchar * messageName;
guint32 callState;
gboolean hasCallInfo;
diff --git a/tools/SkinnyProtocolOptimized.xml b/tools/SkinnyProtocolOptimized.xml
index c089be1820..cc9b99df41 100644
--- a/tools/SkinnyProtocolOptimized.xml
+++ b/tools/SkinnyProtocolOptimized.xml
@@ -446,7 +446,7 @@
<integer comment="Active RTP Streams" longcomment="Active RTP Streams at Registration" name="activeStreams" type="uint32"/>
<integer comment="Protocol Version" longcomment="Maximum Supported Protocol Version" name="protocolVer" type="uint8"/>
<integer comment="unknown" longcomment="unknown (Part of ProtocolVer)" name="unknown" type="uint8"/>
- <bitfield comment="Features this device supports" name="PhoneFeatures" size="uint16" subtype="PhoneFeatures" type="bitfield">
+ <bitfield comment="Features this device supports" name="phoneFeatures" size="uint16" subtype="PhoneFeatures" type="bitfield">
<entries>
<entry comment="" name="PhoneFeatures_Bit1" text="Bit1" value="0x0001"/>
<entry comment="" name="PhoneFeatures_Bit2" text="Bit2" value="0x0002"/>
@@ -775,7 +775,7 @@
<message comment="" direction="dev2pbx" dynamic="no" msgtype="response" name="MulticastMediaReceptionAckMessage" opcode="0x0021" request="0x0101" type="MediaControl">
<fields beginversion="0" endversion="22">
<enum comment="" name="multicastReceptionStatus" subtype="MulticastMediaReceptionStatus" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
</fields>
</message>
@@ -809,7 +809,7 @@
<enum comment="" name="mediaReceptionStatus" subtype="MediaStatus" type="uint32"/>
<ipv4or6 comment="" name="ipAddr" subtype="IPV4orV6Address" type="ipaddr"/>
<integer comment="" declare="yes" name="portNumber" subtype="uint32" type="ipport" use_param="ipAddr"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
</fields>
<fields beginversion="0" endversion="22" size_gt="20">
<integer comment="CallId" name="callReference" type="uint32"/>
@@ -822,17 +822,12 @@
</entries>
</enum>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="response" name="ConnectionStatisticsResMessage" opcode="0x0023" request="0x0107" type="CallControl">
- <fields endversion="16" fixed="yes">
+ <fields endversion="17" fixed="yes">
<string comment="" name="directoryNum" size="24" type="char"/>
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
<enum comment="Stats Processing Mode" longcomment="What do do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint32"/>
</fields>
- <fields beginversion="17" endversion="20" fixed="yes">
- <string comment="" name="directoryNum" size="28" type="char"/>
- <integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
- <enum comment="Stats Processing Mode" longcomment="What do do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint32"/>
- </fields>
- <fields beginversion="21" endversion="22" fixed="yes">
+ <fields beginversion="18" endversion="22" fixed="yes">
<string comment="" name="directoryNum" size="28" type="char"/>
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
<integer comment="Stats Processing Mode" longcomment="What do do after you send the stats" name="statsProcessingMode" subtype="StatsProcessingType" type="uint8"/>
@@ -1004,8 +999,8 @@
</message>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="response" name="MediaTransmissionFailureMessage" opcode="0x002a" request="0x008a" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="remoteIpAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<integer comment="CallId" name="callReference" type="uint32"/>
@@ -1046,10 +1041,10 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="deviceToUserData" subtype="UserAndDeviceData" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
</fields>
@@ -1060,10 +1055,10 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="deviceToUserData" subtype="UserAndDeviceData" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
</fields>
@@ -1098,7 +1093,7 @@
<integer comment="" declare="yes" name="audioCapCount" type="uint32"/>
<integer comment="" declare="yes" name="videoCapCount" type="uint32"/>
<integer comment="" declare="yes" name="dataCapCount" type="uint32"/>
- <integer comment="" name="RTPPayloadFormat" type="uint32"/>
+ <integer comment="" name="rtpPayloadFormat" type="uint32"/>
<integer comment="" declare="yes" name="customPictureFormatCount" type="uint32"/>
<struct comment="" maxsize="6" name="customPictureFormat" size_fieldname="customPictureFormatCount" subtype="CustomPictureFormat" type="struct">
<fields>
@@ -1260,13 +1255,13 @@
<enum comment="" name="multimediaReceptionStatus" subtype="OpenReceiveChanStatus" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="ipAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="" declare="yes" name="portNumber" subtype="uint32" type="ipport" use_param="ipAddr"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
</fields>
</message>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="event" name="ClearConferenceMessage" opcode="0x0032" type="Conference">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="serviceNum" type="uint32"/>
</fields>
</message>
@@ -1293,7 +1288,7 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="response" name="CreateConferenceResMessage" opcode="0x0035" request="0x0137" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<enum comment="" name="result" subtype="CreateConfResult" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<string comment="variable field size (max: 2000]" maxsize="2000" name="passThruData" size_fieldname="dataLength" type="char"/>
@@ -1308,7 +1303,7 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="response" name="DeleteConferenceResMessage" opcode="0x0036" request="0x0138" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<enum comment="" name="delete_conf_result" subtype="DeleteConfResult" type="uint32"/>
</fields>
</message>
@@ -1325,7 +1320,7 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="response" name="ModifyConferenceResMessage" opcode="0x0037" request="0x0139" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<enum comment="" name="modify_conf_result" subtype="ModifyConfResult" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<string comment="variable field size (max: 2000]" maxsize="2000" name="passThruData" size_fieldname="dataLength" type="char"/>
@@ -1342,7 +1337,7 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="response" name="AddParticipantResMessage" opcode="0x0038" request="0x013a" type="IntraCCM">
<fields alignment="4" beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" name="add_participant_result" subtype="AddParticipantResult" type="uint32"/>
<string comment="" name="bridgeParticipantId" size="257" type="char"/>
@@ -1360,11 +1355,11 @@
<integer comment="" declare="yes" name="numberOfEntries" type="uint32"/>
<struct comment="" maxsize="32" name="conferenceEntry" size_fieldname="numberOfEntries" subtype="AuditConferenceEntry" type="struct">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<enum comment="" name="resourceType" subtype="ResourceType" type="uint32"/>
<integer comment="" name="numberOfReservedParticipants" type="uint32"/>
<integer comment="" name="numberOfActiveParticipants" type="uint32"/>
- <integer comment="" name="appID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<string comment="" name="appConfID" size="32" type="char"/>
<string comment="" name="appData" size="24" type="char"/>
</fields>
@@ -1381,7 +1376,7 @@
<fields beginversion="0" endversion="22">
<enum comment="" name="audit_participant_result" subtype="AuditParticipantResult" type="uint32"/>
<integer comment="" name="last" type="uint32"/>
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="" declare="yes" name="numberOfEntries" type="uint32"/>
<integer comment="" maxsize="256" name="participantEntry" size_fieldname="numberOfEntries" type="uint32"/>
</fields>
@@ -1390,14 +1385,14 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="deviceToUserDataVersion1" subtype="UserAndDeviceDataVersion1" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<enum comment="" name="sequenceFlag" subtype="SequenceFlag" type="uint32"/>
<integer comment="" name="displayPriority" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="appInstanceID" type="uint32"/>
<integer comment="" name="routingID" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
@@ -1409,14 +1404,14 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="deviceToUserDataVersion1" subtype="UserAndDeviceDataVersion1" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<enum comment="" name="sequenceFlag" subtype="SequenceFlag" type="uint32"/>
<integer comment="" name="displayPriority" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="appInstanceID" type="uint32"/>
<integer comment="" name="routingID" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
@@ -1429,7 +1424,7 @@
<integer comment="" declare="yes" name="audioCapCount" type="uint32"/>
<integer comment="" declare="yes" name="videoCapCount" type="uint32"/>
<integer comment="" declare="yes" name="dataCapCount" type="uint32"/>
- <integer comment="" name="RTPPayloadFormat" type="uint32"/>
+ <integer comment="" name="rtpPayloadFormat" type="uint32"/>
<integer comment="" declare="yes" name="customPictureFormatCount" type="uint32"/>
<struct comment="" maxsize="6" name="customPictureFormat" size_fieldname="customPictureFormatCount" subtype="CustomPictureFormat" type="struct">
<fields>
@@ -1608,7 +1603,7 @@
<integer comment="" declare="yes" name="audioCapCount" type="uint32"/>
<integer comment="" declare="yes" name="videoCapCount" type="uint32"/>
<integer comment="" declare="yes" name="dataCapCount" type="uint32"/>
- <integer comment="" name="RTPPayloadFormat" type="uint32"/>
+ <integer comment="" name="rtpPayloadFormat" type="uint32"/>
<integer comment="" declare="yes" name="customPictureFormatCount" type="uint32"/>
<struct comment="" maxsize="6" name="customPictureFormat" size_fieldname="customPictureFormatCount" subtype="CustomPictureFormat" type="struct">
<fields>
@@ -1790,9 +1785,9 @@
</enum>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="response" name="PortResMessage" opcode="0x0045" request="0x014b" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" declare="yes" name="callReference" req_resp_key="1" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="ipAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="" name="portNumber" subtype="uint32" type="ipport" use_param="ipAddr"/>
<integer comment="" name="RTCPPortNumber" type="uint32"/>
@@ -1810,9 +1805,9 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSResvNotifyMessage" opcode="0x0046" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="direction" subtype="RSVPDirection" type="uint32"/>
@@ -1858,9 +1853,9 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSErrorNotifyMessage" opcode="0x0047" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="direction" subtype="RSVPDirection" type="uint32"/>
@@ -1878,7 +1873,7 @@
</enum>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="request" name="SubscriptionStatReqMessage" opcode="0x0048" type="CallControl">
<fields beginversion="0" endversion="22">
- <integer comment="" declare="yes" name="transactionID" req_resp_key="1" type="uint32"/>
+ <integer comment="" declare="yes" name="transactionId" req_resp_key="1" type="uint32"/>
<enum comment="" name="subcriptionFeatureID" subtype="SubscriptionFeatureID" type="uint32"/>
<integer comment="" name="timer" type="uint32"/>
<string comment="" name="subscriptionID" size="64" type="char"/>
@@ -1955,7 +1950,7 @@
<integer comment="" name="secondaryKeepAliveInterval" type="uint32"/>
<integer comment="" name="maxProtocolVer" type="uint8"/>
<integer comment="unknown" longcomment="unknown (Part of ProtocolVer)" name="unknown" type="uint8"/>
- <bitfield comment="Features this device supports" name="PhoneFeatures" size="uint16" subtype="PhoneFeatures" type="bitfield">
+ <bitfield comment="Features this device supports" name="phoneFeatures" size="uint16" subtype="PhoneFeatures" type="bitfield">
<entries>
<entry comment="" name="PhoneFeatures_Bit1" text="Bit1" value="0x0001"/>
<entry comment="" name="PhoneFeatures_Bit2" text="Bit2" value="0x0002"/>
@@ -2194,11 +2189,11 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="StartMediaTransmissionMessage" opcode="0x008a" priority="send_immediate" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<ipv4or6 comment="" name="remoteIpAddr" subtype="IPV4orV6Address" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<struct comment="" name="qualifierOut" subtype="Media_QualifierOutgoing" type="struct">
<fields>
@@ -2238,8 +2233,8 @@
<integer comment="" name="keyDerivationRate" type="uint32"/>
</fields>
</struct>
- <integer comment="" name="streamPassThroughID" type="uint32"/>
- <integer comment="" name="associatedStreamID" type="uint32"/>
+ <integer comment="" name="streamPassThroughId" type="uint32"/>
+ <integer comment="" name="associatedStreamId" type="uint32"/>
<integer comment="" name="RFC2833PayloadType" type="uint32"/>
<integer comment="" name="dtmfType" type="uint32"/>
<integer comment="" name="mixingMode" type="uint32"/>
@@ -2295,8 +2290,8 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="StopMediaTransmissionMessage" opcode="0x008b" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" name="portHandlingFlag" subtype="PortHandling" type="uint32"/>
</fields>
@@ -2534,7 +2529,7 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="VersionResMessage" opcode="0x0098" request="0x000f" type="RegistrationAndManagement">
<fields beginversion="0" endversion="22">
- <string comment="" name="version" size="16" type="char"/>
+ <string comment="" name="versionStr" size="16" type="char"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="DisplayTextMessage" opcode="0x0099" type="CallControl">
@@ -2594,11 +2589,11 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="StartMulticastMediaReceptionMessage" opcode="0x0101" priority="send_immediate" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="multicastIpAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="" name="multicastPortNumber" subtype="uint32" type="ipport" use_param="multicastIpAddr"/>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<struct comment="" name="qualifierIn" subtype="Media_QualifierIncoming" type="struct">
<fields>
@@ -2628,11 +2623,11 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="StartMulticastMediaTransmissionMessage" opcode="0x0102" priority="send_immediate" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="multicastIpAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="" name="multicastPortNumber" subtype="uint32" type="ipport" use_param="multicastIpAddr"/>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<struct comment="" name="qualifierOut" subtype="Media_QualifierOutgoing" type="struct">
<fields>
@@ -2665,23 +2660,23 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="StopMulticastMediaReceptionMessage" opcode="0x0103" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="StopMulticastMediaTransmissionMessage" opcode="0x0104" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="OpenReceiveChannelMessage" opcode="0x0105" priority="send_immediate" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<struct comment="" name="qualifierIn" subtype="Media_QualifierIncoming" type="struct">
<fields>
@@ -2718,8 +2713,8 @@
<integer comment="" name="keyDerivationRate" type="uint32"/>
</fields>
</struct>
- <integer comment="" name="streamPassThroughID" type="uint32"/>
- <integer comment="" name="associatedStreamID" type="uint32"/>
+ <integer comment="" name="streamPassThroughId" type="uint32"/>
+ <integer comment="" name="associatedStreamId" type="uint32"/>
<integer comment="" name="RFC2833PayloadType" type="uint32"/>
<integer comment="" name="dtmfType" type="uint32"/>
</fields>
@@ -2777,17 +2772,17 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="CloseReceiveChannelMessage" opcode="0x0106" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" name="portHandlingFlag" subtype="PortHandling" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="ConnectionStatisticsReqMessage" opcode="0x0107" type="CallControl">
- <fields endversion="16" fixed="yes">
+ <fields endversion="17" fixed="yes">
<string comment="" name="directoryNum" size="24" type="char"/>
</fields>
- <fields beginversion="17" endversion="22" fixed="yes">
+ <fields beginversion="18" endversion="22" fixed="yes">
<string comment="" name="directoryNum" size="28" type="char"/>
</fields>
<fields>
@@ -3047,9 +3042,9 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="StartMediaFailureDetectionMessage" opcode="0x011c" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<struct comment="" name="qualifierIn" subtype="Media_QualifierIncoming" type="struct">
<fields>
@@ -3093,10 +3088,10 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="userToDeviceData" subtype="UserAndDeviceData" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
</fields>
@@ -3146,7 +3141,7 @@
</fields>
</struct>
<enum comment="" name="annAckReq" subtype="EndOfAnnAck" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="matrixConfPartyID" size="16" type="uint32"/>
<integer comment="" name="hearingConfPartyMask" type="uint32"/>
<enum comment="" name="annPlayMode" subtype="AnnPlayMode" type="uint32"/>
@@ -3154,7 +3149,7 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="StopAnnouncementMessage" opcode="0x0123" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
</fields>
</message>
<enum name="PlayAnnStatus">
@@ -3165,28 +3160,28 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="AnnouncementFinishMessage" opcode="0x0124" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<enum comment="" name="annStatus" subtype="PlayAnnStatus" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="NotifyDtmfToneMessage" opcode="0x0127" type="CallControl">
<fields beginversion="0" endversion="22">
<enum comment="" name="tone" subtype="DeviceTone" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="SendDtmfToneMessage" opcode="0x0128" type="CallControl">
<fields beginversion="0" endversion="22">
<enum comment="" name="tone" subtype="DeviceTone" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="SubscribeDtmfPayloadReqMessage" opcode="0x0129" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
<integer comment="" name="dtmfType" type="uint32"/>
</fields>
@@ -3194,21 +3189,21 @@
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="SubscribeDtmfPayloadResMessage" opcode="0x012a" request="0x0129" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="SubscribeDtmfPayloadErrMessage" opcode="0x012b" request="0x0129" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="UnSubscribeDtmfPayloadReqMessage" opcode="0x012c" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
<integer comment="" name="dtmfType" type="uint32"/>
</fields>
@@ -3216,14 +3211,14 @@
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="UnSubscribeDtmfPayloadResMessage" opcode="0x012d" request="0x012d" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="UnSubscribeDtmfPayloadErrMessage" opcode="0x012e" request="0x012d" type="CallControl">
<fields beginversion="0" endversion="22">
<integer comment="" name="payloadDtmf" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
</fields>
</message>
@@ -3243,8 +3238,8 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="OpenMultiMediaReceiveChannelMessage" opcode="0x0131" priority="send_immediate" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
@@ -3259,7 +3254,7 @@
<fields>
<struct comment="" lookup_le="Media_Payload_AMR_WB" name="audioParameters" subtype="Media_AudioIncomingParameters" type="struct">
<fields>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<struct comment="" name="qualifierIn" subtype="Media_QualifierIncoming" type="struct">
<fields>
<enum comment="" name="ecValue" subtype="Media_EchoCancellation" type="uint32"/>
@@ -3384,8 +3379,8 @@
<integer comment="" name="keyDerivationRate" type="uint32"/>
</fields>
</struct>
- <integer comment="" name="streamPassThroughID" type="uint32"/>
- <integer comment="" name="associatedStreamID" type="uint32"/>
+ <integer comment="" name="streamPassThroughId" type="uint32"/>
+ <integer comment="" name="associatedStreamId" type="uint32"/>
</fields>
<fields beginversion="11">
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="sourceIpAddr" subtype="uint32" type="ipaddr"/>
@@ -3397,7 +3392,7 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="StartMultiMediaTransmissionMessage" opcode="0x0132" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" declare="yes" name="passthruPartyID" req_resp_key="1" type="uint32"/>
<enum comment="" declare="yes" name="compressionType" subtype="Media_PayloadType" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
@@ -3414,7 +3409,7 @@
<fields>
<struct comment="" lookup_le="Media_Payload_AMR_WB" name="audioParameters" subtype="Media_AudioIncomingParameters" type="struct">
<fields>
- <integer comment="" name="millisecondPacketSize" type="uint32"/>
+ <integer comment="" name="milliSecondPacketSize" type="uint32"/>
<struct comment="" name="qualifierIn" subtype="Media_QualifierIncoming" type="struct">
<fields>
<enum comment="" name="ecValue" subtype="Media_EchoCancellation" type="uint32"/>
@@ -3539,14 +3534,14 @@
<integer comment="" name="keyDerivationRate" type="uint32"/>
</fields>
</struct>
- <integer comment="" name="streamPassThroughID" type="uint32"/>
- <integer comment="" name="associatedStreamID" type="uint32"/>
+ <integer comment="" name="streamPassThroughId" type="uint32"/>
+ <integer comment="" name="associatedStreamId" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="StopMultiMediaTransmissionMessage" opcode="0x0133" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" name="portHandlingFlag" subtype="PortHandling" type="uint32"/>
</fields>
@@ -3565,7 +3560,7 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="MiscellaneousCommandMessage" opcode="0x0134" type="CallControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" declare="yes" name="command" subtype="MiscCommandType" type="uint32"/>
@@ -3627,7 +3622,7 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="FlowControlCommandMessage" opcode="0x0135" type="CallControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<integer comment="" name="maximumBitRate" type="uint32"/>
@@ -3635,18 +3630,18 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="CloseMultiMediaReceiveChannelMessage" opcode="0x0136" priority="send_immediate" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<enum comment="" name="portHandlingFlag" subtype="PortHandling" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="CreateConferenceReqMessage" opcode="0x0137" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="" name="numberOfReservedParticipants" type="uint32"/>
<enum comment="" name="resourceType" subtype="ResourceType" type="uint32"/>
- <integer comment="" name="appID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<string comment="" name="appConfID" size="32" type="char"/>
<string comment="" name="appData" size="24" type="char"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
@@ -3655,14 +3650,14 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="DeleteConferenceReqMessage" opcode="0x0138" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="ModifyConferenceReqMessage" opcode="0x0139" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="" name="numberOfReservedParticipants" type="uint32"/>
- <integer comment="" name="appID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<string comment="" name="appConfID" size="32" type="char"/>
<string comment="" name="appData" size="24" type="char"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
@@ -3671,7 +3666,7 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="AddParticipantReqMessage" opcode="0x013a" type="IntraCCM">
<fields>
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<bitfield comment="" name="partyPIRestrictionBits" size="uint32" subtype="RestrictInformationType" type="bitfield">
<entries>
@@ -3697,19 +3692,19 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="DropParticipantReqMessage" opcode="0x013b" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="AuditConferenceReqMessage" opcode="0x013c" type="IntraCCM"/>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="AuditParticipantReqMessage" opcode="0x013d" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="request" name="ChangeParticipantReqMessage" opcode="0x013e" type="IntraCCM">
<fields>
- <integer comment="Conference ID" declare="yes" name="conferenceID" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" declare="yes" name="conferenceId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<bitfield comment="" name="partyPIRestrictionBits" size="uint32" subtype="RestrictInformationType" type="bitfield">
<entries>
@@ -3737,14 +3732,14 @@
<fields beginversion="0" endversion="22">
<struct comment="" name="userToDeviceDataVersion1" subtype="UserAndDeviceDataVersion1" type="struct">
<fields>
- <integer comment="" name="applicationID" type="uint32"/>
+ <integer comment="" name="applicationId" type="uint32"/>
<integer comment="LineId" name="lineInstance" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<integer comment="" declare="yes" name="dataLength" type="uint32"/>
<enum comment="" name="sequenceFlag" subtype="SequenceFlag" type="uint32"/>
<integer comment="" name="displayPriority" type="uint32"/>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="appInstanceID" type="uint32"/>
<integer comment="" name="routingID" type="uint32"/>
<xml comment="" maxsize="2000" name="xmldata" size_fieldname="dataLength" type="xml"/>
@@ -3754,14 +3749,14 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="VideoDisplayCommandMessage" opcode="0x0140" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<integer comment="" name="layoutID" type="uint32"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="FlowControlNotifyMessage" opcode="0x0141" type="CallControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="" name="passthruPartyID" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<integer comment="" name="maximumBitRate" type="uint32"/>
@@ -3901,9 +3896,9 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="request" name="PortReqMessage" opcode="0x014b" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<enum comment="" name="mediaTransportType" subtype="MediaTransportType" type="uint32"/>
<enum comment="" name="ipAddressType" subtype="IpAddrType" type="uint32"/>
<enum comment="" name="mediaType" subtype="MediaType" type="uint32"/>
@@ -3911,9 +3906,9 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="PortCloseMessage" opcode="0x014c" type="MediaControl">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<enum comment="" name="mediaType" subtype="MediaType" type="uint32"/>
</fields>
</message>
@@ -3926,9 +3921,9 @@
</enum>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSListenMessage" opcode="0x014d" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="resvStyle" subtype="ResvStyle" type="uint32"/>
@@ -3941,7 +3936,7 @@
<integer comment="" name="averageBitRate" type="uint32"/>
<integer comment="" name="burstSize" type="uint32"/>
<integer comment="" name="peakRate" type="uint32"/>
- <struct comment="" name="appID" subtype="RSVPApplicationID" type="struct">
+ <struct comment="" name="applicationID" subtype="RSVPApplicationID" type="struct">
<fields>
<string comment="" name="vendorID" size="32" type="char"/>
<string comment="" name="version" size="16" type="char"/>
@@ -3953,9 +3948,9 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSPathMessage" opcode="0x014e" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="resvStyle" subtype="ResvStyle" type="uint32"/>
@@ -3967,7 +3962,7 @@
<integer comment="" name="averageBitRate" type="uint32"/>
<integer comment="" name="burstSize" type="uint32"/>
<integer comment="" name="peakRate" type="uint32"/>
- <struct comment="" name="appID" subtype="RSVPApplicationID" type="struct">
+ <struct comment="" name="applicationID" subtype="RSVPApplicationID" type="struct">
<fields>
<string comment="" name="vendorID" size="32" type="char"/>
<string comment="" name="version" size="16" type="char"/>
@@ -3979,9 +3974,9 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSTeardownMessage" opcode="0x014f" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="direction" subtype="RSVPDirection" type="uint32"/>
@@ -3989,9 +3984,9 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="UpdateDSCPMessage" opcode="0x0150" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<integer comment="" name="DSCPValue" type="uint32"/>
@@ -3999,9 +3994,9 @@
</message>
<message comment="" direction="pbx2pbx" dynamic="no" msgtype="event" name="QoSModifyMessage" opcode="0x0151" type="IntraCCM">
<fields beginversion="0" endversion="22">
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
- <integer comment="PassThrough PartyId" name="passThruPartyId" type="uint32"/>
+ <integer comment="PassThrough PartyId" name="passThroughPartyId" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endianness="big" name="remoteIpAddr" subtype="uint32" type="ipaddr"/>
<integer comment="" name="remotePortNumber" subtype="uint32" type="ipport" use_param="remoteIpAddr"/>
<enum comment="" name="direction" subtype="RSVPDirection" type="uint32"/>
@@ -4009,7 +4004,7 @@
<integer comment="" name="averageBitRate" type="uint32"/>
<integer comment="" name="burstSize" type="uint32"/>
<integer comment="" name="peakRate" type="uint32"/>
- <struct comment="" name="appID" subtype="RSVPApplicationID" type="struct">
+ <struct comment="" name="applicationID" subtype="RSVPApplicationID" type="struct">
<fields>
<string comment="" name="vendorID" size="32" type="char"/>
<string comment="" name="version" size="16" type="char"/>
@@ -4032,7 +4027,7 @@
</enum>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="SubscriptionStatResMessage" opcode="0x0152" request="0x0048" status="result" type="RegistrationAndManagement">
<fields beginversion="0" endversion="22">
- <integer comment="" declare="yes" name="transactionID" req_resp_key="1" type="uint32"/>
+ <integer comment="" declare="yes" name="transactionId" req_resp_key="1" type="uint32"/>
<enum comment="" name="subscriptionFeatureID" subtype="SubscriptionFeatureID" type="uint32"/>
<integer comment="" name="timer" type="uint32"/>
<enum comment="" name="cause" subtype="SubscribeCause" type="uint32"/>
@@ -4040,7 +4035,7 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="NotificationMessage" opcode="0x0153" type="RegistrationAndManagement">
<fields alignment="4" beginversion="0" endversion="22">
- <integer comment="" name="transactionID" type="uint32"/>
+ <integer comment="" name="transactionId" type="uint32"/>
<enum comment="" name="subscriptionFeatureID" subtype="SubscriptionFeatureID" type="uint32"/>
<integer comment="" name="notificationStatus" type="uint32"/>
<string comment="" name="text" size="97" type="char"/>
@@ -4048,8 +4043,8 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="StartMediaTransmissionAckMessage" opcode="0x0154" request="0x008a" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="transmitIpAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="transmit Port" declare="yes" name="portNumber" subtype="uint32" type="ipport"/>
@@ -4058,8 +4053,8 @@
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="response" name="StartMultiMediaTransmissionAckMessage" opcode="0x0155" request="0x0132" type="MediaControl">
<fields>
- <integer comment="Conference ID" name="conferenceID" type="uint32"/>
- <integer comment="PassThrough PartyId" declare="yes" name="passThruPartyId" req_resp_key="1" type="uint32"/>
+ <integer comment="Conference ID" name="conferenceId" type="uint32"/>
+ <integer comment="PassThrough PartyId" declare="yes" name="passThroughPartyId" req_resp_key="1" type="uint32"/>
<integer comment="CallId" name="callReference" type="uint32"/>
<ipv4or6 comment="ipaddress in big endian" endiannes="big" endianness="big" name="transmitIpAddr" subtype="IpAddress" type="ipaddr"/>
<integer comment="transmit Port" declare="yes" name="portNumber" subtype="uint32" type="ipport"/>
@@ -4106,10 +4101,10 @@
</message>
<message comment="" direction="dev2pbx" dynamic="no" msgtype="event" name="AddOnDeviceCapabilitiesMessage" opcode="0x0159" type="RegistrationAndManagement">
<fields beginversion="0" endversion="22">
- <integer comment="" name="unknown1_0159" type="uint32"/>
- <integer comment="" name="unknown2_0159" type="uint32"/>
- <integer comment="" name="unknown3_0159" type="uint32"/>
- <string comment="" name="unknownString_0159" size="152" type="char"/>
+ <integer name="unknown1_0159" type="uint32"/>
+ <integer name="unknown2_0159" type="uint32"/>
+ <integer name="unknown3_0159" type="uint32"/>
+ <string name="unknownString_0159" size="152" type="char"/>
</fields>
</message>
<message comment="" direction="pbx2dev" dynamic="no" msgtype="event" name="EnhancedAlarmMessage" opcode="0x015a" type="RegistrationAndManagement">
diff --git a/tools/parse_xml2skinny_dissector.py b/tools/parse_xml2skinny_dissector.py
index 3af2abe169..f3e6799597 100755
--- a/tools/parse_xml2skinny_dissector.py
+++ b/tools/parse_xml2skinny_dissector.py
@@ -40,7 +40,7 @@ fieldsArray = {}
si_fields = {
"callReference" : "si->callId",
"lineInstance": "si->lineId",
- "passThruPartyId" : "si->passThruId",
+ "passThroughPartyId" : "si->passThroughPartyId",
"callState" : "si->callState",
"callingParty" : "si->callingParty",
"calledParty" : "si->calledParty",
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 6cd70d728a..25629fe0f4 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -3848,7 +3848,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
skinny_calls_info_t *tmp_skinnyinfo;
gchar *comment;
- if (si == NULL || (si->callId == 0 && si->passThruId == 0))
+ if (si == NULL || (si->callId == 0 && si->passThroughPartyId == 0))
return FALSE;
/* check whether we already have this context in the list */
list = g_queue_peek_nth_link(tapinfo->callsinfos, 0);
@@ -3858,7 +3858,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
if (tmp_listinfo->protocol == VOIP_SKINNY) {
tmp_skinnyinfo = (skinny_calls_info_t *)tmp_listinfo->prot_info;
if (tmp_skinnyinfo->callId == si->callId ||
- tmp_skinnyinfo->callId == si->passThruId) {
+ tmp_skinnyinfo->callId == si->passThroughPartyId) {
callsinfo = (voip_calls_info_t*)(list->data);
break;
}
@@ -3881,7 +3881,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
callsinfo->prot_info = g_malloc(sizeof(skinny_calls_info_t));
callsinfo->free_prot_info = g_free;
tmp_skinnyinfo = (skinny_calls_info_t *)callsinfo->prot_info;
- tmp_skinnyinfo->callId = si->callId ? si->callId : si->passThruId;
+ tmp_skinnyinfo->callId = si->callId ? si->callId : si->passThroughPartyId;
callsinfo->npackets = 1;
copy_address(&(callsinfo->initial_speaker), phone);
@@ -3913,13 +3913,13 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
}
if (si->callId) {
- if (si->passThruId)
- comment = g_strdup_printf("CallId = %u, PTId = %u", si->callId, si->passThruId);
+ if (si->passThroughPartyId)
+ comment = g_strdup_printf("CallId = %u, PTId = %u", si->callId, si->passThroughPartyId);
else
comment = g_strdup_printf("CallId = %u, LineId = %u", si->callId, si->lineId);
} else {
- if (si->passThruId)
- comment = g_strdup_printf("PTId = %u", si->passThruId);
+ if (si->passThroughPartyId)
+ comment = g_strdup_printf("PTId = %u", si->passThroughPartyId);
else
comment = NULL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 07:17:00 +0000