diff --git a/Backend/Backend.csproj b/Backend/Backend.csproj
index 87db91a..5c26c51 100644
--- a/Backend/Backend.csproj
+++ b/Backend/Backend.csproj
@@ -6,8 +6,8 @@
enable
enable
- x64
- true
+
+ false
diff --git a/Backend/Handler/ContentFilter.cs b/Backend/Handler/ContentFilter.cs
index 706202c..676bb47 100644
--- a/Backend/Handler/ContentFilter.cs
+++ b/Backend/Handler/ContentFilter.cs
@@ -161,19 +161,33 @@ public class ContentFilter
for (int i = 0; i < ports.Length; i++)
{
- string? html;
+ string? html = "";
if (ports[i] == 80)
{
if (string.IsNullOrWhiteSpace(url1)) continue;
-
- html = Task.Run(() => HttpClientHelper.GetHtml(url1, 80).Result).Result;
+
+ try
+ {
+ html = HttpClientHelper.GetHtml(url1, 80).GetAwaiter().GetResult();
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ }
}
else
{
if (string.IsNullOrWhiteSpace(url2)) continue;
-
- html = Task.Run(() => HttpClientHelper.GetHtml(url2, 443).Result).Result;
+
+ try
+ {
+ html = HttpClientHelper.GetHtml(url2, 443).GetAwaiter().GetResult();
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ }
}
if (string.IsNullOrWhiteSpace(html)) continue;
@@ -182,8 +196,8 @@ public class ContentFilter
if (ports[i] == 443 && string.IsNullOrWhiteSpace(title2)) { FilterHelper.GetTitle(html ,out title2); }
if (ports[i] == 80 && string.IsNullOrWhiteSpace(description1)) { FilterHelper.GetDescription(html, out description1); }
if (ports[i] == 443 && string.IsNullOrWhiteSpace(description2)) { FilterHelper.GetDescription(html, out description2); }
- if (ports[i] == 80 && !robotsTxt1) { robotsTxt1 = Task.Run(() => HttpClientHelper.HasRobotsTxt(url1, 80).Result).Result; }
- if (ports[i] == 443 && !robotsTxt2) { robotsTxt2 = Task.Run(() => HttpClientHelper.HasRobotsTxt(url2, 443).Result).Result; }
+ if (ports[i] == 80 && !robotsTxt1) { robotsTxt1 = HttpClientHelper.HasRobotsTxt(url1, 80).GetAwaiter().GetResult(); }
+ if (ports[i] == 443 && !robotsTxt2) { robotsTxt2 = HttpClientHelper.HasRobotsTxt(url2, 443).GetAwaiter().GetResult(); }
}
Filtered siteData = new()
diff --git a/Backend/Handler/IpScanner.cs b/Backend/Handler/IpScanner.cs
index c4b5e51..c8d2943 100644
--- a/Backend/Handler/IpScanner.cs
+++ b/Backend/Handler/IpScanner.cs
@@ -41,15 +41,30 @@ public class IpScanner
_timeout = milliseconds;
}
- public WaitHandle[] Start(int threads)
+ public List Start(int threads)
{
int threadsAmount = 0;
if (threads % 2 == 0)
{
threadsAmount = 256 / threads;
}
+
+ WaitHandle[] waitHandle1;
+ WaitHandle[] waitHandle2;
- WaitHandle[] waitHandles = new WaitHandle[threads];
+ if (threads <= 64)
+ {
+ waitHandle1 = new WaitHandle[threads];
+ waitHandle2 = new WaitHandle[threads];
+ }
+ else
+ {
+ waitHandle1 = new WaitHandle[64];
+ waitHandle2 = new WaitHandle[64];
+ }
+
+ int counter = 0;
+ int counter2 = 0;
for (int i = 0; i < threads; i++)
{
@@ -62,16 +77,33 @@ public class IpScanner
ThreadNumber = i,
Handle = handle
};
-
- waitHandles[i] = handle;
+
+ if (i < 64)
+ {
+ waitHandle1[counter] = handle;
+ counter++;
+ }
+ else
+ {
+ waitHandle2[counter2] = handle;
+ counter2++;
+ }
Thread f = new (Scan!);
f.Start(scanSettings);
Console.WriteLine($"Scanner thread ({i}) started");
- Thread.Sleep(1000);
+ Thread.Sleep(100);
}
+ List waitHandles = new();
+
+ Console.WriteLine("Waithandle 1 count = " + waitHandle1.Length);
+ Console.WriteLine("Waithandle 2 count = " + waitHandle2.Length);
+
+ waitHandles.Add(waitHandle1);
+ waitHandles.Add(waitHandle2);
+
return waitHandles;
}
@@ -193,7 +225,8 @@ public class IpScanner
resumeObject.FirstByte = i;
break;
}
- //Console.WriteLine($"Thread ({scanSettings.ThreadNumber}) is at index ({i}) out of ({scanSettings.End}). Remaining ({scanSettings.End - i})");
+
+ Console.WriteLine($"Thread ({scanSettings.ThreadNumber}) is at index ({i}) out of ({scanSettings.End}). Remaining ({scanSettings.End - i})");
}
_resumeQueue.Enqueue(resumeObject);
diff --git a/Backend/Handler/ThreadHandler.cs b/Backend/Handler/ThreadHandler.cs
index 47c9a70..784c270 100644
--- a/Backend/Handler/ThreadHandler.cs
+++ b/Backend/Handler/ThreadHandler.cs
@@ -59,9 +59,12 @@ public class ThreadHandler
{
Thread.Sleep(5000); // Let the database handler instantiate and warm up first.
- WaitHandle[] wait = _ipScanner.Start(64);
-
- WaitHandle.WaitAll(wait);
+ List wait = _ipScanner.Start(128);
+
+ for (int i = 0; i < wait.Count; i++)
+ {
+ WaitHandle.WaitAll(wait[i]);
+ }
Console.WriteLine("Scanner finished");
@@ -70,6 +73,8 @@ public class ThreadHandler
private void StartContentFilter()
{
+ Thread.Sleep(5000);
+
WaitHandle[] wait = _contentFilter.Start();
WaitHandle.WaitAll(wait);
@@ -83,12 +88,12 @@ public class ThreadHandler
{
_dbHandler.UnfilteredDbHandler();
}
-
+
private void StartFilteredDbHandler()
{
_dbHandler.FilteredDbHandler();
}
-
+
private void StartResumeDbHandler()
{
_dbHandler.ResumeDbHandler();
@@ -96,7 +101,7 @@ public class ThreadHandler
private void StartDiscardedDbHandler()
{
- WaitHandle[] wait = _dbHandler.Start(2);
+ WaitHandle[] wait = _dbHandler.Start(4);
WaitHandle.WaitAll(wait);
diff --git a/Backend/Helper/HttpClientHelper.cs b/Backend/Helper/HttpClientHelper.cs
index 0d8b36b..0dfe66b 100644
--- a/Backend/Helper/HttpClientHelper.cs
+++ b/Backend/Helper/HttpClientHelper.cs
@@ -18,9 +18,9 @@ public static class HttpClientHelper
}
client.DefaultRequestHeaders.Accept.Clear();
- client.Timeout = TimeSpan.FromSeconds(30);
+ client.Timeout = TimeSpan.FromSeconds(1);
- HttpResponseMessage? response = null;
+ HttpResponseMessage? response;
try
{
@@ -28,10 +28,10 @@ public static class HttpClientHelper
}
catch
{
- //
+ return "";
}
- if (response is null || !response.IsSuccessStatusCode)
+ if (!response.IsSuccessStatusCode)
{
return "";
}
@@ -53,6 +53,7 @@ public static class HttpClientHelper
}
client.DefaultRequestHeaders.Accept.Clear();
+ client.Timeout = TimeSpan.FromSeconds(1);
HttpResponseMessage? response = null;
diff --git a/Models/BackupDB/Discarded.db b/Models/BackupDB/Discarded.db
index 5f296eb..ddddc99 100644
Binary files a/Models/BackupDB/Discarded.db and b/Models/BackupDB/Discarded.db differ
diff --git a/Models/BackupDB/Filtered.db b/Models/BackupDB/Filtered.db
index 93bce66..a1172a1 100644
Binary files a/Models/BackupDB/Filtered.db and b/Models/BackupDB/Filtered.db differ
diff --git a/Models/BackupDB/mydb.db b/Models/BackupDB/mydb.db
index ef45e70..1ed87f7 100644
Binary files a/Models/BackupDB/mydb.db and b/Models/BackupDB/mydb.db differ
diff --git a/Models/Handler/DbHandler.cs b/Models/Handler/DbHandler.cs
index dbae440..b26c8c6 100644
--- a/Models/Handler/DbHandler.cs
+++ b/Models/Handler/DbHandler.cs
@@ -1,4 +1,5 @@
using System.Collections.Concurrent;
+using System.Diagnostics;
using Microsoft.Data.Sqlite;
using Models.Model.Backend;
using Models.Model.External;
@@ -24,18 +25,45 @@ public class DbHandler
" VALUES (@ip1, @ip2, @ip3, @ip4, @port1, @port2, @filtered)";
private const string InsertIntoFiltered = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
- " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
+ " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = on;" +
" INSERT INTO Filtered (Ip1, Ip2, Ip3, Ip4, Port1, Port2, Title1, Title2," +
" Description1, Description2, Url1, Url2, ServerType1, ServerType2," +
" RobotsTXT1, RobotsTXT2, HttpVersion1, HttpVersion2, CertificateIssuerCountry," +
" CertificateOrganizationName, IpV6, TlsVersion, CipherSuite, KeyExchangeAlgorithm," +
" PublicKeyType1, PublicKeyType2, PublicKeyType3, AcceptEncoding1, AcceptEncoding2," +
- " ALPN, Connection1, Connection2) VALUES (@ip1, @ip2, @ip3, @ip4, @port1, @port2," +
- " @title1, @title2, @description1, @description2, @url1, @url2, @serverType1," +
- " @serverType2, @robotsTXT1, @robotsTXT2, @httpVersion1, @httpVersion2," +
- " @certificateIssuerCountry, @certificateOrganizationName, @ipV6, @tlsVersion," +
- " @cipherSuite, @keyExchangeAlgorithm, @publicKeyType1, @publicKeyType2," +
- " @publicKeyType3, @acceptEncoding1, @acceptEncoding2, @aLPN, @connection1, @connection2)";
+ " ALPN, Connection1, Connection2) VALUES (@ip1, @ip2, @ip3, @ip4, @port1, @port2, " +
+ " @title1, @title2, @description1, @description2, @url1, @url2, " +
+ " (SELECT ServerId FROM ServerType WHERE Type = @serverType1), " +
+ " (SELECT ServerId FROM ServerType WHERE Type = @serverType2), " +
+ " @robotsTXT1, @robotsTXT2," +
+ " (SELECT HttpId FROM HttpVersion WHERE Version = @httpVersion1)," +
+ " (SELECT HttpId FROM HttpVersion WHERE Version = @httpVersion2)," +
+ " (SELECT CertificateIssuerId FROM CertificateIssuerCountry WHERE Country = @certificateIssuerCountry)," +
+ " (SELECT CertificateOrganizationId FROM CertificateOrganizationName WHERE Name = @certificateOrganizationName), " +
+ " @ipV6, " +
+ " (SELECT TlsId FROM TlsVersion WHERE Version = @tlsVersion)," +
+ " (SELECT CipherId FROM CipherSuite WHERE Suite = @cipherSuite)," +
+ " (SELECT KeyExchangeId FROM KeyExchangeAlgorithm WHERE Algorithm = @keyExchangeAlgorithm)," +
+ " (SELECT PublicKeyId FROM PublicKeyType WHERE Type = @publicKeyType1)," +
+ " (SELECT PublicKeyId FROM PublicKeyType WHERE Type = @publicKeyType2)," +
+ " (SELECT PublicKeyId FROM PublicKeyType WHERE Type = @publicKeyType3)," +
+ " (SELECT AcceptId FROM AcceptEncoding WHERE Encoding = @acceptEncoding1)," +
+ " (SELECT AcceptId FROM AcceptEncoding WHERE Encoding = @acceptEncoding2)," +
+ " (SELECT ALPNId FROM ALPN WHERE ALPNValue = @aLPN)," +
+ " (SELECT ConnectionId FROM Connection WHERE ConnectionValue = @connection1)," +
+ " (SELECT ConnectionId FROM Connection WHERE ConnectionValue = @connection2))";
+
+ private const string InsertIntoFilteredServerType = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO ServerType (Type) VALUES (@type)";
+ private const string InsertIntoFilteredHttpVersion = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO HttpVersion (Version) VALUES (@version)";
+ private const string InsertIntoFilteredCertificateIssuerCountry = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO CertificateIssuerCountry (Country) VALUES (@country)";
+ private const string InsertIntoFilteredCertificateOrganizationName = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO CertificateOrganizationName (Name) VALUES (@name)";
+ private const string InsertIntoFilteredTlsVersion = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO TlsVersion (Version) VALUES (@version)";
+ private const string InsertIntoFilteredCipherSuite = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO CipherSuite (Suite) VALUES (@suite)";
+ private const string InsertIntoFilteredKeyExchangeAlgorithm = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO KeyExchangeAlgorithm (Algorithm) VALUES (@algorithm)";
+ private const string InsertIntoFilteredPublicKeyType = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO PublicKeyType (Type) VALUES (@type)";
+ private const string InsertIntoFilteredAcceptEncoding = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO AcceptEncoding (Encoding) VALUES (@encoding)";
+ private const string InsertIntoFilteredALPN = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO ALPN (ALPNValue) VALUES (@alpnValue)";
+ private const string InsertIntoFilteredConnection = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; INSERT OR IGNORE INTO Connection (ConnectionValue) VALUES (@connectionValue)";
private const string InsertIntoDiscarded = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
" PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
@@ -270,8 +298,75 @@ public class DbHandler
using SqliteConnection connection = new(_filteredConnectionString);
connection.Open();
- using SqliteCommand command = new(InsertIntoFiltered, connection);
+ SqliteCommand command = new(InsertIntoFilteredServerType, connection);
+ command.Parameters.AddWithValue("@type", filtered.ServerType1);
+ _ = command.ExecuteNonQuery();
+ command = new(InsertIntoFilteredServerType, connection);
+ command.Parameters.AddWithValue("@type", filtered.ServerType2);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredHttpVersion, connection);
+ command.Parameters.AddWithValue("@version", filtered.HttpVersion1);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredHttpVersion, connection);
+ command.Parameters.AddWithValue("@version", filtered.HttpVersion2);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredCertificateIssuerCountry, connection);
+ command.Parameters.AddWithValue("@country", filtered.CertificateIssuerCountry);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredCertificateOrganizationName, connection);
+ command.Parameters.AddWithValue("@name", filtered.CertificateOrganizationName);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredTlsVersion, connection);
+ command.Parameters.AddWithValue("@version", filtered.TlsVersion);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredCipherSuite, connection);
+ command.Parameters.AddWithValue("@suite", filtered.CipherSuite);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredKeyExchangeAlgorithm, connection);
+ command.Parameters.AddWithValue("@algorithm", filtered.KeyExchangeAlgorithm);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredPublicKeyType, connection);
+ command.Parameters.AddWithValue("@type", filtered.PublicKeyType1);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredPublicKeyType, connection);
+ command.Parameters.AddWithValue("@type", filtered.PublicKeyType2);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredPublicKeyType, connection);
+ command.Parameters.AddWithValue("@type", filtered.PublicKeyType3);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredAcceptEncoding, connection);
+ command.Parameters.AddWithValue("@encoding", filtered.AcceptEncoding1);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredAcceptEncoding, connection);
+ command.Parameters.AddWithValue("@encoding", filtered.AcceptEncoding2);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredALPN, connection);
+ command.Parameters.AddWithValue("@alpnValue", filtered.ALPN);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredConnection, connection);
+ command.Parameters.AddWithValue("@connectionValue", filtered.Connection1);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFilteredConnection, connection);
+ command.Parameters.AddWithValue("@connectionValue", filtered.Connection2);
+ _ = command.ExecuteNonQuery();
+
+ command = new(InsertIntoFiltered, connection);
command.Parameters.AddWithValue("@ip1", filtered.Ip.Ip1);
command.Parameters.AddWithValue("@ip2", filtered.Ip.Ip2);
command.Parameters.AddWithValue("@ip3", filtered.Ip.Ip3);
@@ -304,8 +399,9 @@ public class DbHandler
command.Parameters.AddWithValue("@aLPN", filtered.ALPN);
command.Parameters.AddWithValue("@connection1", filtered.Connection1);
command.Parameters.AddWithValue("@connection2", filtered.Connection2);
-
_ = command.ExecuteNonQuery();
+ command.Dispose();
+
connection.Close();
}
@@ -640,8 +736,8 @@ public class DbHandler
{
string databaseName = $"Data Source={_basePath}/Models/Discarded{threadNumber}.db";
- const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip1 TEXT NOT NULL, Ip2 TEXT NOT NULL, Ip3 TEXT NOT NULL, Ip4 TEXT NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))";
-
+ const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip1 INTEGER NOT NULL, Ip2 INTEGER NOT NULL, Ip3 INTEGER NOT NULL, Ip4 INTEGER NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))";
+
_discardedConnectionStrings.Add(databaseName);
using SqliteConnection connection = new(databaseName);
diff --git a/Models/Model/Backend/IP.cs b/Models/Model/Backend/IP.cs
index 9abe538..3b835e1 100644
--- a/Models/Model/Backend/IP.cs
+++ b/Models/Model/Backend/IP.cs
@@ -9,7 +9,7 @@ public struct Ip
public int Ip3 { get; set; }
public int Ip4 { get; set; }
-
+
public override string ToString()
{
return $"{Ip1}.{Ip2}.{Ip3}.{Ip4}";
diff --git a/Models/Models.csproj b/Models/Models.csproj
index f009e73..3a65374 100644
--- a/Models/Models.csproj
+++ b/Models/Models.csproj
@@ -8,6 +8,5 @@
-
diff --git a/Models/Sql/DropAndCreateFiltered.sql b/Models/Sql/DropAndCreateFiltered.sql
index ed0d761..698098b 100644
--- a/Models/Sql/DropAndCreateFiltered.sql
+++ b/Models/Sql/DropAndCreateFiltered.sql
@@ -1,10 +1,68 @@
VACUUM;
+CREATE TABLE IF NOT EXISTS "ServerType" (
+ "ServerId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Type" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "HttpVersion" (
+ "HttpId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Version" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "CertificateIssuerCountry" (
+ "CertificateIssuerId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Country" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "CertificateOrganizationName" (
+ "CertificateOrganizationId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Name" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "TlsVersion" (
+ "TlsId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Version" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "CipherSuite" (
+ "CipherId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Suite" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "KeyExchangeAlgorithm" (
+ "KeyExchangeId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Algorithm" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "PublicKeyType" (
+ "PublicKeyId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Type" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "AcceptEncoding" (
+ "AcceptId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "Encoding" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "ALPN" (
+ "ALPNId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "ALPNValue" TEXT NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "Connection" (
+ "ConnectionId" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "ConnectionValue" TEXT NOT NULL UNIQUE
+);
+
DROP TABLE Filtered;
CREATE TABLE "Filtered" (
"Id" INTEGER NOT NULL,
- "Ip" TEXT NOT NULL,
+ "Ip1" INTEGER NOT NULL,
+ "Ip2" INTEGER NOT NULL,
+ "Ip3" INTEGER NOT NULL,
+ "Ip4" INTEGER NOT NULL,
"Port1" INTEGER NOT NULL,
"Port2" INTEGER NOT NULL,
"Title1" TEXT NOT NULL,
@@ -13,25 +71,42 @@ CREATE TABLE "Filtered" (
"Description2" TEXT NOT NULL,
"Url1" TEXT NOT NULL,
"Url2" TEXT NOT NULL,
- "ServerType1" TEXT NOT NULL,
- "ServerType2" TEXT NOT NULL,
+ "ServerType1" INTEGER NOT NULL,
+ "ServerType2" INTEGER NOT NULL,
"RobotsTXT1" TEXT NOT NULL,
"RobotsTXT2" TEXT NOT NULL,
- "HttpVersion1" TEXT NOT NULL,
- "HttpVersion2" TEXT NOT NULL,
- "CertificateIssuerCountry" TEXT NOT NULL,
- "CertificateOrganizationName" TEXT NOT NULL,
+ "HttpVersion1" INTEGER NOT NULL,
+ "HttpVersion2" INTEGER NOT NULL,
+ "CertificateIssuerCountry" INTEGER NOT NULL,
+ "CertificateOrganizationName" INTEGER NOT NULL,
"IpV6" TEXT NOT NULL,
- "TlsVersion" TEXT NOT NULL,
- "CipherSuite" TEXT NOT NULL,
- "KeyExchangeAlgorithm" TEXT NOT NULL,
- "PublicKeyType1" TEXT NOT NULL,
- "PublicKeyType2" TEXT NOT NULL,
- "PublicKeyType3" TEXT NOT NULL,
- "AcceptEncoding1" TEXT NOT NULL,
- "AcceptEncoding2" TEXT NOT NULL,
- "ALPN" TEXT NOT NULL,
- "Connection1" TEXT NOT NULL,
- "Connection2" TEXT NOT NULL,
- PRIMARY KEY("Id" AUTOINCREMENT)
+ "TlsVersion" INTEGER NOT NULL,
+ "CipherSuite" INTEGER NOT NULL,
+ "KeyExchangeAlgorithm" INTEGER NOT NULL,
+ "PublicKeyType1" INTEGER NOT NULL,
+ "PublicKeyType2" INTEGER NOT NULL,
+ "PublicKeyType3" INTEGER NOT NULL,
+ "AcceptEncoding1" INTEGER NOT NULL,
+ "AcceptEncoding2" INTEGER NOT NULL,
+ "ALPN" INTEGER NOT NULL,
+ "Connection1" INTEGER NOT NULL,
+ "Connection2" INTEGER NOT NULL,
+ PRIMARY KEY("Id" AUTOINCREMENT),
+ FOREIGN KEY("ALPN") REFERENCES "ALPN"("ALPNId"),
+ FOREIGN KEY("AcceptEncoding1") REFERENCES "AcceptEncoding"("AcceptId"),
+ FOREIGN KEY("AcceptEncoding2") REFERENCES "AcceptEncoding"("AcceptId"),
+ FOREIGN KEY("CertificateIssuerCountry") REFERENCES "CertificateIssuerCountry"("CertificateIssuerId"),
+ FOREIGN KEY("CertificateOrganizationName") REFERENCES "CertificateOrganizationName"("CertificateOrganizationId"),
+ FOREIGN KEY("CipherSuite") REFERENCES "CipherSuite"("CipherId"),
+ FOREIGN KEY("Connection1") REFERENCES "Connection"("ConnectionId"),
+ FOREIGN KEY("Connection2") REFERENCES "Connection"("ConnectionId"),
+ FOREIGN KEY("HttpVersion1") REFERENCES "HttpVersion"("HttpId"),
+ FOREIGN KEY("HttpVersion2") REFERENCES "HttpVersion"("HttpId"),
+ FOREIGN KEY("KeyExchangeAlgorithm") REFERENCES "KeyExchangeAlgorithm"("KeyExchangeId"),
+ FOREIGN KEY("PublicKeyType1") REFERENCES "PublicKeyType"("PublicKeyId"),
+ FOREIGN KEY("PublicKeyType2") REFERENCES "PublicKeyType"("PublicKeyId"),
+ FOREIGN KEY("PublicKeyType3") REFERENCES "PublicKeyType"("PublicKeyId"),
+ FOREIGN KEY("ServerType1") REFERENCES "ServerType"("ServerId"),
+ FOREIGN KEY("ServerType2") REFERENCES "ServerType"("ServerId"),
+ FOREIGN KEY("TlsVersion") REFERENCES "TlsVersion"("TlsId")
)
\ No newline at end of file
diff --git a/RSE.sln.DotSettings.user b/RSE.sln.DotSettings.user
index d78a6a8..e315b01 100644
--- a/RSE.sln.DotSettings.user
+++ b/RSE.sln.DotSettings.user
@@ -2,4 +2,5 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
\ No newline at end of file