← Back to branch summary

~jelmer/wireshark/daily-ppa

« back to all changes in this revision

Viewing changes to epan/dissectors/packet-nlm.c

  • Committer: Bazaar Package Importer
  • Author(s): Balint Reczey
  • Date: 2010-11-20 18:41:41 UTC
  • mfrom: (1.1.28 upstream) (42.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20101120184141-19e4sxq2kfsdnc9i
Tags: 1.4.2-1
* New upstream release 1.4.2
  - release notes:
    http://www.wireshark.org/docs/relnotes/wireshark-1.4.2.html
  - security fixes
     - Nephi Johnson of BreakingPoint discovered that the LDSS dissector
       could overflow a buffer. (No assigned CVE number.)
     - The ZigBee ZCL dissector could go into an infinite loop.
       (No assigned CVE number.)
* drop 05_fix-display-filter-update-when-changing-profile.patch
  patch since it has been integrated upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
epan/dissectors/packet-nlm.c
1
1
/* packet-nlm.c
2
2
 * Routines for nlm dissection
3
3
 *
4
 
 * $Id: packet-nlm.c 28321 2009-05-08 22:55:22Z wmeier $
 
4
 * $Id: packet-nlm.c 28770 2009-06-18 21:30:42Z stig $
5
5
 *
6
6
 * Wireshark - Network traffic analyzer
7
7
 * By Gerald Combs <gerald@wireshark.org>
1137
1137
        static hf_register_info hf[] = {
1138
1138
                { &hf_nlm_procedure_v1, {
1139
1139
                        "V1 Procedure", "nlm.procedure_v1", FT_UINT32, BASE_DEC,
1140
 
                        VALS(nlm1_proc_vals), 0, "V1 Procedure", HFILL }},
 
1140
                        VALS(nlm1_proc_vals), 0, NULL, HFILL }},
1141
1141
                { &hf_nlm_procedure_v2, {
1142
1142
                        "V2 Procedure", "nlm.procedure_v2", FT_UINT32, BASE_DEC,
1143
 
                        VALS(nlm2_proc_vals), 0, "V2 Procedure", HFILL }},
 
1143
                        VALS(nlm2_proc_vals), 0, NULL, HFILL }},
1144
1144
                { &hf_nlm_procedure_v3, {
1145
1145
                        "V3 Procedure", "nlm.procedure_v3", FT_UINT32, BASE_DEC,
1146
 
                        VALS(nlm3_proc_vals), 0, "V3 Procedure", HFILL }},
 
1146
                        VALS(nlm3_proc_vals), 0, NULL, HFILL }},
1147
1147
                { &hf_nlm_procedure_v4, {
1148
1148
                        "V4 Procedure", "nlm.procedure_v4", FT_UINT32, BASE_DEC,
1149
 
                        VALS(nlm4_proc_vals), 0, "V4 Procedure", HFILL }},
 
1149
                        VALS(nlm4_proc_vals), 0, NULL, HFILL }},
1150
1150
                { &hf_nlm_cookie, {
1151
 
                        "cookie", "nlm.cookie", FT_BYTES, BASE_DEC,
1152
 
                        NULL, 0, "cookie", HFILL }},
 
1151
                        "cookie", "nlm.cookie", FT_BYTES, BASE_NONE,
 
1152
                        NULL, 0, NULL, HFILL }},
1153
1153
                { &hf_nlm_block, {
1154
1154
                        "block", "nlm.block", FT_BOOLEAN, BASE_NONE,
1155
 
                        TFS(&tfs_yes_no), 0, "block", HFILL }},
 
1155
                        TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
1156
1156
                { &hf_nlm_exclusive, {
1157
1157
                        "exclusive", "nlm.exclusive", FT_BOOLEAN, BASE_NONE,
1158
 
                        TFS(&tfs_yes_no), 0, "exclusive", HFILL }},
 
1158
                        TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
1159
1159
                { &hf_nlm_lock, {
1160
 
                        "lock", "nlm.lock", FT_NONE, 0,
1161
 
                        NULL, 0, "lock", HFILL }},
 
1160
                        "lock", "nlm.lock", FT_NONE, BASE_NONE,
 
1161
                        NULL, 0, NULL, HFILL }},
1162
1162
                { &hf_nlm_lock_caller_name, {
1163
1163
                        "caller_name", "nlm.lock.caller_name", FT_STRING, BASE_NONE,
1164
 
                        NULL, 0, "caller_name", HFILL }},
 
1164
                        NULL, 0, NULL, HFILL }},
1165
1165
                { &hf_nlm_lock_owner, {
1166
 
                        "owner", "nlm.lock.owner", FT_BYTES, BASE_DEC,
1167
 
                        NULL, 0, "owner", HFILL }},
 
1166
                        "owner", "nlm.lock.owner", FT_BYTES, BASE_NONE,
 
1167
                        NULL, 0, NULL, HFILL }},
1168
1168
                { &hf_nlm_lock_svid, {
1169
1169
                        "svid", "nlm.lock.svid", FT_UINT32, BASE_DEC,
1170
 
                        NULL, 0, "svid", HFILL }},
 
1170
                        NULL, 0, NULL, HFILL }},
1171
1171
                { &hf_nlm_lock_l_offset64, {
1172
1172
                        "l_offset", "nlm.lock.l_offset", FT_UINT64, BASE_DEC,
1173
 
                        NULL, 0, "l_offset", HFILL }},
 
1173
                        NULL, 0, NULL, HFILL }},
1174
1174
                { &hf_nlm_lock_l_offset, {
1175
1175
                        "l_offset", "nlm.lock.l_offset", FT_UINT32, BASE_DEC,
1176
 
                        NULL, 0, "l_offset", HFILL }},
 
1176
                        NULL, 0, NULL, HFILL }},
1177
1177
                { &hf_nlm_lock_l_len64, {
1178
1178
                        "l_len", "nlm.lock.l_len", FT_UINT64, BASE_DEC,
1179
 
                        NULL, 0, "l_len", HFILL }},
 
1179
                        NULL, 0, NULL, HFILL }},
1180
1180
                { &hf_nlm_lock_l_len, {
1181
1181
                        "l_len", "nlm.lock.l_len", FT_UINT32, BASE_DEC,
1182
 
                        NULL, 0, "l_len", HFILL }},
 
1182
                        NULL, 0, NULL, HFILL }},
1183
1183
                { &hf_nlm_reclaim, {
1184
1184
                        "reclaim", "nlm.reclaim", FT_BOOLEAN, BASE_NONE,
1185
 
                        TFS(&tfs_yes_no), 0, "reclaim", HFILL }},
 
1185
                        TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
1186
1186
                { &hf_nlm_state, {
1187
1187
                        "state", "nlm.state", FT_UINT32, BASE_DEC,
1188
1188
                        NULL, 0, "STATD state", HFILL }},
1189
1189
                { &hf_nlm_stat, {
1190
1190
                        "stat", "nlm.stat", FT_UINT32, BASE_DEC,
1191
 
                        VALS(names_nlm_stats), 0, "stat", HFILL }},
 
1191
                        VALS(names_nlm_stats), 0, NULL, HFILL }},
1192
1192
                { &hf_nlm_test_stat, {
1193
 
                        "test_stat", "nlm.test_stat", FT_NONE, 0,
1194
 
                        NULL, 0, "test_stat", HFILL }},
 
1193
                        "test_stat", "nlm.test_stat", FT_NONE, BASE_NONE,
 
1194
                        NULL, 0, NULL, HFILL }},
1195
1195
                { &hf_nlm_test_stat_stat, {
1196
1196
                        "stat", "nlm.test_stat.stat", FT_UINT32, BASE_DEC,
1197
 
                        VALS(names_nlm_stats), 0, "stat", HFILL }},
 
1197
                        VALS(names_nlm_stats), 0, NULL, HFILL }},
1198
1198
                { &hf_nlm_holder, {
1199
 
                        "holder", "nlm.holder", FT_NONE, 0,
1200
 
                        NULL, 0, "holder", HFILL }},
 
1199
                        "holder", "nlm.holder", FT_NONE, BASE_NONE,
 
1200
                        NULL, 0, NULL, HFILL }},
1201
1201
                { &hf_nlm_share, {
1202
 
                        "share", "nlm.share", FT_NONE, 0,
1203
 
                        NULL, 0, "share", HFILL }},
 
1202
                        "share", "nlm.share", FT_NONE, BASE_NONE,
 
1203
                        NULL, 0, NULL, HFILL }},
1204
1204
                { &hf_nlm_share_mode, {
1205
1205
                        "mode", "nlm.share.mode", FT_UINT32, BASE_DEC,
1206
 
                        VALS(names_fsh_mode), 0, "mode", HFILL }},
 
1206
                        VALS(names_fsh_mode), 0, NULL, HFILL }},
1207
1207
                { &hf_nlm_share_access, {
1208
1208
                        "access", "nlm.share.access", FT_UINT32, BASE_DEC,
1209
 
                        VALS(names_fsh_access), 0, "access", HFILL }},
 
1209
                        VALS(names_fsh_access), 0, NULL, HFILL }},
1210
1210
                { &hf_nlm_share_name, {
1211
1211
                        "name", "nlm.share.name", FT_STRING, BASE_NONE,
1212
 
                        NULL, 0, "name", HFILL }},
 
1212
                        NULL, 0, NULL, HFILL }},
1213
1213
                { &hf_nlm_sequence, {
1214
1214
                        "sequence", "nlm.sequence", FT_INT32, BASE_DEC,
1215
 
                        NULL, 0, "sequence", HFILL }},
 
1215
                        NULL, 0, NULL, HFILL }},
1216
1216
                { &hf_nlm_request_in, {
1217
1217
                        "Request MSG in", "nlm.msg_in", FT_UINT32, BASE_DEC,
1218
1218
                        NULL, 0, "The RES packet is a response to the MSG in this packet", HFILL }},