Cleanup and initial open source release

3 files changed, 48 insertions, 10 deletions

diff --git a/module/Makefile.am b/module/Makefile.am
index 6f10233..0874973 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -6,11 +6,13 @@ module_LTLIBRARIES = snmp_regex.la
 
 snmp_regex_la_LDFLAGS = -module
 snmp_regex_la_SOURCES = regex_tree.c regex_tree.h regex_oid.h \
-                          bsnmp-regex.c
+                          bsnmp-regex.c usuals.h
 
-regex_tree.c: regex-tree.def
-	gensnmptree -p regex_ < regex-tree.def
-	gensnmptree -e regexData > regex_oid.h < regex-tree.def
+regex_tree.c: $(srcdir)/regex-tree.def
+	gensnmptree -p regex_ < $(srcdir)/regex-tree.def
+	gensnmptree -e regexData > regex_oid.h < $(srcdir)/regex-tree.def
 
 CLEANFILES = regex_tree.* \
              regex_oid.h
+
+EXTRA_DIST = regex-tree.def
diff --git a/module/regex-tree.def b/module/regex-tree.def
index be7dca4..1d58819 100644
--- a/module/regex-tree.def
+++ b/module/regex-tree.def
@@ -42,18 +42,18 @@
         (1 begemot
           (203 regexData
           
-            # Valid only during configuration 
-            (0 regexConfig OCTETSTRING op_regexconfig GET SET)
-            (1 regexSocket OCTETSTRING op_regexconfig GET SET)
-        
-            (10 regexCount INTEGER op_regex GET)
-            (11 regexEntry : INTEGER op_regexentry
+            (0 regexCount INTEGER op_regex GET)
+            (1 regexEntry : INTEGER op_regexentry
               (1 regexIndex INTEGER GET)
               (2 regexDescr OCTETSTRING GET)
               (3 regexLast TIMETICKS GET)
               (4 regexInteger INTEGER GET)
               (5 regexValue OCTETSTRING GET)
             )
+            
+            # Valid only during configuration 
+            (100 regexConfig OCTETSTRING op_regexconfig GET SET)
+            (101 regexSocket OCTETSTRING op_regexconfig GET SET)
           )
         )
       )
diff --git a/module/usuals.h b/module/usuals.h
index 6dc7b08..7e0cd8d 100644
--- a/module/usuals.h
+++ b/module/usuals.h
@@ -1,3 +1,39 @@
+/*
+ * Copyright (c) 2006, Nate Nielsen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ *
+ * CONTRIBUTORS
+ *  Nate Nielsen <nielsen@memberwebs.com>
+ */
 
 #ifndef __USUALS_H__
 #define __USUALS_H__