diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-04-17 15:15:40 +0200 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-04-17 13:28:52 +0000 |
| commit | 17a0b59e39c043a397b98b37c9cc33beb14c919b (patch) | |
| tree | 739e04e7083f58271ff2c529572ca28bfbf6e2d0 /epan | |
| parent | ce468653dab1fc470179ad25c95d12a3889905d7 (diff) | |
From Graham Bloice:
Fix A mismatch in the dnp3_al_obj_vals value string fixes bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9945
Change-Id: I3d0a423d7d2e4a711533debbd950e2976dd5115e
Reviewed-on: https://code.wireshark.org/review/1183
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 7df5984979..caf861dc4f 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -947,14 +947,18 @@ static const value_string dnp3_al_obj_vals[] = { { AL_OBJ_FCTR_16, "16-Bit Frozen Binary Counter (Obj:21, Var:02)" }, { AL_OBJ_FDCTR_32, "32-Bit Frozen Binary Delta Counter (Obj:21, Var:03)" }, { AL_OBJ_FDCTR_16, "16-Bit Frozen Binary Delta Counter (Obj:21, Var:04)" }, - { AL_OBJ_FCTR_32T, "32-Bit Frozen Binary Counter (Obj:21, Var:01)" }, - { AL_OBJ_FCTR_16T, "16-Bit Frozen Binary Counter (Obj:21, Var:02)" }, - { AL_OBJ_FDCTR_32T, "32-Bit Frozen Binary Delta Counter (Obj:21, Var:03)" }, - { AL_OBJ_FDCTR_16T, "16-Bit Frozen Binary Delta Counter (Obj:21, Var:04)" }, - { AL_OBJ_FCTR_32NF, "32-Bit Frozen Binary Counter Without Flag (Obj:21, Var:05)" }, - { AL_OBJ_FCTR_16NF, "16-Bit Frozen Binary Counter Without Flag (Obj:21, Var:06)" }, - { AL_OBJ_FDCTR_32NF, "32-Bit Frozen Binary Delta Counter Without Flag (Obj:21, Var:07)" }, - { AL_OBJ_FDCTR_16NF, "16-Bit Frozen Binary Delta Counter Without Flag (Obj:21, Var:08)" }, + { AL_OBJ_FCTR_32, "32-Bit Frozen Binary Counter (Obj:21, Var:01)" }, + { AL_OBJ_FCTR_16, "16-Bit Frozen Binary Counter (Obj:21, Var:02)" }, + { AL_OBJ_FDCTR_32, "32-Bit Frozen Binary Delta Counter (Obj:21, Var:03)" }, + { AL_OBJ_FDCTR_16, "16-Bit Frozen Binary Delta Counter (Obj:21, Var:04)" }, + { AL_OBJ_FCTR_32T, "32-Bit Frozen Binary Counter With Flag and Time (Obj:21, Var:05)" }, + { AL_OBJ_FCTR_16T, "16-Bit Frozen Binary Counter With Flag and Time (Obj:21, Var:06)" }, + { AL_OBJ_FDCTR_32T, "32-Bit Frozen Binary Delta Counter With Flag and Time (Obj:21, Var:07)" }, + { AL_OBJ_FDCTR_16T, "16-Bit Frozen Binary Delta Counter With Flag and Time (Obj:21, Var:08)" }, + { AL_OBJ_FCTR_32NF, "32-Bit Frozen Binary Counter Without Flag (Obj:21, Var:09)" }, + { AL_OBJ_FCTR_16NF, "16-Bit Frozen Binary Counter Without Flag (Obj:21, Var:10)" }, + { AL_OBJ_FDCTR_32NF, "32-Bit Frozen Binary Delta Counter Without Flag (Obj:21, Var:11)" }, + { AL_OBJ_FDCTR_16NF, "16-Bit Frozen Binary Delta Counter Without Flag (Obj:21, Var:12)" }, { AL_OBJ_CTRC_ALL, "Binary Counter Change Default Variation (Obj:22, Var:Default)" }, { AL_OBJ_CTRC_32, "32-Bit Counter Change Event w/o Time (Obj:22, Var:01)" }, { AL_OBJ_CTRC_16, "16-Bit Counter Change Event w/o Time (Obj:22, Var:02)" }, |