Netflow/Ipfix: Update some IE (RFC8549)

Updates some information elements according to
https://www.iana.org/assignments/ipfix/ipfix.xhtml

Adds support for RFC8549

Change-Id: Ic4129df7cfeccd86a7bfb40cbc7181559b85fe50
Reviewed-on: https://code.wireshark.org/review/32690
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 124 insertions, 0 deletions

diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index b9cd988a56..250bc3a573 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -118,6 +118,10 @@
  * December 2017: uhei
  * Updated IEs from https://www.iana.org/assignments/ipfix/ipfix.xhtml
  * Includes updates for RFC8038, RFC8158
+ *
+ * April 2019: uhei
+ * Updated IEs from https://www.iana.org/assignments/ipfix/ipfix.xhtml
+ * Includes updates for RFC8549
  */
 
 #include "config.h"
@@ -769,6 +773,16 @@ static const value_string v9_v10_template_types[] = {
     { 479, "addressPortMappingLowThreshold" },
     { 480, "addressPortMappingPerUserHighThreshold" },
     { 481, "globalAddressMappingHighThreshold" },
+    { 482, "vpnIdentifier" },
+    { 483, "bgpCommunity" },
+    { 484, "bgpSourceCommunityList" },
+    { 485, "bgpDestinationCommunityList" },
+    { 486, "bgpExtendedCommunity" },
+    { 487, "bgpSourceExtendedCommunityList" },
+    { 488, "bgpDestinationExtendedCommunityList" },
+    { 489, "bgpLargeCommunity" },
+    { 490, "bgpSourceLargeCommunityList" },
+    { 491, "bgpDestinationLargeCommunityList" },
 
     /* Ericsson NAT Logging */
     { 24628, "NAT_LOG_FIELD_IDX_CONTEXT_ID" },
@@ -2494,6 +2508,16 @@ static int      hf_cflow_addressport_mapping_highthreshold          = -1;      /
 static int      hf_cflow_addressport_mapping_lowthreshold           = -1;      /* ID: 479 */
 static int      hf_cflow_addressport_mapping_per_user_highthreshold = -1;      /* ID: 480 */
 static int      hf_cflow_global_addressmapping_highthreshold        = -1;      /* ID: 481 */
+static int      hf_cflow_vpn_identifier                             = -1;      /* ID: 482 */
+static int      hf_cflow_bgp_community                              = -1;      /* ID: 483 */
+static int      hf_cflow_bgp_source_community_list                  = -1;      /* ID: 484 */
+static int      hf_cflow_bgp_destination_community_list             = -1;      /* ID: 485 */
+static int      hf_cflow_bgp_extended_community                     = -1;      /* ID: 486 */
+static int      hf_cflow_bgp_source_extended_community_list         = -1;      /* ID: 487 */
+static int      hf_cflow_bgp_destination_extended_community_list    = -1;      /* ID: 488 */
+static int      hf_cflow_bgp_large_community                        = -1;      /* ID: 489 */
+static int      hf_cflow_bgp_source_large_community_list            = -1;      /* ID: 490 */
+static int      hf_cflow_bgp_destination_large_community_list       = -1;      /* ID: 491 */
 
 static int      hf_cflow_mpls_label                                 = -1;
 static int      hf_cflow_mpls_exp                                   = -1;
@@ -6908,6 +6932,56 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
                                      tvb, offset, length, ENC_BIG_ENDIAN);
             break;
 
+        case 482: /* vpnIdentifier */
+            ti = proto_tree_add_item(pdutree, hf_cflow_vpn_identifier ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 483: /* bgpCommunity */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_community ,
+                                     tvb, offset, length, ENC_BIG_ENDIAN);
+            break;
+
+        case 484: /* bgpSourceCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_source_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 485: /* bgpDestinationCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_destination_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 486: /* bgpExtendedCommunity */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_extended_community ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 487: /* bgpSourceExtendedCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_source_extended_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 488: /* bgpDestinationExtendedCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_destination_extended_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 489: /* bgpLargeCommunity */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_large_community ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 490: /* bgpSourceLargeCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_source_large_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
+        case 491: /* bgpDestinationLargeCommunityList */
+            ti = proto_tree_add_item(pdutree, hf_cflow_bgp_destination_large_community_list ,
+                                     tvb, offset, length, ENC_NA);
+            break;
+
 
         case 34000: /* cts_sgt_source_tag */
             ti = proto_tree_add_item(pdutree, hf_cflow_cts_sgt_source_tag,
@@ -13237,6 +13311,56 @@ proto_register_netflow(void)
            FT_UINT32, BASE_DEC, NULL, 0x0,
            NULL, HFILL}
         },
+        {&hf_cflow_vpn_identifier,
+          {"VPN Identifier", "cflow.vpn_identifier",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_community,
+          {"BGP Community", "cflow.bgp_community",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_source_community_list,
+          {"BGP Source Community", "cflow.bgp_source_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_destination_community_list,
+          {"BGP Destination Community", "cflow.bgp_destination_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_extended_community,
+          {"BGP Extended Community", "cflow.bgp_extended_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_source_extended_community_list,
+          {"BGP Source Extended Community", "cflow.bgp_source_extended_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_destination_extended_community_list,
+          {"BGP Destination Extended Community", "cflow.bgp_destination_extended_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_large_community,
+          {"BGP Large Community", "cflow.bgp_large_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_source_large_community_list,
+          {"BGP Source Large Community", "cflow.bgp_source_large_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
+        {&hf_cflow_bgp_destination_large_community_list,
+          {"BGP Source Destination Community", "cflow.bgp_source_destination_community",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}
+        },
 
         /*
          * end pdu content storage