Merge branch 'maint'

6 files changed, 371 insertions, 25 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index db09ec3dc5..bde637744c 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -8,8 +8,17 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
+  {<<"5\\.2\\.6">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
+  {<<"5\\.2\\.5">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
   {<<"5\\.2\\.4">>,
-   [{load_module, snmp, soft_purge, soft_purge, []},
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []},
+    {load_module, snmp, soft_purge, soft_purge, []},
     {load_module, snmpc_lib, soft_purge, soft_purge, []},
     {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
@@ -21,8 +30,17 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
  
  [
+  {<<"5\\.2\\.6">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
+  {<<"5\\.2\\.5">>,
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmpc_lib, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
   {<<"5\\.2\\.4">>,
-   [{load_module, snmp, soft_purge, soft_purge, []},
+   [{load_module, snmpc, soft_purge, soft_purge, []},
+    {load_module, snmp_generic, soft_purge, soft_purge, []},
+    {load_module, snmp, soft_purge, soft_purge, []},
     {load_module, snmpc_lib, soft_purge, soft_purge, []},
     {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 416353508e..4416626a4c 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -455,7 +455,8 @@ compile_parsed_data(#pdata{mib_name = MibName,
     Deprecated = get_deprecated(Opts),
     RelChk = get_relaxed_row_name_assign_check(Opts),
     Data = #dldata{deprecated                    = Deprecated,
-		   relaxed_row_name_assign_check = RelChk}, 
+		   relaxed_row_name_assign_check = RelChk},
+    put(augmentations, false),
     definitions_loop(Definitions, Data),
     MibName.
 
@@ -1211,7 +1212,39 @@ definitions_loop([{Obj,Line}|T], Data) ->
 
 definitions_loop([], _Data) ->
     ?vlog("defloop -> done", []),
-    ok.
+    case get(augmentations) of
+        true ->
+            CData = get(cdata),
+            put(cdata, CData#cdata{mes = augmentations(CData#cdata.mes)}),
+            ok;
+        false ->
+            ok
+    end.
+
+augmentations(
+  [#me{
+      aliasname = AliasName,
+      assocList =
+          [{table_info,
+            #table_info{
+               index_types =
+                   {augments, SrcTableEntry, Line}} = TableInfo}|Ref]} = Me
+   |Mes]) ->
+    ?vlog("augmentations(~w) ->"
+          "~n   NameOfTable:  ~p"
+          "~n   IndexingInfo: ~p"
+          "~n   Sline:        ~p",
+          [?LINE, AliasName, {augments, SrcTableEntry}, Line]),
+    NewTableInfo = snmpc_lib:fix_table_info_augmentation(TableInfo),
+    [Me#me{assocList = [{table_info,NewTableInfo}|Ref]}
+     |augmentations(Mes)];
+augmentations([Me | Mes]) ->
+     [Me|augmentations(Mes)];
+augmentations([]) ->
+    ?vlog("augmentations -> done", []),
+    [].
+
+
 
 safe_elem(N,T) ->
     case catch(element(N,T)) of
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 33ddd78308..19a6bc8851 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -26,7 +26,7 @@
 -export([test_father/4, make_ASN1type/1, import/1, makeInternalNode2/2,
 	 is_consistent/1, resolve_defval/1, make_variable_info/1,
 	 check_trap_name/3, make_table_info/5, get_final_mib/2, set_dir/2,
-	 look_at/1, add_cdata/2,
+         fix_table_info_augmentation/1, look_at/1, add_cdata/2,
 	 check_object_group/4, check_notification_group/4, 
 	 check_notification/3, 
 	 register_oid/4,
@@ -710,25 +710,34 @@ check_trap_name(EnterpriseName, Line, MEs) ->
 %% functions for tables.
 %%----------------------------------------------------------------------
 
+fix_table_info_augmentation(
+  #table_info{index_types = {augments, SrcTableEntry, Line}} = TableInfo) ->
+    MEs = (get(cdata))#cdata.mes,
+    Aug =
+        case lookup(SrcTableEntry, MEs) of
+            false ->
+                print_error(
+                  "Cannot AUGMENT the non-existing table entry ~p",
+                  [SrcTableEntry], Line),
+                {augments, error};
+            {value, ME} ->
+                {augments,
+                 {SrcTableEntry, translate_type(ME#me.asn1_type)}}
+        end,
+    TableInfo#table_info{index_types = Aug}.
+
+
 make_table_info(Line, TableName, {augments, SrcTableEntry}, _, ColumnMEs) ->
     ColMEs = lists:keysort(#me.oid, ColumnMEs),
-    Nbr_of_Cols = length(ColMEs), 
-    MEs = ColMEs ++ (get(cdata))#cdata.mes,
-    Aug = case lookup(SrcTableEntry, MEs) of
-	      false ->
-		  print_error("Cannot AUGMENT the non-existing table entry ~p",
-			      [SrcTableEntry], Line),
-		  {augments, error};
-	      {value, ME} ->
-		  {augments, {SrcTableEntry, translate_type(ME#me.asn1_type)}}
-	  end,
-    FirstNonIdxCol = augments_first_non_index_column(ColMEs), 
+    Nbr_of_Cols = length(ColMEs),
+    put(augmentations, true),
+    FirstNonIdxCol = augments_first_non_index_column(ColMEs),
     NoAccs         = list_not_accessible(FirstNonIdxCol, ColMEs),
     FirstAcc       = first_accessible(TableName, ColMEs),
     #table_info{nbr_of_cols      = Nbr_of_Cols,
-		first_accessible = FirstAcc, 
-		not_accessible   = NoAccs, 
-		index_types      = Aug}; 
+		first_accessible = FirstAcc,
+		not_accessible   = NoAccs,
+		index_types      = {augments, SrcTableEntry, Line}};
 make_table_info(Line, TableName, {indexes, []}, _, _ColumnMEs) ->
     print_error("Table ~w lacks indexes.", [TableName],Line),
     #table_info{};
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 9b3c2bfd2c..2b6bba4ee6 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -57,8 +57,8 @@
 	 otp_8595/1, 
 	 otp_10799/1, 
 	 otp_10808/1,
-	 otp_14145/1
-
+	 otp_14145/1,
+         otp_13014/1
 	]).
 
 %%----------------------------------------------------------------------
@@ -137,7 +137,8 @@ all() ->
 
 groups() -> 
     [{tickets, [],
-      [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808, otp_14145]}].
+      [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808, otp_14145,
+       otp_13014]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -436,7 +437,7 @@ otp_10808(Config) when is_list(Config) ->
 otp_14145(suite) ->
     [];
 otp_14145(Config) when is_list(Config) ->
-    put(tname, otp10808),
+    put(tname, otp14145),
     p("starting with Config: ~p~n", [Config]),
 
     Dir     = ?config(case_top_dir, Config),
@@ -457,6 +458,40 @@ otp_14145(Config) when is_list(Config) ->
 
 %%======================================================================
 
+otp_13014(suite) ->
+    [];
+otp_13014(Config) when is_list(Config) ->
+    put(tname, otp13014),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibName = "Test-LLDP-MIB",
+    MibFile = join(MibDir, MibName++".mib"),
+    ?line {ok, MibBin} =
+	snmpc:compile(MibFile, [{outdir, Dir},
+				{verbosity, log},
+				{group_check, false},
+				module_compliance]),
+    p("Mib: ~n~p~n", [MibBin]),
+    #mib{mes = MEs} = read_mib(MibBin),
+    Oid = [1,0,8802,1,1,2,1,1,7],
+    #me{
+       entrytype = table,
+       aliasname = lldpConfigManAddrTable,
+       assocList = [{table_info,TableInfo}]} =
+        lists:keyfind(Oid, #me.oid, MEs),
+    #table_info{
+       nbr_of_cols = 1,
+       first_accessible = 1,
+       not_accessible = [],
+       index_types = {augments,{lldpLocManAddrEntry,undefined}}} =
+        TableInfo,
+    ok.
+
+
+%%======================================================================
+
 augments_extra_info(suite) ->
     [];
 augments_extra_info(Config) when is_list(Config) ->
diff --git a/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
new file mode 100644
index 0000000000..40a9fc79e1
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
@@ -0,0 +1,251 @@
+Test-LLDP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, Integer32, Counter32, NOTIFICATION-TYPE
+        FROM SNMPv2-SMI
+    TEXTUAL-CONVENTION, TimeStamp, TruthValue
+        FROM SNMPv2-TC
+    SnmpAdminString
+        FROM SNMP-FRAMEWORK-MIB
+    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+        FROM SNMPv2-CONF;
+
+t-lldpMIB MODULE-IDENTITY
+    LAST-UPDATED "200505060000Z" -- May 06, 2005
+    ORGANIZATION "IEEE 802.1 Working Group"
+    CONTACT-INFO
+            " Contact: The Erlang/OTP team at Ericsson AB, Sweden
+
+               WG-URL: http://grouper.ieee.org/groups/802/1/index.html
+             WG-EMail: stds-802-1@ieee.org
+
+              Contact: Paul Congdon
+               Postal: Hewlett-Packard Company
+                       8000 Foothills Blvd.
+                       Roseville, CA 95747
+                       USA
+                  Tel: +1-916-785-5753
+               E-mail: paul_congdon@hp.com"
+    DESCRIPTION
+            "This is the ripped out bits and pieces of LLDP-MIB
+            that triggered a compilation problem for Erlang/OTP's
+            MIB compiler due to an AUGMENTS in lldpConfigManAddrEntry
+            refering to a not yet defined OBJECT-TYPE lldpLocManAddrEntry.
+	    Rip and rewrite done 2017.
+
+             Management Information Base module for LLDP configuration,
+            statistics, local system data and remote systems data
+            components.
+
+            Copyright (C) IEEE (2005).  This version of this MIB module
+            is published as subclause 12.1 of IEEE Std 802.1AB-2005;
+            see the standard itself for full legal notices."
+    REVISION        "200505060000Z" -- May 06, 2005
+    DESCRIPTION
+            "Published as part of IEEE Std 802.1AB-2005 initial version."
+   ::= { iso std(0) iso8802(8802) ieee802dot1(1) ieee802dot1mibs(1) 2 }
+
+--lldpNotifications            OBJECT IDENTIFIER ::= { lldpMIB 0 }
+lldpObjects                  OBJECT IDENTIFIER ::= { t-lldpMIB 1 }
+lldpConformance              OBJECT IDENTIFIER ::= { t-lldpMIB 2 }
+
+--
+-- LLDP MIB Objects
+--
+
+lldpConfiguration            OBJECT IDENTIFIER ::= { lldpObjects 1 }
+--lldpStatistics               OBJECT IDENTIFIER ::= { lldpObjects 2 }
+lldpLocalSystemData          OBJECT IDENTIFIER ::= { lldpObjects 3 }
+--lldpRemoteSystemsData        OBJECT IDENTIFIER ::= { lldpObjects 4 }
+--lldpExtensions               OBJECT IDENTIFIER ::= { lldpObjects 5 }
+
+
+
+LldpPortList ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+            "Each octet within this value specifies a set of eight ports,
+            with the first octet specifying ports 1 through 8, the second
+            octet specifying ports 9 through 16, etc.  Within each octet,
+            the most significant bit represents the lowest numbered port,
+            and the least significant bit represents the highest numbered
+            port.  Thus, each port of the system is represented by a
+            single bit within the value of this object.  If that bit has
+            a value of '1' then that port is included in the set of ports;
+            the port is not included if its bit has a value of '0'."
+    REFERENCE
+            "IETF RFC 2674 section 5"
+    SYNTAX  OCTET STRING(SIZE(0..512))
+
+
+
+--
+-- lldpManAddrConfigTxPortsTable : selection of management addresses
+--                                 to be transmitted on a specified set
+--                                 of ports.
+--
+
+lldpConfigManAddrTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF LldpConfigManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "The table that controls selection of LLDP management address
+            TLV instances to be transmitted on individual ports."
+    ::= { lldpConfiguration 7 }
+
+lldpConfigManAddrEntry  OBJECT-TYPE
+    SYNTAX      LldpConfigManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "LLDP configuration information that specifies the set
+            of ports (represented as a PortList) on which the local
+            system management address instance will be transmitted.
+
+            This configuration object augments the lldpLocManAddrEntry,
+            therefore it is only present along with the management
+            address instance contained in the associated
+            lldpLocManAddrEntry entry.
+
+            Each active lldpConfigManAddrEntry must be restored from
+            non-volatile and re-created (along with the corresponding
+            lldpLocManAddrEntry) after a re-initialization of the
+            management system."
+    AUGMENTS { lldpLocManAddrEntry }
+    ::= { lldpConfigManAddrTable 1 }
+
+LldpConfigManAddrEntry  ::= SEQUENCE {
+    lldpConfigManAddrPortsTxEnable LldpPortList
+}
+
+lldpConfigManAddrPortsTxEnable  OBJECT-TYPE
+    SYNTAX        LldpPortList
+    MAX-ACCESS    read-write
+    STATUS        current
+    DESCRIPTION
+            "A set of ports that are identified by a PortList, in which
+            each port is represented as a bit.  The corresponding local
+            system management address instance will be transmitted on the
+            member ports of the lldpManAddrPortsTxEnable.
+
+            The default value for lldpConfigManAddrPortsTxEnable object
+            is empty binary string, which means no ports are specified
+            for advertising indicated management address instance."
+    REFERENCE
+            "IEEE 802.1AB-2005 10.2.1.1"
+    DEFVAL  { ''H }     -- empty binary string
+    ::= { lldpConfigManAddrEntry 1 }
+
+
+--
+-- lldpLocManAddrTable : Management addresses of the local system
+--
+
+lldpLocManAddrTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF LldpLocManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "This table contains management address information on the
+            local system known to this agent."
+    ::= { lldpLocalSystemData 8 }
+
+lldpLocManAddrEntry OBJECT-TYPE
+    SYNTAX      LldpLocManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "Management address information about a particular chassis
+            component.  There may be multiple management addresses
+            configured on the system identified by a particular
+            lldpLocChassisId.  Each management address should have
+            distinct 'management address type' (lldpLocManAddrSubtype) and
+            'management address' (lldpLocManAddr.)
+
+            Entries may be created and deleted in this table by the
+            agent."
+    INDEX   { lldpLocManAddrIfId,
+              lldpLocManAddrLen }
+    ::= { lldpLocManAddrTable 1 }
+
+LldpLocManAddrEntry ::= SEQUENCE {
+      lldpLocManAddrIfId       Integer32,
+      lldpLocManAddrLen        Integer32,
+      lldpLocManAddrOID        OBJECT IDENTIFIER
+}
+
+lldpLocManAddrIfId  OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The integer value used to identify the interface number
+            regarding the management address component associated with
+            the local system."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.6"
+    ::= { lldpLocManAddrEntry 1 }
+
+lldpLocManAddrLen  OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The total length of the management address subtype and the
+            management address fields in LLDPDUs transmitted by the
+            local LLDP agent.
+
+            The management address length field is needed so that the
+            receiving systems that do not implement SNMP will not be
+            required to implement an iana family numbers/address length
+            equivalency table in order to decode the management adress."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.2"
+    ::= { lldpLocManAddrEntry 2 }
+
+lldpLocManAddrOID  OBJECT-TYPE
+    SYNTAX      OBJECT IDENTIFIER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The OID value used to identify the type of hardware component
+            or protocol entity associated with the management address
+            advertised by the local system agent."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.8"
+    ::= { lldpLocManAddrEntry 3 }
+
+
+lldpGroups      OBJECT IDENTIFIER ::= { lldpConformance 1 }
+
+lldpLocSysGroup  OBJECT-GROUP
+    OBJECTS {
+        lldpLocManAddrIfId,
+        lldpLocManAddrLen,
+        lldpLocManAddrOID
+    }
+    STATUS  current
+    DESCRIPTION
+            "The collection of objects which are used to represent LLDP
+            Local System Information.
+
+            This group is mandatory for agents which implement the LLDP
+            and have the capability of transmitting LLDP frames."
+    ::= { lldpGroups 6 }
+
+lldpConfigTxGroup    OBJECT-GROUP
+    OBJECTS {
+        lldpConfigManAddrPortsTxEnable
+    }
+    STATUS  current
+    DESCRIPTION
+            "The collection of objects which are used to configure the
+            LLDP implementation behavior.
+
+            This group is mandatory for agents which implement the LLDP
+            and have the capability of transmitting LLDP frames."
+    ::= { lldpGroups 3 }
+
+
+END
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index d41b1999cc..207f0084d8 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.6
+SNMP_VSN    = 5.2.7
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"