undns 0.4.0d → 0.4.0f

data/ext/undns/earth.c

@@ -5,12 +5,17 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
+#include <sys/types.h>
 
 #ifdef HAVE_GNUREGEX_H
+#ifdef DEPRECATED_GNU_REGEX
 #include <gnuregex.h>
 #else
 #include <regex.h>
 #endif
+#else
+#include <regex.h>
+#endif
 
 #include "xmalloc.h"
 #include "nscommon.h"
@@ -108,13 +113,27 @@ void init_earth(const char *LocationTableFilename) {
       free(newlte);
     }
 #else
-    int reg_ret = regexec(&rpbuf, linebuf, REGS_LEN, regs, 0);
+    // printf("-- %s", linebuf);
+    memset(regs, 0, sizeof(regs));
+    int reg_ret = regexec(&rpbuf, linebuf, REGS_LEN-1, regs, 0);
     if(reg_ret == REG_NOMATCH) {
       fprintf(stderr, "init_earth: Couldn't parse line: %s", linebuf);
       free(newlte);
       continue;
+    } else if(reg_ret == REG_ILLSEQ) {
+      fprintf(stderr, "init_earth: Illegal character sequence in (skipped) line: %s", linebuf);
+      free(newlte);
+      continue;
+    } else if(reg_ret != 0) {
+      fprintf(stderr, "init_earth: unexpected nonzero return from regexec: %d\n", reg_ret);
+      exit(1);
     }
+    /* on mac, at least, rm_eo and rm_so are long long (64 bit) */
+    // printf("%d %s %lld %lld\n", reg_ret, linebuf, regs[1].rm_eo, regs[1].rm_so);
+    /* if incorrectly thought to be 32 bit when it's 64, eo will be zero; fail quickly */
+    assert(regs[1].rm_eo >= regs[1].rm_so);
     newlte->place = malloc(regs[1].rm_eo - regs[1].rm_so + 1);
