[svn] commit: r1842 - /branches/trac109/src/bin/auth/main.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon May 17 22:49:30 UTC 2010
Author: each
Date: Mon May 17 22:49:30 2010
New Revision: 1842
Log:
Improved b10-auth output messages [trac #109]
Modified:
branches/trac109/src/bin/auth/main.cc
Modified: branches/trac109/src/bin/auth/main.cc
==============================================================================
--- branches/trac109/src/bin/auth/main.cc (original)
+++ branches/trac109/src/bin/auth/main.cc Mon May 17 22:49:30 2010
@@ -139,7 +139,8 @@
}
catch (const std::exception & err) {
//if (verbose_mode)
- cerr << "error handle xfr query:" << err.what() << endl;
+ cerr << "[b10-auth] Error handling XFR query: "
+ << err.what() << endl;
}
}
#endif
@@ -397,7 +398,7 @@
servers.tcp6_server = new TCPServer(io_service_, AF_INET6, portnum);
}
- cout << "Server started." << endl;
+ cout << "[b10-auth] Server started." << endl;
io_service_.run();
}
#else // !HAVE_BOOST_SYSTEM
@@ -432,24 +433,28 @@
int error = getaddrinfo(NULL, port, &hints, &res);
if (error != 0) {
- isc_throw(FatalError, "getaddrinfo failed: " << gai_strerror(error));
+ isc_throw(FatalError, "[b10-auth] getaddrinfo failed: "
+ << gai_strerror(error));
}
int s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- isc_throw(FatalError, "failed to open socket");
+ isc_throw(FatalError, "[b10-auth] Failed to open UDP socket: "
+ << strerror(errno));
}
if (af == AF_INET6) {
int on = 1;
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
- cerr << "couldn't set IPV6_V6ONLY socket option" << endl;
+ cerr << "[b10-auth] Failed to set IPV6_V6ONLY socket option: "
+ << strerror(errno) << endl;
// proceed anyway
}
}
if (bind(s, res->ai_addr, res->ai_addrlen) < 0) {
- isc_throw(FatalError, "binding socket failure");
+ isc_throw(FatalError, "[b10-auth] Failed to bind UDP socket: "
+ << strerror(errno));
}
return (s);
@@ -467,32 +472,38 @@
int error = getaddrinfo(NULL, port, &hints, &res);
if (error != 0) {
- isc_throw(FatalError, "getaddrinfo failed: " << gai_strerror(error));
+ isc_throw(FatalError, "[b10-auth] getaddrinfo failed: "
+ << gai_strerror(error));
}
int s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (s < 0) {
- isc_throw(FatalError, "failed to open socket");
+ isc_throw(FatalError, "[b10-auth] Failed to open TCP socket: "
+ << strerror(errno));
}
int on = 1;
if (af == AF_INET6) {
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
- cerr << "couldn't set IPV6_V6ONLY socket option" << endl;
+ cerr << "[b10-auth] Failed to set IPV6_V6ONLY socket option: "
+ << strerror(errno) << endl;
}
// proceed anyway
}
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
- cerr << "couldn't set SO_REUSEADDR socket option" << endl;
+ cerr << "[b10-auth] Failed to set SO_REUSEADDR socket option: "
+ << strerror(errno) << endl;
}
if (bind(s, res->ai_addr, res->ai_addrlen) < 0) {
- isc_throw(FatalError, "binding socket failure");
+ isc_throw(FatalError, "[b10-auth] Failed to bind TCP socket: "
+ << strerror(errno));
}
if (listen(s, 100) < 0) {
- isc_throw(FatalError, "failed to listen on a TCP socket");
+ isc_throw(FatalError, "[b10-auth] Failed to listen on TCP socket: "
+ << strerror(errno));
}
return (s);
}
@@ -516,11 +527,12 @@
cc = sendto(fd, response_renderer.getData(),
response_renderer.getLength(), 0, sa, sa_len);
if (cc != response_renderer.getLength()) {
- cerr << "UDP send error" << endl;
+ cerr << "[b10-auth] UDP send error: "
+ << strerror(errno) << endl;
}
}
} else if (verbose_mode) {
- cerr << "UDP receive error" << endl;
+ cerr << "[b10-auth] UDP receive error: " << strerror(errno) << endl;
}
}
@@ -539,30 +551,30 @@
int ts = accept(fd, sa, &sa_len);
if (ts < 0) {
if (verbose_mode) {
- cerr << "[XX] TCP accept failure:" << endl;
+ cerr << "[b10-auth] [XX] TCP accept failure:" << endl;
return;
}
}
if (verbose_mode) {
- cerr << "[XX] process TCP" << endl;
+ cerr << "[b10-auth] [XX] process TCP" << endl;
}
cc = recv(ts, sizebuf, 2, 0);
if (cc < 0) {
if (verbose_mode) {
- cerr << "[XX] TCP recv failure:" << endl;
+ cerr << "[b10-auth] [XX] TCP recv failure:" << endl;
}
close(ts);
return;
}
if (verbose_mode) {
- cerr << "[XX] got: " << cc << endl;
+ cerr << "[b10-auth] [XX] got: " << cc << endl;
}
uint16_t size, size_n;
memcpy(&size_n, sizebuf, 2);
size = ntohs(size_n);
if (verbose_mode) {
- cerr << "[XX] got: " << size << endl;
+ cerr << "[b10-auth] [XX] got: " << size << endl;
}
vector<char> message_buffer;
@@ -570,12 +582,13 @@
cc = 0;
while (cc < size) {
if (verbose_mode) {
- cerr << "[XX] cc now: " << cc << " of " << size << endl;
+ cerr << "[b10-auth] [XX] cc now: " << cc << " of " << size << endl;
}
const int cc0 = recv(ts, &message_buffer[0] + cc, size - cc, 0);
if (cc0 < 0) {
if (verbose_mode) {
- cerr << "TCP receive error" << endl;
+ cerr << "[b10-auth] TCP receive error: " << strerror(errno)
+ << endl;
close(ts);
return;
}
@@ -600,18 +613,19 @@
response_renderer.getLength(), 0);
if (cc == -1) {
if (verbose_mode) {
- cerr << "[AuthSrv] error in sending TCP response message" <<
- endl;
+ cerr << "[b10-auth] Error sending TCP response message: "
+ << strerror(errno) << endl;
}
} else {
if (verbose_mode) {
- cerr << "[XX] sent TCP response: " << cc << " bytes"
- << endl;
+ cerr << "[b10-auth] [XX] sent TCP response: " << cc
+ << " bytes" << endl;
}
}
} else {
if (verbose_mode) {
- cerr << "TCP send error" << endl;
+ cerr << "[b10-auth] TCP send error: "
+ << strerror(errno) << endl;
}
}
}
@@ -647,10 +661,10 @@
}
++nfds;
- cout << "Server started." << endl;
+ cout << "[b10-auth] Server started." << endl;
if (srv->configSession() == NULL) {
- isc_throw(FatalError, "Config session not initalized");
+ isc_throw(FatalError, "[b10-auth] Config session not initalized");
}
int ss = srv->configSession()->getSocket();
@@ -734,7 +748,7 @@
}
if (!use_ipv4 && !use_ipv6) {
- cerr << "-4 and -6 can't coexist" << endl;
+ cerr << "Error: -4 and -6 can't coexist" << endl;
usage();
}
More information about the bind10-changes
mailing list