From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 27 Aug 2014 15:29:01 +0000 (+0200)
Subject: [master] Merge branch 'trac3512'
X-Git-Tag: trac3482_base~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cbbab2d01c6e1bf6d563ba64d80bc6bc857f73d;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3512'

Conflicts:
	src/lib/dhcpsrv/configuration.h
---

5cbbab2d01c6e1bf6d563ba64d80bc6bc857f73d
diff --cc src/lib/dhcpsrv/configuration.h
index 39af734be9,255bc18eda..f5a132bed4
--- a/src/lib/dhcpsrv/configuration.h
+++ b/src/lib/dhcpsrv/configuration.h
@@@ -112,25 -86,12 +113,31 @@@ struct Configuration 
      /// @brief logging specific information
      LoggingInfoStorage logging_info_;
  
+     /// @brief Interface configuration.
+     ///
+     /// Used to select interfaces on which the DHCP server will listen to
+     /// queries.
+     CfgIface cfg_iface_;
+ 
 +    /// @brief Returns summary of the configuration in the textual format.
 +    ///
 +    /// This method returns the brief text describing the current configuration.
 +    /// It may be used for logging purposes, e.g. when the new configuration is
 +    /// committed to notify a user about the changes in configuration.
 +    ///
 +    /// @todo Currently this method uses @c CfgMgr accessors to get the
 +    /// configuration parameters. Once these parameters are migrated from the
 +    /// @c CfgMgr this method will have to be modified accordingly.
 +    ///
 +    /// @todo Implement reporting a summary of interfaces being used for
 +    /// receiving and sending DHCP messages. This will be implemented with
 +    /// ticket #3512.
 +    ///
 +    /// @param selection Is a bitfield which describes the parts of the
 +    /// configuration to be returned.
 +    ///
 +    /// @return Summary of the configuration in the textual format.
 +    std::string getConfigSummary(const uint32_t selection) const;
  };
  
  /// @brief pointer to the configuration