+    assert(newlte->place);
     strncpy(newlte->place, linebuf+regs[1].rm_so, regs[1].rm_eo-regs[1].rm_so);
     newlte->place[ regs[1].rm_eo - regs[1].rm_so ] = '\0';
     if(lte_ht_lookup(loctable, newlte) == NULL) {

data/ext/undns/extconf.rb

@@ -15,7 +15,9 @@ have_header('sys/types.h')
 have_header('sys/time.h')
 have_header('ruby/io.h')
 have_func('snprintf')
-$defs.push('-DPKGDATADIR=\"$(RUBYLIBDIR)/undns\"')
+# if installed as system, likely in rubylibdir
+# if installed as user, perhaps relative to where unpacked.
+$defs.push('-DPKGDATADIR=\"$(RUBYLIBDIR)/undns:%s\"' % [ File.expand_path(File.dirname(__FILE__) + "/../../lib/undns") ])
 $defs.push('-DONIG_ESCAPE_REGEX_T_COLLISION')  # deep in there is a typedef
 
 # create_header('config.h')

data/ext/undns/hashtable.c

@@ -88,14 +88,18 @@ hashtable ht_new(unsigned int size,
   ht->isequal = isequal;
   ht->free_keyval = free_keyval;
 #ifdef _REENTRANT
-#ifdef PTHREAD_MUTEX_RECURSIVE_NP
   (void)pthread_mutexattr_init(&attrib);
   // (void)pthread_mutexattr_setkind_np(&attrib, PTHREAD_MUTEX_RECURSIVE_NP);
   // (void)pthread_mutexattr_setkind(&attrib, PTHREAD_MUTEX_RECURSIVE_NP);
+#ifdef PTHREAD_MUTEX_RECURSIVE_NP
+  /* linux only */
   (void)pthread_mutexattr_settype(&attrib, PTHREAD_MUTEX_RECURSIVE_NP);
+#else
+  /* mac, at least */
+  (void)pthread_mutexattr_settype(&attrib, PTHREAD_MUTEX_RECURSIVE);
+#endif
   (void)pthread_mutex_init(&ht->mutex, &attrib);
   (void)pthread_mutexattr_destroy(&attrib);
-#endif
 #endif
   return(ht);
 }

data/ext/undns/originAS.c

@@ -22,12 +22,14 @@ static in_addr_t addr_from_octets(unsigned int o1, unsigned int o2,
   return (htonl((o1<<24) + (o2<<16) + (o3<<8) + o4));
 }
 
+const char *Origins_In_Use;
+
 void 
 origins_init(const char *origins_dat) {
   char linebuf[60];
   // FILE *in = popen("./show_origins.pl | sort -u", "r");
   const char *filename = (origins_dat != NULL) ? origins_dat : "origins.dat";
-  FILE *in = fopen_path_r(filename);
+  FILE *in = fopen_path_r(filename, &Origins_In_Use);
   if(in == NULL) {
     char buf[255];
     sprintf(buf, "can't open origins.dat(%s): %s", filename, strerror(errno));
@@ -99,7 +101,7 @@ origins_regression_test(const char *origins_dat) {
   FILE *in;
   char linebuf[60];
   origins_init(origins_dat);
-  in = fopen_path_r(origins_dat);
+  in = fopen_path_r(origins_dat, &Origins_In_Use);
   while(!feof(in) && fgets(linebuf, sizeof(linebuf), in) != NULL) {
     unsigned int o1, o2, o3, o4, len, as;
     if(sscanf(linebuf, "%u.%u.%u.%u/%u %u",
@@ -112,7 +114,7 @@ origins_regression_test(const char *origins_dat) {
           fprintf(stderr, "failed to verify %u == %u on line:\n%s", 
                   as, (unsigned int) pe->data, linebuf);
           if(pe->prefixlen > len) {
-            fprintf(stderr, " -- because a more specific was matched. (%d > %d)\n", pe->prefixlen, len);
+            fprintf(stderr, " -- because a more specific was matched. (%u > %u)\n", pe->prefixlen, len);
           } else {
 #if !defined(CHECK_ORIGINS_SHOULD_FAIL) || CHECK_ORIGINS_SHOULD_FAIL == 0
             abort();
@@ -130,5 +132,5 @@ origins_regression_test(const char *origins_dat) {
       }
     } 
   }
-  fclose(in);
+  (void)fclose(in);
 }

data/ext/undns/originAS.h

@@ -1,8 +1,11 @@
 /* (c) neil spring 2002 */
 
 #include "nscommon.h"
+#include <sys/types.h>
 #include <netinet/in.h>
 
+extern const char *Origins_In_Use; /* for ensuring the right one is being used */
+
 void origins_init(const char *origins_dat);
 unsigned short origin_for_address(in_addr_t a);
 unsigned short origin_for_address_str(const char *addrstring);

data/ext/undns/progress.c

@@ -30,10 +30,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include<float.h>
-#include<assert.h>
+#include <float.h>
+#include <assert.h>
 
-#include"nscommon.h"
+#include "nscommon.h"
 
 /* gettimeofday */
 #include <sys/time.h>

data/ext/undns/ruleset.c

@@ -70,7 +70,7 @@ static const char *inst_format_stats(char *buf, unsigned int buflen, const struc
 
 /* also invoked by originAS.c */
 /*@null@*/ FILE *
-fopen_path_r(const char *filename) {
+fopen_path_r(const char *filename, const char **found_path_name) {
   char *fullpath = searchPath(ruleset_path, filename);
   if(fullpath != NULL) {
     FILE * ret;
@@ -85,7 +85,11 @@ fopen_path_r(const char *filename) {
     }
     */
     ret = fopen(fullpath, "r");
-    free(fullpath);
+    if(found_path_name) {
+      *found_path_name = fullpath;
+    } else {
+      free(fullpath);
+    }
     return ret;
   } else {
     errno = ENOENT;
@@ -93,13 +97,15 @@ fopen_path_r(const char *filename) {
   }
 }
 
+const char *Ruleset_In_Use;
+
 /* returns true if all good, false if there was a parse error */
 void load_ruleset(const char *filename) {
   FILE *fp;
   if(filename == NULL) {
     throw_void("load_ruleset: no filename to load\n");
   }
-  fp=fopen_path_r(filename);
+  fp=fopen_path_r(filename, &Ruleset_In_Use);
   if(fp != NULL) {
     if(is_nonempty(fp)) {
       input_filename = filename;

data/ext/undns/ruleset.h

@@ -16,6 +16,8 @@
 #include "nscommon.h"
 #include <stdio.h>
 
+extern const char *Ruleset_In_Use; /* for ensuring the right one is being used */
+
 struct instrumentation {
   const char *file; unsigned int line;
   unsigned int dynamic_match_count;
@@ -98,7 +100,7 @@ const char *get_role(int asn, const char *hostname);
 const char *get_loc_list(int asn, const char **hostname_list); /* majority rule */
 int get_asn_bydns(const char *hostname);
 /*@mustfree@*/ /*@null@*/ char * search_path(const char *path, const char *find_me);
-/*@null@*/ FILE *fopen_path_r (const char *filename);
+/*@null@*/ FILE *fopen_path_r (const char *filename, /*@out null@*/ const char **found);
 extern const char *ruleset_path; /* where to search */
 
 void set_conventions_debug(boolean v);

data/ext/undns/swig-undns_wrap-rb.c

@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
- *
- * This file is not intended to be easily readable and contains a number of
+ * Version 2.0.7
+ * 
+ * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
 # else
-#   define SWIGUNUSED
+#   define SWIGUNUSED 
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif
+# endif 
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif
+# endif 
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
 # else
-#   define SWIGUNUSED
+#   define SWIGUNUSED 
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif
+# endif 
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif
+# endif 
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-
+  
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/*
+/* 
    Flags/methods for returning states.
-
-   The SWIG conversion methods, as ConvertPtr, return an integer
+   
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-
+   
    Use the following macros/flags to set or process the returning
    states.
-
+   
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-
+    
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {
-        if (<obj is ok>) {
-          if (<need new object>) {
-            *ptr = <ptr to new allocated object>;
-            return SWIG_NEWOBJ;
-          } else {
-            *ptr = <ptr to old object>;
-            return SWIG_OLDOBJ;
-          }
-        } else {
-          return SWIG_BADOBJ;
-        }
+      int SWIG_ConvertPtr(obj, ptr,...) {         
+        if (<obj is ok>) {			       
+          if (<need new object>) {		       
+            *ptr = <ptr to new allocated object>; 
+            return SWIG_NEWOBJ;		       
+          } else {				       
+            *ptr = <ptr to old object>;	       
+            return SWIG_OLDOBJ;		       
+          } 				       
+        } else {				       
+          return SWIG_BADOBJ;		       
+        }					       
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
-
+ 
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0)
+#define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) {
+SWIGINTERNINLINE int SWIG_AddCast(int r) { 
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) {
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
+SWIGINTERNINLINE int SWIG_CheckState(int r) { 
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast(r) (r)
+#  define SWIG_AddCast
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/*
+/* 
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 1;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (equiv != 0 && *ne) {
+  while (!equiv && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,13 +481,24 @@ SWIG_TypeCmp(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
+SWIG_TypeCompare(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
 }
 
+
 /*
   Check the typename
 */
@@ -515,7 +526,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/*
+/* 
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -550,7 +561,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/*
+/* 
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -594,7 +605,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/*
+/* 
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -602,14 +613,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-
+  
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }
+    }    
     cast = cast->next;
   }
 }
@@ -618,18 +629,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-
+  
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-
-  We start searching at module start, and finish searching when start == end.
+  
+  We start searching at module start, and finish searching when start == end.  
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start,
-                            swig_module_info *end,
+SWIG_MangledTypeQueryModule(swig_module_info *start, 
+                            swig_module_info *end, 
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -638,11 +649,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	register size_t i = (l + r) >> 1; 
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {
+	  if (compare == 0) {	    
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -667,14 +678,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-
-  We start searching at module start, and finish searching when start == end.
+  
+  We start searching at module start, and finish searching when start == end.  
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start,
-                     swig_module_info *end,
+SWIG_TypeQueryModule(swig_module_info *start, 
+                     swig_module_info *end, 
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -693,12 +704,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-
+  
   /* neither found a match */
   return 0;
 }
 
-/*
+/* 
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -714,7 +725,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/*
+/* 
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -728,21 +739,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else
+    else 
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else
+    else 
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/*
+/* 
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -802,18 +813,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1
-#define  SWIG_IOError        	   -2
-#define  SWIG_RuntimeError   	   -3
-#define  SWIG_IndexError     	   -4
-#define  SWIG_TypeError      	   -5
-#define  SWIG_DivisionByZero 	   -6
-#define  SWIG_OverflowError  	   -7
-#define  SWIG_SyntaxError    	   -8
-#define  SWIG_ValueError     	   -9
+#define  SWIG_UnknownError    	   -1 
+#define  SWIG_IOError        	   -2 
+#define  SWIG_RuntimeError   	   -3 
+#define  SWIG_IndexError     	   -4 
+#define  SWIG_TypeError      	   -5 
+#define  SWIG_DivisionByZero 	   -6 
+#define  SWIG_OverflowError  	   -7 
+#define  SWIG_SyntaxError    	   -8 
+#define  SWIG_ValueError     	   -9 
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12
+#define  SWIG_MemoryError    	   -12 
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1363,7 +1374,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1699,7 +1710,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
+SWIG_Ruby_GetModule(void)
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1739,7 +1750,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) )
+  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
     return 1;
   return 0;
 }
@@ -1752,7 +1763,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) )
+  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1801,7 +1812,7 @@ static VALUE mUndns;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x020007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1887,7 +1898,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/2.0.7/share/swig/2.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1993,7 +2004,11 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
+    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
+    #else
+    char *cstr = STR2CSTR(obj);
+    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -2169,6 +2184,24 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Ruleset_In_Use_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_FromCharPtr(Ruleset_In_Use);
+  return _val;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Origins_In_Use_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_FromCharPtr(Origins_In_Use);
+  return _val;
+}
+
+
 SWIGINTERN VALUE
 _wrap_get_loc(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
@@ -2708,18 +2741,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic
- * memory is used. Also, since swig_type_info structures store pointers to
+ * This problem is tough by the requirement that no dynamic 
+ * memory is used. Also, since swig_type_info structures store pointers to 
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization.
- * The idea is that swig generates all the structures that are needed.
- * The runtime then collects these partially filled structures.
- * The SWIG_InitializeModule function takes these initial arrays out of
+ * to swig_type_info structures, we need some lookup code at initialization. 
+ * The idea is that swig generates all the structures that are needed. 
+ * The runtime then collects these partially filled structures. 
+ * The SWIG_InitializeModule function takes these initial arrays out of 
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned staticly to an initial 
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -2729,17 +2762,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it
+ * we find the array of casts associated with the type, and loop through it 
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded.
+ * First off, we lookup the cast->type name to see if it is already loaded. 
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the
+ *  2) If BOTH types (the one we are adding casting info to, and the 
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -2765,6 +2798,8 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
 
+  clientdata = clientdata;
+
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */
@@ -2802,7 +2837,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpreters are used, a module could have already been initialized in
+  /* When multiple interpeters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -2816,7 +2851,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-
+  
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -2843,7 +2878,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-
+    
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -2965,6 +3000,8 @@ SWIGEXPORT void Init_undns(void) {
   rb_define_singleton_method(mUndns, "want_conventions_debug=", _wrap_want_conventions_debug_set, 1);
   rb_define_singleton_method(mUndns, "ruleset_path", _wrap_ruleset_path_get, 0);
   rb_define_singleton_method(mUndns, "ruleset_path=", _wrap_ruleset_path_set, 1);
+  rb_define_singleton_method(mUndns, "Ruleset_In_Use", _wrap_Ruleset_In_Use_get, 0);
+  rb_define_singleton_method(mUndns, "Origins_In_Use", _wrap_Origins_In_Use_get, 0);
   rb_define_module_function(mUndns, "get_loc", _wrap_get_loc, -1);
   rb_define_module_function(mUndns, "get_role", _wrap_get_role, -1);
   rb_define_module_function(mUndns, "get_asn_bydns", _wrap_get_asn_bydns, -1);