[svn] commit: r1153 - in /branches/xfrin: ./ src/bin/ src/bin/auth/ src/bin/bind10/ src/bin/xfrin/ src/bin/xfrin/unittest/ src/lib/dns/ src/lib/python/isc/auth/

[BIND 10 source code commits]

Author: zhanglikun
Date: Sat Mar  6 13:34:39 2010
New Revision: 1153

Log:
create a temp branch for xfrin.

Added:
    branches/xfrin/src/bin/xfrin/
    branches/xfrin/src/bin/xfrin/Makefile.am
    branches/xfrin/src/bin/xfrin/run_b10-xfrin.sh.in
    branches/xfrin/src/bin/xfrin/test.py
    branches/xfrin/src/bin/xfrin/unittest/
    branches/xfrin/src/bin/xfrin/xfrin.py.in
    branches/xfrin/src/bin/xfrin/xfrin.spec
Modified:
    branches/xfrin/configure.ac
    branches/xfrin/src/bin/Makefile.am
    branches/xfrin/src/bin/auth/Makefile.am
    branches/xfrin/src/bin/bind10/bind10.py.in
    branches/xfrin/src/lib/dns/buffer.h
    branches/xfrin/src/lib/python/isc/auth/Makefile.am

Modified: branches/xfrin/configure.ac
==============================================================================
--- branches/xfrin/configure.ac (original)
+++ branches/xfrin/configure.ac Sat Mar  6 13:34:39 2010
@@ -152,6 +152,7 @@
                  src/bin/loadzone/Makefile
                  src/bin/msgq/Makefile
                  src/bin/auth/Makefile
+                 src/bin/xfrin/Makefile
                  src/lib/Makefile
                  src/lib/cc/Makefile
                  src/lib/python/Makefile
@@ -170,6 +171,8 @@
            src/bin/cmdctl/cmdctl.py
            src/bin/cmdctl/run_b10-cmdctl.sh
            src/bin/cmdctl/unittest/cmdctl_test
+           src/bin/xfrin/xfrin.py
+           src/bin/xfrin/run_b10-xfrin.sh
            src/bin/bind10/bind10.py
            src/bin/bind10/bind10_test
            src/bin/bind10/run_bind10.sh
@@ -187,6 +190,7 @@
            src/lib/dns/tests/testdata/gen-wiredata.py
           ], [
            chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
+           chmod +x src/bin/xfrin/run_b10-xfrin.sh
            chmod +x src/bin/bind10/run_bind10.sh
            chmod +x src/bin/cmdctl/unittest/cmdctl_test
            chmod +x src/bin/bindctl/unittest/bindctl_test

Modified: branches/xfrin/src/bin/Makefile.am
==============================================================================
--- branches/xfrin/src/bin/Makefile.am (original)
+++ branches/xfrin/src/bin/Makefile.am Sat Mar  6 13:34:39 2010
@@ -1,1 +1,1 @@
-SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth
+SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin

Modified: branches/xfrin/src/bin/auth/Makefile.am
==============================================================================
--- branches/xfrin/src/bin/auth/Makefile.am (original)
+++ branches/xfrin/src/bin/auth/Makefile.am Sat Mar  6 13:34:39 2010
@@ -13,7 +13,7 @@
 b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
-b10_auth_LDADD += $(SQLITE_LIBS)
+b10_auth_LDADD += -lsqlite3
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}

Modified: branches/xfrin/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/xfrin/src/bin/bind10/bind10.py.in (original)
+++ branches/xfrin/src/bin/bind10/bind10.py.in Sat Mar  6 13:34:39 2010
@@ -229,6 +229,20 @@
         if self.verbose:
             sys.stdout.write("Started b10-auth (PID %d)\n" % auth.pid)
 
+        # start the b10-xfrin
+        if self.verbose:
+            sys.stdout.write("Starting b10-xfrin\n")
+        try:
+            xfrind = ProcessInfo("b10-xfrin", ['b10-xfrin'])
+        except Exception as e:
+            c_channel.process.kill()
+            bind_cfgd.process.kill()
+            auth.process.kill()
+            return "Unable to start b10-xfrin; " + str(e)
+        self.processes[xfrind.pid] = xfrind
+        if self.verbose:
+            sys.stdout.write("Started b10-xfrin (PID %d)\n" % xfrind.pid)
+
         # start the b10-cmdctl
         # XXX: we hardcode port 8080
         if self.verbose:
@@ -239,6 +253,7 @@
             c_channel.process.kill()
             bind_cfgd.process.kill()
             auth.process.kill()
+            xfrind.process.kill()
             return "Unable to start b10-cmdctl; " + str(e)
         self.processes[cmd_ctrld.pid] = cmd_ctrld
         if self.verbose:

Modified: branches/xfrin/src/lib/dns/buffer.h
==============================================================================
--- branches/xfrin/src/lib/dns/buffer.h (original)
+++ branches/xfrin/src/lib/dns/buffer.h Sat Mar  6 13:34:39 2010
@@ -205,7 +205,7 @@
     }
     //@}
 
-private:
+protected:
     size_t position_;
     const uint8_t* data_;
     size_t len_;
@@ -358,7 +358,7 @@
     /// \param pos The beginning position in the buffer to write the data.
     void writeUint16At(uint16_t data, size_t pos)
     {
-        if (pos + sizeof(data) > data_.size()) {
+        if (pos + sizeof(data) >= data_.size()) {
             dns_throw(InvalidBufferPosition, "write at invalid position");
         }
 

Modified: branches/xfrin/src/lib/python/isc/auth/Makefile.am
==============================================================================
--- branches/xfrin/src/lib/python/isc/auth/Makefile.am (original)
+++ branches/xfrin/src/lib/python/isc/auth/Makefile.am Sat Mar  6 13:34:39 2010
@@ -1,6 +1,6 @@
-PY_MODULES=	__init__.py master.py sqlite3ds.py
+PY_MODULES=	__init__.py master.py sqlite3_ds.py
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/auth
 	@(for _foo_ in $(PY_MODULES) ; \
-		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/auth/python/isc/auth/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/auth/; done)
+		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/python/isc/auth/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/auth/; done)