Merge 099ef1f6a8 into eca362af81

FIx: UDPASSOC via parent broken after previous commits
2026-08-13 12:19:17 +08:00 · 2026-08-10 11:19:14 +03:00 · 2026-08-10 11:18:56 +03:00
2 changed files with 2 additions and 1 deletions
--- a/src/acl.c
+++ b/src/acl.c
@ -150,7 +150,7 @@ int checkACL(struct clientparam * param){
 				if(param->redirected && acentry->chains && SAISNULL(&acentry->chains->addr) && !*SAPORT(&acentry->chains->addr)) {
 					continue;
 				}
-				if(param->remsock != INVALID_SOCKET && (param->operation != UDPASSOC || param->ctrlsocksrv != INVALID_SOCKET)) {
+				if((param->operation == UDPASSOC)? (param->ctrlsocksrv != INVALID_SOCKET) : (param->remsock != INVALID_SOCKET)) {
 					return 0;
 				}
 				for(; i < conf.parentretries; i++){
--- a/src/common.c
+++ b/src/common.c
@ -644,6 +644,7 @@ int doconnect(struct clientparam * param){

 if (param->operation == ADMIN || (( param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC) && !param->redirected))
 	return 0;
+ if (param->operation == UDPASSOC && param->ctrlsocksrv != INVALID_SOCKET) return 0;
 if (param->remsock != INVALID_SOCKET){
 	if(param->operation == UDPASSOC) return 0;
 	size = sizeof(param->sinsr);
Author	SHA1	Message	Date
yazhog	631ce4673e	Merge `099ef1f6a8` into `eca362af81`	2026-08-10 11:19:14 +03:00
Vladimir Dubrovin	eca362af81	FIx: UDPASSOC via parent broken after previous commits Some checks are pending C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run Details C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run Details C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run Details C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run Details C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run Details C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run Details C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run Details C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run Details C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Waiting to run Details	2026-08-10 11:18:56 +03:00