osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixes for issues reported by Chris Maynard in bug #2813; 

Also: fix a typo

svn path=/trunk/; revision=27082
This commit is contained in:
Bill Meier 2008-12-22 13:34:51 +00:00
parent d7cd8b410b
commit b3d131b43d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sercosiii/packet-sercosiii_1v1_at.c
View File

@ -40,8 +40,8 @@ static gint ett_siii_at = -1;
static gint ett_siii_at_svc = -1;
static gint ett_siii_at_devstats = -1;
static gint ett_siii_at_svc_channel[MAX_SERCOS_DEVICES] = {-1};
static gint ett_siii_at_dev_status[MAX_SERCOS_DEVICES] = {-1};
static gint ett_siii_at_svc_channel[MAX_SERCOS_DEVICES];
static gint ett_siii_at_dev_status[MAX_SERCOS_DEVICES];
void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
{
@ -65,7 +65,7 @@ void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
if(tfield == 0)
{
g_snprintf(outbuf, sizeof(outbuf), "Device Address %u: No SERCOS Addresss", i);
g_snprintf(outbuf, sizeof(outbuf), "Device Address %u: No SERCOS Address", i);
}
else if(tfield == 0xFFFF)
{
@ -207,12 +207,14 @@ void dissect_siii_at_init(gint proto_siii _U_)
for(idx = 0; idx < MAX_SERCOS_DEVICES; ++idx)
{
ett_siii_at_svc_channel[idx] = -1;
etts[idx] = &ett_siii_at_svc_channel[idx];
}
proto_register_subtree_array(etts, array_length(etts));
for(idx = 0; idx < MAX_SERCOS_DEVICES; ++idx)
{
ett_siii_at_dev_status[idx] = -1;
etts[idx] = &ett_siii_at_dev_status[idx];
}
proto_register_subtree_array(etts, array_length(etts));

4
plugins/sercosiii/packet-sercosiii_1v1_at_devstat.c
View File

@ -67,8 +67,8 @@ static const value_string siii_at_devstatus_inactiveportstatus_text[]=
{
{0x00, "No link on port"},
{0x01, "Link on port"},
{0x02, "S III P-Telegramm on port"},
{0x03, "S III S-Telegramm on port"},
{0x02, "S III P-Telegram on port"},
{0x03, "S III S-Telegram on port"},
{0, NULL}
};

6
plugins/sercosiii/packet-sercosiii_1v1_mdt.c
View File

@ -59,8 +59,8 @@ static gint ett_siii_mdt = -1;
static gint ett_siii_mdt_svc = -1;
static gint ett_siii_mdt_devctrls = -1;
static gint ett_siii_mdt_version = -1;
static gint ett_siii_mdt_svc_channel[MAX_SERCOS_DEVICES] = {-1};
static gint ett_siii_mdt_dev_control[MAX_SERCOS_DEVICES] = {-1};
static gint ett_siii_mdt_svc_channel[MAX_SERCOS_DEVICES];
static gint ett_siii_mdt_dev_control[MAX_SERCOS_DEVICES];
void dissect_siii_mdt_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
{
@ -229,12 +229,14 @@ void dissect_siii_mdt_init(gint proto_siii)
for(idx = 0; idx < MAX_SERCOS_DEVICES; ++idx)
{
ett_siii_mdt_svc_channel[idx] = -1;
etts[idx] = &ett_siii_mdt_svc_channel[idx];
}
proto_register_subtree_array(etts, array_length(etts));
for(idx = 0; idx < MAX_SERCOS_DEVICES; ++idx)
{
ett_siii_mdt_dev_control[idx] = -1;
etts[idx] = &ett_siii_mdt_dev_control[idx];
}
proto_register_subtree_array(etts, array_length(etts));