[svn] commit: r1636 - in /trunk/src: bin/auth/main.cc bin/bind10/run_bind10.sh.in bin/xfrout/xfrout.py.in lib/Makefile.am

[BIND 10 source code commits]

Author: jinmei
Date: Wed Mar 24 01:54:04 2010
New Revision: 1636

Log:
fixed build problem without boost::sys and boost::python.
(first aid workaround with ugly ifdef's, but worked)
also fixed the problem that "from source" didn't work.

Modified:
    trunk/src/bin/auth/main.cc
    trunk/src/bin/bind10/run_bind10.sh.in
    trunk/src/bin/xfrout/xfrout.py.in
    trunk/src/lib/Makefile.am

Modified: trunk/src/bin/auth/main.cc
==============================================================================
--- trunk/src/bin/auth/main.cc (original)
+++ trunk/src/bin/auth/main.cc Wed Mar 24 01:54:04 2010
@@ -42,14 +42,20 @@
 #include <cc/session.h>
 #include <cc/data.h>
 #include <config/ccsession.h>
+
+#if defined(HAVE_BOOST_SYSTEM) && defined(HAVE_BOOST_PYTHON)
+#define USE_XFROUT
 #include <xfr/xfrout_client.h>
+#endif
 
 #include "spec_config.h"
 #include "common.h"
 #include "auth_srv.h"
 
 using namespace std;
+#ifdef USE_XFROUT
 using namespace isc::xfr;
+#endif
 
 #ifdef HAVE_BOOST_SYSTEM
 using namespace boost::asio;
@@ -105,6 +111,7 @@
     return answer;
 }
 
+#ifdef USE_XFROUT
 //TODO. The sample way for checking axfr query, the code should be merged to auth server class
 static bool
 check_axfr_query(char *msg_data, uint16_t msg_len)
@@ -135,6 +142,7 @@
             cerr << "error handle xfr query:" << err.what() << endl;
     }
 }
+#endif
 
 #ifdef HAVE_BOOST_SYSTEM
 //
@@ -181,12 +189,13 @@
     {
         if (!error) {
             InputBuffer dnsbuffer(data_, bytes_transferred);
+#ifdef USE_XFROUT
             if (check_axfr_query(data_, bytes_transferred)) {
                 dispatch_axfr_query(socket_.native(), data_, bytes_transferred); 
                 // start to get new query ?
                 start();
-            }
-            else {          
+            } else {
+#endif          
                 if (auth_server->processMessage(dnsbuffer, dns_message_,
                                                 response_renderer_, false)) {
                     responselen_buffer_.writeUint16(response_buffer_.getLength());
@@ -199,7 +208,9 @@
                 } else {
                     delete this;
                 }
+#ifdef USE_XFROUT
             }
+#endif
         } else {
             delete this;
         }
@@ -577,30 +588,25 @@
         cc += cc0;
     }
 
-    if (check_axfr_query(&message_buffer[0], size)) {
-        dispatch_axfr_query(ts, &message_buffer[0], size);
-    }
-    else {          
-        InputBuffer buffer(&message_buffer[0], size);
-        dns_message.clear(Message::PARSE);
-        response_renderer.clear();
-        if (auth_server->processMessage(buffer, dns_message, response_renderer,
-                                        false)) {
-            size = response_renderer.getLength();
-            size_n = htons(size);
-            if (send(ts, &size_n, 2, 0) == 2) {
-                cc = send(ts, response_renderer.getData(),
-                          response_renderer.getLength(), 0);
-                if (cc == -1) {
-                    if (verbose_mode) {
-                        cerr << "[AuthSrv] error in sending TCP response message" <<
-                            endl;
-                    }
-                } else {
-                    if (verbose_mode) {
-                        cerr << "[XX] sent TCP response: " << cc << " bytes"
-                             << endl;
-                    }
+    InputBuffer buffer(&message_buffer[0], size);
+    dns_message.clear(Message::PARSE);
+    response_renderer.clear();
+    if (auth_server->processMessage(buffer, dns_message, response_renderer,
+                                    false)) {
+        size = response_renderer.getLength();
+        size_n = htons(size);
+        if (send(ts, &size_n, 2, 0) == 2) {
+            cc = send(ts, response_renderer.getData(),
+                      response_renderer.getLength(), 0);
+            if (cc == -1) {
+                if (verbose_mode) {
+                    cerr << "[AuthSrv] error in sending TCP response message" <<
+                        endl;
+                }
+            } else {
+                if (verbose_mode) {
+                    cerr << "[XX] sent TCP response: " << cc << " bytes"
+                         << endl;
                 }
             }
         } else {

Modified: trunk/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- trunk/src/bin/bind10/run_bind10.sh.in (original)
+++ trunk/src/bin/bind10/run_bind10.sh.in Wed Mar 24 01:54:04 2010
@@ -5,7 +5,7 @@
 
 BIND10_PATH=@abs_top_builddir@/src/bin/bind10
 
-PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/xfrin:$PATH
+PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:$PATH
 export PATH
 
 PYTHONPATH=@abs_top_builddir@/src/lib/python

Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Wed Mar 24 01:54:04 2010
@@ -19,7 +19,6 @@
 import sys; sys.path.append ('@@PYTHONPATH@@')
 import isc
 import isc.cc
-import os
 import threading
 import struct
 import signal
@@ -28,8 +27,6 @@
 import os
 from isc.config.ccsession import *
 import socket
-from bind10_xfr import *
-from bind10_dns import *
 from optparse import OptionParser, OptionValueError
 try:
     from bind10_xfr import *

Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am (original)
+++ trunk/src/lib/Makefile.am Wed Mar 24 01:54:04 2010
@@ -1,1 +1,6 @@
-SUBDIRS = exceptions dns cc config auth xfr python
+SUBDIRS = exceptions dns cc config auth python
+if HAVE_BOOST_PYTHON
+if HAVE_BOOST_SYSTEM
+SUBDIRS += xfr
+endif
+endif