diff options
| author | D. Ulis <daulis0@gmail.com> | 2016-12-05 07:43:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-06 00:08:35 +0000 |
| commit | 8773ea03cbcd72cc6463476e0342d6756d51267a (patch) | |
| tree | 15f00bc8977ee31bd6eeab2154d541025b141925 /epan/dissectors/packet-cipmotion.c | |
| parent | a94b82a8e1ca71d130ec5a77f7d71b2d6814aeef (diff) | |
CIP: Minor enhancements
1. ENIP: Display the CIP Forward Open Request packet number for connected data
2. CIP: Extended Network: Display expert info when the expected bytes does not match actual bytes
3. CIP: Look up more data fields as CIP service or Device Type
4. CIP: Display data as Dec/Hex, depending on how the spec shows things
5. Minor: Pull out common code into load_cip_request_data()
6. Minor: Text corrections
Change-Id: I184ac3899786f650e4d4643a5dfe68bba785d6e0
Reviewed-on: https://code.wireshark.org/review/19092
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cipmotion.c')
| -rw-r--r-- | epan/dissectors/packet-cipmotion.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 72ce5c0a70..780f942a29 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -341,7 +341,7 @@ static const value_string cip_axis_control_vals[] = { { 0, "No Request" }, { 1, "Enable Request" }, - { 2, "Disble Request" }, + { 2, "Disable Request" }, { 3, "Shutdown Request" }, { 4, "Shutdown Reset Request" }, { 5, "Abort Request" }, @@ -454,7 +454,7 @@ static const value_string cip_sc_vals[] = { { SC_RUN_MOTOR_TEST, "Run Motor Test" }, { SC_GET_MOTOR_TEST_DATA, "Get Motor Test Data" }, { SC_RUN_INERTIA_TEST, "Run Inertia Test" }, - { SC_GET_INERTIA_TEST_DATA, "Get Intertia Test Data" }, + { SC_GET_INERTIA_TEST_DATA, "Get Inertia Test Data" }, { SC_RUN_HOOKUP_TEST, "Run Hookup Test" }, { SC_GET_HOOKUP_TEST_DATA, "Get Hookup Test Data" }, { 0, NULL } @@ -1533,7 +1533,7 @@ dissect_var_inst_header(tvbuff_t* tvb, proto_tree* tree, guint32 offset, guint8* proto_tree_add_item(header_tree, hf_var_devce_instance, tvb, offset, 1, ENC_LITTLE_ENDIAN); /* The "size" fields in the instance data block header are all stored as number of 32-bit words the - * block uses since all blocks should pad up to 32-bits so to convert to bytes each is mulitplied by 4 */ + * block uses since all blocks should pad up to 32-bits so to convert to bytes each is multiplied by 4 */ /* Read the instance block size field in bytes from the instance data header */ temp_data = tvb_get_guint8(tvb, offset + 2); @@ -1923,7 +1923,7 @@ proto_register_cipmotion(void) }, { &hf_cip_class1_seqnum, - { "CIP Class 1 Sequence Number", "cipm.class1seqnum", + { "CIP Class 1 Sequence Count", "cipm.class1seqnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } }, @@ -2143,7 +2143,7 @@ proto_register_cipmotion(void) { &hf_cip_act_data_pos, { "Actual Position", "cipm.act.pos", FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_POSITION, - "Acutal Data Set: Actual Position", HFILL} + "Actual Data Set: Actual Position", HFILL} }, { &hf_cip_act_data_vel, { "Actual Velocity", "cipm.act.vel", @@ -2562,7 +2562,7 @@ proto_register_cipmotion(void) }, { &hf_cip_svc_code, { "Service Code", "cipm.svc.code", - FT_UINT8, BASE_DEC, VALS(cip_sc_vals), 0, + FT_UINT8, BASE_HEX, VALS(cip_sc_vals), 0, "Service Data Block: Service Code", HFILL} }, { &hf_cip_svc_sts, @@ -2712,7 +2712,7 @@ proto_register_cipmotion(void) { &hf_cip_axis_sts_local_ctrl, { "Local Control", "cipm.axis.local", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, - "Axis Status Data Set: Local Contol", HFILL } + "Axis Status Data Set: Local Control", HFILL } }, { &hf_cip_axis_sts_alarm, { "Alarm", "cipm.axis.alarm", |