fix: trying to fix dc issue

stowmyy · Sep 4, 2024 · 023142b · 023142b
1 parent 075187c
commit 023142b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/dropship/src/FirewallManager.cpp b/dropship/src/FirewallManager.cpp
@@ -13,8 +13,17 @@
 
 bool FirewallManager::AddFirewallRule(Endpoint* e, bool enabled)
 {
-    return this->_windowsFirewall->add_rule(e, NET_FW_RULE_DIR_OUT, enabled, NET_FW_PROFILE2_ALL)
-        && this->_windowsFirewall->add_rule(e, NET_FW_RULE_DIR_IN, enabled, NET_FW_PROFILE2_ALL);
+    if (this->_windowsFirewall->add_rule(e, NET_FW_RULE_DIR_OUT, enabled, NET_FW_PROFILE2_ALL)) {
+        if (this->_windowsFirewall->add_rule(e, NET_FW_RULE_DIR_IN, enabled, NET_FW_PROFILE2_ALL)) {
+            return true;
+        }
+        else {
+            printf("first failed");
+            this->_windowsFirewall->add_rule(e, NET_FW_RULE_DIR_OUT, !enabled, NET_FW_PROFILE2_ALL);
+        }
+    }
+
+    return false;
 }
 
 
@@ -51,8 +60,10 @@ void FirewallManager::flushRules(std::vector<Endpoint>* endpoints)
     printf("Adding rules..\n");
     for (auto &e : *endpoints)
     {
-        this->_windowsFirewall->add_rule(&e, NET_FW_RULE_DIR_OUT, false);
-        this->_windowsFirewall->add_rule(&e, NET_FW_RULE_DIR_IN, false);
+        //this->_windowsFirewall->add_rule(&e, NET_FW_RULE_DIR_OUT, false);
+        //this->_windowsFirewall->add_rule(&e, NET_FW_RULE_DIR_IN, false);
+
+        this->AddFirewallRule(&e, false);
     }
     printf("Added %d rules.\n", endpoints->size());
 

diff --git a/dropship/src/_WindowsFirewallUtil.h b/dropship/src/_WindowsFirewallUtil.h
@@ -648,7 +648,7 @@ class _WindowsFirewallUtil : public failable
         }
 
         // returns true if succeeded
-        bool add_rule(Endpoint* e, NET_FW_RULE_DIRECTION_ dir, bool enabled = false, NET_FW_PROFILE_TYPE2_ profile = NET_FW_PROFILE2_ALL)
+        bool add_rule(Endpoint* e, NET_FW_RULE_DIRECTION_ dir, bool enabled, NET_FW_PROFILE_TYPE2_ profile = NET_FW_PROFILE2_ALL)
         {
             //BSTR bstrRuleName = SysAllocString(std::wstring(e.title.begin(), e.title.end()).c_str());
             BSTR bstrRuleName = _com_util::ConvertStringToBSTR(e->title.c_str());
@@ -772,6 +772,9 @@ class _WindowsFirewallUtil : public failable
                     bool ruleEnabled;
                     ruleEnabled = (__enabled != VARIANT_FALSE);
 
+                    NET_FW_RULE_DIRECTION rule_direction;
+                    pFwRule->get_Direction(&rule_direction);
+
                     const std::string s_ruleName (_bstr_t(ruleName, true));
 
                     for (auto& e : *endpoints)
@@ -786,7 +789,7 @@ class _WindowsFirewallUtil : public failable
                                 if (endpointDominant)
                                 {
 
-                                    printf(std::format("({0}) firewall: {1}, ui: {2} . Setting firewall rule to match UI state\n", s_ruleName, ruleEnabled ? "block" : "allow", e.active ? "selected" : "not selected").c_str());
+                                    printf(std::format("{3} ({0}) firewall: {1}, ui: {2} . Setting firewall rule to match UI state\n", s_ruleName, ruleEnabled ? "block" : "allow", e.active ? "selected" : "not selected", rule_direction == NET_FW_RULE_DIR_IN ? "IN" : "OUT").c_str());
                                     if (FAILED(pFwRule->put_Enabled(e.active_desired_state ? VARIANT_FALSE : VARIANT_TRUE)))
                                     {
                                         printf("failed to write rule state\n");