- update pythonmod for ldns_ to sldns_ name change.

git-svn-id: file:///svn/unbound/trunk@3035 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index f5cd6a5fcd9662fe1629273385a9f2a84cf90a12..c5ae4f20491312eba810dcfd0fda2c0e2837fbba 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 5 Dec 2013: Wouter
        - Fix bug in cachedump that uses sldns.
+       - update pythonmod for ldns_ to sldns_ name change.
 
 3 Dec 2013: Wouter
        - Fix sldns to use sldns_ prefix for all ldns_ variables.

diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 065dd309b494c0dc1cbba1034b692ff63e65bf6f..606d85fac9f5445338aa4be3d94c65aa9609b181 100644 (file)
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -167,11 +167,11 @@ struct query_info {
 
 %extend query_info {
    %pythoncode %{
-        def _get_qtype_str(self): return ldns_wire2str_type(self.qtype)
+        def _get_qtype_str(self): return sldns_wire2str_type(self.qtype)
         __swig_getmethods__["qtype_str"] = _get_qtype_str
         if _newclass:qtype_str = _swig_property(_get_qtype_str)
 
-        def _get_qclass_str(self): return ldns_wire2str_class(self.qclass)
+        def _get_qclass_str(self): return sldns_wire2str_class(self.qclass)
         __swig_getmethods__["qclass_str"] = _get_qclass_str
         if _newclass:qclass_str = _swig_property(_get_qclass_str)
 
@@ -219,11 +219,11 @@ uint16_t ntohs(uint16_t netshort);
 
 %extend packed_rrset_key {
    %pythoncode %{
-        def _get_type_str(self): return ldns_wire2str_type(_unboundmodule.ntohs(self.type))
+        def _get_type_str(self): return sldns_wire2str_type(_unboundmodule.ntohs(self.type))
         __swig_getmethods__["type_str"] = _get_type_str
         if _newclass:type_str = _swig_property(_get_type_str)
 
-        def _get_class_str(self): return ldns_wire2str_class(_unboundmodule.ntohs(self.rrset_class))
+        def _get_class_str(self): return sldns_wire2str_class(_unboundmodule.ntohs(self.rrset_class))
         __swig_getmethods__["rrset_class_str"] = _get_class_str
         if _newclass:rrset_class_str = _swig_property(_get_class_str)
 
@@ -755,7 +755,7 @@ int checkList(PyObject *l)
     return 0;
 }
 
-int pushRRList(ldns_buffer* qb, PyObject *l, uint32_t default_ttl, int qsec,
+int pushRRList(sldns_buffer* qb, PyObject *l, uint32_t default_ttl, int qsec,
         size_t count_offset)
 {
     PyObject* item;
@@ -766,31 +766,31 @@ int pushRRList(ldns_buffer* qb, PyObject *l, uint32_t default_ttl, int qsec,
     {
         item = PyList_GetItem(l, i);
 
-        len = ldns_buffer_remaining(qb);
+        len = sldns_buffer_remaining(qb);
         if(qsec) {
-                if(ldns_str2wire_rr_question_buf(PyString_AsString(item),
-                        ldns_buffer_current(qb), &len, NULL, NULL, 0, NULL, 0)
+                if(sldns_str2wire_rr_question_buf(PyString_AsString(item),
+                        sldns_buffer_current(qb), &len, NULL, NULL, 0, NULL, 0)
                         != 0)
                         return 0;
         } else {
-                if(ldns_str2wire_rr_buf(PyString_AsString(item),
-                        ldns_buffer_current(qb), &len, NULL, default_ttl,
+                if(sldns_str2wire_rr_buf(PyString_AsString(item),
+                        sldns_buffer_current(qb), &len, NULL, default_ttl,
                         NULL, 0, NULL, 0) != 0)
                         return 0;
         }
-        ldns_buffer_skip(qb, len);
+        sldns_buffer_skip(qb, len);
 
-        ldns_buffer_write_u16_at(qb, count_offset,
-                ldns_buffer_read_u16_at(qb, count_offset)+1);
+        sldns_buffer_write_u16_at(qb, count_offset,
+                sldns_buffer_read_u16_at(qb, count_offset)+1);
     }
     return 1;
 }
 
 int set_return_msg(struct module_qstate* qstate, 
-                   const char* rr_name, ldns_rr_type rr_type, ldns_rr_class rr_class , uint16_t flags, uint32_t default_ttl,
+                   const char* rr_name, sldns_rr_type rr_type, sldns_rr_class rr_class , uint16_t flags, uint32_t default_ttl,
                    PyObject* question, PyObject* answer, PyObject* authority, PyObject* additional) 
 {
-     ldns_buffer *qb = 0;
+     sldns_buffer *qb = 0;
      int res = 1;
      size_t l;
      uint16_t PKT_QR = 1;
@@ -803,34 +803,34 @@ int set_return_msg(struct module_qstate* qstate,
  
      if ((!checkList(question)) || (!checkList(answer)) || (!checkList(authority)) || (!checkList(additional)))
         return 0;
-     if ((qb = ldns_buffer_new(LDNS_RR_BUF_SIZE)) == 0) return 0;
+     if ((qb = sldns_buffer_new(LDNS_RR_BUF_SIZE)) == 0) return 0;
 
      /* write header */
-     ldns_buffer_write_u16(qb, 0); /* ID */
-     ldns_buffer_write_u16(qb, 0); /* flags */
-     ldns_buffer_write_u16(qb, 1); /* qdcount */
-     ldns_buffer_write_u16(qb, 0); /* ancount */
-     ldns_buffer_write_u16(qb, 0); /* nscount */
-     ldns_buffer_write_u16(qb, 0); /* arcount */
-     if ((flags&PKT_QR)) LDNS_QR_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_AA)) LDNS_AA_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_TC)) LDNS_TC_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_RD)) LDNS_RD_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_CD)) LDNS_CD_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_RA)) LDNS_RA_SET(ldns_buffer_begin(qb));
-     if ((flags&PKT_AD)) LDNS_AD_SET(ldns_buffer_begin(qb));
+     sldns_buffer_write_u16(qb, 0); /* ID */
+     sldns_buffer_write_u16(qb, 0); /* flags */
+     sldns_buffer_write_u16(qb, 1); /* qdcount */
+     sldns_buffer_write_u16(qb, 0); /* ancount */
+     sldns_buffer_write_u16(qb, 0); /* nscount */
+     sldns_buffer_write_u16(qb, 0); /* arcount */
+     if ((flags&PKT_QR)) LDNS_QR_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_AA)) LDNS_AA_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_TC)) LDNS_TC_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_RD)) LDNS_RD_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_CD)) LDNS_CD_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_RA)) LDNS_RA_SET(sldns_buffer_begin(qb));
+     if ((flags&PKT_AD)) LDNS_AD_SET(sldns_buffer_begin(qb));
 
      /* write the query */
