Sync with working version

[ssmd.git] / src / switch.cpp

diff --git a/src/switch.cpp b/src/switch.cpp
index b70540294d9c1fa6ad4246366c17d9b99bb6e284..db8a1be6227dae9953e680bc2771f944610fc5b6 100644 (file)
--- a/src/switch.cpp
+++ b/src/switch.cpp
@@ -26,7 +26,8 @@ Switch::Switch(const Settings & settings,
       _writeCommunity(writeCommunity),
       _uplinkPort(uplinkPort),
       _nextUpACL(1),
-      _nextDownACL(1)
+      _nextDownACL(1),
+      _aclsCreated(false)
 {
 }
 
@@ -39,12 +40,38 @@ Switch::Switch(const Switch & rvalue)
       _uplinkPort(rvalue._uplinkPort),
       _nextUpACL(rvalue._nextUpACL),
       _nextDownACL(rvalue._nextDownACL),
-      _acls(rvalue._acls)
+      _acls(rvalue._acls),
+      _aclsCreated(rvalue._aclsCreated)
 {
 }
 
 Switch::~Switch()
 {
+    if (_aclsCreated) {
+        IpAddress addr(_ip.c_str());
+        if (!addr.valid()) {
+            logger << "Switch::~Switch() - ivalid switch ip: '" << _ip << "'" << std::endl;
+            return;
+        }
+
+        CTarget target(addr, _readCommunity.c_str(), _writeCommunity.c_str());
+        if (!target.valid()) {
+            logger << "Switch::~Switch() - failed to create target for the switch '" << _ip << "'" << std::endl;
+            return;
+        }
+
+        target.set_version(version2c);
+
+        if (!checkProfiles(target)) {
+            logger << "Switch::~Switch() - no upload and download profiles defined for the switch '" << _ip << "'" << std::endl;
+            return;
+        }
+
+        if (!dropACLs(target)) {
+            logger << "Switch::~Switch() - failed to drop ACLs for the switch '" << _ip << "'" << std::endl;
+            return;
+        }
+    }
 }
 
 Switch & Switch::operator=(const Switch & rvalue)
@@ -56,6 +83,7 @@ Switch & Switch::operator=(const Switch & rvalue)
     _nextUpACL = rvalue._nextUpACL;
     _nextDownACL = rvalue._nextDownACL;
     _acls = rvalue._acls;
+    _aclsCreated = rvalue._aclsCreated;
 
     return *this;
 }
@@ -106,6 +134,7 @@ void Switch::sync()
 
     if (!createACLs(target)) {
         logger << "Switch::sync() - failed to create ACLs for the switch '" << _ip << "'" << std::endl;
+        return;
     }
 
     if (_settings.isDebug()) {
@@ -174,24 +203,27 @@ bool Switch::dropACLsByTable(const CTarget & target, unsigned profileId, const S
     dropACLOidPrefix += ".";
     dropACLOidPrefix += boost::lexical_cast<std::string>(profileId);
     SNMPList aclsList(table.getList());
-    Pdu pdu;
-    SNMPList::const_iterator it;
-    for (it = aclsList.begin(); it != aclsList.end(); ++it) {
-        int id;
-        if (int c = it->get_value(id) != SNMP_CLASS_SUCCESS) {
-            logger << "Switch::dropACLsByTable() - failed to get ACL id for the switch '" << _ip << "'. Error message: '" << Snmp::error_msg(c) << "'" << std::endl;
+    SNMPList::const_iterator it(aclsList.begin());
+    size_t chunks = aclsList.size() / _settings.maxACLPerPDU() + 1;
+    for (size_t i = 0; i < chunks && it != aclsList.end(); ++i) {
+        Pdu pdu;
+        for (size_t j = 0; j < _settings.maxACLPerPDU() && it != aclsList.end(); ++j, ++it) {
+            int id;
+            if (int c = it->get_value(id) != SNMP_CLASS_SUCCESS) {
+                logger << "Switch::dropACLsByTable() - failed to get ACL id for the switch '" << _ip << "'. Error message: '" << Snmp::error_msg(c) << "'" << std::endl;
+                return false;
+            }
+            std::string dropACLOid(dropACLOidPrefix);
+            dropACLOid += ".";
+            dropACLOid += boost::lexical_cast<std::string>(id);
+            Vb vb(Oid(dropACLOid.c_str()));
+            vb.set_value(int(6));
+            pdu += vb;
+        }
+        if (int c = _snmp.set(pdu, target) != SNMP_CLASS_SUCCESS) {
+            logger << "Switch::dropACLsByTable() - failed to invoke Snmp::set for the switch '" << _ip << "'. Error message: '" << Snmp::error_msg(c) << "'" << std::endl;
             return false;
         }
-        std::string dropACLOid(dropACLOidPrefix);
-        dropACLOid += ".";
-        dropACLOid += boost::lexical_cast<std::string>(id);
-        Vb vb(Oid(dropACLOid.c_str()));
-        vb.set_value(int(6));
-        pdu += vb;
-    }
-    if (int c = _snmp.set(pdu, target) != SNMP_CLASS_SUCCESS) {
-        logger << "Switch::dropACLsByTable() - failed to invoke Snmp::set for the switch '" << _ip << "'. Error message: '" << Snmp::error_msg(c) << "'" << std::endl;
-        return false;
     }
     return true;
 }
@@ -206,6 +238,7 @@ bool Switch::createACLs(const CTarget & target)
             logger << "Switch::createACLs() - failed to invoke Snmp::set for the switch '" << _ip << "'. Error message: '" << Snmp::error_msg(c) << "'" << std::endl;
             return false;
         }
+        _aclsCreated = true;
     }
     return true;
 }