BIND 10 trac1651, updated. 62de4b87e94b5bea78fd4100969eaea30f881df4 [1651] Support for msgq implemented in b10-dhcp4 component.
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed May 30 16:37:36 UTC 2012
The branch, trac1651 has been updated
via 62de4b87e94b5bea78fd4100969eaea30f881df4 (commit)
from 977c4a2b576986ab0e7402cb0ade14244bf90ca2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62de4b87e94b5bea78fd4100969eaea30f881df4
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Wed May 30 18:36:58 2012 +0200
[1651] Support for msgq implemented in b10-dhcp4 component.
-----------------------------------------------------------------------
Summary of changes:
doc/guide/bind10-guide.xml | 2 +-
src/bin/dhcp4/dhcp4_srv.cc | 12 +++-
src/bin/dhcp4/dhcp4_srv.h | 3 +
src/bin/dhcp4/main.cc | 32 ++++++++---
src/lib/cc/session.cc | 13 +++++
src/lib/cc/session.h | 5 ++
src/lib/dhcp/iface_mgr.cc | 90 +++++++++++++++++++++++++++---
src/lib/dhcp/iface_mgr.h | 27 +++++++--
src/lib/dhcp/tests/iface_mgr_unittest.cc | 2 +-
9 files changed, 161 insertions(+), 25 deletions(-)
-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 85b3909..714b093 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -2041,7 +2041,7 @@ then change those defaults with config set Resolver/forward_addresses[0]/address
run under BIND10 framework. To add a DHCPv4 process to the set of running
BIND10 services, you can use following commands in <command>bindctl</command>:
<screen>> <userinput>config add Boss/components b10-dhcp4</userinput>
-> <userinput>config set Boss/components/b10-resolver/kind dispensable</userinput>
+> <userinput>config set Boss/components/b10-dhcp4/kind dispensable</userinput>
> <userinput>config commit</userinput></screen></para>
<para>
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index d065eda..4fb0a77 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -52,15 +52,23 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t port) {
}
Dhcpv4Srv::~Dhcpv4Srv() {
- cout << "DHCPv4 server shutdown." << endl;
+ cout << "b10-dhcp4: DHCPv4 server terminating." << endl;
IfaceMgr::instance().closeSockets();
}
+void Dhcpv4Srv::shutdown() {
+ cout << "b10-dhcp4: DHCPv4 server shutdown." << endl;
+ shutdown_ = true;
+}
+
bool
Dhcpv4Srv::run() {
while (!shutdown_) {
+ /// @todo: calculate actual timeout once we have lease database
+ int timeout = 1000;
+
// client's message and server's response
- Pkt4Ptr query = IfaceMgr::instance().receive4();
+ Pkt4Ptr query = IfaceMgr::instance().receive4(timeout);
Pkt4Ptr rsp;
if (query) {
diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 745a4ec..28a66b2 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -60,6 +60,9 @@ class Dhcpv4Srv : public boost::noncopyable {
/// critical error.
bool run();
+ /// @brief instructs server to shut down.
+ void shutdown();
+
protected:
/// @brief Processes incoming DISCOVER and returns response.
///
diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 1f8f7a0..c7a6011 100644
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -37,6 +37,7 @@
#include <dhcp4/spec_config.h>
#include <dhcp4/dhcp4_srv.h>
+#include <dhcp/iface_mgr.h>
#include <asiolink/asiolink.h>
#include <log/logger_support.h>
@@ -65,8 +66,13 @@ usage() {
}
} // end of anonymous namespace
+// Global objects are ugly, but that is the most convenient way of
+// having it accessible from handlers.
IOService io_service;
+// The same applies to global pointers. Ugly, but useful.
+Dhcpv4Srv* server = NULL;
+
ConstElementPtr
dhcp4_config_handler(ConstElementPtr new_config) {
cout << "b10-dhcp4: Received new config:" << new_config->str() << endl;
@@ -80,6 +86,9 @@ dhcp4_command_handler(const string& command, ConstElementPtr args) {
cout << "b10-dhcp4: Received new command: [" << command << "], args="
<< args->str() << endl;
if (command == "shutdown") {
+ if (server) {
+ server->shutdown();
+ }
io_service.stop();
ConstElementPtr answer = isc::config::createAnswer(0,
"Shutting down.");
@@ -92,6 +101,9 @@ dhcp4_command_handler(const string& command, ConstElementPtr args) {
return (answer);
}
+void session_reader(void) {
+ io_service.run_one();
+}
void establish_session() {
@@ -113,14 +125,18 @@ void establish_session() {
config_session = new ModuleCCSession(specfile, *cc_session,
dhcp4_config_handler,
dhcp4_command_handler, false);
- cout << "b10-dhcp4: hasQueuedMsgs()=" << config_session->hasQueuedMsgs() << endl;
config_session->start();
- cout << "b10-dhcp4: After session start." << endl;
- cout << "b10-dhcp4: About to call io_service.run()" << endl;
- io_service.run();
- cout << "b10-dhcp4: Returned from io_service.run()" << endl;
+ int ctrl_socket = cc_session->getSocketDesc();
+ cout << "b10-dhcp4: Control session started, socket="
+ << ctrl_socket << endl;
+
+ IfaceMgr::instance().set_session_socket(ctrl_socket, session_reader);
+
+ // cout << "b10-dhcp4: About to call io_service.run()" << endl;
+ // io_service.run();
+ // cout << "b10-dhcp4: Returned from io_service.run()" << endl;
}
int
@@ -159,9 +175,11 @@ main(int argc, char* argv[]) {
cout << "[b10-dhcp4] Initiating DHCPv4 server operation." << endl;
- Dhcpv4Srv* srv = new Dhcpv4Srv();
+ server = new Dhcpv4Srv();
+
+ server->run();
- srv->run();
+ delete server;
} catch (const std::exception& ex) {
cerr << "[b10-dhcp4] Server failed: " << ex.what() << endl;
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index 40ab86d..073d4f0 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -88,6 +88,7 @@ public:
void startRead(boost::function<void()> user_handler);
void setTimeout(size_t seconds) { timeout_ = seconds; };
size_t getTimeout() const { return timeout_; };
+ int getSocketDesc();
long int sequence_; // the next sequence number to use
std::string lname_;
@@ -254,6 +255,13 @@ SessionImpl::internalRead(const asio::error_code& error,
}
}
+int
+SessionImpl::getSocketDesc() {
+ /// @todo boost 1.42 uses native() method, but it is deprecated
+ /// in 1.49 and native_handle() is recommended instead
+ return socket_.native();
+}
+
Session::Session(asio::io_service& io_service) :
impl_(new SessionImpl(io_service))
{}
@@ -273,6 +281,11 @@ Session::startRead(boost::function<void()> read_callback) {
impl_->startRead(read_callback);
}
+int
+Session::getSocketDesc() const {
+ return impl_->getSocketDesc();
+}
+
namespace { // maybe unnecessary.
// This is a helper class to make the establish() method (below) exception-safe
// with the RAII approach.
diff --git a/src/lib/cc/session.h b/src/lib/cc/session.h
index e91dd76..9b08232 100644
--- a/src/lib/cc/session.h
+++ b/src/lib/cc/session.h
@@ -141,6 +141,11 @@ namespace isc {
virtual bool hasQueuedMsgs() const;
virtual void setTimeout(size_t milliseconds);
virtual size_t getTimeout() const;
+
+ /// @brief returns socket descriptor from underlying socket connection
+ ///
+ /// @param returns socket descriptor used for session connection
+ virtual int getSocketDesc() const;
private:
void sendmsg(isc::data::ConstElementPtr msg);
void sendmsg(isc::data::ConstElementPtr env,
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 990e987..6f47889 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -18,6 +18,7 @@
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <sys/select.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
@@ -121,7 +122,8 @@ bool IfaceMgr::Iface::delSocket(uint16_t sockfd) {
IfaceMgr::IfaceMgr()
:control_buf_len_(CMSG_SPACE(sizeof(struct in6_pktinfo))),
- control_buf_(new char[control_buf_len_])
+ control_buf_(new char[control_buf_len_]),
+ session_socket_(0), session_callback_(NULL)
{
cout << "IfaceMgr initialization." << endl;
@@ -230,11 +232,13 @@ bool IfaceMgr::openSockets4(const uint16_t port) {
iface!=ifaces_.end();
++iface) {
- cout << "Trying interface " << iface->getFullName() << endl;
+ cout << "Trying opening socket on interface " << iface->getFullName() << endl;
if (iface->flag_loopback_ ||
!iface->flag_up_ ||
!iface->flag_running_) {
+ cout << "Interface " << iface->getFullName()
+ << " not suitable: is loopback, is down or not running" << endl;
continue;
}
@@ -681,13 +685,19 @@ IfaceMgr::send(const Pkt4Ptr& pkt)
boost::shared_ptr<Pkt4>
-IfaceMgr::receive4() {
+IfaceMgr::receive4(unsigned int timeout) {
const SocketInfo* candidate = 0;
IfaceCollection::const_iterator iface;
+
+ fd_set sockets;
+ FD_ZERO(&sockets);
+ int maxfd = 0;
+
+ stringstream names;
+
for (iface = ifaces_.begin(); iface != ifaces_.end(); ++iface) {
- /// @todo: rewrite this as part of #1555
for (SocketCollection::const_iterator s = iface->sockets_.begin();
s != iface->sockets_.end(); ++s) {
@@ -696,20 +706,82 @@ IfaceMgr::receive4() {
continue;
}
- // This address looks good.
- if (!candidate) {
+ names << s->sockfd_ << "(" << iface->getName() << ") ";
+
+ // add this socket to listening set
+ FD_SET(s->sockfd_, &sockets);
+ if (maxfd < s->sockfd_)
+ maxfd = s->sockfd_;
+ }
+ }
+
+ // if there is session socket registered...
+ if (session_socket_) {
+ // at it to the set as well
+ FD_SET(session_socket_, &sockets);
+ if (maxfd < session_socket_)
+ maxfd = session_socket_;
+ names << session_socket_ << "(session)";
+ }
+
+ /// @todo: implement sub-second precision one day
+ struct timeval select_timeout;
+ select_timeout.tv_sec = timeout;
+ select_timeout.tv_usec = 0;
+
+ cout << "Trying to receive data on sockets: " << names.str()
+ << ". Timeout is " << timeout << " seconds." << endl;
+ int result = select(maxfd + 1, &sockets, NULL, NULL, &select_timeout);
+ cout << "select returned " << result << endl;
+
+ if (result == 0) {
+ // nothing received and timeout has been reached
+ return (Pkt4Ptr()); // NULL
+ }
+ if (result < 0) {
+ char buf[512];
+ strncpy(buf, strerror(errno), 512);
+ cout << "Socket read error: " << buf << endl;
+
+ /// @todo: perhaps throw here?
+ return (Pkt4Ptr()); // NULL
+ }
+
+ // Let's find out which socket has the data
+
+ if (session_socket_ && (FD_ISSET(session_socket_, &sockets))) {
+ // something received over session socket
+ cout << "BIND10 command or config available over session socket." << endl;
+
+ if (session_callback_) {
+ // in theory we could call io_service.run_one() here, instead of
+ // implementing callback mechanism, but that would introduce
+ // asiolink dependency to libdhcp++ and that is something we want
+ // to avoid (see CPE market and out long term plans for minimalistic
+ // implementations.
+ session_callback_();
+ }
+
+ return (Pkt4Ptr()); // NULL
+ }
+
+ // Let's find out which interface/socket has the data
+ for (iface = ifaces_.begin(); iface != ifaces_.end(); ++iface) {
+ for (SocketCollection::const_iterator s = iface->sockets_.begin();
+ s != iface->sockets_.end(); ++s) {
+ if (FD_ISSET(s->sockfd_, &sockets)) {
candidate = &(*s);
break;
}
}
-
if (candidate) {
break;
}
}
if (!candidate) {
- isc_throw(Unexpected, "Failed to find any suitable sockets on all interfaces.");
+ cout << "Received data over unknown socket." << endl;
+ return (Pkt4Ptr()); // NULL
}
cout << "Trying to receive over UDP4 socket " << candidate->sockfd_ << " bound to "
@@ -746,7 +818,7 @@ IfaceMgr::receive4() {
m.msg_control = &control_buf_[0];
m.msg_controllen = control_buf_len_;
- int result = recvmsg(candidate->sockfd_, &m, 0);
+ result = recvmsg(candidate->sockfd_, &m, 0);
if (result < 0) {
cout << "Failed to receive UDP4 data." << endl;
return (Pkt4Ptr()); // NULL
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index b09a1ac..aacc443 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -39,6 +39,9 @@ public:
/// type that defines list of addresses
typedef std::vector<isc::asiolink::IOAddress> AddressCollection;
+ /// defines callback used when commands are received over control session
+ typedef void (*SessionCallback) (void);
+
/// maximum MAC address length (Infiniband uses 20 bytes)
static const unsigned int MAX_MAC_LEN = 20;
@@ -351,12 +354,10 @@ public:
/// If reception is successful and all information about its sender
/// are obtained, Pkt4 object is created and returned.
///
- /// TODO Start using select() and add timeout to be able
- /// to not wait infinitely, but rather do something useful
- /// (e.g. remove expired leases)
+ /// @param timeout specifies timeout (in seconds)
///
/// @return Pkt4 object representing received packet (or NULL)
- Pkt4Ptr receive4();
+ Pkt4Ptr receive4(unsigned int timeout);
/// Opens UDP/IP socket and binds it to address, interface and port.
///
@@ -401,6 +402,18 @@ public:
/// @return number of detected interfaces
uint16_t countIfaces() { return ifaces_.size(); }
+ /// @brief Sets session socket and a callback
+ ///
+ /// Specifies session socket and a callback that will be called
+ /// when data will be received over that socket.
+ ///
+ /// @param socketfd socket descriptor
+ /// @param callback callback function
+ void set_session_socket(int socketfd, SessionCallback callback) {
+ session_socket_ = socketfd;
+ session_callback_ = callback;
+ }
+
// don't use private, we need derived classes in tests
protected:
@@ -487,7 +500,6 @@ protected:
/// control-buffer, used in transmission and reception
boost::scoped_array<char> control_buf_;
-
/// @brief A wrapper for OS-specific operations before sending IPv4 packet
///
/// @param m message header (will be later used for sendmsg() call)
@@ -505,6 +517,11 @@ protected:
/// @return true if successful, false otherwise
bool os_receive4(struct msghdr& m, Pkt4Ptr& pkt);
+ /// socket descriptor of the session socket
+ int session_socket_;
+
+ /// a callback that will be called when data arrives over session_socket_
+ SessionCallback session_callback_;
private:
/// @brief Creates a single instance of this class (a singleton implementation)
diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 83ba231..16ac706 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -428,7 +428,7 @@ TEST_F(IfaceMgrTest, sendReceive4) {
EXPECT_EQ(true, ifacemgr->send(sendPkt));
- rcvPkt = ifacemgr->receive4();
+ rcvPkt = ifacemgr->receive4(10);
ASSERT_TRUE(rcvPkt); // received our own packet
More information about the bind10-changes
mailing list