-     l = ldns_buffer_remaining(qb);
-     if(ldns_str2wire_dname_buf(rr_name, ldns_buffer_current(qb), &l) != 0) {
-             ldns_buffer_free(qb);
+     l = sldns_buffer_remaining(qb);
+     if(sldns_str2wire_dname_buf(rr_name, sldns_buffer_current(qb), &l) != 0) {
+             sldns_buffer_free(qb);
              return 0;
      }
-     ldns_buffer_skip(qb, l);
+     sldns_buffer_skip(qb, l);
      if (rr_type == 0) { rr_type = LDNS_RR_TYPE_A; }
      if (rr_class == 0) { rr_class = LDNS_RR_CLASS_IN; }
-     ldns_buffer_write_u16(qb, rr_type);
-     ldns_buffer_write_u16(qb, rr_class);
+     sldns_buffer_write_u16(qb, rr_type);
+     sldns_buffer_write_u16(qb, rr_class);
 
      /* write RR sections */
      if(res && !pushRRList(qb, question, default_ttl, 1, LDNS_QDCOUNT_OFF))
@@ -844,7 +844,7 @@ int set_return_msg(struct module_qstate* qstate,
 
      if (res) res = createResponse(qstate, qb);
 
-     if (qb) ldns_buffer_free(qb);
+     if (qb) sldns_buffer_free(qb);
      return res;
 }
 %}
@@ -899,12 +899,12 @@ void regional_log_stats(struct regional *r);
 }
 
 // Mark as source returning newly allocated memory
-%newobject ldns_wire2str_type;
-%newobject ldns_wire2str_class;
+%newobject sldns_wire2str_type;
+%newobject sldns_wire2str_class;
 
 // LDNS functions
-char *ldns_wire2str_type(const uint16_t atype);
-char *ldns_wire2str_class(const uint16_t aclass);
+char *sldns_wire2str_type(const uint16_t atype);
+char *sldns_wire2str_class(const uint16_t aclass);
 
 // Functions from pythonmod_utils
 int storeQueryInCache(struct module_qstate* qstate, struct query_info* qinfo, struct reply_info* msgrep, int is_referral);

diff --git a/util/configlexer.c b/util/configlexer.c
index 59b9838e64937b35c7f6d49dabbc00af57169603..6fcb1e6da1b95780a494c69acda8cefa3c36168e 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -10,7 +10,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 36
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -3505,7 +3505,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
        YY_BUFFER_STATE b;
        char *buf;
        yy_size_t n;
-       int i;
+       yy_size_t i;
     
        /* Get memory for full buffer, including space for trailing EOB's. */
        n = _yybytes_len + 2;