aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-vsip.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-vsip.c')
-rw-r--r--epan/dissectors/packet-vsip.c321
1 files changed, 160 insertions, 161 deletions
diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c
index 3fb0d6f1e7..956a7c2d10 100644
--- a/epan/dissectors/packet-vsip.c
+++ b/epan/dissectors/packet-vsip.c
@@ -23,6 +23,8 @@
void proto_register_vsip(void);
void proto_reg_handoff_vsip(void);
+static dissector_handle_t vsip_handle;
+
static const value_string EVsipMessageType_vals[] =
{
{ 1, "VSIP Ping Request"},
@@ -675,157 +677,157 @@ static value_string_ext EVsipErrorCode_vals_ext = VALUE_STRING_EXT_INIT(EVsipErr
/* Global module variables. */
-static int proto_vsip = -1;
-
-static int hf_vsip_ValueTypeString_Size = -1;
-static int hf_vsip_ValueTypeBinary_Size = -1;
-static int hf_vsip_PingReq_ReplyAddress = -1;
-static int hf_vsip_PingReq_ReplyPort = -1;
-static int hf_vsip_PingReq_ConnType = -1;
-static int hf_vsip_PingResp_SuppConnTypes_VOLATILE = -1;
-static int hf_vsip_PingResp_SuppConnTypes_RTP = -1;
-static int hf_vsip_PingResp_SuppConnTypes_SSL = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_BROADCAST = -1;
-static int hf_vsip_PingResp_SuppConnTypes_TCP_CLIENT = -1;
-static int hf_vsip_PingResp_SuppConnTypes_TCP_SERVER = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_MULTICAST = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_UNICAST = -1;
-static int hf_vsip_PingResp_DeviceIP = -1;
-static int hf_vsip_PingResp_DevicePort = -1;
-static int hf_vsip_PingResp_SuppConnTypes = -1;
-static int hf_vsip_ContentTypeSwitchReq_DeviceGUID = -1;
-static int hf_vsip_PingResp_DeviceGUID = -1;
-static int hf_vsip_PingResp_VendorID = -1;
-static int hf_vsip_PingResp_ProductType = -1;
-static int hf_vsip_PingResp_Status = -1;
-static int hf_vsip_PingResp_SubtypeLen = -1;
-static int hf_vsip_PingResp_Subtype = -1;
-static int hf_vsip_ContentTypeSwitchReq_ApplicationGUID = -1;
-static int hf_vsip_ContentTypeSwitchReq_ContentType = -1;
-static int hf_vsip_ContentTypeSwitchResp_DeviceGUID = -1;
-static int hf_vsip_ContentTypeSwitchResp_SwitchResult = -1;
-static int hf_vsip_GetCapabilitiesReq_DisabledCapabilities = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_EntityType = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_CapabilityGUID = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VendorID = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VersionNumber = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityCount = -1;
-static int hf_vsip_StartDevice_CapabilityGUID = -1;
-static int hf_vsip_StartDevice_TargetAddress = -1;
-static int hf_vsip_StartDevice_TargetPort = -1;
-static int hf_vsip_StartDevice_LocalPort = -1;
-static int hf_vsip_StartDevice_ConnectionType = -1;
-static int hf_vsip_StartDeviceEx_CapabilityGUID = -1;
-static int hf_vsip_StartDeviceEx_TargetAddress = -1;
-static int hf_vsip_StartDeviceEx_TargetPort = -1;
-static int hf_vsip_StartDeviceEx_LocalPort = -1;
-static int hf_vsip_StartDeviceEx_ConnectionType = -1;
-static int hf_vsip_StartDeviceEx_TargetGUID = -1;
-static int hf_vsip_StopDevice_CapabilityGUID = -1;
-static int hf_vsip_StopDeviceEx_CapabilityGUID = -1;
-static int hf_vsip_StopDeviceEx_TargetGUID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_ShortValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_ValueType = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_IntValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_StringValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_UintValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_GuidValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_FloatValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_BinaryValue = -1;
-static int hf_vsip_SetConfigReq_CapabilityGUID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemCount = -1;
-static int hf_vsip_GetConfigReq_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_GetConfigReq_CapabilityGUID = -1;
-static int hf_vsip_GetConfigReq_ConfigItemCount = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_ValueType = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_CharValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_ShortValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_IntValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_StringValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_UintValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_GuidValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_FloatValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_BinaryValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_CharValue = -1;
-static int hf_vsip_GetConfigResp_CapabilityGUID = -1;
-static int hf_vsip_GetConfigResp_ConfigItemCount = -1;
-static int hf_vsip_SendCommand_CapabilityGUID = -1;
-static int hf_vsip_SendCommand_CommandCode = -1;
-static int hf_vsip_SendCommand_Arg1 = -1;
-static int hf_vsip_SendCommand_Arg2 = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_ValueType = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_CharValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_ShortValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_IntValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_StringValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_UintValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_GuidValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_FloatValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_BinaryValue = -1;
-static int hf_vsip_SendCommandEx_CapabilityGUID = -1;
-static int hf_vsip_SendCommandEx_CommandCode = -1;
-static int hf_vsip_SendCommandEx_Arg1 = -1;
-static int hf_vsip_SendCommandEx_Arg2 = -1;
-static int hf_vsip_SendCommandEx_NumAddArgs = -1;
-static int hf_vsip_EventNotify_CapabilityGUID = -1;
-static int hf_vsip_EventNotify_EventType = -1;
-static int hf_vsip_EventNotify_EventArgument = -1;
-static int hf_vsip_EventSubscribeReq_ReceiverAddress = -1;
-static int hf_vsip_EventSubscribeReq_ReceiverPort = -1;
-static int hf_vsip_EventSubscribeReq_ConnectionType = -1;
-static int hf_vsip_EventSubscribeExReq_ReceiverAddress = -1;
-static int hf_vsip_EventSubscribeExReq_ReceiverPort = -1;
-static int hf_vsip_EventSubscribeExReq_ConnectionType = -1;
-static int hf_vsip_EventSubscribeExReq_DestinationGUID = -1;
-static int hf_vsip_ErrorResponse_RequestMessageType = -1;
-static int hf_vsip_ErrorResponse_StatusCode = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_ValueType = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_CharValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_ShortValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_IntValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_StringValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_UintValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_GuidValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_FloatValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_BinaryValue = -1;
-static int hf_vsip_ErrorVAResponse_NumAddArgs = -1;
-static int hf_vsip_Version = -1;
-static int hf_vsip_Type = -1;
-static int hf_vsip_TransacId = -1;
-static int hf_vsip_PacketSize = -1;
-
-static int ett_vsipValueTypeString = -1;
-static int ett_vsipValueTypeBinary = -1;
-static int ett_vsipPingReq = -1;
-static int ett_vsipPingResp_SuppConnTypes = -1;
-static int ett_vsipPingResp = -1;
-static int ett_vsipContentTypeSwitchReq = -1;
-static int ett_vsipContentTypeSwitchResp = -1;
-static int ett_vsipGetCapabilitiesReq = -1;
-static int ett_vsipGetCapabilitiesResp_CapabilityArray = -1;
-static int ett_vsipGetCapabilitiesResp = -1;
-static int ett_vsipStartDevice = -1;
-static int ett_vsipStartDeviceEx = -1;
-static int ett_vsipStopDevice = -1;
-static int ett_vsipStopDeviceEx = -1;
-static int ett_vsipSetConfigReq_ConfigItemArray = -1;
-static int ett_vsipSetConfigReq = -1;
-static int ett_vsipGetConfigReq_ConfigItemArray = -1;
-static int ett_vsipGetConfigReq = -1;
-static int ett_vsipGetConfigResp_ConfigItemArray = -1;
-static int ett_vsipGetConfigResp = -1;
-static int ett_vsipSendCommand = -1;
-static int ett_vsipSendCommandEx_AddArgsArray = -1;
-static int ett_vsipSendCommandEx = -1;
-static int ett_vsipEventNotify = -1;
-static int ett_vsipEventSubscribeReq = -1;
-static int ett_vsipEventSubscribeExReq = -1;
-static int ett_vsipErrorResponse = -1;
-static int ett_vsipErrorVAResponse_AddArgsArray = -1;
-static int ett_vsipErrorVAResponse = -1;
-static int ett_vsip = -1;
+static int proto_vsip;
+
+static int hf_vsip_ValueTypeString_Size;
+static int hf_vsip_ValueTypeBinary_Size;
+static int hf_vsip_PingReq_ReplyAddress;
+static int hf_vsip_PingReq_ReplyPort;
+static int hf_vsip_PingReq_ConnType;
+static int hf_vsip_PingResp_SuppConnTypes_VOLATILE;
+static int hf_vsip_PingResp_SuppConnTypes_RTP;
+static int hf_vsip_PingResp_SuppConnTypes_SSL;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_BROADCAST;
+static int hf_vsip_PingResp_SuppConnTypes_TCP_CLIENT;
+static int hf_vsip_PingResp_SuppConnTypes_TCP_SERVER;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_MULTICAST;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_UNICAST;
+static int hf_vsip_PingResp_DeviceIP;
+static int hf_vsip_PingResp_DevicePort;
+static int hf_vsip_PingResp_SuppConnTypes;
+static int hf_vsip_ContentTypeSwitchReq_DeviceGUID;
+static int hf_vsip_PingResp_DeviceGUID;
+static int hf_vsip_PingResp_VendorID;
+static int hf_vsip_PingResp_ProductType;
+static int hf_vsip_PingResp_Status;
+static int hf_vsip_PingResp_SubtypeLen;
+static int hf_vsip_PingResp_Subtype;
+static int hf_vsip_ContentTypeSwitchReq_ApplicationGUID;
+static int hf_vsip_ContentTypeSwitchReq_ContentType;
+static int hf_vsip_ContentTypeSwitchResp_DeviceGUID;
+static int hf_vsip_ContentTypeSwitchResp_SwitchResult;
+static int hf_vsip_GetCapabilitiesReq_DisabledCapabilities;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_EntityType;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_CapabilityGUID;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VendorID;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VersionNumber;
+static int hf_vsip_GetCapabilitiesResp_CapabilityCount;
+static int hf_vsip_StartDevice_CapabilityGUID;
+static int hf_vsip_StartDevice_TargetAddress;
+static int hf_vsip_StartDevice_TargetPort;
+static int hf_vsip_StartDevice_LocalPort;
+static int hf_vsip_StartDevice_ConnectionType;
+static int hf_vsip_StartDeviceEx_CapabilityGUID;
+static int hf_vsip_StartDeviceEx_TargetAddress;
+static int hf_vsip_StartDeviceEx_TargetPort;
+static int hf_vsip_StartDeviceEx_LocalPort;
+static int hf_vsip_StartDeviceEx_ConnectionType;
+static int hf_vsip_StartDeviceEx_TargetGUID;
+static int hf_vsip_StopDevice_CapabilityGUID;
+static int hf_vsip_StopDeviceEx_CapabilityGUID;
+static int hf_vsip_StopDeviceEx_TargetGUID;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_ShortValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_ValueType;
+static int hf_vsip_SetConfigReq_ConfigItemArray_ConfigItemID;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_IntValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_StringValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_UintValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_GuidValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_FloatValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_BinaryValue;
+static int hf_vsip_SetConfigReq_CapabilityGUID;
+static int hf_vsip_SetConfigReq_ConfigItemCount;
+static int hf_vsip_GetConfigReq_ConfigItemArray_ConfigItemID;
+static int hf_vsip_GetConfigReq_CapabilityGUID;
+static int hf_vsip_GetConfigReq_ConfigItemCount;
+static int hf_vsip_GetConfigResp_ConfigItemArray_ConfigItemID;
+static int hf_vsip_GetConfigResp_ConfigItemArray_ValueType;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_CharValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_ShortValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_IntValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_StringValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_UintValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_GuidValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_FloatValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_BinaryValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_CharValue;
+static int hf_vsip_GetConfigResp_CapabilityGUID;
+static int hf_vsip_GetConfigResp_ConfigItemCount;
+static int hf_vsip_SendCommand_CapabilityGUID;
+static int hf_vsip_SendCommand_CommandCode;
+static int hf_vsip_SendCommand_Arg1;
+static int hf_vsip_SendCommand_Arg2;
+static int hf_vsip_SendCommandEx_AddArgsArray_ValueType;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_CharValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_ShortValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_IntValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_StringValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_UintValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_GuidValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_FloatValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_BinaryValue;
+static int hf_vsip_SendCommandEx_CapabilityGUID;
+static int hf_vsip_SendCommandEx_CommandCode;
+static int hf_vsip_SendCommandEx_Arg1;
+static int hf_vsip_SendCommandEx_Arg2;
+static int hf_vsip_SendCommandEx_NumAddArgs;
+static int hf_vsip_EventNotify_CapabilityGUID;
+static int hf_vsip_EventNotify_EventType;
+static int hf_vsip_EventNotify_EventArgument;
+static int hf_vsip_EventSubscribeReq_ReceiverAddress;
+static int hf_vsip_EventSubscribeReq_ReceiverPort;
+static int hf_vsip_EventSubscribeReq_ConnectionType;
+static int hf_vsip_EventSubscribeExReq_ReceiverAddress;
+static int hf_vsip_EventSubscribeExReq_ReceiverPort;
+static int hf_vsip_EventSubscribeExReq_ConnectionType;
+static int hf_vsip_EventSubscribeExReq_DestinationGUID;
+static int hf_vsip_ErrorResponse_RequestMessageType;
+static int hf_vsip_ErrorResponse_StatusCode;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_ValueType;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_CharValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_ShortValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_IntValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_StringValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_UintValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_GuidValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_FloatValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_BinaryValue;
+static int hf_vsip_ErrorVAResponse_NumAddArgs;
+static int hf_vsip_Version;
+static int hf_vsip_Type;
+static int hf_vsip_TransacId;
+static int hf_vsip_PacketSize;
+
+static int ett_vsipValueTypeString;
+static int ett_vsipValueTypeBinary;
+static int ett_vsipPingReq;
+static int ett_vsipPingResp_SuppConnTypes;
+static int ett_vsipPingResp;
+static int ett_vsipContentTypeSwitchReq;
+static int ett_vsipContentTypeSwitchResp;
+static int ett_vsipGetCapabilitiesReq;
+static int ett_vsipGetCapabilitiesResp_CapabilityArray;
+static int ett_vsipGetCapabilitiesResp;
+static int ett_vsipStartDevice;
+static int ett_vsipStartDeviceEx;
+static int ett_vsipStopDevice;
+static int ett_vsipStopDeviceEx;
+static int ett_vsipSetConfigReq_ConfigItemArray;
+static int ett_vsipSetConfigReq;
+static int ett_vsipGetConfigReq_ConfigItemArray;
+static int ett_vsipGetConfigReq;
+static int ett_vsipGetConfigResp_ConfigItemArray;
+static int ett_vsipGetConfigResp;
+static int ett_vsipSendCommand;
+static int ett_vsipSendCommandEx_AddArgsArray;
+static int ett_vsipSendCommandEx;
+static int ett_vsipEventNotify;
+static int ett_vsipEventSubscribeReq;
+static int ett_vsipEventSubscribeExReq;
+static int ett_vsipErrorResponse;
+static int ett_vsipErrorVAResponse_AddArgsArray;
+static int ett_vsipErrorVAResponse;
+static int ett_vsip;
static guint32 vsip_ValueTypeString(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, int offset, int hf_string)
@@ -929,7 +931,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t
proto_tree_add_item(tree, hf_vsip_PingResp_ProductType, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
len = tvb_get_ntohs(tvb, offset);
@@ -938,7 +940,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t
if (len > 0)
{
- proto_tree_add_item(tree, hf_vsip_PingResp_Subtype, tvb, offset, len, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_vsip_PingResp_Subtype, tvb, offset, len, ENC_ASCII);
offset += len;
}
@@ -1611,12 +1613,11 @@ static guint32 vsip_ErrorVAResponse(proto_tree *tree, packet_info *pinfo, tvbuff
static guint32 vsip_dissect_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
{
int soffset = offset;
- guint16 version;
+ guint32 version;
guint8 type;
proto_item *ti;
- version = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(tree, hf_vsip_Version, tvb, offset, 2, version);
+ proto_tree_add_item_ret_uint(tree, hf_vsip_Version, tvb, offset, 2, ENC_BIG_ENDIAN, &version);
offset += 2;
type = tvb_get_guint8(tvb, offset);
@@ -1632,7 +1633,7 @@ static guint32 vsip_dissect_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, p
proto_tree_add_item(tree, hf_vsip_PacketSize, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
}
- else if(version == 256)
+ else if (version == 256)
{
proto_tree_add_item(tree, hf_vsip_PacketSize, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
@@ -1754,7 +1755,7 @@ static int dissect_vsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
static void
vsip_fmt_revision( gchar *result, guint32 revision )
{
- g_snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
+ snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
}
void proto_register_vsip(void)
@@ -2061,13 +2062,11 @@ void proto_register_vsip(void)
proto_register_subtree_array(ett, array_length(ett));
proto_register_field_array(proto_vsip, hf, array_length(hf));
+ vsip_handle = register_dissector("vsip", dissect_vsip, proto_vsip);
}
void proto_reg_handoff_vsip(void)
{
- dissector_handle_t vsip_handle;
-
- vsip_handle = create_dissector_handle(dissect_vsip, proto_vsip);
dissector_add_for_decode_as_with_preference("udp.port", vsip_handle);
dissector_add_for_decode_as_with_preference("tcp.port", vsip_handle);
}