diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-06-24 14:25:41 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-06-26 22:40:50 +0000 |
| commit | 7466880e8a09aa7a9bb797b70fa44bca397881d9 (patch) | |
| tree | 1634c5d6e433a4803ecd5543a4cb6420e7c886d7 /epan/dissectors/packet-netflow.c | |
| parent | 3071f9dd7409bd5b0432dd8f1bebbeeee1b6c755 (diff) | |
Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed
"enterprises". Unused fields are stripped.
PENs are stored in a hash table loaded at run-time.
User "enterprises" file is loaded from the personal config dir.
Misc make-sminmpec.pl improvements and fixes.
Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output.
Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2
Reviewed-on: https://code.wireshark.org/review/22246
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index b021383562..9ac96fab06 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -9960,7 +9960,7 @@ dissect_v9_v10_template_fields(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree length = tvb_get_ntohs(tvb, offset+2); /* XXX: 0 length should not be allowed ? exception: "ScopeSystem" */ if ((ver == 10) && (type & 0x8000)) { /* IPFIX only */ pen = tvb_get_ntohl(tvb, offset+4); - pen_str = val_to_str_ext_const(pen, &sminmpec_values_ext, "(Unknown)"); + pen_str = enterprises_lookup(pen, "(Unknown)"); } if (tmplt_p->fields_p[fields_type] != NULL) { |