osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Lori Tribble: 

Attached is a patch which corrects the string construction issue in the
PropertyStates method.  This patch also corrects a spelling error for
'utcTimeSyncronization' and adds decode support for this property.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6475#c8

svn path=/trunk/; revision=43868
This commit is contained in:
Bill Meier 2012-07-20 19:09:05 +00:00
parent 69b1c2dd84
commit 7eb2b89e71
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-bacapp.c
View File

@ -2554,7 +2554,7 @@ BACnetUnconfirmedServiceChoice [] = {
{ 6, "timeSynchronization"}, { 6, "timeSynchronization"},
{ 7, "who-Has"}, { 7, "who-Has"},
{ 8, "who-Is"}, { 8, "who-Is"},
{ 9, "utcTimeSynchonization"}, { 9, "utcTimeSynchronization"},
{ 0, NULL} { 0, NULL}
}; };
@ -7161,7 +7161,7 @@ fBACnetPropertyStates(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, g
const gchar* label = NULL; const gchar* label = NULL;
fTagHeader (tvb, pinfo, offset, &tag_no, &tag_info, &lvt); fTagHeader (tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
label = ep_strdup_printf( "%s: ", val_to_str_const( tag_no, VALS(BACnetPropertyStates), "unknown-"+tag_no )); label = ep_strdup_printf( "%s: ", val_to_str_const( tag_no, VALS(BACnetPropertyStates), "Unknown State" ));
switch (tag_no) { switch (tag_no) {
case 0: case 0:
@ -7174,7 +7174,7 @@ fBACnetPropertyStates(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, g
if ( (tag_no > BACnetPropertyStatesEnums_Size) || if ( (tag_no > BACnetPropertyStatesEnums_Size) ||
VALS(BACnetPropertyStatesEnums[tag_no].valstr) == NULL) VALS(BACnetPropertyStatesEnums[tag_no].valstr) == NULL)
{ {
offset = fEnumeratedTag(tvb, pinfo, tree, offset, "Unknown State: ", NULL); offset = fEnumeratedTag(tvb, pinfo, tree, offset, label, NULL);
/* don't use Abstract type here because it is context tagged and therefore we don't know app type */ /* don't use Abstract type here because it is context tagged and therefore we don't know app type */
} }
else else
@ -9760,6 +9760,7 @@ fUnconfirmedServiceRequest (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
case 5: /* unconfirmedTextMessage */ case 5: /* unconfirmedTextMessage */
offset = fUnconfirmedTextMessageRequest(tvb, pinfo, tree, offset); offset = fUnconfirmedTextMessageRequest(tvb, pinfo, tree, offset);
break; break;
case 206: /* utc-time-synchronization-recipients */
case 6: /* timeSynchronization */ case 6: /* timeSynchronization */
offset = fTimeSynchronizationRequest (tvb, pinfo, tree, offset); offset = fTimeSynchronizationRequest (tvb, pinfo, tree, offset);
break; break;