From d9e63bfb1a4a452ad8eb7a9e62d5127a666e2845 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 4 Feb 2013 19:08:56 +0100
Subject: [snmp/compiler] MIB compiler did not handle forward index ref

The MIB compiler could not handle a table index refering to
an object defined later in the MIB.
---
 lib/snmp/src/compile/snmpc.erl | 51 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

(limited to 'lib/snmp/src/compile/snmpc.erl')

diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 5e6b81f1ec..b238214798 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -562,8 +562,10 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 		       units       = Eunits},
     {ColMEs, RestObjs} = 
 	define_cols(ColsEtc, 1, FieldList, NameOfEntry, NameOfTable, []),
+    AfterIdxTypes = after_indexes_type(IndexingInfo, RestObjs), 
+    after_indexes_type(IndexingInfo, RestObjs), 
     TableInfo = snmpc_lib:make_table_info(Eline, NameOfTable,
-					  IndexingInfo, ColMEs),
+					  IndexingInfo, AfterIdxTypes, ColMEs),
     snmpc_lib:add_cdata(#cdata.mes, 
 			[TableEntryME,
 			 TableME#me{assocList=[{table_info, 
@@ -644,8 +646,9 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 		       units       = Eunits},
     {ColMEs, RestObjs} = 
 	define_cols(ColsEtc, 1, FieldList, NameOfEntry, NameOfTable, []),
+    AfterIdxTypes = after_indexes_type(IndexingInfo, RestObjs), 
     TableInfo = snmpc_lib:make_table_info(Eline, NameOfTable,
-					  IndexingInfo, ColMEs),
+					  IndexingInfo, AfterIdxTypes, ColMEs),
     snmpc_lib:add_cdata(#cdata.mes, 
 			[TableEntryME,
 			 TableME#me{assocList=[{table_info, 
@@ -720,8 +723,9 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 		       units       = Eunits},
     {ColMEs, RestObjs} = 
 	define_cols(ColsEtc, 1, FieldList, NameOfEntry, NameOfTable, []),
+    AfterIdxTypes = after_indexes_type(IndexingInfo, RestObjs), 
     TableInfo = snmpc_lib:make_table_info(Eline, NameOfTable,
-					  IndexingInfo, ColMEs),
+					  IndexingInfo, AfterIdxTypes, ColMEs),
     snmpc_lib:add_cdata(#cdata.mes, 
 			       [TableEntryME,
 				TableME#me{assocList=[{table_info, 
@@ -1205,6 +1209,12 @@ safe_elem(N,T) ->
 	X -> X
     end.
 
+
+%% An table index is either: 
+%%   a) part of the table
+%%   b) not part of the table and defined *before* the table
+%%   c) not part of the table and defined *after* the table
+
 %% A correct column
 define_cols([{#mc_object_type{name        = NameOfCol,
 			      syntax      = Type1,
@@ -1379,14 +1389,45 @@ define_cols(Rest, _SubIndex,_,_,_,ColMEs) ->
     snmpc_lib:print_error("Corrupt table definition.",[]),
     {ColMEs,Rest}.
 
+
+%% Table indexes can either be: 
+%%   a) part of the table (a column)
+%%   b) not part of the table and defined *before* the table
+%%   c) not part of the table and defined *after* the table
+
+after_indexes_type({indexes, Indexes}, Objs) ->
+    after_indexes_type2(Indexes, Objs);
+after_indexes_type(_, _) ->
+    [].
+
+after_indexes_type2(Indexes, Objs) ->
+    after_indexes_type2(Indexes, Objs, []).
+
+after_indexes_type2([], _Objs, IndexesASN1types) ->
+    IndexesASN1types;
+after_indexes_type2([Index|Indexes], Objs, Acc) ->
+    Acc2 = after_indexes_type3(Index, Objs, Acc),
+    after_indexes_type2(Indexes, Objs, Acc2).
+
+after_indexes_type3(_Index, [], Acc) ->
+    Acc;
+after_indexes_type3(Index, 
+		    [{#mc_object_type{name   = Index, 
+				      syntax = Syntax},_}|_], Acc) ->
+    ASN1 = snmpc_lib:make_ASN1type(Syntax), 
+    [{Index, ASN1}|Acc];
+after_indexes_type3(Index, [_|Objs], Acc) ->
+    after_indexes_type3(Index, Objs, Acc). 
+
+
+
 ensure_macro_imported(dummy, _Line) -> ok;
 ensure_macro_imported(Macro, Line) ->
     Macros = (get(cdata))#cdata.imported_macros,
     case lists:member(Macro, Macros) of
 	true -> ok;
 	false ->
-	    snmpc_lib:print_error("Macro ~p not imported.", [Macro],
-					 Line)
+	    snmpc_lib:print_error("Macro ~p not imported.", [Macro], Line)
     end.
 
 test_table(NameOfTable, Taccess, Kind, _Tindex, Tline) ->
-- 
cgit v1.2.3