Cosmetic: Remove unnecessary constructor.

Change-Id: Ib1de6e8988c4728e962da8607d0ecd98d6121e0c

diff --git a/include/Fwmark.h b/include/Fwmark.h
index 7360e1b..178e175 100644 (file)
--- a/include/Fwmark.h
+++ b/include/Fwmark.h
@@ -30,9 +30,6 @@ union Fwmark {
         Permission permission   :  2;
     };
     Fwmark() : intValue(0) {}
-    Fwmark(unsigned netId, bool explicitlySelected, bool protectedFromVpn, Permission permission)
-        : netId(netId), explicitlySelected(explicitlySelected),
-          protectedFromVpn(protectedFromVpn), permission(permission) {}
 };
 
 static const unsigned FWMARK_NET_ID_MASK = 0xffff;

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index bcb01ba..c19e299 100644 (file)
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -61,7 +61,13 @@ int ClatdController::startClatd(char *interface) {
         char netIdString[UINT32_STRLEN];
         snprintf(netIdString, sizeof(netIdString), "%u", netId);
 
-        Fwmark fwmark = {netId, true, true, PERMISSION_SYSTEM};
+        Fwmark fwmark;
+
+        fwmark.netId = netId;
+        fwmark.explicitlySelected = true;
+        fwmark.protectedFromVpn = true;
+        fwmark.permission = PERMISSION_SYSTEM;
+
         char fwmarkString[UINT32_HEX_STRLEN];
         snprintf(fwmarkString, sizeof(fwmarkString), "0x%x", fwmark.intValue);