.github/workflows/c-cpp.yml

@@ -23,51 +23,41 @@ jobs:
     - uses: actions/checkout@v4
 #    - name: configure
 #      run: ./configure
+    - name: ln Linux
+      if: ${{ startsWith(matrix.target, 'ubuntu') }}
+      run: ln -s Makefile.Linux Makefile
     - name: Linux libraries
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: sudo apt install libssl-dev libpam-dev libpcre3 libpcre3-dev
+    - name: Mac libraries
+      if: ${{ startsWith(matrix.target, 'macos') }}
+      run: brew install pcre
+    - name: ln Mac
+      if: ${{ startsWith(matrix.target, 'macos') }}
+      run: ln -s Makefile.FreeBSD Makefile
+    - name: ln Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: copy Makefile.win Makefile
+    - name: make Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: make
+      env:
+       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
+       CFLAGS: '-I "c:/program files/openssl/include"'
     - name: make Ubuntu
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
-      run: make -f Makefile.Linux
+      run: make
+    - name: make MacOS
+      if: ${{ startsWith(matrix.target, 'macos') }}
+      run: make
+      env:
+       LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/usr/local/opt/openssl/lib -L/opt/homebrew/opt/openssl/lib"
+       CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include"
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: mkdir ~/3proxy
     - name: make install
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
-      run: make -f Makefile.Linux DESTDIR=~/3proxy install
+      run: make DESTDIR=~/3proxy install
-    - name: make clean Linux
+    - name: make clean
-      if: ${{ startsWith(matrix.target, 'ubuntu') }}
+      run: make clean
-      run: make -f Makefile.Linux clean
-    - name: Mac libraries
-      if: ${{ startsWith(matrix.target, 'macos') }}
-      run: brew install pcre
-    - name: make MacOS
-      if: ${{ startsWith(matrix.target, 'macos') }}
-      run: make -f Makefile.FreeBSD
-      env:
-       LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib"
-       CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include"
-    - name: make clean MacOS
-      if: ${{ startsWith(matrix.target, 'macos') }}
-      run: make -f Makefile.FreeBSD clean
-    - name: make Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: make -f Makefile.win
-      env:
-       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
-       CFLAGS: '-I "c:/program files/openssl/include"'
-    - name: make clean Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: make -f Makefile.win clean
-#    - name: make Windows MSVC
-#      if: ${{ startsWith(matrix.target, 'windows') }}
-#      shell: cmd
-#      run: |
-#       call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-#       nmake /F Makefile.msvc64'
-#      env:
-#       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
-#       CFLAGS: '-I "c:/program files/openssl/include"'
-#    - name: make clean Windows
-#      if: ${{ startsWith(matrix.target, 'windows') }}
-#      run: nmake /F Makefile.msvc64 clean

src/plugins/TrafficPlugin/TrafficPlugin.c

@@ -200,12 +200,12 @@ void mylogfunc(struct clientparam * param, const unsigned char * pz) {
 #endif
 		rule++;
 		if (((g_s == param->service) && (port == myhtons(*SAPORT(&param->sinsr)))) || 
-			( ((starttrafcorrect->con_type == UDP) && 
+			( ((starttrafcorrect->type == UDP) && 
 				((param->operation == UDPASSOC)||
 				 (param->operation == DNSRESOLVE)||
 				 (param->operation == BIND)||
 				 (param->operation == ICMPASSOC))
-			   )||(starttrafcorrect->con_type == TCP))) /* TCP support */
+			   )||(starttrafcorrect->type == TCP))) /* TCP support */
 		{
 				/* ôèëüòð ïîäîø¸ë. ìîæíî èçìåíÿòü çíà÷åíèå òðàôôèêà
 				   äîìíîæàåì íà ÷èñëî */