Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
WIP - Windows multi Proxy Setup
Sourav Kalal547076fc20af
diff --git a/Windows/cli/Program.cs b/Windows/cli/Program.csindex e9fba4d..6fa8791 100644--- a/Windows/cli/Program.cs+++ b/Windows/cli/Program.cs@@ -15,7 +15,7 @@ public class ProxyRuleImportpublic bool Enabled { get; set; } = true;}-// JSON Source Generator for NativeAOT compatibility+// json source gen for nativeaot[JsonSerializable(typeof(List<ProxyRuleImport>))][JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]public partial class ProxyRuleJsonContext : JsonSerializerContext@@ -179,12 +179,7 @@ class ProgramparsedRules.AddRange(fileRules);}- // Only register callbacks when verbose level needs them- // -v 0: No callbacks at all -> disable traffic logging- // -v 1: Only log messages- // -v 2: Only connection events- // -v 3: Both logs and connections-+ // 1=logs, 2=connections, 3=both, 0=nothingif (_verboseLevel == 1 || _verboseLevel == 3){_logCallback = OnLog;@@ -197,7 +192,6 @@ class ProgramProxyBridgeNative.ProxyBridge_SetConnectionCallback(_connectionCallback);}- // Disable traffic logging if no callbacks registered (prevents memory leak)bool enableTrafficLogging = _verboseLevel > 0;ProxyBridgeNative.ProxyBridge_SetTrafficLoggingEnabled(enableTrafficLogging);@@ -209,12 +203,12 @@ class ProgramConsole.WriteLine($"DNS via Proxy: {(dnsViaProxy ? "Enabled" : "Disabled")}");Console.WriteLine($"Localhost via Proxy: {(localhostViaProxy ? "Enabled" : "Disabled (Security: most proxies block localhost)")}");- if (!ProxyBridgeNative.ProxyBridge_SetProxyConfig(+ if (ProxyBridgeNative.ProxyBridge_AddProxyConfig(proxyInfo.Type,proxyInfo.Host,proxyInfo.Port,proxyInfo.Username ?? "",- proxyInfo.Password ?? ""))+ proxyInfo.Password ?? "") == 0){Console.WriteLine("ERROR: Failed to set proxy configuration");return 1;@@ -233,7 +227,8 @@ class Programrule.TargetHosts,rule.TargetPorts,rule.Protocol,- rule.Action);+ rule.Action,+ 0u);if (ruleId > 0){@@ -283,7 +278,6 @@ class Programprivate static void OnLog(string message){- // Verbose 1 = logs only, Verbose 3 = bothif (_verboseLevel is 1 or 3){Console.Write("[LOG] ");@@ -293,7 +287,6 @@ class Programprivate static void OnConnection(string processName, uint pid, string destIp, ushort destPort, string proxyInfo){- // Verbose 2 = connections only, Verbose 3 = bothif (_verboseLevel is 2 or 3){Console.WriteLine($"[CONN] {processName} (PID:{pid}) -> {destIp}:{destPort} via {proxyInfo}");@@ -387,7 +380,7 @@ class Programforeach (var rule in rules){- // Split by colon, but limit to 5 parts to allow colons in other fields if needed+ // limit to 5 so colons in paths dont break parsingvar parts = rule.Split(':', 5);if (parts.Length != 5){@@ -444,7 +437,6 @@ class ProgramShowBanner();Console.WriteLine("Checking for updates...\n");- // Get version from assemblyvar currentVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString(3) ?? "0.0.0";@@ -494,8 +486,7 @@ class Programreturn;}- // Check if Windows installer exists before showing update available- // (handles cross-platform releases where v4.0 might be released for Linux only)+ // skip if no windows installer in release (might be linux-only release)var assets = root.GetProperty("assets").EnumerateArray();string? setupUrl = null;string? setupName = null;diff --git a/Windows/cli/ProxyBridgeNative.cs b/Windows/cli/ProxyBridgeNative.csindex 071ffd1..9fb5bcd 100644--- a/Windows/cli/ProxyBridgeNative.cs+++ b/Windows/cli/ProxyBridgeNative.cs@@ -56,7 +56,8 @@ public static class ProxyBridgeNative[MarshalAs(UnmanagedType.LPStr)] string targetHosts,[MarshalAs(UnmanagedType.LPStr)] string targetPorts,RuleProtocol protocol,- RuleAction action);+ RuleAction action,+ uint proxyConfigId);[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)][return: MarshalAs(UnmanagedType.Bool)]@@ -67,8 +68,7 @@ public static class ProxyBridgeNativepublic static extern bool ProxyBridge_DisableRule(uint ruleId);[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]- [return: MarshalAs(UnmanagedType.Bool)]- public static extern bool ProxyBridge_SetProxyConfig(+ public static extern uint ProxyBridge_AddProxyConfig(ProxyType type,[MarshalAs(UnmanagedType.LPStr)] string proxyIp,ushort proxyPort,diff --git a/Windows/gui/Interop/ProxyBridgeNative.cs b/Windows/gui/Interop/ProxyBridgeNative.csindex b9ba05f..aace1fd 100644--- a/Windows/gui/Interop/ProxyBridgeNative.cs+++ b/Windows/gui/Interop/ProxyBridgeNative.cs@@ -59,7 +59,8 @@ public static class ProxyBridgeNative[MarshalAs(UnmanagedType.LPStr)] string targetHosts,[MarshalAs(UnmanagedType.LPStr)] string targetPorts,RuleProtocol protocol,- RuleAction action);+ RuleAction action,+ uint proxyConfigId);[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)][return: MarshalAs(UnmanagedType.Bool)]@@ -81,7 +82,8 @@ public static class ProxyBridgeNative[MarshalAs(UnmanagedType.LPStr)] string targetHosts,[MarshalAs(UnmanagedType.LPStr)] string targetPorts,RuleProtocol protocol,- RuleAction action);+ RuleAction action,+ uint proxyConfigId);[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]public static extern uint ProxyBridge_GetRulePosition(uint ruleId);@@ -90,15 +92,36 @@ public static class ProxyBridgeNative[return: MarshalAs(UnmanagedType.Bool)]public static extern bool ProxyBridge_MoveRuleToPosition(uint ruleId, uint newPosition);+ [DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]+ public static extern uint ProxyBridge_AddProxyConfig(+ ProxyType type,+ [MarshalAs(UnmanagedType.LPStr)] string proxyIp,+ ushort proxyPort,+ [MarshalAs(UnmanagedType.LPStr)] string username,+ [MarshalAs(UnmanagedType.LPStr)] string password);+[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)][return: MarshalAs(UnmanagedType.Bool)]- public static extern bool ProxyBridge_SetProxyConfig(+ public static extern bool ProxyBridge_EditProxyConfig(+ uint configId,ProxyType type,[MarshalAs(UnmanagedType.LPStr)] string proxyIp,ushort proxyPort,[MarshalAs(UnmanagedType.LPStr)] string username,[MarshalAs(UnmanagedType.LPStr)] string password);+ [DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]+ [return: MarshalAs(UnmanagedType.Bool)]+ public static extern bool ProxyBridge_DeleteProxyConfig(uint configId);++ [DllImport(DllName, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]+ public static extern int ProxyBridge_TestProxyConfig(+ uint configId,+ [MarshalAs(UnmanagedType.LPStr)] string targetHost,+ ushort targetPort,+ [MarshalAs(UnmanagedType.LPStr)] System.Text.StringBuilder resultBuffer,+ UIntPtr bufferSize);+[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]public static extern void ProxyBridge_SetLogCallback(LogCallback callback);@@ -122,10 +145,4 @@ public static class ProxyBridgeNative[return: MarshalAs(UnmanagedType.Bool)]public static extern bool ProxyBridge_Stop();- [DllImport(DllName, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]- public static extern int ProxyBridge_TestConnection(- [MarshalAs(UnmanagedType.LPStr)] string targetHost,- ushort targetPort,- [MarshalAs(UnmanagedType.LPStr)] System.Text.StringBuilder resultBuffer,- UIntPtr bufferSize);}diff --git a/Windows/gui/Services/ConfigManager.cs b/Windows/gui/Services/ConfigManager.csindex e1d5acc..a2b43d8 100644--- a/Windows/gui/Services/ConfigManager.cs+++ b/Windows/gui/Services/ConfigManager.cs@@ -7,18 +7,24 @@ using ProxyBridge.GUI.ViewModels;namespace ProxyBridge.GUI.Services;+public class ProxyConfigEntry+{+ public uint Id { get; set; }+ public string Type { get; set; } = "SOCKS5";+ public string Host { get; set; } = "";+ public string Port { get; set; } = "";+ public string Username { get; set; } = "";+ public string Password { get; set; } = "";+}+public class AppConfig{- public string ProxyType { get; set; } = "SOCKS5";- public string ProxyIp { get; set; } = "";- public string ProxyPort { get; set; } = "";- public string ProxyUsername { get; set; } = "";- public string ProxyPassword { get; set; } = "";public bool DnsViaProxy { get; set; } = true;- public bool LocalhostViaProxy { get; set; } = false; // Default: disabled+ public bool LocalhostViaProxy { get; set; } = false;public bool IsTrafficLoggingEnabled { get; set; } = true;public string Language { get; set; } = "en";public bool CloseToTray { get; set; } = true;+ public List<ProxyConfigEntry> ProxyConfigs { get; set; } = new();public List<ProxyRuleConfig> ProxyRules { get; set; } = new();}@@ -30,9 +36,12 @@ public class ProxyRuleConfigpublic string Protocol { get; set; } = "TCP";public string Action { get; set; } = "PROXY";public bool IsEnabled { get; set; } = true;+ public uint ProxyConfigId { get; set; } = 0;}[JsonSerializable(typeof(AppConfig))]+[JsonSerializable(typeof(ProxyConfigEntry))]+[JsonSerializable(typeof(List<ProxyConfigEntry>))][JsonSerializable(typeof(ProxyRuleConfig))][JsonSerializable(typeof(List<ProxyRuleConfig>))]internal partial class AppConfigJsonContext : JsonSerializerContext@@ -118,6 +127,8 @@ public static class ConfigManagerif (config != null){config.ProxyRules ??= new List<ProxyRuleConfig>();+ config.ProxyConfigs ??= new List<ProxyConfigEntry>();+return config;}}diff --git a/Windows/gui/Services/ProxyBridgeService.cs b/Windows/gui/Services/ProxyBridgeService.csindex fa34ce5..2ef99a9 100644--- a/Windows/gui/Services/ProxyBridgeService.cs+++ b/Windows/gui/Services/ProxyBridgeService.cs@@ -49,16 +49,37 @@ public class ProxyBridgeService : IDisposablereturn !_isRunning;}- public bool SetProxyConfig(string type, string ip, ushort port, string username, string password)+ public uint AddProxyConfig(string type, string ip, ushort port, string username, string password){var proxyType = type.ToUpper() == "HTTP"? ProxyBridgeNative.ProxyType.HTTP: ProxyBridgeNative.ProxyType.SOCKS5;- return ProxyBridgeNative.ProxyBridge_SetProxyConfig(proxyType, ip, port, username, password);+ return ProxyBridgeNative.ProxyBridge_AddProxyConfig(proxyType, ip, port, username, password);}- public uint AddRule(string processName, string targetHosts, string targetPorts, string protocol, string action)+ public bool EditProxyConfig(uint configId, string type, string ip, ushort port, string username, string password)+ {+ var proxyType = type.ToUpper() == "HTTP"+ ? ProxyBridgeNative.ProxyType.HTTP+ : ProxyBridgeNative.ProxyType.SOCKS5;++ return ProxyBridgeNative.ProxyBridge_EditProxyConfig(configId, proxyType, ip, port, username, password);+ }++ public bool DeleteProxyConfig(uint configId)+ {+ return ProxyBridgeNative.ProxyBridge_DeleteProxyConfig(configId);+ }++ public string TestProxyConfig(uint configId, string targetHost, ushort targetPort)+ {+ var buffer = new System.Text.StringBuilder(4096);+ ProxyBridgeNative.ProxyBridge_TestProxyConfig(configId, targetHost, targetPort, buffer, (UIntPtr)buffer.Capacity);+ return buffer.ToString();+ }++ public uint AddRule(string processName, string targetHosts, string targetPorts, string protocol, string action, uint proxyConfigId = 0){var ruleAction = action.ToUpper() switch{@@ -75,7 +96,7 @@ public class ProxyBridgeService : IDisposable_ => ProxyBridgeNative.RuleProtocol.TCP};- return ProxyBridgeNative.ProxyBridge_AddRule(processName, targetHosts, targetPorts, ruleProtocol, ruleAction);+ return ProxyBridgeNative.ProxyBridge_AddRule(processName, targetHosts, targetPorts, ruleProtocol, ruleAction, proxyConfigId);}public bool EnableRule(uint ruleId)@@ -93,7 +114,7 @@ public class ProxyBridgeService : IDisposablereturn ProxyBridgeNative.ProxyBridge_DeleteRule(ruleId);}- public bool EditRule(uint ruleId, string processName, string targetHosts, string targetPorts, string protocol, string action)+ public bool EditRule(uint ruleId, string processName, string targetHosts, string targetPorts, string protocol, string action, uint proxyConfigId = 0){var ruleAction = action.ToUpper() switch{@@ -110,7 +131,7 @@ public class ProxyBridgeService : IDisposable_ => ProxyBridgeNative.RuleProtocol.TCP};- return ProxyBridgeNative.ProxyBridge_EditRule(ruleId, processName, targetHosts, targetPorts, ruleProtocol, ruleAction);+ return ProxyBridgeNative.ProxyBridge_EditRule(ruleId, processName, targetHosts, targetPorts, ruleProtocol, ruleAction, proxyConfigId);}public uint GetRulePosition(uint ruleId)@@ -138,18 +159,6 @@ public class ProxyBridgeService : IDisposableProxyBridgeNative.ProxyBridge_SetTrafficLoggingEnabled(enable);}- public string TestConnection(string targetHost, ushort targetPort)- {- var buffer = new System.Text.StringBuilder(4096);- int result = ProxyBridgeNative.ProxyBridge_TestConnection(- targetHost,- targetPort,- buffer,- (UIntPtr)buffer.Capacity);-- return buffer.ToString();- }-public void Dispose(){if (_isRunning)diff --git a/Windows/gui/ViewModels/MainWindowViewModel.cs b/Windows/gui/ViewModels/MainWindowViewModel.csindex 58393f0..c143d49 100644--- a/Windows/gui/ViewModels/MainWindowViewModel.cs+++ b/Windows/gui/ViewModels/MainWindowViewModel.cs@@ -37,11 +37,7 @@ public class MainWindowViewModel : ViewModelBaseprivate bool _isServiceInitialized = false;private readonly SettingsService _settingsService = new SettingsService();- private string _currentProxyType = "SOCKS5";- private string _currentProxyIp = "";- private string _currentProxyPort = "";- private string _currentProxyUsername = "";- private string _currentProxyPassword = "";+ public ObservableCollection<ProxyConfig> ProxyConfigs { get; } = new();private readonly List<string> _pendingConnectionLogs = new(128);private readonly List<string> _pendingActivityLogs = new(64);@@ -123,16 +119,15 @@ public class MainWindowViewModel : ViewModelBase_proxyService.SetDnsViaProxy(_dnsViaProxy);_proxyService.SetLocalhostViaProxy(_localhostViaProxy);- if (!string.IsNullOrEmpty(_currentProxyIp) &&- !string.IsNullOrEmpty(_currentProxyPort) &&- ushort.TryParse(_currentProxyPort, out ushort portNum))++ foreach (var pc in ProxyConfigs){- _proxyService.SetProxyConfig(- _currentProxyType,- _currentProxyIp,- portNum,- _currentProxyUsername,- _currentProxyPassword);+ if (!string.IsNullOrWhiteSpace(pc.Host) && ushort.TryParse(pc.Port, out ushort pcPort))+ {+ uint assignedId = _proxyService.AddProxyConfig(pc.Type, pc.Host, pcPort, pc.Username, pc.Password);+ if (assignedId > 0)+ pc.Id = assignedId;+ }}if (_proxyService.Start())@@ -144,7 +139,8 @@ public class MainWindowViewModel : ViewModelBaserule.TargetHosts,rule.TargetPorts,rule.Protocol,- rule.Action);+ rule.Action,+ rule.ProxyConfigId);if (ruleId > 0){@@ -397,38 +393,10 @@ public class MainWindowViewModel : ViewModelBasevar window = new ProxySettingsWindow();var viewModel = new ProxySettingsViewModel(- initialType: _currentProxyType,- initialIp: _currentProxyIp,- initialPort: _currentProxyPort,- initialUsername: _currentProxyUsername,- initialPassword: _currentProxyPassword,- onSave: (type, ip, port, username, password) =>- {- if (_proxyService != null && ushort.TryParse(port, out ushort portNum))- {- if (_proxyService.SetProxyConfig(type, ip, portNum, username, password))- {-- _currentProxyType = type;- _currentProxyIp = ip;- _currentProxyPort = port;- _currentProxyUsername = username;- _currentProxyPassword = password;-- SaveConfigurationInternal();- }- else- {- QueueActivityLog("ERROR: Failed to set proxy config");- }- }- window.Close();- },- onClose: () =>- {- window.Close();- },- proxyService: _proxyService+ proxyConfigs: ProxyConfigs,+ proxyService: _proxyService,+ onConfigsChanged: SaveConfigurationInternal,+ onClose: () => window.Close());window.DataContext = viewModel;@@ -445,6 +413,7 @@ public class MainWindowViewModel : ViewModelBasevar viewModel = new ProxyRulesViewModel(proxyRules: ProxyRules,+ availableProxyConfigs: ProxyConfigs,onAddRule: (rule) =>{if (_proxyService != null)@@ -454,7 +423,8 @@ public class MainWindowViewModel : ViewModelBaserule.TargetHosts,rule.TargetPorts,rule.Protocol,- rule.Action);+ rule.Action,+ rule.ProxyConfigId);if (ruleId > 0){rule.RuleId = ruleId;@@ -721,12 +691,6 @@ public class MainWindowViewModel : ViewModelBasevar config = ConfigManager.LoadConfig();- _currentProxyType = ValidationHelper.DefaultIfEmpty(config.ProxyType, "SOCKS5");- _currentProxyIp = ValidationHelper.DefaultIfEmpty(config.ProxyIp, "");- _currentProxyPort = ValidationHelper.DefaultIfEmpty(config.ProxyPort, "");- _currentProxyUsername = config.ProxyUsername ?? "";- _currentProxyPassword = config.ProxyPassword ?? "";-DnsViaProxy = config.DnsViaProxy;LocalhostViaProxy = config.LocalhostViaProxy;CloseToTray = config.CloseToTray;@@ -740,6 +704,23 @@ public class MainWindowViewModel : ViewModelBaseChineseCheckmark = config.Language == "zh" ? "✓" : "";}+ if (config.ProxyConfigs != null)+ {+ foreach (var pc in config.ProxyConfigs)+ {+ if (string.IsNullOrWhiteSpace(pc.Host)) continue;+ ProxyConfigs.Add(new ProxyConfig+ {+ Id = pc.Id,+ Type = pc.Type,+ Host = pc.Host,+ Port = pc.Port,+ Username = pc.Username ?? "",+ Password = pc.Password ?? ""+ });+ }+ }+if (config.ProxyRules != null && config.ProxyRules.Count > 0){foreach (var ruleConfig in config.ProxyRules)@@ -747,6 +728,9 @@ public class MainWindowViewModel : ViewModelBaseif (string.IsNullOrWhiteSpace(ruleConfig.ProcessName))continue;+ var pc = ruleConfig.ProxyConfigId > 0+ ? ProxyConfigs.FirstOrDefault(p => p.Id == ruleConfig.ProxyConfigId)+ : null;var rule = new ProxyRule{ProcessName = ruleConfig.ProcessName,@@ -754,7 +738,9 @@ public class MainWindowViewModel : ViewModelBaseTargetPorts = ValidationHelper.DefaultIfEmpty(ruleConfig.TargetPorts),Protocol = ValidationHelper.DefaultIfEmpty(ruleConfig.Protocol, "TCP"),Action = ValidationHelper.DefaultIfEmpty(ruleConfig.Action, "PROXY"),- IsEnabled = ruleConfig.IsEnabled+ IsEnabled = ruleConfig.IsEnabled,+ ProxyConfigId = ruleConfig.ProxyConfigId,+ ProxyConfigDisplay = pc?.DisplayName ?? ""};ProxyRules.Add(rule);}@@ -779,16 +765,20 @@ public class MainWindowViewModel : ViewModelBase{var config = new AppConfig{- ProxyType = _currentProxyType,- ProxyIp = _currentProxyIp,- ProxyPort = _currentProxyPort,- ProxyUsername = _currentProxyUsername,- ProxyPassword = _currentProxyPassword,DnsViaProxy = _dnsViaProxy,LocalhostViaProxy = _localhostViaProxy,IsTrafficLoggingEnabled = _isTrafficLoggingEnabled,Language = _currentLanguage,CloseToTray = _closeToTray,+ ProxyConfigs = ProxyConfigs.Select(pc => new ProxyConfigEntry+ {+ Id = pc.Id,+ Type = pc.Type,+ Host = pc.Host,+ Port = pc.Port,+ Username = pc.Username,+ Password = pc.Password+ }).ToList(),ProxyRules = ProxyRules.Select(r => new ProxyRuleConfig{ProcessName = r.ProcessName,@@ -796,7 +786,8 @@ public class MainWindowViewModel : ViewModelBaseTargetPorts = r.TargetPorts,Protocol = r.Protocol,Action = r.Action,- IsEnabled = r.IsEnabled+ IsEnabled = r.IsEnabled,+ ProxyConfigId = r.ProxyConfigId}).ToList()};@@ -865,9 +856,31 @@ public class ProxyRule : ViewModelBasepublic string Action{get => _action;- set => SetProperty(ref _action, value);+ set+ {+ if (SetProperty(ref _action, value))+ OnPropertyChanged(nameof(ActionDisplay));+ }+ }++ private uint _proxyConfigId;+ public uint ProxyConfigId+ {+ get => _proxyConfigId;+ set => SetProperty(ref _proxyConfigId, value);}+ private string _proxyConfigDisplay = "";+ public string ProxyConfigDisplay+ {+ get => _proxyConfigDisplay;+ set => SetProperty(ref _proxyConfigDisplay, value);+ }++ public string ActionDisplay => Action == "PROXY"+ ? (string.IsNullOrEmpty(_proxyConfigDisplay) ? "PROXY" : _proxyConfigDisplay)+ : Action;+public bool IsEnabled{get => _isEnabled;@@ -880,3 +893,63 @@ public class ProxyRule : ViewModelBaseset => SetProperty(ref _isSelected, value);}}++public class ProxyConfig : ViewModelBase+{+ private uint _id;+ private string _type = "SOCKS5";+ private string _host = "";+ private string _port = "";+ private string _username = "";+ private string _password = "";++ public uint Id+ {+ get => _id;+ set => SetProperty(ref _id, value);+ }++ public string Type+ {+ get => _type;+ set+ {+ if (SetProperty(ref _type, value))+ OnPropertyChanged(nameof(DisplayName));+ }+ }++ public string Host+ {+ get => _host;+ set+ {+ if (SetProperty(ref _host, value))+ OnPropertyChanged(nameof(DisplayName));+ }+ }++ public string Port+ {+ get => _port;+ set+ {+ if (SetProperty(ref _port, value))+ OnPropertyChanged(nameof(DisplayName));+ }+ }++ public string Username+ {+ get => _username;+ set => SetProperty(ref _username, value);+ }++ public string Password+ {+ get => _password;+ set => SetProperty(ref _password, value);+ }++ public string DisplayName => $"{_type} {_host}:{_port}";+}diff --git a/Windows/gui/ViewModels/ProxyRulesViewModel.cs b/Windows/gui/ViewModels/ProxyRulesViewModel.csindex 7556f14..12c8e01 100644--- a/Windows/gui/ViewModels/ProxyRulesViewModel.cs+++ b/Windows/gui/ViewModels/ProxyRulesViewModel.cs@@ -21,7 +21,7 @@ public class ProxyRulesViewModel : ViewModelBaseprivate string _newTargetHosts = "*";private string _newTargetPorts = "*";private string _newProtocol = "TCP"; // TCP, UDP, or BOTH- private string _newProxyAction = "PROXY";+ private RuleActionItem? _selectedRuleAction;private string _processNameError = "";private Action<ProxyRule>? _onAddRule;private Action? _onClose;@@ -30,6 +30,7 @@ public class ProxyRulesViewModel : ViewModelBaseprivate Window? _window;public ObservableCollection<ProxyRule> ProxyRules { get; }+ public ObservableCollection<RuleActionItem> AvailableActions { get; } = new();public bool IsAddRuleViewOpen{@@ -65,10 +66,10 @@ public class ProxyRulesViewModel : ViewModelBaseset => SetProperty(ref _newProtocol, value);}- public string NewProxyAction+ public RuleActionItem? SelectedRuleAction{- get => _newProxyAction;- set => SetProperty(ref _newProxyAction, value);+ get => _selectedRuleAction;+ set => SetProperty(ref _selectedRuleAction, value);}public string ProcessNameError@@ -111,11 +112,11 @@ public class ProxyRulesViewModel : ViewModelBaseNewTargetHosts = "*";NewTargetPorts = "*";NewProtocol = "TCP";- NewProxyAction = "PROXY";+ SelectedRuleAction = AvailableActions.FirstOrDefault();ProcessNameError = "";}- public ProxyRulesViewModel(ObservableCollection<ProxyRule> proxyRules, Action<ProxyRule> onAddRule, Action onClose, ProxyBridgeService? proxyService = null, Action? onConfigChanged = null)+ public ProxyRulesViewModel(ObservableCollection<ProxyRule> proxyRules, ObservableCollection<ProxyConfig> availableProxyConfigs, Action<ProxyRule> onAddRule, Action onClose, ProxyBridgeService? proxyService = null, Action? onConfigChanged = null){ProxyRules = proxyRules;_onAddRule = onAddRule;@@ -123,6 +124,13 @@ public class ProxyRulesViewModel : ViewModelBase_proxyService = proxyService;_onConfigChanged = onConfigChanged;+ // proxy configs first, then direct/block at end+ foreach (var pc in availableProxyConfigs)+ AvailableActions.Add(new RuleActionItem(pc.DisplayName, "PROXY", pc.Id));+ AvailableActions.Add(new RuleActionItem("Direct", "DIRECT", 0));+ AvailableActions.Add(new RuleActionItem("Block", "BLOCK", 0));+ _selectedRuleAction = AvailableActions.FirstOrDefault();+foreach (var rule in ProxyRules){rule.PropertyChanged += Rule_PropertyChanged;@@ -158,16 +166,21 @@ public class ProxyRulesViewModel : ViewModelBaseif (_isEditMode && _proxyService != null){- if (_proxyService.EditRule(_currentEditingRuleId, NewProcessName, NewTargetHosts, NewTargetPorts, NewProtocol, NewProxyAction))+ var existRule = ProxyRules.FirstOrDefault(r => r.RuleId == _currentEditingRuleId);+ string action = SelectedRuleAction?.Action ?? "PROXY";+ uint pcId = SelectedRuleAction?.ProxyConfigId ?? 0;++ if (_proxyService.EditRule(_currentEditingRuleId, NewProcessName, NewTargetHosts, NewTargetPorts, NewProtocol, action, pcId)){- var existingRule = ProxyRules.FirstOrDefault(r => r.RuleId == _currentEditingRuleId);- if (existingRule != null)+ if (existRule != null){- existingRule.ProcessName = NewProcessName;- existingRule.TargetHosts = NewTargetHosts;- existingRule.TargetPorts = NewTargetPorts;- existingRule.Protocol = NewProtocol;- existingRule.Action = NewProxyAction;+ existRule.ProcessName = NewProcessName;+ existRule.TargetHosts = NewTargetHosts;+ existRule.TargetPorts = NewTargetPorts;+ existRule.Protocol = NewProtocol;+ existRule.Action = action;+ existRule.ProxyConfigId = pcId;+ existRule.ProxyConfigDisplay = action == "PROXY" ? (SelectedRuleAction?.Label ?? "") : "";}_onConfigChanged?.Invoke();}@@ -177,14 +190,18 @@ public class ProxyRulesViewModel : ViewModelBase}else{+ string action = SelectedRuleAction?.Action ?? "PROXY";+ uint pcId = SelectedRuleAction?.ProxyConfigId ?? 0;var newRule = new ProxyRule{ProcessName = NewProcessName,TargetHosts = NewTargetHosts,TargetPorts = NewTargetPorts,Protocol = NewProtocol,- Action = NewProxyAction,- IsEnabled = true+ Action = action,+ IsEnabled = true,+ ProxyConfigId = pcId,+ ProxyConfigDisplay = action == "PROXY" ? (SelectedRuleAction?.Label ?? "") : ""};newRule.PropertyChanged += Rule_PropertyChanged;@@ -276,7 +293,9 @@ public class ProxyRulesViewModel : ViewModelBaseNewTargetHosts = rule.TargetHosts;NewTargetPorts = rule.TargetPorts;NewProtocol = rule.Protocol;- NewProxyAction = rule.Action;+ SelectedRuleAction = AvailableActions.FirstOrDefault(a =>+ a.Action == rule.Action && (a.Action != "PROXY" || a.ProxyConfigId == rule.ProxyConfigId))+ ?? AvailableActions.FirstOrDefault();ProcessNameError = "";IsAddRuleViewOpen = true;});@@ -616,7 +635,7 @@ public class ProxyRulesViewModel : ViewModelBase}}-// JSON export/import model matching macOS format+// same format as macos exportpublic class ProxyRuleExport{public string ProcessNames { get; set; } = "*";@@ -627,7 +646,20 @@ public class ProxyRuleExportpublic bool Enabled { get; set; } = true;}-// JSON serialization context for NativeAOT compatibility+public class RuleActionItem+{+ public string Label { get; }+ public string Action { get; } // "PROXY", "DIRECT", "BLOCK"+ public uint ProxyConfigId { get; }++ public RuleActionItem(string label, string action, uint proxyConfigId)+ {+ Label = label;+ Action = action;+ ProxyConfigId = proxyConfigId;+ }+}+[JsonSourceGenerationOptions(WriteIndented = true,PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,diff --git a/Windows/gui/ViewModels/ProxySettingsViewModel.cs b/Windows/gui/ViewModels/ProxySettingsViewModel.csindex 8e0447d..cae6136 100644--- a/Windows/gui/ViewModels/ProxySettingsViewModel.cs+++ b/Windows/gui/ViewModels/ProxySettingsViewModel.cs@@ -1,4 +1,5 @@using System;+using System.Collections.ObjectModel;using System.Net;using System.Text.RegularExpressions;using System.Windows.Input;@@ -12,64 +13,75 @@ public class ProxySettingsViewModel : ViewModelBaseprivate readonly Loc _loc = Loc.Instance;public Loc Loc => _loc;- private string _proxyIp = "";- private string _proxyPort = "";- private string _proxyType = "SOCKS5";- private string _proxyUsername = "";- private string _proxyPassword = "";- private string _ipError = "";+ private readonly ObservableCollection<ProxyConfig> _proxyConfigs;+ private readonly ProxyBridgeService? _proxyService;+ private readonly Action? _onConfigsChanged;+ private readonly Action? _onClose;++ // edit panel state+ private bool _isEditPanelOpen;+ private uint _editingConfigId;++ private string _newType = "SOCKS5";+ private string _newHost = "";+ private string _newPort = "";+ private string _newUsername = "";+ private string _newPassword = "";+ private string _hostError = "";private string _portError = "";- private bool _isTestViewOpen = false;++ // test panel state+ private bool _isTestViewOpen;private string _testTargetHost = "google.com";private string _testTargetPort = "80";private string _testOutput = "";- private bool _isTesting = false;- private Action<string, string, string, string, string>? _onSave;- private Action? _onClose;- private Services.ProxyBridgeService? _proxyService;+ private bool _isTesting;+ private uint _testingConfigId;++ public ObservableCollection<ProxyConfig> ProxyConfigs => _proxyConfigs;- public string ProxyIp+ public bool IsEditPanelOpen{- get => _proxyIp;- set- {- SetProperty(ref _proxyIp, value);- IpError = "";- }+ get => _isEditPanelOpen;+ set => SetProperty(ref _isEditPanelOpen, value);}- public string ProxyPort+ public string EditPanelTitle => _editingConfigId > 0 ? "Edit Proxy Config" : "Add Proxy Config";++ public string NewType{- get => _proxyPort;- set- {- SetProperty(ref _proxyPort, value);- PortError = "";- }+ get => _newType;+ set => SetProperty(ref _newType, value);+ }++ public string NewHost+ {+ get => _newHost;+ set { SetProperty(ref _newHost, value); HostError = ""; }}- public string ProxyType+ public string NewPort{- get => _proxyType;- set => SetProperty(ref _proxyType, value);+ get => _newPort;+ set { SetProperty(ref _newPort, value); PortError = ""; }}- public string ProxyUsername+ public string NewUsername{- get => _proxyUsername;- set => SetProperty(ref _proxyUsername, value);+ get => _newUsername;+ set => SetProperty(ref _newUsername, value);}- public string ProxyPassword+ public string NewPassword{- get => _proxyPassword;- set => SetProperty(ref _proxyPassword, value);+ get => _newPassword;+ set => SetProperty(ref _newPassword, value);}- public string IpError+ public string HostError{- get => _ipError;- set => SetProperty(ref _ipError, value);+ get => _hostError;+ set => SetProperty(ref _hostError, value);}public string PortError@@ -108,58 +120,125 @@ public class ProxySettingsViewModel : ViewModelBaseset => SetProperty(ref _isTesting, value);}- public ICommand SaveCommand { get; }- public ICommand CancelCommand { get; }- public ICommand OpenTestCommand { get; }- public ICommand CloseTestCommand { get; }+ public ICommand OpenAddPanelCommand { get; }+ public ICommand SaveConfigCommand { get; }+ public ICommand CancelEditCommand { get; }+ public ICommand EditConfigCommand { get; }+ public ICommand DeleteConfigCommand { get; }+ public ICommand OpenTestPanelCommand { get; }+ public ICommand CloseTestPanelCommand { get; }public ICommand StartTestCommand { get; }+ public ICommand CloseCommand { get; }- private bool IsValidIpOrDomain(string input)+ public ProxySettingsViewModel(+ ObservableCollection<ProxyConfig> proxyConfigs,+ ProxyBridgeService? proxyService,+ Action? onConfigsChanged,+ Action? onClose){- if (IPAddress.TryParse(input, out _))- {- return true;- }-- var domainRegex = new Regex(@"^(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$");- return domainRegex.IsMatch(input);- }-- public ProxySettingsViewModel(string initialType, string initialIp, string initialPort, string initialUsername, string initialPassword, Action<string, string, string, string, string> onSave, Action onClose, Services.ProxyBridgeService? proxyService)- {- _onSave = onSave;- _onClose = onClose;+ _proxyConfigs = proxyConfigs;_proxyService = proxyService;+ _onConfigsChanged = onConfigsChanged;+ _onClose = onClose;- ProxyType = initialType;- ProxyIp = initialIp;- ProxyPort = initialPort;- ProxyUsername = initialUsername;- ProxyPassword = initialPassword;+ OpenAddPanelCommand = new RelayCommand(() =>+ {+ _editingConfigId = 0;+ OnPropertyChanged(nameof(EditPanelTitle));+ NewType = "SOCKS5";+ NewHost = "";+ NewPort = "";+ NewUsername = "";+ NewPassword = "";+ HostError = "";+ PortError = "";+ IsEditPanelOpen = true;+ });- SaveCommand = new RelayCommand(() =>+ SaveConfigCommand = new RelayCommand(() =>{- bool isValid = ValidationHelper.ValidateIpOrDomain(ProxyIp, IsValidIpOrDomain, msg => IpError = msg)- && ValidationHelper.ValidatePort(ProxyPort, msg => PortError = msg);+ bool valid = ValidationHelper.ValidateIpOrDomain(NewHost, IsValidIpOrDomain, msg => HostError = msg)+ && ValidationHelper.ValidatePort(NewPort, msg => PortError = msg);+ if (!valid) return;++ if (!ushort.TryParse(NewPort, out ushort portNum)) return;++ if (_editingConfigId > 0)+ {+ if (_proxyService != null)+ _proxyService.EditProxyConfig(_editingConfigId, NewType, NewHost, portNum, NewUsername, NewPassword);- if (isValid)+ var existing = FindConfig(_editingConfigId);+ if (existing != null)+ {+ existing.Type = NewType;+ existing.Host = NewHost;+ existing.Port = NewPort;+ existing.Username = NewUsername;+ existing.Password = NewPassword;+ }+ }+ else{- _onSave?.Invoke(ProxyType, ProxyIp, ProxyPort, ProxyUsername ?? "", ProxyPassword ?? "");+ uint newId = 0;+ if (_proxyService != null)+ newId = _proxyService.AddProxyConfig(NewType, NewHost, portNum, NewUsername, NewPassword);++ if (newId == 0) newId = (uint)(DateTime.Now.Ticks & 0xFFFFFFFF);++ _proxyConfigs.Add(new ProxyConfig+ {+ Id = newId,+ Type = NewType,+ Host = NewHost,+ Port = NewPort,+ Username = NewUsername,+ Password = NewPassword+ });}++ IsEditPanelOpen = false;+ _onConfigsChanged?.Invoke();});- CancelCommand = new RelayCommand(() =>+ CancelEditCommand = new RelayCommand(() =>{- _onClose?.Invoke();+ IsEditPanelOpen = false;});- OpenTestCommand = new RelayCommand(() =>+ EditConfigCommand = new RelayCommandWithParameter<ProxyConfig>(config =>{- IsTestViewOpen = true;+ if (config == null) return;+ _editingConfigId = config.Id;+ OnPropertyChanged(nameof(EditPanelTitle));+ NewType = config.Type;+ NewHost = config.Host;+ NewPort = config.Port;+ NewUsername = config.Username;+ NewPassword = config.Password;+ HostError = "";+ PortError = "";+ IsEditPanelOpen = true;+ });++ DeleteConfigCommand = new RelayCommandWithParameter<ProxyConfig>(config =>+ {+ if (config == null) return;+ if (_proxyService != null)+ _proxyService.DeleteProxyConfig(config.Id);+ _proxyConfigs.Remove(config);+ _onConfigsChanged?.Invoke();+ });++ OpenTestPanelCommand = new RelayCommandWithParameter<ProxyConfig>(config =>+ {+ if (config == null) return;+ _testingConfigId = config.Id;TestOutput = "";+ IsTestViewOpen = true;});- CloseTestCommand = new RelayCommand(() =>+ CloseTestPanelCommand = new RelayCommand(() =>{IsTestViewOpen = false;});@@ -167,44 +246,18 @@ public class ProxySettingsViewModel : ViewModelBaseStartTestCommand = new RelayCommand(async () =>{if (IsTesting) return;-- if (string.IsNullOrWhiteSpace(ProxyIp))- {- TestOutput = "ERROR: Please configure proxy IP address or hostname first";- return;- }-- if (!ushort.TryParse(ProxyPort, out ushort proxyPortNum))- {- TestOutput = "ERROR: Please configure valid proxy port first";- return;- }-- if (string.IsNullOrWhiteSpace(TestTargetHost))- {- TestOutput = "ERROR: Please enter target host";- return;- }-- if (!ushort.TryParse(TestTargetPort, out ushort targetPortNum))- {- TestOutput = "ERROR: Invalid target port";- return;- }+ if (string.IsNullOrWhiteSpace(TestTargetHost)) { TestOutput = "ERROR: Enter target host"; return; }+ if (!ushort.TryParse(TestTargetPort, out ushort targetPortNum)) { TestOutput = "ERROR: Invalid target port"; return; }IsTesting = true;- TestOutput = "Testing connection...\n";-+ TestOutput = "Testing...\n";try{if (_proxyService != null){- _proxyService.SetProxyConfig(ProxyType, ProxyIp, proxyPortNum, ProxyUsername ?? "", ProxyPassword ?? "");-await System.Threading.Tasks.Task.Run(() =>{- var result = _proxyService.TestConnection(TestTargetHost, targetPortNum);- TestOutput = result;+ TestOutput = _proxyService.TestProxyConfig(_testingConfigId, TestTargetHost, targetPortNum);});}else@@ -221,5 +274,21 @@ public class ProxySettingsViewModel : ViewModelBaseIsTesting = false;}});++ CloseCommand = new RelayCommand(() => _onClose?.Invoke());+ }++ private ProxyConfig? FindConfig(uint configId)+ {+ foreach (var c in _proxyConfigs)+ if (c.Id == configId) return c;+ return null;+ }++ private static bool IsValidIpOrDomain(string input)+ {+ if (IPAddress.TryParse(input, out _)) return true;+ var domainRegex = new Regex(@"^(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$");+ return domainRegex.IsMatch(input);}}diff --git a/Windows/gui/Views/ProxyRulesWindow.axaml b/Windows/gui/Views/ProxyRulesWindow.axamlindex b54d75c..677b4cb 100644--- a/Windows/gui/Views/ProxyRulesWindow.axaml+++ b/Windows/gui/Views/ProxyRulesWindow.axaml@@ -226,11 +226,12 @@VerticalAlignment="Center"Margin="0,0,10,0"/><TextBlock Grid.Column="8"- Text="{Binding Action}"+ Text="{Binding ActionDisplay}"FontSize="14"FontWeight="SemiBold"Foreground="#FF4EC9B0"- VerticalAlignment="Center"/>+ VerticalAlignment="Center"+ TextTrimming="CharacterEllipsis"/></Grid></Border></DataTemplate>@@ -306,10 +307,13 @@<TextBlock Text="{Binding Loc.ActionLabel}" Classes="label"/><ComboBox HorizontalAlignment="Stretch"x:Name="ActionComboBox"- SelectionChanged="ActionComboBox_SelectionChanged">- <ComboBoxItem Content="{Binding Loc.ActionProxy}" Tag="PROXY"/>- <ComboBoxItem Content="{Binding Loc.ActionDirect}" Tag="DIRECT"/>- <ComboBoxItem Content="{Binding Loc.ActionBlock}" Tag="BLOCK"/>+ ItemsSource="{Binding AvailableActions}"+ SelectedItem="{Binding SelectedRuleAction}">+ <ComboBox.ItemTemplate>+ <DataTemplate x:DataType="vm:RuleActionItem">+ <TextBlock Text="{Binding Label}"/>+ </DataTemplate>+ </ComboBox.ItemTemplate></ComboBox></StackPanel>diff --git a/Windows/gui/Views/ProxyRulesWindow.axaml.cs b/Windows/gui/Views/ProxyRulesWindow.axaml.csindex f25266d..b841222 100644--- a/Windows/gui/Views/ProxyRulesWindow.axaml.cs+++ b/Windows/gui/Views/ProxyRulesWindow.axaml.cs@@ -69,23 +69,15 @@ public partial class ProxyRulesWindow : Windowprivate void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e){- if (sender is ProxyRulesViewModel vm)+ if (sender is ProxyRulesViewModel vm && e.PropertyName == nameof(ProxyRulesViewModel.NewProtocol)){- if (e.PropertyName == nameof(ProxyRulesViewModel.NewProtocol))- {- UpdateProtocolComboBox(vm.NewProtocol);- }- else if (e.PropertyName == nameof(ProxyRulesViewModel.NewProxyAction))- {- UpdateActionComboBox(vm.NewProxyAction);- }+ UpdateProtocolComboBox(vm.NewProtocol);}}private void UpdateComboBoxSelections(ProxyRulesViewModel vm){UpdateProtocolComboBox(vm.NewProtocol);- UpdateActionComboBox(vm.NewProxyAction);}private void UpdateProtocolComboBox(string protocol)@@ -109,42 +101,6 @@ public partial class ProxyRulesWindow : Window}}- private void UpdateActionComboBox(string action)- {- if (this.FindControl<ComboBox>("ActionComboBox") is ComboBox actionComboBox)- {- _isUpdatingFromViewModel = true;-- foreach (var item in actionComboBox.Items)- {- if (item is ComboBoxItem comboBoxItem &&- comboBoxItem.Tag is string tag &&- tag.Equals(action, StringComparison.OrdinalIgnoreCase))- {- actionComboBox.SelectedItem = comboBoxItem;- break;- }- }-- _isUpdatingFromViewModel = false;- }- }-- private void ActionComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)- {- // dont update ViewModel when updating from Viewmodel- if (_isUpdatingFromViewModel)- return;-- if (sender is ComboBox comboBox &&- comboBox.SelectedItem is ComboBoxItem item &&- item.Tag is string tag &&- DataContext is ProxyRulesViewModel vm)- {- vm.NewProxyAction = tag;- }- }-private void ProtocolComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e){if (_isUpdatingFromViewModel)diff --git a/Windows/gui/Views/ProxySettingsWindow.axaml b/Windows/gui/Views/ProxySettingsWindow.axamlindex c4819e1..7d8adec 100644--- a/Windows/gui/Views/ProxySettingsWindow.axaml+++ b/Windows/gui/Views/ProxySettingsWindow.axaml@@ -3,14 +3,14 @@xmlns:vm="using:ProxyBridge.GUI.ViewModels"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="650"+ mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="550"x:Class="ProxyBridge.GUI.Views.ProxySettingsWindow"x:DataType="vm:ProxySettingsViewModel"x:CompileBindings="True"Title="{Binding Loc.ProxySettingsTitle}"Icon="/Assets/logo.ico"- Width="500" Height="650"- MinHeight="550"+ Width="680" Height="420"+ MinWidth="520" MinHeight="300"CanResize="True"Background="#FF2D2D30"WindowStartupLocation="CenterOwner">@@ -18,90 +18,111 @@<DockPanel><!-- Header --><Border DockPanel.Dock="Top" Background="#FF1E1E1E" Padding="20,16">- <StackPanel Orientation="Horizontal" Spacing="10">- <TextBlock Text="🔧" FontSize="22" VerticalAlignment="Center"/>- <TextBlock Text="{Binding Loc.ProxySettingsTitle}"- FontSize="18"- FontWeight="SemiBold"- Foreground="#FFE0E0E0"- VerticalAlignment="Center"/>- </StackPanel>+ <Grid ColumnDefinitions="*,Auto">+ <StackPanel Orientation="Horizontal" Spacing="10">+ <TextBlock Text="🔧" FontSize="22" VerticalAlignment="Center"/>+ <TextBlock Text="{Binding Loc.ProxySettingsTitle}"+ FontSize="18"+ FontWeight="SemiBold"+ Foreground="#FFE0E0E0"+ VerticalAlignment="Center"/>+ </StackPanel>+ <StackPanel Grid.Column="1"+ Orientation="Horizontal"+ Spacing="8"+ IsVisible="{Binding !IsEditPanelOpen}">+ <Button Content="{Binding Loc.ButtonAdd}"+ Command="{Binding OpenAddPanelCommand}"/>+ </StackPanel>+ </Grid></Border>- <!-- Settings Form with ScrollViewer -->- <ScrollViewer VerticalScrollBarVisibility="Auto"- HorizontalScrollBarVisibility="Disabled">- <StackPanel Margin="24,20" Spacing="20">- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.ProxyTypeLabel}" Classes="label"/>- <ComboBox HorizontalAlignment="Stretch"- x:Name="ProxyTypeComboBox">- <ComboBoxItem Content="SOCKS5" Tag="SOCKS5"/>- <ComboBoxItem Content="HTTP" Tag="HTTP"/>- </ComboBox>- </StackPanel>+ <!-- Proxy List View -->+ <Grid IsVisible="{Binding !IsEditPanelOpen}">+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto"/>+ <RowDefinition Height="*"/>+ <!-- Test panel at bottom -->+ <RowDefinition Height="Auto"/>+ </Grid.RowDefinitions>- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.ProxyIpLabel}" Classes="label"/>- <TextBox Text="{Binding ProxyIp}"- Watermark="{Binding Loc.ProxyIpPlaceholder}"/>- <TextBlock Text="{Binding IpError}"- Classes="error"- IsVisible="{Binding IpError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>- </StackPanel>-- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.ProxyPortLabel}" Classes="label"/>- <TextBox Text="{Binding ProxyPort}"- Watermark="{Binding Loc.ProxyPortPlaceholder}"/>- <TextBlock Text="{Binding PortError}"- Classes="error"- IsVisible="{Binding PortError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>- </StackPanel>-- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.UsernameLabel}" Classes="label"/>- <TextBox Text="{Binding ProxyUsername}"- Watermark="{Binding Loc.UsernamePlaceholder}"/>- </StackPanel>-- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.PasswordLabel}" Classes="label"/>- <TextBox Text="{Binding ProxyPassword}"- Watermark="{Binding Loc.PasswordPlaceholder}"- PasswordChar="●"/>- </StackPanel>-- <TextBlock Text="{Binding Loc.RequiredFieldsNote}"- Foreground="#FF999999"- FontSize="12"- Margin="0,8,0,0"/>-- <!-- Test Connection Section -->- <Border BorderBrush="#FF3F3F46"- BorderThickness="0,1,0,0"- Padding="0,16,0,0"- Margin="0,16,0,0"- IsVisible="{Binding !IsTestViewOpen}">- <StackPanel Spacing="12">- <TextBlock Text="{Binding Loc.TestConnectionTitle}"- FontSize="14"- FontWeight="SemiBold"- Foreground="#FFE0E0E0"/>- <Button Content="{Binding Loc.TestConnectionButton}"- Command="{Binding OpenTestCommand}"- Classes="secondary"- HorizontalAlignment="Left"/>- </StackPanel>+ <!-- Table Header -->+ <Border Grid.Row="0"+ Background="#FF1E1E1E"+ BorderBrush="#FF3F3F46"+ BorderThickness="0,1,0,1"+ Padding="20,10">+ <Grid ColumnDefinitions="90,*,80,80,90,90,90">+ <TextBlock Grid.Column="0" Text="Type" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ <TextBlock Grid.Column="1" Text="Host" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ <TextBlock Grid.Column="2" Text="Port" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ <TextBlock Grid.Column="3" Text="Test" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ <TextBlock Grid.Column="4" Text="Edit" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ <TextBlock Grid.Column="5" Text="Delete" FontSize="13" FontWeight="SemiBold" Foreground="#FF999999"/>+ </Grid></Border>- <!-- Test Connection Form -->- <Border BorderBrush="#FF3F3F46"+ <!-- Proxy Config Items -->+ <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">+ <ItemsControl ItemsSource="{Binding ProxyConfigs}">+ <ItemsControl.ItemTemplate>+ <DataTemplate x:DataType="vm:ProxyConfig">+ <Border BorderBrush="#FF3F3F46"+ BorderThickness="0,0,0,1"+ Padding="20,12">+ <Grid ColumnDefinitions="90,*,80,80,90,90">+ <TextBlock Grid.Column="0"+ Text="{Binding Type}"+ FontSize="13"+ FontWeight="SemiBold"+ Foreground="#FF4EC9B0"+ VerticalAlignment="Center"/>+ <StackPanel Grid.Column="1" VerticalAlignment="Center">+ <TextBlock Text="{Binding Host}"+ FontSize="14"+ Foreground="#FFE0E0E0"+ TextTrimming="CharacterEllipsis"/>+ </StackPanel>+ <TextBlock Grid.Column="2"+ Text="{Binding Port}"+ FontSize="13"+ Foreground="#FF999999"+ VerticalAlignment="Center"/>+ <Button Grid.Column="3"+ Content="🔗 Test"+ Command="{Binding $parent[ItemsControl].((vm:ProxySettingsViewModel)DataContext).OpenTestPanelCommand}"+ CommandParameter="{Binding}"+ Padding="6,4"+ FontSize="12"+ Classes="secondary"/>+ <Button Grid.Column="4"+ Content="✏ Edit"+ Command="{Binding $parent[ItemsControl].((vm:ProxySettingsViewModel)DataContext).EditConfigCommand}"+ CommandParameter="{Binding}"+ Padding="6,4"+ FontSize="12"/>+ <Button Grid.Column="5"+ Content="🗑 Del"+ Command="{Binding $parent[ItemsControl].((vm:ProxySettingsViewModel)DataContext).DeleteConfigCommand}"+ CommandParameter="{Binding}"+ Padding="6,4"+ FontSize="12"+ Classes="secondary"/>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </ScrollViewer>++ <!-- Test Panel at bottom (shared) -->+ <Border Grid.Row="2"+ Background="#FF252526"+ BorderBrush="#FF3F3F46"BorderThickness="0,1,0,0"- Padding="0,16,0,0"- Margin="0,16,0,0"+ Padding="20,16"IsVisible="{Binding IsTestViewOpen}">- <StackPanel Spacing="12">+ <StackPanel Spacing="10"><Grid ColumnDefinitions="*,Auto"><TextBlock Text="{Binding Loc.TestConnectionTitle}"FontSize="14"@@ -111,60 +132,96 @@<Button Grid.Column="1"Content="✕"Classes="secondary"- Command="{Binding CloseTestCommand}"- Width="32"- Height="32"- Padding="0"/>+ Command="{Binding CloseTestPanelCommand}"+ Width="32" Height="32" Padding="0"/></Grid>-- <Grid ColumnDefinitions="3*,2*">- <StackPanel Grid.Column="0" Spacing="6" Margin="0,0,6,0">- <TextBlock Text="{Binding Loc.TargetHostLabel}" Classes="label"/>- <TextBox Text="{Binding TestTargetHost}"/>- </StackPanel>- <StackPanel Grid.Column="1" Spacing="6" Margin="6,0,0,0">- <TextBlock Text="{Binding Loc.PortLabel}" Classes="label"/>- <TextBox Text="{Binding TestTargetPort}"/>- </StackPanel>+ <Grid ColumnDefinitions="3*,2*,Auto">+ <TextBox Grid.Column="0" Text="{Binding TestTargetHost}" Watermark="Target host" Margin="0,0,8,0"/>+ <TextBox Grid.Column="1" Text="{Binding TestTargetPort}" Watermark="Port" Margin="0,0,8,0"/>+ <Button Grid.Column="2" Content="{Binding Loc.StartTestButton}"+ Command="{Binding StartTestCommand}"+ IsEnabled="{Binding !IsTesting}"/></Grid>+ <Border Background="#FF1E1E1E"+ BorderBrush="#FF3F3F46"+ BorderThickness="1"+ Padding="10"+ MinHeight="80"+ MaxHeight="150">+ <ScrollViewer VerticalScrollBarVisibility="Auto">+ <TextBlock Text="{Binding TestOutput}"+ FontFamily="Consolas,monospace"+ FontSize="12"+ Foreground="#FFE0E0E0"+ TextWrapping="Wrap"/>+ </ScrollViewer>+ </Border>+ </StackPanel>+ </Border>+ </Grid>- <Button Content="{Binding Loc.StartTestButton}"- Command="{Binding StartTestCommand}"- IsEnabled="{Binding !IsTesting}"- HorizontalAlignment="Left"/>+ <!-- Add/Edit Form -->+ <ScrollViewer VerticalScrollBarVisibility="Auto"+ HorizontalScrollBarVisibility="Disabled"+ IsVisible="{Binding IsEditPanelOpen}">+ <StackPanel Margin="24,20" Spacing="16">+ <TextBlock Text="{Binding EditPanelTitle}"+ FontSize="16"+ FontWeight="SemiBold"+ Foreground="#FFE0E0E0"/>- <StackPanel Spacing="6">- <TextBlock Text="{Binding Loc.OutputLabel}" Classes="label"/>- <Border Background="#FF1E1E1E"- BorderBrush="#FF3F3F46"- BorderThickness="1"- Padding="10"- MinHeight="150"- MaxHeight="200">- <ScrollViewer VerticalScrollBarVisibility="Auto">- <TextBlock Text="{Binding TestOutput}"- FontFamily="Consolas,monospace"- FontSize="12"- Foreground="#FFE0E0E0"- TextWrapping="Wrap"/>- </ScrollViewer>- </Border>- </StackPanel>+ <StackPanel Spacing="6">+ <TextBlock Text="{Binding Loc.ProxyTypeLabel}" Classes="label"/>+ <ComboBox HorizontalAlignment="Stretch"+ x:Name="EditTypeComboBox">+ <ComboBoxItem Content="SOCKS5" Tag="SOCKS5"/>+ <ComboBoxItem Content="HTTP" Tag="HTTP"/>+ </ComboBox></StackPanel>- </Border>- <StackPanel Orientation="Horizontal"- HorizontalAlignment="Right"- Spacing="12"- Margin="0,16,0,20">- <Button Content="{Binding Loc.ButtonCancel}"- Classes="secondary"- Command="{Binding CancelCommand}"- Width="100"/>- <Button Content="{Binding Loc.SaveChangesButton}"- Command="{Binding SaveCommand}"- Width="130"/>- </StackPanel>+ <StackPanel Spacing="6">+ <TextBlock Text="{Binding Loc.ProxyIpLabel}" Classes="label"/>+ <TextBox Text="{Binding NewHost}"+ Watermark="{Binding Loc.ProxyIpPlaceholder}"/>+ <TextBlock Text="{Binding HostError}"+ Classes="error"+ IsVisible="{Binding HostError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>+ </StackPanel>++ <StackPanel Spacing="6">+ <TextBlock Text="{Binding Loc.ProxyPortLabel}" Classes="label"/>+ <TextBox Text="{Binding NewPort}"+ Watermark="{Binding Loc.ProxyPortPlaceholder}"/>+ <TextBlock Text="{Binding PortError}"+ Classes="error"+ IsVisible="{Binding PortError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>+ </StackPanel>++ <StackPanel Spacing="6">+ <TextBlock Text="{Binding Loc.UsernameLabel}" Classes="label"/>+ <TextBox Text="{Binding NewUsername}"+ Watermark="{Binding Loc.UsernamePlaceholder}"/>+ </StackPanel>++ <StackPanel Spacing="6">+ <TextBlock Text="{Binding Loc.PasswordLabel}" Classes="label"/>+ <TextBox Text="{Binding NewPassword}"+ Watermark="{Binding Loc.PasswordPlaceholder}"+ PasswordChar="●"/>+ </StackPanel>++ <StackPanel Orientation="Horizontal"+ HorizontalAlignment="Right"+ Spacing="12"+ Margin="0,16,0,20">+ <Button Content="{Binding Loc.ButtonCancel}"+ Classes="secondary"+ Command="{Binding CancelEditCommand}"+ Width="100"/>+ <Button Content="{Binding Loc.SaveChangesButton}"+ Command="{Binding SaveConfigCommand}"+ Width="130"/>+ </StackPanel></StackPanel></ScrollViewer></DockPanel>diff --git a/Windows/gui/Views/ProxySettingsWindow.axaml.cs b/Windows/gui/Views/ProxySettingsWindow.axaml.csindex 6ce7992..a2e6d12 100644--- a/Windows/gui/Views/ProxySettingsWindow.axaml.cs+++ b/Windows/gui/Views/ProxySettingsWindow.axaml.cs@@ -1,3 +1,4 @@+using System.ComponentModel;using Avalonia.Controls;using Avalonia.Interactivity;using ProxyBridge.GUI.ViewModels;@@ -6,38 +7,72 @@ namespace ProxyBridge.GUI.Views;public partial class ProxySettingsWindow : Window{+ private bool _isUpdatingFromViewModel = false;+public ProxySettingsWindow(){InitializeComponent();+ this.DataContextChanged += OnDataContextChanged;+this.Opened += (s, e) =>{if (DataContext is ProxySettingsViewModel vm)+ UpdateEditTypeComboBox(vm.NewType);+ };+ }++ private void OnDataContextChanged(object? sender, System.EventArgs e)+ {+ if (DataContext is ProxySettingsViewModel vm)+ {+ vm.PropertyChanged += ViewModel_PropertyChanged;++ var editComboBox = this.FindControl<ComboBox>("EditTypeComboBox");+ if (editComboBox != null){- var comboBox = this.FindControl<ComboBox>("ProxyTypeComboBox");- if (comboBox != null)- {- foreach (var obj in comboBox.Items)- {- if (obj is ComboBoxItem item && item.Tag is string tag && tag == vm.ProxyType)- {- comboBox.SelectedItem = item;- break;- }- }-- comboBox.SelectionChanged += (sender, args) =>- {- if (DataContext is ProxySettingsViewModel vm2)- {- if (comboBox.SelectedItem is ComboBoxItem sel && sel.Tag is string selTag)- {- vm2.ProxyType = selTag;- }- }- };- }+ editComboBox.SelectionChanged -= EditTypeComboBox_SelectionChanged;+ editComboBox.SelectionChanged += EditTypeComboBox_SelectionChanged;}- };+ }+ }++ private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)+ {+ if (sender is ProxySettingsViewModel vm && e.PropertyName == nameof(ProxySettingsViewModel.NewType))+ {+ UpdateEditTypeComboBox(vm.NewType);+ }+ }++ private void UpdateEditTypeComboBox(string typeTag)+ {+ var comboBox = this.FindControl<ComboBox>("EditTypeComboBox");+ if (comboBox == null) return;++ _isUpdatingFromViewModel = true;+ foreach (var obj in comboBox.Items)+ {+ if (obj is ComboBoxItem item && item.Tag is string tag &&+ tag.Equals(typeTag, System.StringComparison.OrdinalIgnoreCase))+ {+ comboBox.SelectedItem = item;+ break;+ }+ }+ _isUpdatingFromViewModel = false;+ }++ private void EditTypeComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)+ {+ if (_isUpdatingFromViewModel) return;++ if (sender is ComboBox comboBox &&+ comboBox.SelectedItem is ComboBoxItem item &&+ item.Tag is string tag &&+ DataContext is ProxySettingsViewModel vm)+ {+ vm.NewType = tag;+ }}}diff --git a/Windows/src/ProxyBridge.c b/Windows/src/ProxyBridge.cindex 7a21d5d..c5361c3 100644--- a/Windows/src/ProxyBridge.c+++ b/Windows/src/ProxyBridge.c@@ -33,6 +33,7 @@ typedef struct PROCESS_RULE {char *target_ports; // Dynamic: Port filter "*", "80", "80;443", "8000-9000"RuleProtocol protocol; // TCP, UDP, or BOTHRuleAction action;+ UINT32 proxy_config_id; // Which proxy config to route this rule through (0 = first available)BOOL enabled;struct PROCESS_RULE *next;} PROCESS_RULE;@@ -50,6 +51,7 @@ typedef struct CONNECTION_INFO {UINT16 orig_dest_port;BOOL is_tracked;ULONGLONG last_activity; // GetTickCount64() timestamp for cleanup+ UINT32 proxy_config_id; // Which proxy config handles this connectionstruct CONNECTION_INFO *next;} CONNECTION_INFO;@@ -57,6 +59,7 @@ typedef struct {SOCKET client_socket;UINT32 orig_dest_ip;UINT16 orig_dest_port;+ UINT32 proxy_config_id; // Which proxy config to use for this connection} CONNECTION_CONFIG;typedef struct {@@ -83,6 +86,25 @@ typedef struct PID_CACHE_ENTRY {struct PID_CACHE_ENTRY *next;} PID_CACHE_ENTRY;+// Internal proxy configuration with per-config UDP SOCKS5 state+typedef struct {+ UINT32 config_id; // Unique ID (1-based), 0 = unused slot+ ProxyType type;+ char host[256]; // Hostname or IP+ UINT16 port;+ char username[256];+ char password[256];+ ULONGLONG last_udp_attempt; // Rate-limit UDP ASSOCIATE retry per config+ SOCKET udp_tcp_ctrl; // TCP control socket for SOCKS5 UDP ASSOCIATE+ SOCKET udp_send_sock; // UDP socket for sending/receiving via this proxy+ struct sockaddr_in udp_relay_addr;+ BOOL udp_connected;+} PROXY_CONFIG;++static PROXY_CONFIG g_proxy_configs[MAX_PROXY_CONFIGS];+static int g_proxy_config_count = 0;+static UINT32 g_next_config_id = 1;+static CONNECTION_INFO *connection_hash_table[CONNECTION_HASH_SIZE] = {NULL};static LOGGED_CONNECTION *logged_connections = NULL;static PROCESS_RULE *rules_list = NULL;@@ -96,22 +118,12 @@ static HANDLE cleanup_thread = NULL;static PID_CACHE_ENTRY *pid_cache[PID_CACHE_SIZE] = {NULL};static BOOL g_has_active_rules = FALSE;static SOCKET udp_relay_socket = INVALID_SOCKET;-static SOCKET socks5_udp_socket = INVALID_SOCKET;-static SOCKET socks5_udp_send_socket = INVALID_SOCKET;-static struct sockaddr_in socks5_udp_relay_addr;-static BOOL udp_associate_connected = FALSE;-static DWORD last_udp_connect_attempt = 0;static BOOL running = FALSE;static DWORD g_current_process_id = 0;static BOOL g_traffic_logging_enabled = TRUE;-static char g_proxy_host[256] = ""; // Can be IP address or hostname-static UINT16 g_proxy_port = 0;static UINT16 g_local_relay_port = LOCAL_PROXY_PORT;-static ProxyType g_proxy_type = PROXY_TYPE_SOCKS5;-static char g_proxy_username[256] = "";-static char g_proxy_password[256] = "";static BOOL g_dns_via_proxy = TRUE;static BOOL g_localhost_via_proxy = FALSE; // default disabled for security - most proxy server block localhost for ssrf and also many app might not work if localhost trafic goes to remote server if proxy server is on diffrent machinestatic LogCallback g_log_callback = NULL;@@ -213,8 +225,11 @@ static int send_all(SOCKET sock, const char *buf, int len)static UINT32 parse_ipv4(const char *ip);static UINT32 resolve_hostname(const char *hostname);-static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port);-static int socks5_udp_associate(SOCKET s, struct sockaddr_in *relay_addr);+static PROXY_CONFIG* find_proxy_config(UINT32 config_id);+static BOOL any_socks5_config(void);+static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port, const PROXY_CONFIG *cfg);+static int socks5_udp_associate_with_config(SOCKET s, struct sockaddr_in *relay_addr, const PROXY_CONFIG *cfg);+static BOOL establish_udp_associate_for_config(PROXY_CONFIG *cfg);static DWORD WINAPI udp_relay_server(LPVOID arg);static BOOL match_ip_pattern(const char *pattern, UINT32 ip);static BOOL match_port_pattern(const char *pattern, UINT16 port);@@ -222,7 +237,7 @@ static BOOL match_ip_list(const char *ip_list, UINT32 ip);static BOOL match_port_list(const char *port_list, UINT16 port);static BOOL match_process_pattern(const char *pattern, const char *process_name);static BOOL match_process_list(const char *process_list, const char *process_name);-static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port);+static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port, const PROXY_CONFIG *cfg);static DWORD WINAPI local_proxy_server(LPVOID arg);static DWORD WINAPI connection_handler(LPVOID arg);static DWORD WINAPI transfer_handler(LPVOID arg);@@ -230,10 +245,11 @@ static DWORD WINAPI packet_processor(LPVOID arg);static DWORD get_process_id_from_connection(UINT32 src_ip, UINT16 src_port);static DWORD get_process_id_from_udp_connection(UINT32 src_ip, UINT16 src_port);static BOOL get_process_name_from_pid(DWORD pid, char *name, DWORD name_size);-static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp);-static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, DWORD *out_pid);-static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT16 dest_port);+static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, UINT32 *out_proxy_config_id);+static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, DWORD *out_pid, UINT32 *out_proxy_config_id);+static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT16 dest_port, UINT32 proxy_config_id);static BOOL get_connection(UINT16 src_port, UINT32 *dest_ip, UINT16 *dest_port);+static UINT32 get_connection_proxy_id(UINT16 src_port);static BOOL is_connection_tracked(UINT16 src_port);static void remove_connection(UINT16 src_port);static void cleanup_stale_connections(void);@@ -323,11 +339,12 @@ static DWORD WINAPI packet_processor(LPVOID arg)RuleAction action;DWORD pid = 0;+ UINT32 proxy_config_id = 0;if (dest_port == 53 && !g_dns_via_proxy)action = RULE_ACTION_DIRECT;else- action = check_process_rule(src_ip, src_port, dest_ip, dest_port, TRUE, &pid);+ action = check_process_rule(src_ip, src_port, dest_ip, dest_port, TRUE, &pid, &proxy_config_id);// override PROXY to DIRECT if localhost proxy is disabled and destination is localhostBYTE dest_first_octet = (dest_ip >> 0) & 0xFF;@@ -359,8 +376,13 @@ static DWORD WINAPI packet_processor(LPVOID arg)char proxy_info[128];if (action == RULE_ACTION_PROXY){- snprintf(proxy_info, sizeof(proxy_info), "Proxy SOCKS5://%s:%d (UDP)",- g_proxy_host, g_proxy_port);+ PROXY_CONFIG *pcfg = find_proxy_config(proxy_config_id);+ if (pcfg != NULL)+ snprintf(proxy_info, sizeof(proxy_info), "Proxy %s://%s:%d (UDP)",+ pcfg->type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",+ pcfg->host, pcfg->port);+ else+ snprintf(proxy_info, sizeof(proxy_info), "Proxy (UDP)");}else if (action == RULE_ACTION_DIRECT){@@ -389,7 +411,7 @@ static DWORD WINAPI packet_processor(LPVOID arg)if (action == RULE_ACTION_PROXY){- add_connection(src_port, src_ip, dest_ip, dest_port);+ add_connection(src_port, src_ip, dest_ip, dest_port, proxy_config_id);// redirect to UDP relay server at 127.0.0.1:34011udp_header->DstPort = htons(LOCAL_UDP_RELAY_PORT);@@ -493,11 +515,12 @@ static DWORD WINAPI packet_processor(LPVOID arg)RuleAction action;DWORD pid = 0;+ UINT32 proxy_config_id = 0;if (orig_dest_port == 53 && !g_dns_via_proxy)action = RULE_ACTION_DIRECT;else- action = check_process_rule(src_ip, src_port, orig_dest_ip, orig_dest_port, FALSE, &pid);+ action = check_process_rule(src_ip, src_port, orig_dest_ip, orig_dest_port, FALSE, &pid, &proxy_config_id);BYTE orig_dest_first_octet = (orig_dest_ip >> 0) & 0xFF;if (action == RULE_ACTION_PROXY && !g_localhost_via_proxy && orig_dest_first_octet == 127)@@ -523,9 +546,13 @@ static DWORD WINAPI packet_processor(LPVOID arg)char proxy_info[128];if (action == RULE_ACTION_PROXY){- snprintf(proxy_info, sizeof(proxy_info), "Proxy %s://%s:%d",- g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",- g_proxy_host, g_proxy_port);+ PROXY_CONFIG *pcfg = find_proxy_config(proxy_config_id);+ if (pcfg != NULL)+ snprintf(proxy_info, sizeof(proxy_info), "Proxy %s://%s:%d",+ pcfg->type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",+ pcfg->host, pcfg->port);+ else+ snprintf(proxy_info, sizeof(proxy_info), "Proxy");}else if (action == RULE_ACTION_DIRECT){@@ -560,7 +587,7 @@ static DWORD WINAPI packet_processor(LPVOID arg)}else if (action == RULE_ACTION_PROXY){- add_connection(src_port, src_ip, orig_dest_ip, orig_dest_port);+ add_connection(src_port, src_ip, orig_dest_ip, orig_dest_port, proxy_config_id);tcp_header->DstPort = htons(g_local_relay_port);@@ -1097,7 +1124,7 @@ static BOOL is_broadcast_or_multicast(UINT32 ip)// Unified rule matching function for both TCP and UDP// Matches rules by process name, IP, port, and protocol-static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp)+static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, UINT32 *out_proxy_config_id){PROCESS_RULE *rule = rules_list;PROCESS_RULE *wildcard_rule = NULL; // Save fully wildcard rule for last@@ -1142,6 +1169,7 @@ static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dematch_port_list(rule->target_ports, dest_port)){// Matched! Return this rule's action+ if (out_proxy_config_id != NULL) *out_proxy_config_id = rule->proxy_config_id;return rule->action;}// Didn't match, continue@@ -1166,6 +1194,7 @@ static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 dematch_port_list(rule->target_ports, dest_port)){// All filters matched! Return this rule's action+ if (out_proxy_config_id != NULL) *out_proxy_config_id = rule->proxy_config_id;return rule->action;}}@@ -1176,14 +1205,16 @@ static RuleAction match_rule(const char *process_name, UINT32 dest_ip, UINT16 de// No specific rule matched, use wildcard if availableif (wildcard_rule != NULL){+ if (out_proxy_config_id != NULL) *out_proxy_config_id = wildcard_rule->proxy_config_id;return wildcard_rule->action;}// No rule matched at all+ if (out_proxy_config_id != NULL) *out_proxy_config_id = 0;return RULE_ACTION_DIRECT;}-static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, DWORD *out_pid)+static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 dest_ip, UINT16 dest_port, BOOL is_udp, DWORD *out_pid, UINT32 *out_proxy_config_id){DWORD pid;char process_name[MAX_PROCESS_NAME];@@ -1207,27 +1238,60 @@ static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 destreturn RULE_ACTION_DIRECT;// Use unified rule matching function- RuleAction action = match_rule(process_name, dest_ip, dest_port, is_udp);+ UINT32 proxy_config_id = 0;+ RuleAction action = match_rule(process_name, dest_ip, dest_port, is_udp, &proxy_config_id);// Additional checks for proxy configuration- if (action == RULE_ACTION_PROXY && is_udp && g_proxy_type == PROXY_TYPE_HTTP)- {- return RULE_ACTION_DIRECT; // HTTP proxy doesn't support UDP- }- if (action == RULE_ACTION_PROXY && (g_proxy_host[0] == '\0' || g_proxy_port == 0))+ if (action == RULE_ACTION_PROXY){- return RULE_ACTION_DIRECT; // No proxy configured+ PROXY_CONFIG *cfg = find_proxy_config(proxy_config_id);+ if (cfg == NULL || cfg->host[0] == '\0' || cfg->port == 0)+ return RULE_ACTION_DIRECT; // No proxy configured++ // UDP: HTTP proxy doesn't support UDP - use per-rule proxy config type+ if (is_udp && cfg->type == PROXY_TYPE_HTTP)+ return RULE_ACTION_DIRECT;}+ if (out_proxy_config_id != NULL)+ *out_proxy_config_id = proxy_config_id;+return action;}-static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port)+// Helper: find proxy config by ID; falls back to first config if not found+static PROXY_CONFIG* find_proxy_config(UINT32 config_id)+{+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ if (g_proxy_configs[i].config_id == config_id)+ return &g_proxy_configs[i];+ }+ // Fall back to first available config+ if (g_proxy_config_count > 0)+ return &g_proxy_configs[0];+ return NULL;+}++// Helper: check if any proxy config is SOCKS5 (needed to decide whether to start UDP relay)+static BOOL any_socks5_config(void)+{+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ if (g_proxy_configs[i].type == PROXY_TYPE_SOCKS5 &&+ g_proxy_configs[i].host[0] != '\0' &&+ g_proxy_configs[i].port != 0)+ return TRUE;+ }+ return FALSE;+}++static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port, const PROXY_CONFIG *cfg){unsigned char buf[SOCKS5_BUFFER_SIZE];int len;- BOOL use_auth = (g_proxy_username[0] != '\0');+ BOOL use_auth = (cfg != NULL && cfg->username[0] != '\0');buf[0] = SOCKS5_VERSION;if (use_auth)@@ -1269,8 +1333,8 @@ static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port)}// Send username/password (RFC 1929)- size_t user_len = strlen(g_proxy_username);- size_t pass_len = strlen(g_proxy_password);+ size_t user_len = strlen(cfg->username);+ size_t pass_len = strlen(cfg->password);if (user_len > 255 || pass_len > 255){log_message("SOCKS5: Username or password too long");@@ -1279,9 +1343,9 @@ static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port)buf[0] = 0x01; // Version of username/password authbuf[1] = (unsigned char)user_len;- memcpy(&buf[2], g_proxy_username, user_len);+ memcpy(&buf[2], cfg->username, user_len);buf[2 + user_len] = (unsigned char)pass_len;- memcpy(&buf[3 + user_len], g_proxy_password, pass_len);+ memcpy(&buf[3 + user_len], cfg->password, pass_len);if (send(s, (char*)buf, 3 + user_len + pass_len, 0) != (int)(3 + user_len + pass_len)){@@ -1352,21 +1416,21 @@ static void base64_encode(const char* input, char* output, size_t output_size)output[output_len] = '\0';}-static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port)+static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port, const PROXY_CONFIG *cfg){char request[HTTP_BUFFER_SIZE];char response[4096];int len;char *status_line;int status_code;- BOOL use_auth = (g_proxy_username[0] != '\0');+ BOOL use_auth = (cfg != NULL && cfg->username[0] != '\0');if (use_auth){// Create "username:password" string and encode as Base64char credentials[SOCKS5_BUFFER_SIZE];char encoded[HTTP_BUFFER_SIZE];- snprintf(credentials, sizeof(credentials), "%s:%s", g_proxy_username, g_proxy_password);+ snprintf(credentials, sizeof(credentials), "%s:%s", cfg->username, cfg->password);base64_encode(credentials, encoded, sizeof(encoded));char ip_str[32];@@ -1426,11 +1490,11 @@ static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port)return 0;}-static int socks5_udp_associate(SOCKET s, struct sockaddr_in *relay_addr)+static int socks5_udp_associate_with_config(SOCKET s, struct sockaddr_in *relay_addr, const PROXY_CONFIG *cfg){unsigned char buf[SOCKS5_BUFFER_SIZE];int len;- BOOL use_auth = (g_proxy_username[0] != '\0');+ BOOL use_auth = (cfg != NULL && cfg->username[0] != '\0');buf[0] = SOCKS5_VERSION;if (use_auth)@@ -1458,16 +1522,16 @@ static int socks5_udp_associate(SOCKET s, struct sockaddr_in *relay_addr)if (!use_auth)return -1;- size_t user_len = strlen(g_proxy_username);- size_t pass_len = strlen(g_proxy_password);+ size_t user_len = strlen(cfg->username);+ size_t pass_len = strlen(cfg->password);if (user_len > 255 || pass_len > 255)return -1;buf[0] = 0x01;buf[1] = (unsigned char)user_len;- memcpy(&buf[2], g_proxy_username, user_len);+ memcpy(&buf[2], cfg->username, user_len);buf[2 + user_len] = (unsigned char)pass_len;- memcpy(&buf[3 + user_len], g_proxy_password, pass_len);+ memcpy(&buf[3 + user_len], cfg->password, pass_len);if (send(s, (char*)buf, 3 + user_len + pass_len, 0) != (int)(3 + user_len + pass_len))return -1;@@ -1506,27 +1570,31 @@ static int socks5_udp_associate(SOCKET s, struct sockaddr_in *relay_addr)return 0;}-// connect UDP ASSOCIATE with SOCKS5 proxy-// Need to monitor the System memory and CPU usage-static BOOL establish_udp_associate(void)+// connect UDP ASSOCIATE with SOCKS5 proxy (per proxy config)+static BOOL establish_udp_associate_for_config(PROXY_CONFIG *cfg){- // Prevent retry spam - only try every 5 seconds+ if (cfg == NULL || cfg->host[0] == '\0' || cfg->port == 0)+ return FALSE;+ if (cfg->type != PROXY_TYPE_SOCKS5)+ return FALSE;++ // Prevent retry spam - only try every 5 seconds per configULONGLONG now = GetTickCount64();- if (now - last_udp_connect_attempt < 5000)+ if (now - cfg->last_udp_attempt < 5000)return FALSE;- last_udp_connect_attempt = now;+ cfg->last_udp_attempt = now;// Close existing connections if any- if (socks5_udp_socket != INVALID_SOCKET)+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET){- closesocket(socks5_udp_socket);- socks5_udp_socket = INVALID_SOCKET;+ closesocket(cfg->udp_tcp_ctrl);+ cfg->udp_tcp_ctrl = INVALID_SOCKET;}- if (socks5_udp_send_socket != INVALID_SOCKET)+ if (cfg->udp_send_sock != INVALID_SOCKET){- closesocket(socks5_udp_send_socket);- socks5_udp_send_socket = INVALID_SOCKET;+ closesocket(cfg->udp_send_sock);+ cfg->udp_send_sock = INVALID_SOCKET;}// Create TCP control connection@@ -1536,7 +1604,7 @@ static BOOL establish_udp_associate(void)configure_tcp_socket(tcp_sock, 262144, 3000);- UINT32 socks5_ip = resolve_hostname(g_proxy_host);+ UINT32 socks5_ip = resolve_hostname(cfg->host);if (socks5_ip == 0){closesocket(tcp_sock);@@ -1547,7 +1615,7 @@ static BOOL establish_udp_associate(void)memset(&socks_addr, 0, sizeof(socks_addr));socks_addr.sin_family = AF_INET;socks_addr.sin_addr.s_addr = socks5_ip;- socks_addr.sin_port = htons(g_proxy_port);+ socks_addr.sin_port = htons(cfg->port);if (connect(tcp_sock, (struct sockaddr *)&socks_addr, sizeof(socks_addr)) == SOCKET_ERROR){@@ -1555,27 +1623,28 @@ static BOOL establish_udp_associate(void)return FALSE;}- if (socks5_udp_associate(tcp_sock, &socks5_udp_relay_addr) != 0)+ if (socks5_udp_associate_with_config(tcp_sock, &cfg->udp_relay_addr, cfg) != 0){closesocket(tcp_sock);return FALSE;}- socks5_udp_socket = tcp_sock;+ cfg->udp_tcp_ctrl = tcp_sock;- // ccreate UDP socket for sending to SOCKS5 proxy- socks5_udp_send_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);- if (socks5_udp_send_socket == INVALID_SOCKET)+ // create UDP socket for sending to SOCKS5 proxy+ cfg->udp_send_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);+ if (cfg->udp_send_sock == INVALID_SOCKET){- closesocket(socks5_udp_socket);- socks5_udp_socket = INVALID_SOCKET;+ closesocket(cfg->udp_tcp_ctrl);+ cfg->udp_tcp_ctrl = INVALID_SOCKET;+ cfg->udp_connected = FALSE;return FALSE;}- configure_udp_socket(socks5_udp_send_socket, 262144, 30000);+ configure_udp_socket(cfg->udp_send_sock, 262144, 30000);- udp_associate_connected = TRUE;- log_message("UDP ASSOCIATE established with SOCKS5 proxy");+ cfg->udp_connected = TRUE;+ log_message("UDP ASSOCIATE established with SOCKS5 proxy %s:%d", cfg->host, cfg->port);return TRUE;}@@ -1614,59 +1683,59 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)return 1;}- // Try initial UDP ASSOCIATE (non-fatal if it fails)- udp_associate_connected = establish_udp_associate();-- log_message("UDP relay listening on port %d", LOCAL_UDP_RELAY_PORT);- if (!udp_associate_connected)+ // Try initial UDP ASSOCIATE for all SOCKS5 configs+ for (int i = 0; i < g_proxy_config_count; i++){- log_message("UDP ASSOCIATE not available yet - will retry when needed");+ if (g_proxy_configs[i].type == PROXY_TYPE_SOCKS5)+ {+ establish_udp_associate_for_config(&g_proxy_configs[i]);+ }}+ log_message("UDP relay listening on port %d", LOCAL_UDP_RELAY_PORT);+while (running){fd_set read_fds;FD_ZERO(&read_fds);FD_SET(udp_relay_socket, &read_fds);- // monitor both TCP control connection and UDP send socket- if (udp_associate_connected && socks5_udp_socket != INVALID_SOCKET)- FD_SET(socks5_udp_socket, &read_fds);-- if (udp_associate_connected && socks5_udp_send_socket != INVALID_SOCKET)- FD_SET(socks5_udp_send_socket, &read_fds);+ // Add all SOCKS5 configs' TCP control and UDP send sockets+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->type != PROXY_TYPE_SOCKS5) continue;+ if (cfg->udp_connected && cfg->udp_tcp_ctrl != INVALID_SOCKET)+ FD_SET(cfg->udp_tcp_ctrl, &read_fds);+ if (cfg->udp_connected && cfg->udp_send_sock != INVALID_SOCKET)+ FD_SET(cfg->udp_send_sock, &read_fds);+ }struct timeval timeout = {1, 0};-- SOCKET max_fd = udp_relay_socket;- if (socks5_udp_socket > max_fd) max_fd = socks5_udp_socket;- if (socks5_udp_send_socket > max_fd) max_fd = socks5_udp_send_socket;-- if (select(max_fd + 1, &read_fds, NULL, NULL, &timeout) <= 0)+ if (select(0, &read_fds, NULL, NULL, &timeout) <= 0)continue;- // check SOCKS5 server disconnected- if (udp_associate_connected && socks5_udp_socket != INVALID_SOCKET && FD_ISSET(socks5_udp_socket, &read_fds))+ // Check if any SOCKS5 proxy TCP control socket disconnected+ for (int i = 0; i < g_proxy_config_count; i++){- char test_buf[1];- int result = recv(socks5_udp_socket, test_buf, sizeof(test_buf), MSG_PEEK);- if (result == 0 || (result == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK))+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->type != PROXY_TYPE_SOCKS5 || !cfg->udp_connected) continue;+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET && FD_ISSET(cfg->udp_tcp_ctrl, &read_fds)){- log_message("[UDP RELAY] TCP control connection closed - SOCKS5 proxy disconnected");-- // close all connections- if (socks5_udp_socket != INVALID_SOCKET)- {- closesocket(socks5_udp_socket);- socks5_udp_socket = INVALID_SOCKET;- }- if (socks5_udp_send_socket != INVALID_SOCKET)+ char test_buf[1];+ int result = recv(cfg->udp_tcp_ctrl, test_buf, sizeof(test_buf), MSG_PEEK);+ if (result == 0 || (result == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK)){- closesocket(socks5_udp_send_socket);- socks5_udp_send_socket = INVALID_SOCKET;+ log_message("[UDP RELAY] TCP control connection closed for proxy %s:%d", cfg->host, cfg->port);+ closesocket(cfg->udp_tcp_ctrl);+ cfg->udp_tcp_ctrl = INVALID_SOCKET;+ if (cfg->udp_send_sock != INVALID_SOCKET)+ {+ closesocket(cfg->udp_send_sock);+ cfg->udp_send_sock = INVALID_SOCKET;+ }+ cfg->udp_connected = FALSE;}- udp_associate_connected = FALSE;- continue;}}@@ -1679,23 +1748,31 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)if (recv_len > 0){- // Buffer overflow protection- if (recv_len > MAXBUF - 10) continue;+ // Buffer overflow protection+ if (recv_len > MAXBUF - 10) continue;- UINT32 from_ip = from_addr.sin_addr.s_addr;UINT16 from_port = ntohs(from_addr.sin_port);UINT32 dest_ip;UINT16 dest_port;+if (get_connection(from_port, &dest_ip, &dest_port)){+ // Get the proxy config for this connection+ UINT32 proxy_config_id = get_connection_proxy_id(from_port);+ PROXY_CONFIG *cfg = find_proxy_config(proxy_config_id);++ if (cfg == NULL || cfg->type != PROXY_TYPE_SOCKS5)+ {+ log_message("[UDP RELAY] No SOCKS5 config for port %d", from_port);+ continue;+ }// Ensure UDP ASSOCIATE is established (retry if needed)- if (!udp_associate_connected)+ if (!cfg->udp_connected){- udp_associate_connected = establish_udp_associate();- if (!udp_associate_connected)+ if (!establish_udp_associate_for_config(cfg)){- log_message("[UDP RELAY] Cannot send - UDP ASSOCIATE not established");+ log_message("[UDP RELAY] Cannot send - UDP ASSOCIATE not established for %s:%d", cfg->host, cfg->port);continue;}}@@ -1712,25 +1789,15 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)send_buf[9] = (dest_port >> 0) & 0xFF;memcpy(&send_buf[10], recv_buf, recv_len);- int sent = sendto(socks5_udp_send_socket, (char*)send_buf, 10 + recv_len, 0,- (struct sockaddr *)&socks5_udp_relay_addr, sizeof(socks5_udp_relay_addr));+ int sent = sendto(cfg->udp_send_sock, (char*)send_buf, 10 + recv_len, 0,+ (struct sockaddr *)&cfg->udp_relay_addr, sizeof(cfg->udp_relay_addr));if (sent == SOCKET_ERROR) {int err = WSAGetLastError();- log_message("[UDP RELAY ERROR] Failed to send to SOCKS5 proxy: %d - closing connection", err);-- // connection is broken close all sockets and retry- if (socks5_udp_socket != INVALID_SOCKET)- {- closesocket(socks5_udp_socket);- socks5_udp_socket = INVALID_SOCKET;- }- if (socks5_udp_send_socket != INVALID_SOCKET)- {- closesocket(socks5_udp_send_socket);- socks5_udp_send_socket = INVALID_SOCKET;- }- udp_associate_connected = FALSE;+ log_message("[UDP RELAY ERROR] Failed to send to SOCKS5 proxy %s:%d: %d - closing", cfg->host, cfg->port, err);+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); cfg->udp_tcp_ctrl = INVALID_SOCKET; }+ if (cfg->udp_send_sock != INVALID_SOCKET) { closesocket(cfg->udp_send_sock); cfg->udp_send_sock = INVALID_SOCKET; }+ cfg->udp_connected = FALSE;}}else@@ -1740,60 +1807,51 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)}}- // Check if packet is from SOCKS5 proxy (only if connected)- if (udp_associate_connected && socks5_udp_send_socket != INVALID_SOCKET && FD_ISSET(socks5_udp_send_socket, &read_fds))+ // Check if packet is from any SOCKS5 proxy's UDP socket+ for (int i = 0; i < g_proxy_config_count; i++){+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->type != PROXY_TYPE_SOCKS5 || !cfg->udp_connected) continue;+ if (cfg->udp_send_sock == INVALID_SOCKET || !FD_ISSET(cfg->udp_send_sock, &read_fds)) continue;+from_len = sizeof(from_addr);- recv_len = recvfrom(socks5_udp_send_socket, (char*)recv_buf, sizeof(recv_buf), 0,+ recv_len = recvfrom(cfg->udp_send_sock, (char*)recv_buf, sizeof(recv_buf), 0,(struct sockaddr *)&from_addr, &from_len);if (recv_len == SOCKET_ERROR){int err = WSAGetLastError();- log_message("[UDP RELAY ERROR] Failed to receive from SOCKS5 proxy: %d - closing connection", err);- if (socks5_udp_socket != INVALID_SOCKET)- {- closesocket(socks5_udp_socket);- socks5_udp_socket = INVALID_SOCKET;- }- if (socks5_udp_send_socket != INVALID_SOCKET)- {- closesocket(socks5_udp_send_socket);- socks5_udp_send_socket = INVALID_SOCKET;- }- udp_associate_connected = FALSE;+ log_message("[UDP RELAY ERROR] Failed to receive from proxy %s:%d: %d - closing", cfg->host, cfg->port, err);+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); cfg->udp_tcp_ctrl = INVALID_SOCKET; }+ closesocket(cfg->udp_send_sock);+ cfg->udp_send_sock = INVALID_SOCKET;+ cfg->udp_connected = FALSE;continue;}if (recv_len > 0){// Packet from SOCKS5 proxy - decapsulate and forward to original sender- if (recv_len < 10)- continue;+ if (recv_len < 10) continue;// SOCKS5 UDP packet format: RSV(2) + FRAG(1) + ATYP(1) + DST.ADDR(4) + DST.PORT(2) + DATA- if (recv_buf[2] != 0x00) // FRAG must be 0- continue;-- if (recv_buf[3] != SOCKS5_ATYP_IPV4) // Only IPv4 supported- continue;+ if (recv_buf[2] != 0x00) continue; // FRAG must be 0+ if (recv_buf[3] != SOCKS5_ATYP_IPV4) continue; // Only IPv4 supported- // Extract source IP and port from SOCKS5 headerUINT32 src_ip = (recv_buf[4] << 0) | (recv_buf[5] << 8) |(recv_buf[6] << 16) | (recv_buf[7] << 24);UINT16 src_port = (recv_buf[8] << 8) | recv_buf[9];- // Find which local port this packet should go to+ // Find which local port to deliver to via reverse lookupWaitForSingleObject(lock, INFINITE);struct sockaddr_in target_addr;BOOL found = FALSE;UINT32 target_ip = 0;UINT16 target_port = 0;- // search all hash for reverse lookup in bucket- for (int i = 0; i < CONNECTION_HASH_SIZE && !found; i++)+ for (int b = 0; b < CONNECTION_HASH_SIZE && !found; b++){- CONNECTION_INFO *conn = connection_hash_table[i];+ CONNECTION_INFO *conn = connection_hash_table[b];while (conn != NULL){if (conn->orig_dest_ip == src_ip && conn->orig_dest_port == src_port)@@ -1822,12 +1880,16 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)}}- closesocket(socks5_udp_socket);- closesocket(socks5_udp_send_socket);+ // Clean up all proxy UDP sockets+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); cfg->udp_tcp_ctrl = INVALID_SOCKET; }+ if (cfg->udp_send_sock != INVALID_SOCKET) { closesocket(cfg->udp_send_sock); cfg->udp_send_sock = INVALID_SOCKET; }+ cfg->udp_connected = FALSE;+ }closesocket(udp_relay_socket);udp_relay_socket = INVALID_SOCKET;- socks5_udp_socket = INVALID_SOCKET;- socks5_udp_send_socket = INVALID_SOCKET;WSACleanup();return 0;}@@ -1916,6 +1978,7 @@ static DWORD WINAPI local_proxy_server(LPVOID arg)free(conn_config);continue;}+ conn_config->proxy_config_id = get_connection_proxy_id(client_port);HANDLE conn_thread = CreateThread(NULL, 1, connection_handler,(LPVOID)conn_config, 0, NULL);@@ -1941,15 +2004,25 @@ static DWORD WINAPI connection_handler(LPVOID arg)SOCKET client_sock = config->client_socket;UINT32 dest_ip = config->orig_dest_ip;UINT16 dest_port = config->orig_dest_port;+ UINT32 proxy_config_id = config->proxy_config_id;SOCKET socks_sock;struct sockaddr_in socks_addr;- UINT32 socks5_ip;+ UINT32 proxy_ip;free(config);- // Connect to SOCKS5 proxy- socks5_ip = resolve_hostname(g_proxy_host);- if (socks5_ip == 0)+ // Look up the proxy config for this connection+ PROXY_CONFIG *proxy = find_proxy_config(proxy_config_id);+ if (proxy == NULL || proxy->host[0] == '\0' || proxy->port == 0)+ {+ log_message("[RELAY] No proxy config (id=%u) - dropping connection", proxy_config_id);+ closesocket(client_sock);+ return 1;+ }++ // Connect to proxy+ proxy_ip = resolve_hostname(proxy->host);+ if (proxy_ip == 0){closesocket(client_sock);return 1;@@ -1968,29 +2041,29 @@ static DWORD WINAPI connection_handler(LPVOID arg)memset(&socks_addr, 0, sizeof(socks_addr));socks_addr.sin_family = AF_INET;- socks_addr.sin_addr.s_addr = socks5_ip;- socks_addr.sin_port = htons(g_proxy_port);+ socks_addr.sin_addr.s_addr = proxy_ip;+ socks_addr.sin_port = htons(proxy->port);if (connect(socks_sock, (struct sockaddr *)&socks_addr, sizeof(socks_addr)) == SOCKET_ERROR){- log_message("[RELAY] Failed to connect to proxy (%d)", WSAGetLastError());+ log_message("[RELAY] Failed to connect to proxy %s:%d (%d)", proxy->host, proxy->port, WSAGetLastError());closesocket(client_sock);closesocket(socks_sock);return 0;}- if (g_proxy_type == PROXY_TYPE_SOCKS5)+ if (proxy->type == PROXY_TYPE_SOCKS5){- if (socks5_connect(socks_sock, dest_ip, dest_port) != 0)+ if (socks5_connect(socks_sock, dest_ip, dest_port, proxy) != 0){closesocket(client_sock);closesocket(socks_sock);return 0;}}- else if (g_proxy_type == PROXY_TYPE_HTTP)+ else if (proxy->type == PROXY_TYPE_HTTP){- if (http_connect(socks_sock, dest_ip, dest_port) != 0)+ if (http_connect(socks_sock, dest_ip, dest_port, proxy) != 0){closesocket(client_sock);closesocket(socks_sock);@@ -1999,7 +2072,7 @@ static DWORD WINAPI connection_handler(LPVOID arg)}//- // educes thread count by 50% and CPU usage significantly+ // Reduces thread count by 50% and CPU usage significantlyTRANSFER_CONFIG *transfer_config = (TRANSFER_CONFIG *)malloc(sizeof(TRANSFER_CONFIG));if (transfer_config == NULL)@@ -2091,7 +2164,7 @@ cleanup:return 0;}-static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT16 dest_port)+static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT16 dest_port, UINT32 proxy_config_id){WaitForSingleObject(lock, INFINITE);@@ -2105,6 +2178,7 @@ static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT1existing->src_ip = src_ip;existing->orig_dest_ip = dest_ip;existing->orig_dest_port = dest_port;+ existing->proxy_config_id = proxy_config_id;existing->is_tracked = TRUE;ReleaseMutex(lock);return;@@ -2122,6 +2196,7 @@ static void add_connection(UINT16 src_port, UINT32 src_ip, UINT32 dest_ip, UINT1conn->src_ip = src_ip;conn->orig_dest_ip = dest_ip;conn->orig_dest_port = dest_port;+ conn->proxy_config_id = proxy_config_id;conn->is_tracked = TRUE;conn->last_activity = GetTickCount64();@@ -2178,6 +2253,29 @@ static BOOL get_connection(UINT16 src_port, UINT32 *dest_ip, UINT16 *dest_port)return found;}+static UINT32 get_connection_proxy_id(UINT16 src_port)+{+ UINT32 proxy_config_id = 0;++ WaitForSingleObject(lock, INFINITE);++ int hash = src_port % CONNECTION_HASH_SIZE;+ CONNECTION_INFO *conn = connection_hash_table[hash];++ while (conn != NULL)+ {+ if (conn->src_port == src_port)+ {+ proxy_config_id = conn->proxy_config_id;+ break;+ }+ conn = conn->next;+ }+ ReleaseMutex(lock);++ return proxy_config_id;+}+static void remove_connection(UINT16 src_port){WaitForSingleObject(lock, INFINITE);@@ -2290,7 +2388,7 @@ static void cleanup_stale_connections(void)ReleaseMutex(lock);}-PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action)+PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action, UINT32 proxy_config_id){if (process_name == NULL || process_name[0] == '\0')return 0;@@ -2302,6 +2400,7 @@ PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char*rule->rule_id = g_next_rule_id++;strncpy_s(rule->process_name, MAX_PROCESS_NAME, process_name, _TRUNCATE);rule->protocol = protocol;+ rule->proxy_config_id = proxy_config_id;if (target_hosts != NULL && target_hosts[0] != '\0'){@@ -2358,7 +2457,7 @@ PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char*rules_list = rule;update_has_active_rules();- log_message("Added rule ID: %u for process '%s' (Protocol: %d, Action: %d)", rule->rule_id, process_name, protocol, action);+ log_message("Added rule ID: %u for process '%s' (Protocol: %d, Action: %d, ProxyConfigId: %u)", rule->rule_id, process_name, protocol, action, proxy_config_id);return rule->rule_id;}@@ -2436,7 +2535,7 @@ PROXYBRIDGE_API BOOL ProxyBridge_DeleteRule(UINT32 rule_id)return FALSE;}-PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action)+PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action, UINT32 proxy_config_id){if (rule_id == 0 || process_name == NULL || target_hosts == NULL || target_ports == NULL)return FALSE;@@ -2468,9 +2567,10 @@ PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_narule->protocol = protocol;rule->action = action;+ rule->proxy_config_id = proxy_config_id;update_has_active_rules();- log_message("Updated rule ID: %u", rule_id);+ log_message("Updated rule ID: %u (ProxyConfigId: %u)", rule_id, proxy_config_id);return TRUE;}rule = rule->next;@@ -2564,39 +2664,164 @@ PROXYBRIDGE_API BOOL ProxyBridge_MoveRuleToPosition(UINT32 rule_id, UINT32 new_preturn TRUE;}-PROXYBRIDGE_API BOOL ProxyBridge_SetProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password)+PROXYBRIDGE_API UINT32 ProxyBridge_AddProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password)+{+ if (proxy_ip == NULL || proxy_ip[0] == '\0' || proxy_port == 0)+ return 0;++ if (resolve_hostname(proxy_ip) == 0)+ return 0;++ if (g_proxy_config_count >= MAX_PROXY_CONFIGS)+ return 0;++ PROXY_CONFIG *cfg = &g_proxy_configs[g_proxy_config_count];+ memset(cfg, 0, sizeof(PROXY_CONFIG));++ cfg->config_id = g_next_config_id++;+ cfg->type = (type == PROXY_TYPE_HTTP) ? PROXY_TYPE_HTTP : PROXY_TYPE_SOCKS5;+ cfg->port = proxy_port;+ strncpy_s(cfg->host, sizeof(cfg->host), proxy_ip, _TRUNCATE);+ if (username != NULL) strncpy_s(cfg->username, sizeof(cfg->username), username, _TRUNCATE);+ if (password != NULL) strncpy_s(cfg->password, sizeof(cfg->password), password, _TRUNCATE);+ cfg->udp_tcp_ctrl = INVALID_SOCKET;+ cfg->udp_send_sock = INVALID_SOCKET;+ cfg->udp_connected = FALSE;++ g_proxy_config_count++;+ log_message("Added proxy config ID %u: %s:%u (type %d)", cfg->config_id, cfg->host, cfg->port, cfg->type);+ return cfg->config_id;+}++PROXYBRIDGE_API BOOL ProxyBridge_EditProxyConfig(UINT32 config_id, ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password){if (proxy_ip == NULL || proxy_ip[0] == '\0' || proxy_port == 0)return FALSE;- // Validate that the hostname/IP can be resolvedif (resolve_hostname(proxy_ip) == 0)return FALSE;- strncpy_s(g_proxy_host, sizeof(g_proxy_host), proxy_ip, _TRUNCATE);- g_proxy_port = proxy_port;- g_proxy_type = (type == PROXY_TYPE_HTTP) ? PROXY_TYPE_HTTP : PROXY_TYPE_SOCKS5;+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->config_id == config_id)+ {+ // Close any open UDP state before changing config+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); cfg->udp_tcp_ctrl = INVALID_SOCKET; }+ if (cfg->udp_send_sock != INVALID_SOCKET) { closesocket(cfg->udp_send_sock); cfg->udp_send_sock = INVALID_SOCKET; }+ cfg->udp_connected = FALSE;++ cfg->type = (type == PROXY_TYPE_HTTP) ? PROXY_TYPE_HTTP : PROXY_TYPE_SOCKS5;+ cfg->port = proxy_port;+ strncpy_s(cfg->host, sizeof(cfg->host), proxy_ip, _TRUNCATE);+ cfg->username[0] = '\0';+ cfg->password[0] = '\0';+ if (username != NULL) strncpy_s(cfg->username, sizeof(cfg->username), username, _TRUNCATE);+ if (password != NULL) strncpy_s(cfg->password, sizeof(cfg->password), password, _TRUNCATE);++ log_message("Edited proxy config ID %u: %s:%u (type %d)", config_id, cfg->host, cfg->port, cfg->type);+ return TRUE;+ }+ }+ return FALSE;+}- // Store credentials if there- if (username != NULL && username[0] != '\0')+PROXYBRIDGE_API BOOL ProxyBridge_DeleteProxyConfig(UINT32 config_id)+{+ for (int i = 0; i < g_proxy_config_count; i++){- strncpy_s(g_proxy_username, sizeof(g_proxy_username), username, _TRUNCATE);+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->config_id == config_id)+ {+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); }+ if (cfg->udp_send_sock != INVALID_SOCKET) { closesocket(cfg->udp_send_sock); }++ // Shift remaining entries down+ int remaining = g_proxy_config_count - i - 1;+ if (remaining > 0)+ memmove(&g_proxy_configs[i], &g_proxy_configs[i + 1], remaining * sizeof(PROXY_CONFIG));++ g_proxy_config_count--;+ log_message("Deleted proxy config ID %u", config_id);+ return TRUE;+ }}- else+ return FALSE;+}++PROXYBRIDGE_API int ProxyBridge_TestProxyConfig(UINT32 config_id, const char* target_host, UINT16 target_port, char* result_buffer, size_t buffer_size)+{+ PROXY_CONFIG *cfg = find_proxy_config(config_id);+ if (cfg == NULL)+ {+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "No proxy config found", _TRUNCATE);+ return -1;+ }++ UINT32 dest_ip = resolve_hostname(target_host);+ if (dest_ip == 0){- g_proxy_username[0] = '\0';+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "Failed to resolve target host", _TRUNCATE);+ return -1;}- if (password != NULL && password[0] != '\0')+ SOCKET sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);+ if (sock == INVALID_SOCKET){- strncpy_s(g_proxy_password, sizeof(g_proxy_password), password, _TRUNCATE);+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "Failed to create socket", _TRUNCATE);+ return -1;}- else++ // Set timeout+ DWORD timeout = 10000;+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));+ setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout, sizeof(timeout));++ struct sockaddr_in proxy_addr;+ memset(&proxy_addr, 0, sizeof(proxy_addr));+ proxy_addr.sin_family = AF_INET;+ proxy_addr.sin_port = htons(cfg->port);+ UINT32 proxy_ip = resolve_hostname(cfg->host);+ if (proxy_ip == 0){- g_proxy_password[0] = '\0';+ closesocket(sock);+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "Failed to resolve proxy host", _TRUNCATE);+ return -1;}+ proxy_addr.sin_addr.s_addr = proxy_ip;- return TRUE;+ if (connect(sock, (struct sockaddr*)&proxy_addr, sizeof(proxy_addr)) != 0)+ {+ closesocket(sock);+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "Failed to connect to proxy", _TRUNCATE);+ return -1;+ }++ int result;+ if (cfg->type == PROXY_TYPE_SOCKS5)+ result = socks5_connect(sock, dest_ip, target_port, cfg);+ else+ result = http_connect(sock, dest_ip, target_port, cfg);++ closesocket(sock);++ if (result == 0)+ {+ if (result_buffer && buffer_size > 0)+ strncpy_s(result_buffer, buffer_size, "Connection successful", _TRUNCATE);+ return 0;+ }+ else+ {+ if (result_buffer && buffer_size > 0)+ snprintf(result_buffer, buffer_size, "Connection failed (code %d)", result);+ return result;+ }}PROXYBRIDGE_API void ProxyBridge_SetDnsViaProxy(BOOL enable)@@ -2890,7 +3115,7 @@ PROXYBRIDGE_API BOOL ProxyBridge_Start(void)return FALSE;}- if (g_proxy_type == PROXY_TYPE_SOCKS5)+ if (any_socks5_config()){udp_relay_thread = CreateThread(NULL, 1, udp_relay_server, NULL, 0, NULL);if (udp_relay_thread == NULL)@@ -2956,7 +3181,16 @@ PROXYBRIDGE_API BOOL ProxyBridge_Start(void)log_message("ProxyBridge started");log_message("Local relay: localhost:%d", g_local_relay_port);- log_message("%s proxy: %s:%d", g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5", g_proxy_host, g_proxy_port);+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ log_message("Proxy config ID %u: %s %s:%u",+ cfg->config_id,+ cfg->type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",+ cfg->host, cfg->port);+ }+ if (g_proxy_config_count == 0)+ log_message("Warning: No proxy configs configured");int rule_count = 0;PROCESS_RULE *rule = rules_list;@@ -3045,197 +3279,6 @@ PROXYBRIDGE_API BOOL ProxyBridge_Stop(void)}-PROXYBRIDGE_API int ProxyBridge_TestConnection(const char* target_host, UINT16 target_port, char* result_buffer, size_t buffer_size)-{- WSADATA wsa;- SOCKET test_sock = INVALID_SOCKET;- struct sockaddr_in proxy_addr;- struct hostent* host_info;- UINT32 target_ip;- int ret = -1;- char temp_buffer[FILTER_BUFFER_SIZE];-- if (g_proxy_host[0] == '\0' || g_proxy_port == 0)- {- snprintf(result_buffer, buffer_size, "ERROR: No proxy configured");- return -1;- }-- if (target_host == NULL || target_host[0] == '\0')- {- snprintf(result_buffer, buffer_size, "ERROR: Invalid target host");- return -1;- }-- // Initialize Winsock- if (WSAStartup(MAKEWORD(2, 2), &wsa) != 0)- {- snprintf(result_buffer, buffer_size, "ERROR: WSAStartup failed (%d)", WSAGetLastError());- return -1;- }-- snprintf(temp_buffer, sizeof(temp_buffer), "Testing connection to %s:%d via %s proxy %s:%d...\n",- target_host, target_port,- g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",- g_proxy_host, g_proxy_port);- strncpy_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);--- host_info = gethostbyname(target_host);- if (host_info == NULL)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Failed to resolve hostname %s (%d)\n", target_host, WSAGetLastError());- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- WSACleanup();- return -1;- }- target_ip = *(UINT32*)host_info->h_addr_list[0];-- snprintf(temp_buffer, sizeof(temp_buffer), "Resolved %s to %d.%d.%d.%d\n",- target_host,- (target_ip >> 0) & 0xFF, (target_ip >> 8) & 0xFF,- (target_ip >> 16) & 0xFF, (target_ip >> 24) & 0xFF);- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);-- // Create socket- test_sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);- if (test_sock == INVALID_SOCKET)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Socket creation failed (%d)\n", WSAGetLastError());- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- WSACleanup();- return -1;- }-- DWORD timeout = 10000;- setsockopt(test_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout));- setsockopt(test_sock, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout, sizeof(timeout));-- memset(&proxy_addr, 0, sizeof(proxy_addr));- proxy_addr.sin_family = AF_INET;- proxy_addr.sin_addr.s_addr = resolve_hostname(g_proxy_host);- proxy_addr.sin_port = htons(g_proxy_port);-- snprintf(temp_buffer, sizeof(temp_buffer), "Connecting to proxy %s:%d...\n", g_proxy_host, g_proxy_port);- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);-- if (connect(test_sock, (struct sockaddr*)&proxy_addr, sizeof(proxy_addr)) == SOCKET_ERROR)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Failed to connect to proxy (%d)\n", WSAGetLastError());- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- closesocket(test_sock);- WSACleanup();- return -1;- }-- strncat_s(result_buffer, buffer_size, "Connected to proxy server\n", _TRUNCATE);-- if (g_proxy_type == PROXY_TYPE_SOCKS5)- {- if (socks5_connect(test_sock, target_ip, target_port) != 0)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: SOCKS5 handshake failed\n");- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- closesocket(test_sock);- WSACleanup();- return -1;- }- strncat_s(result_buffer, buffer_size, "SOCKS5 handshake successful\n", _TRUNCATE);- }- else- {- if (http_connect(test_sock, target_ip, target_port) != 0)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: HTTP CONNECT failed\n");- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- closesocket(test_sock);- WSACleanup();- return -1;- }- strncat_s(result_buffer, buffer_size, "HTTP CONNECT successful\n", _TRUNCATE);- }--- char http_request[FILTER_BUFFER_SIZE];- snprintf(http_request, sizeof(http_request),- "GET / HTTP/1.1\r\n"- "Host: %s\r\n"- "Connection: close\r\n"- "User-Agent: ProxyBridge/1.0\r\n"- "\r\n", target_host);-- if (send(test_sock, http_request, strlen(http_request), 0) == SOCKET_ERROR)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Failed to send test request (%d)\n", WSAGetLastError());- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- closesocket(test_sock);- WSACleanup();- return -1;- }-- strncat_s(result_buffer, buffer_size, "Sent HTTP GET request\n", _TRUNCATE);- char response[1024];- int bytes_received = recv(test_sock, response, sizeof(response) - 1, 0);- if (bytes_received > 0)- {- response[bytes_received] = '\0';-- if (strstr(response, "HTTP/") != NULL)- {- char* status_line = strstr(response, "HTTP/");- int status_code = 0;- if (status_line != NULL)- {- sscanf_s(status_line, "HTTP/%*s %d", &status_code);- }-- snprintf(temp_buffer, sizeof(temp_buffer), "SUCCESS: Received HTTP %d response (%d bytes)\n", status_code, bytes_received);- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- ret = 0; // Success- }- else- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Received data but not valid HTTP response\n");- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- ret = -1; // Failure - not a valid HTTP response- }- }- else if (bytes_received == 0)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Connection closed by remote host (no data received)\n");- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- ret = -1; // Failure- }- else- {- int error_code = WSAGetLastError();- if (error_code == WSAETIMEDOUT)- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Connection timeout - no response received\n");- }- else- {- snprintf(temp_buffer, sizeof(temp_buffer), "ERROR: Failed to receive response (%d)\n", error_code);- }- strncat_s(result_buffer, buffer_size, temp_buffer, _TRUNCATE);- ret = -1; // Failure- }-- closesocket(test_sock);- WSACleanup();-- if (ret == 0)- {- strncat_s(result_buffer, buffer_size, "\n✓ Proxy connection test PASSED\n", _TRUNCATE);- }- else- {- strncat_s(result_buffer, buffer_size, "\n✗ Proxy connection test FAILED\n", _TRUNCATE);- }-- return ret;-}-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved){switch (fdwReason)@@ -3247,6 +3290,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)case DLL_PROCESS_DETACH:if (running)ProxyBridge_Stop();+ // Close all proxy config UDP sockets+ for (int i = 0; i < g_proxy_config_count; i++)+ {+ PROXY_CONFIG *cfg = &g_proxy_configs[i];+ if (cfg->udp_tcp_ctrl != INVALID_SOCKET) { closesocket(cfg->udp_tcp_ctrl); cfg->udp_tcp_ctrl = INVALID_SOCKET; }+ if (cfg->udp_send_sock != INVALID_SOCKET) { closesocket(cfg->udp_send_sock); cfg->udp_send_sock = INVALID_SOCKET; }+ }if (lock != NULL){CloseHandle(lock);diff --git a/Windows/src/ProxyBridge.h b/Windows/src/ProxyBridge.hindex f728b76..ff91792 100644--- a/Windows/src/ProxyBridge.h+++ b/Windows/src/ProxyBridge.h@@ -13,6 +13,8 @@extern "C" {#endif+#define MAX_PROXY_CONFIGS 16+typedef void (*LogCallback)(const char* message);typedef void (*ConnectionCallback)(const char* process_name, DWORD pid, const char* dest_ip, UINT16 dest_port, const char* proxy_info);@@ -33,14 +35,21 @@ typedef enum {RULE_PROTOCOL_BOTH = 2} RuleProtocol;-PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action);+// Multiple proxy config management+// proxy_ip can be IP address or hostname; returns config_id (>0) on success, 0 on failure+PROXYBRIDGE_API UINT32 ProxyBridge_AddProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password);+PROXYBRIDGE_API BOOL ProxyBridge_EditProxyConfig(UINT32 config_id, ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password);+PROXYBRIDGE_API BOOL ProxyBridge_DeleteProxyConfig(UINT32 config_id);+PROXYBRIDGE_API int ProxyBridge_TestProxyConfig(UINT32 config_id, const char* target_host, UINT16 target_port, char* result_buffer, size_t buffer_size);++// Rule management - proxy_config_id selects which proxy config the rule uses (0 = first available)+PROXYBRIDGE_API UINT32 ProxyBridge_AddRule(const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action, UINT32 proxy_config_id);PROXYBRIDGE_API BOOL ProxyBridge_EnableRule(UINT32 rule_id);PROXYBRIDGE_API BOOL ProxyBridge_DisableRule(UINT32 rule_id);PROXYBRIDGE_API BOOL ProxyBridge_DeleteRule(UINT32 rule_id);-PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action);+PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action, UINT32 proxy_config_id);PROXYBRIDGE_API BOOL ProxyBridge_MoveRuleToPosition(UINT32 rule_id, UINT32 new_position); // Move rule to specific position (1=first, 2=second, etc)PROXYBRIDGE_API UINT32 ProxyBridge_GetRulePosition(UINT32 rule_id); // Get current position of rule in list (1-based)-PROXYBRIDGE_API BOOL ProxyBridge_SetProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password); // proxy_ip can be IP address or hostnamePROXYBRIDGE_API void ProxyBridge_SetDnsViaProxy(BOOL enable);PROXYBRIDGE_API void ProxyBridge_SetLocalhostViaProxy(BOOL enable);PROXYBRIDGE_API void ProxyBridge_SetLogCallback(LogCallback callback);@@ -49,8 +58,6 @@ PROXYBRIDGE_API void ProxyBridge_SetTrafficLoggingEnabled(BOOL enable);PROXYBRIDGE_API void ProxyBridge_ClearConnectionLogs(void); // Clear connection history from memoryPROXYBRIDGE_API BOOL ProxyBridge_Start(void);PROXYBRIDGE_API BOOL ProxyBridge_Stop(void);-PROXYBRIDGE_API int ProxyBridge_TestConnection(const char* target_host, UINT16 target_port, char* result_buffer, size_t buffer_size);-#ifdef __cplusplus}#endif