mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 05:27:55 +00:00
Code Issues Releases Wiki Activity

Enable b10-xfrout can be launched in source code tree.(Reviewed by Jelte)

Browse Source 
git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2103 e5f2f494-b856-4b98-b285-d166d9295462
This commit is contained in:
Likun Zhang 2010-06-10 02:13:18 +00:00
parent efcdb2155e
commit 187844f29a
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
54. [bug] zhanglikun
bin/xfrout: Enable b10-xfrout can be launched in source
code tree.
(Trac #224, svn r2103)
53. [bug] zhanglikun 53. [bug] zhanglikun
bin/bindctl: Generate a unique session ID by using bin/bindctl: Generate a unique session ID by using
socket.gethostname() instead of socket.gethostbyname(), socket.gethostname() instead of socket.gethostbyname(),

8
src/bin/auth/asio_link.cc
View File

@ -68,7 +68,13 @@ void
dispatch_axfr_query(const int tcp_sock, char const axfr_query[], dispatch_axfr_query(const int tcp_sock, char const axfr_query[],
const uint16_t query_len) const uint16_t query_len)
{ {
string path(UNIX_SOCKET_FILE); string path;
if (getenv("B10_FROM_BUILD")) {
path = string(getenv("B10_FROM_BUILD")) + "/auth_xfrout_conn";
} else {
path = UNIX_SOCKET_FILE;
}
XfroutClient xfr_client(path); XfroutClient xfr_client(path);
try { try {
xfr_client.connect(); xfr_client.connect();

5
src/bin/xfrout/xfrout.py.in
View File

@ -40,13 +40,14 @@ except ImportError as e:
if "B10_FROM_BUILD" in os.environ: if "B10_FROM_BUILD" in os.environ:
SPECFILE_PATH = os.environ["B10_FROM_BUILD"] + "/src/bin/xfrout" SPECFILE_PATH = os.environ["B10_FROM_BUILD"] + "/src/bin/xfrout"
UNIX_SOCKET_FILE= os.environ["B10_FROM_BUILD"] + "/auth_xfrout_conn"
else: else:
PREFIX = "@prefix@" PREFIX = "@prefix@"
DATAROOTDIR = "@datarootdir@" DATAROOTDIR = "@datarootdir@"
SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX) SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec" UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec"
MAX_TRANSFERS_OUT = 10 MAX_TRANSFERS_OUT = 10
verbose_mode = False verbose_mode = False