diff options
| author | Diederik de Groot <ddegroot@talon.nl> | 2014-08-26 01:46:21 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-08-25 23:58:24 +0000 |
| commit | 7749263be6b34dbdb0e1869d55d80ace9d1ef593 (patch) | |
| tree | 177e0160ddd0dd2c04e76dbc62887fae844f4ea0 /tools/SkinnyProtocolOptimized.xml | |
| parent | 1c98a1261b6049f603b9a632118ab8e2fd79f512 (diff) | |
Skinny Dissector:
Source Fix: Trailing Whitespace (Reported by Graham Bloice).
Dissection Fix: ProtocolVer needed to be split up into two fields to display the protocol version correct during device registration
Segfault Fix: Null Pointer Check required after returning from tvb_memdup, before calling strlen (Reported by Evan Huus)
Fix: Whitespace (again)
Bug: 10409
Change-Id: Ib253ea843363792f678f2e724359f83f12ebfadc
Reviewed-on: https://code.wireshark.org/review/3844
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'tools/SkinnyProtocolOptimized.xml')
| -rw-r--r-- | tools/SkinnyProtocolOptimized.xml | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/tools/SkinnyProtocolOptimized.xml b/tools/SkinnyProtocolOptimized.xml index adcce7b68c..6961e90204 100644 --- a/tools/SkinnyProtocolOptimized.xml +++ b/tools/SkinnyProtocolOptimized.xml @@ -450,7 +450,8 @@ </fields> <fields size_gt="52"> <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="uint16"/> + <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"> <entries> <entry comment="" name="PhoneFeatures_Bit1" text="Bit1" value="0x0001"/> @@ -1937,7 +1938,28 @@ <string comment="" name="dateTemplate" size="6" type="char"/> <integer comment="" name="alignmentPadding" type="uint16"/> <integer comment="" name="secondaryKeepAliveInterval" type="uint32"/> - <integer comment="" name="maxProtocolVer" 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"> + <entries> + <entry comment="" name="PhoneFeatures_Bit1" text="Bit1" value="0x0001"/> + <entry comment="" name="PhoneFeatures_Bit2" text="Bit2" value="0x0002"/> + <entry comment="" name="PhoneFeatures_Bit3" text="Bit3" value="0x0004"/> + <entry comment="" name="PhoneFeatures_Bit4" text="Bit4" value="0x0008"/> + <entry comment="Supports UTF-8" name="PhoneFeatures_UTF8" text="UTF8Bit5" value="0x0010"/> + <entry comment="" name="PhoneFeatures_Bit6" text="Bit6" value="0x0020"/> + <entry comment="" name="PhoneFeatures_Bit7" text="Bit7" value="0x0040"/> + <entry comment="Support Dynamic Messages" name="PhoneFeatures_DynamicMessages" text="DynamicMessages" value="0x0080"/> + <entry comment="" name="PhoneFeatures_Bit9" text="Bit9" value="0x0100"/> + <entry comment="Supports DTMF Type RFC2833" name="PhoneFeatures_RFC2833" text="RFC2833" value="0x0200"/> + <entry comment="" name="PhoneFeatures_Bit11" text="Bit11" value="0x0400"/> + <entry comment="" name="PhoneFeatures_Bit12" text="Bit12" value="0x0800"/> + <entry comment="" name="PhoneFeatures_Bit13" text="Bit13" value="0x1000"/> + <entry comment="" name="PhoneFeatures_Bit14" text="Bit14" value="0x2000"/> + <entry comment="" name="PhoneFeatures_Bit15" text="Bit15" value="0x4000"/> + <entry comment="Abbreviated Dial" name="PhoneFeatures_Abbreviated_Dial" text="AbbrevDial" value="0x8000"/> + </entries> + </bitfield> </fields> </message> <enum name="DeviceTone"> @@ -3734,7 +3756,7 @@ <message comment="" direction="pbx2dev" dynamic="yes" name="LineStatV2Message" opcode="0x0147" status="no" type="RegistrationAndManagement"> <fields beginversion="0" endversion="22"> <integer comment="" name="lineNumber" type="uint32"/> - <integer comment="" name="Unknown" type="uint32"/> + <integer comment="" name="lineType" type="uint32"/> <string comment="" name="lineDirNumber" size="25" type="char"/> <string comment="" name="lineFullyQualifiedDisplayName" size="40" type="char"/> <string comment="" name="lineTextLabel" size="40" type="char"/> |