Update the parser to warn about duplicate OBJECTs, TEXTUAL-CONVENTIONs and values in enums

Duplicate enum label 'byte' at line 550 in ...lwapp/CISCO-LWAPP-SI-MIB.my. First at line 549
Duplicate TEXTUAL-CONVENTION 'CucsStorageControllerId' at line 48175 in .../CISCO-UNIFIED-COMPUTING-TC-MIB.my. First at line 48117

Author: nielsb

include/net-snmp/library/parse.h

@@ -54,6 +54,7 @@ SOFTWARE.
         struct enum_list *next;
         int             value;
         char           *label;
+        int             lineno;
     };
 
     /*

snmplib/parse.c

@@ -156,6 +156,7 @@ struct tc {                     /* textual conventions */
     struct enum_list *enums;
     struct range_list *ranges;
     char           *description;
+    int             lineno;
 } *tclist;
 int tc_alloc;
 
@@ -1842,15 +1843,11 @@ do_linkup(struct module *mp, struct node *np)
             nbuckets[i] = NULL;
             while (onp) {
                 snmp_log(LOG_WARNING,
-                         "Unlinked OID in %s: %s ::= { %s %ld }\n",
+                         "Cannot resolve OID in %s: %s ::= { %s %ld } at line %d in %s\n",
                          (mp->name ? mp->name : "<no module>"),
                          (onp->label ? onp->label : "<no label>"),
                          (onp->parent ? onp->parent : "<no parent>"),
-                         onp->subid);
-		 snmp_log(LOG_WARNING,
-			  "Undefined identifier: %s near line %d of %s\n",
-			  (onp->parent ? onp->parent : "<no parent>"),
-			  onp->lineno, onp->filename);
+                         onp->subid, onp->lineno, onp->filename);
                 np = onp;
                 onp = onp->next;
             }
@@ -2212,11 +2209,32 @@ parse_enumlist(FILE * fp, struct enum_list **retp)
                 return NULL;
             }
             (*epp)->value = strtol(token, NULL, 10);
+            (*epp)->lineno = mibLine;
             type = get_token(fp, token, MAXTOKEN);
             if (type != RIGHTPAREN) {
                 print_error("Expected \")\"", token, type);
                 return NULL;
             }
+            else {
+                struct enum_list *op = ep;
+                while (op != *epp) {
+                    if (strcmp((*epp)->label, op->label) == 0) {
+                        snmp_log(LOG_ERR,
+                            "Duplicate enum label '%s' at line %d in %s. First at line %d\n",
+                            (*epp)->label, mibLine, File, op->lineno);
+                        erroneousMibs++;
+                        break;
+                    }
+                    else if ((*epp)->value == op->value) {
+                        snmp_log(LOG_ERR,
+                            "Duplicate enum value '%d' at line %d in %s. First at line %d\n",
+                            (*epp)->value, mibLine, File, op->lineno);
+                        erroneousMibs++;
+                        break;
+                    }
+                    op = op->next;
+                }
+            }
             epp = &(*epp)->next;
         }
     }
@@ -2436,26 +2454,37 @@ parse_asntype(FILE * fp, char *name, int *ntype, char *ntoken)
         /*
          * textual convention 
          */
+        tcp = NULL;
         for (i = 0; i < tc_alloc; i++) {
-            if (tclist[i].type == 0)
-                break;
+            if (tclist[i].type == 0) {
+                if (tcp == NULL) tcp = &tclist[i];
+            }
+            else
+                if (strcmp(name, tclist[i].descriptor) == 0 &&
+                        tclist[i].modid == current_module) {
+                    snmp_log(LOG_ERR, 
+                        "Duplicate TEXTUAL-CONVENTION '%s' at line %d in %s. First at line %d\n",
+                        name, mibLine, File, tclist[i].lineno);
+		    erroneousMibs++;
+		}
         }
 
-        if (i == tc_alloc) {
+        if (tcp == NULL) {
             tclist = realloc(tclist, (tc_alloc + TC_INCR)*sizeof(struct tc));
             memset(tclist+tc_alloc, 0, TC_INCR*sizeof(struct tc));
+            tcp = tclist + tc_alloc;
             tc_alloc += TC_INCR;
         }
         if (!(type & SYNTAX_MASK)) {
             print_error("Textual convention doesn't map to real type",
                         token, type);
             goto err;
         }
-        tcp = &tclist[i];
         tcp->modid = current_module;
         tcp->descriptor = strdup(name);
         tcp->hint = hint;
         tcp->description = descr;
+        tcp->lineno = mibLine;
         tcp->type = type;
         *ntype = get_token(fp, ntoken, MAXTOKEN);
         if (*ntype == LEFTPAREN) {
@@ -4027,12 +4056,11 @@ adopt_orphans(void)
             while (onp) {
                 char            modbuf[256];
                 snmp_log(LOG_WARNING,
-                         "Cannot adopt OID in %s: %s ::= { %s %ld }\n",
+                         "Cannot resolve OID in %s: %s ::= { %s %ld } at line %d in %s\n",
                          module_name(onp->modid, modbuf),
                          (onp->label ? onp->label : "<no label>"),
                          (onp->parent ? onp->parent : "<no parent>"),
-                         onp->subid);
-
+                         onp->subid, onp->lineno, onp->filename);
                 np = onp;
                 onp = onp->next;
             }
@@ -4622,6 +4650,7 @@ parse(FILE * fp)
             goto free_mib;
         }
         if (nnp) {
+            struct node *op;
             if (np)
                 np->next = nnp;
             else
@@ -4630,6 +4659,16 @@ parse(FILE * fp)
                 np = np->next;
             if (np->type == TYPE_OTHER)
                 np->type = type;
+            op = root;
+            while (op != nnp) {
+                if (strcmp(nnp->label, op->label) == 0 && nnp->subid != op->subid) {
+                    snmp_log(LOG_ERR, 
+                        "Duplicate Object '%s' at line %d in %s. First at line %d\n",
+                        op->label, mibLine, File, op->lineno);
+		    erroneousMibs++;
+		}
+                op = op->next;
+            }
         }
     }
     DEBUGMSGTL(("parse-file", "End of file (%s)\n", File));