diff --git a/src/modules/AmneziaWireguardConfiguration.py b/src/modules/AmneziaWireguardConfiguration.py index 6ada7d5f..848816e5 100644 --- a/src/modules/AmneziaWireguardConfiguration.py +++ b/src/modules/AmneziaWireguardConfiguration.py @@ -22,10 +22,17 @@ class AmneziaWireguardConfiguration(WireguardConfiguration): self.Jmax = 0 self.S1 = 0 self.S2 = 0 + self.S3 = 0 + self.S4 = 0 self.H1 = 1 self.H2 = 2 self.H3 = 3 self.H4 = 4 + self.I1 = 0 + self.I2 = 0 + self.I3 = 0 + self.I4 = 0 + self.I5 = 0 super().__init__(DashboardConfig, AllPeerJobs, AllPeerShareLinks, DashboardWebHooks, name, data, backup, startup, wg=False) @@ -58,10 +65,17 @@ class AmneziaWireguardConfiguration(WireguardConfiguration): "Jmax": self.Jmax, "S1": self.S1, "S2": self.S2, + "S3": self.S3, + "S4": self.S4, "H1": self.H1, "H2": self.H2, "H3": self.H3, - "H4": self.H4 + "H4": self.H4, + "I1": self.I1, + "I2": self.I2, + "I3": self.I3, + "I4": self.I4, + "I5": self.I5 } def createDatabase(self, dbName = None): diff --git a/src/modules/Peer.py b/src/modules/Peer.py index 9201a9f0..d8e6d67b 100644 --- a/src/modules/Peer.py +++ b/src/modules/Peer.py @@ -163,10 +163,17 @@ class Peer: "Jmax": self.configuration.Jmax, "S1": self.configuration.S1, "S2": self.configuration.S2, + "S3": self.configuration.S3, + "S4": self.configuration.S4, "H1": self.configuration.H1, "H2": self.configuration.H2, "H3": self.configuration.H3, - "H4": self.configuration.H4 + "H4": self.configuration.H4, + "I1": self.configuration.I1, + "I2": self.configuration.I2, + "I3": self.configuration.I3, + "I4": self.configuration.I4, + "I5": self.configuration.I5 }) peerSection = { diff --git a/src/modules/WireguardConfiguration.py b/src/modules/WireguardConfiguration.py index f1fdfe16..cf804b4c 100644 --- a/src/modules/WireguardConfiguration.py +++ b/src/modules/WireguardConfiguration.py @@ -109,10 +109,17 @@ class WireguardConfiguration: self.__parser["Interface"]["Jmax"] = self.Jmax self.__parser["Interface"]["S1"] = self.S1 self.__parser["Interface"]["S2"] = self.S2 + self.__parser["Interface"]["S3"] = self.S3 + self.__parser["Interface"]["S4"] = self.S4 self.__parser["Interface"]["H1"] = self.H1 self.__parser["Interface"]["H2"] = self.H2 self.__parser["Interface"]["H3"] = self.H3 self.__parser["Interface"]["H4"] = self.H4 + self.__parser["Interface"]["I1"] = self.I1 + self.__parser["Interface"]["I2"] = self.I2 + self.__parser["Interface"]["I3"] = self.I3 + self.__parser["Interface"]["I4"] = self.I4 + self.__parser["Interface"]["I5"] = self.I5 if "Backup" not in data.keys(): self.createDatabase() @@ -995,7 +1002,7 @@ class WireguardConfiguration: original = [l.rstrip("\n") for l in f.readlines()] allowEdit = ["Address", "PreUp", "PostUp", "PreDown", "PostDown", "ListenPort", "Table"] if self.Protocol == 'awg': - allowEdit += ["Jc", "Jmin", "Jmax", "S1", "S2", "H1", "H2", "H3", "H4"] + allowEdit += ["Jc", "Jmin", "Jmax", "S1", "S2", "S3", "S4", "H1", "H2", "H3", "H4", "I1", "I2", "I3", "I4", "I5"] start = original.index("[Interface]") try: end = original.index("[Peer]")