[svn] commit: r526 - in /branches/parkinglot: ./ src/bin/bind-cfgd/ src/bin/parkinglot/ src/lib/ src/lib/bind-cfgd/ src/lib/cc/cpp/ src/lib/config/ src/lib/config/cpp/
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jan 26 21:33:46 UTC 2010
Author: jelte
Date: Tue Jan 26 21:33:45 2010
New Revision: 526
Log:
renamed lib/bind-cfgd to lib/config because it will also contain client-config stuff
moved data_def.* and ccsession.* to lib/config/cpp, they are compiled into lib/config/libclient.a (for now)
fixed includes and ldadds for the rest of the stuff
also fixed an include problem in parkinglot/common.h
Added:
branches/parkinglot/src/lib/config/
- copied from r517, branches/parkinglot/src/lib/bind-cfgd/
branches/parkinglot/src/lib/config/Makefile.am
branches/parkinglot/src/lib/config/cpp/
branches/parkinglot/src/lib/config/cpp/Makefile.am
branches/parkinglot/src/lib/config/cpp/ccsession.cc
- copied, changed from r517, branches/parkinglot/src/bin/parkinglot/ccsession.cc
branches/parkinglot/src/lib/config/cpp/ccsession.h
- copied, changed from r517, branches/parkinglot/src/bin/parkinglot/ccsession.h
branches/parkinglot/src/lib/config/cpp/data_def.cc
- copied unchanged from r523, branches/parkinglot/src/lib/cc/cpp/data_def.cc
branches/parkinglot/src/lib/config/cpp/data_def.h
- copied, changed from r522, branches/parkinglot/src/lib/cc/cpp/data_def.h
Removed:
branches/parkinglot/src/bin/parkinglot/ccsession.cc
branches/parkinglot/src/bin/parkinglot/ccsession.h
branches/parkinglot/src/lib/bind-cfgd/
branches/parkinglot/src/lib/cc/cpp/data_def.cc
branches/parkinglot/src/lib/cc/cpp/data_def.h
Modified:
branches/parkinglot/configure.ac
branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in
branches/parkinglot/src/bin/parkinglot/Makefile.am
branches/parkinglot/src/bin/parkinglot/common.cc
branches/parkinglot/src/bin/parkinglot/common.h
branches/parkinglot/src/bin/parkinglot/main.cc
branches/parkinglot/src/lib/Makefile.am
branches/parkinglot/src/lib/cc/cpp/Makefile.am
Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Tue Jan 26 21:33:45 2010
@@ -130,7 +130,7 @@
src/Makefile
src/bin/Makefile
src/bin/bind10/Makefile
- src/bin/cmd-ctrld/Makefile
+ src/bin/cmd-ctrld/Makefile
src/bin/bindctl/Makefile
src/bin/host/Makefile
src/bin/msgq/Makefile
@@ -138,6 +138,8 @@
src/lib/Makefile
src/lib/cc/Makefile
src/lib/cc/cpp/Makefile
+ src/lib/config/Makefile
+ src/lib/config/cpp/Makefile
src/lib/dns/Makefile
])
AC_OUTPUT([src/bin/bind-cfgd/bind-cfgd
@@ -145,8 +147,8 @@
src/bin/bind10/bind10
src/bin/bind10/bind10_test
src/bin/bindctl/run_bindctl
- src/bin/msgq/msgq
- src/bin/msgq/msgq_test
+ src/bin/msgq/msgq
+ src/bin/msgq/msgq_test
src/bin/parkinglot/config.h
], [
chmod +x src/bin/bind-cfgd/bind-cfgd
Modified: branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in
==============================================================================
--- branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in (original)
+++ branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in Tue Jan 26 21:33:45 2010
@@ -1,6 +1,6 @@
#!/bin/sh
# use build time srcdir for now
-BINPATH=@abs_top_srcdir@/src/lib/bind-cfgd/python
+BINPATH=@abs_top_srcdir@/src/lib/config/python
LIBPATH=@abs_top_srcdir@/src/lib/cc/python
PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
Modified: branches/parkinglot/src/bin/parkinglot/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/Makefile.am (original)
+++ branches/parkinglot/src/bin/parkinglot/Makefile.am Tue Jan 26 21:33:45 2010
@@ -2,6 +2,8 @@
bin_PROGRAMS = parkinglot
parkinglot_SOURCES = common.cc common.h zoneset.h zoneset.cc parkinglot.cc
-parkinglot_SOURCES += parkinglot.h ccsession.cc ccsession.h main.cc
+parkinglot_SOURCES += parkinglot.h main.cc
parkinglot_SOURCES += data_source_plot.h data_source_plot.cc
-parkinglot_LDADD = $(top_srcdir)/src/lib/dns/libdns.a $(top_srcdir)/src/lib/cc/cpp/libcc.a
+parkinglot_LDADD = $(top_srcdir)/src/lib/dns/libdns.a
+parkinglot_LDADD += $(top_srcdir)/src/lib/config/cpp/libclient.a
+parkinglot_LDADD += $(top_srcdir)/src/lib/cc/cpp/libcc.a
Modified: branches/parkinglot/src/bin/parkinglot/common.cc
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/common.cc (original)
+++ branches/parkinglot/src/bin/parkinglot/common.cc Tue Jan 26 21:33:45 2010
@@ -13,4 +13,11 @@
// PERFORMANCE OF THIS SOFTWARE.
// $Id$
+#include "common.h"
+#include <iostream>
+FatalError::FatalError(std::string m) {
+ msg = m;
+ std::cerr << msg << std::endl;
+ exit(1);
+}
Modified: branches/parkinglot/src/bin/parkinglot/common.h
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/common.h (original)
+++ branches/parkinglot/src/bin/parkinglot/common.h Tue Jan 26 21:33:45 2010
@@ -18,18 +18,15 @@
#define __COMMON_H 1
#include <stdlib.h>
+#include <string>
class FatalError : public std::exception {
- public:
- FatalError(std::string m = "fatal error") {
- msg = m;
- std::cerr << msg << std::endl;
- exit(1);
- }
- ~FatalError() throw() {}
- const char* what() const throw() { return msg.c_str(); }
- private:
- std::string msg;
+public:
+ FatalError(std::string m = "fatal error");
+ ~FatalError() throw() {}
+ const char* what() const throw() { return msg.c_str(); }
+private:
+ std::string msg;
};
#endif // __COMMON_H
Modified: branches/parkinglot/src/bin/parkinglot/main.cc
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/main.cc (original)
+++ branches/parkinglot/src/bin/parkinglot/main.cc Tue Jan 26 21:33:45 2010
@@ -32,19 +32,20 @@
#include <cc/cpp/session.h>
#include <cc/cpp/data.h>
+#include <config/cpp/ccsession.h>
#include "zoneset.h"
#include "parkinglot.h"
-#include "ccsession.h"
#include "common.h"
#include <boost/foreach.hpp>
+#include "config.h"
+
using namespace std;
const string PROGRAM = "ParkingLot";
-const string SPECFILE = "parkinglot.spec";
const int DNSPORT = 5300;
/* need global var for config/command handlers.
@@ -106,7 +107,7 @@
// initialize command channel
try {
- CommandSession cs = CommandSession(PROGRAM, SPECFILE, my_config_handler, my_command_handler);
+ CommandSession cs = CommandSession(PROGRAM, PARKINGLOT_SPECFILE_LOCATION, my_config_handler, my_command_handler);
// main server loop
fd_set fds;
Modified: branches/parkinglot/src/lib/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/Makefile.am (original)
+++ branches/parkinglot/src/lib/Makefile.am Tue Jan 26 21:33:45 2010
@@ -1,1 +1,1 @@
-SUBDIRS = dns cc
+SUBDIRS = cc config dns
Modified: branches/parkinglot/src/lib/cc/cpp/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/cc/cpp/Makefile.am (original)
+++ branches/parkinglot/src/lib/cc/cpp/Makefile.am Tue Jan 26 21:33:45 2010
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/lib/cc/cpp -I$(top_srcdir)/ext -Wall -Werror
lib_LIBRARIES = libcc.a
-libcc_a_SOURCES = data.cc data.h data_def.h data_def.cc session.cc session.h
+libcc_a_SOURCES = data.cc data.h session.cc session.h
TESTS =
if HAVE_GTEST
More information about the bind10-changes
mailing list