From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 23 Dec 2011 12:41:30 +0000 (+0100)
Subject: [1237] joinMcast() renamed to joinMulticast()
X-Git-Tag: trac2351_base~299^2~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a040737426aece7cc92a795f2b712d7c3407513;p=thirdparty%2Fkea.git

[1237] joinMcast() renamed to joinMulticast()
---

diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index c7cfa8448a..2a8c0010a4 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -218,7 +218,7 @@ void IfaceMgr::openSockets6(uint16_t port) {
                           << " interface " << iface->getFullName());
             }
 
-            if ( !joinMcast(sock1, iface->getName(),
+            if ( !joinMulticast(sock1, iface->getName(),
                              string(ALL_DHCP_RELAY_AGENTS_AND_SERVERS) ) ) {
                 close(sock1);
                 isc_throw(Unexpected, "Failed to join " << ALL_DHCP_RELAY_AGENTS_AND_SERVERS
@@ -414,7 +414,7 @@ IfaceMgr::openSocket6(Iface& iface, const IOAddress& addr, int port) {
         // are link and site-scoped, so there is no sense to join those groups
         // with global addresses.
 
-        if ( !joinMcast( sock, iface.getName(),
+        if ( !joinMulticast( sock, iface.getName(),
                          string(ALL_DHCP_RELAY_AGENTS_AND_SERVERS) ) ) {
             close(sock);
             isc_throw(Unexpected, "Failed to join " << ALL_DHCP_RELAY_AGENTS_AND_SERVERS
@@ -431,7 +431,7 @@ IfaceMgr::openSocket6(Iface& iface, const IOAddress& addr, int port) {
 }
 
 bool
-IfaceMgr::joinMcast(int sock, const std::string& ifname,
+IfaceMgr::joinMulticast(int sock, const std::string& ifname,
 const std::string & mcast) {
 
     struct ipv6_mreq mreq;
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index 654b8b7bab..39024b5a82 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -452,8 +452,8 @@ private:
     /// @return true if multicast join was successful
     ///
     bool
-    joinMcast(int sock, const std::string& ifname,
-              const std::string& mcast);
+    joinMulticast(int sock, const std::string& ifname,
+                  const std::string& mcast);
 
 };