From ca1f4b8709308852436e44614b1ef66422cee23d Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sun, 26 Apr 2015 14:27:41 +0200 Subject: [PATCH 01/22] trying cygwin test --- appveyor.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..c341c4a --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,18 @@ +environment: + global: + CYG_ROOT: C:\cygwin + CYG_BASH: C:\cygwin\bin\bash + +os: unstable + +platform: + - Win32 + +test: off + +init: + - git config --global core.autocrlf input + +build_script: + - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 14:34:27 +0200 Subject: [PATCH 02/22] fix fprintf error --- host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host.c b/host.c index 751976a..91a89f4 100644 --- a/host.c +++ b/host.c @@ -162,7 +162,7 @@ void host_dump(host_t *host) { fprintf(stderr, "host - ip: %s\n", host->ip); fprintf(stderr, " port: %d\n", host->port); fprintf(stderr, " isv6: %d\n", host->is_v6); - fprintf(stderr, " size: %ld\n", host->size); + fprintf(stderr, " size: %ld\n", (long int)host->size); fprintf(stderr, " src: %p\n", host->sock); } From 29e7a9829cc3da778cf53570a989735adfad77fa Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sun, 26 Apr 2015 14:42:07 +0200 Subject: [PATCH 03/22] checking networking on win --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c341c4a..4083274 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,3 +16,5 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 14:53:30 +0200 Subject: [PATCH 04/22] checking networking on win, 2 --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4083274..9a87be5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,5 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:06:05 +0200 Subject: [PATCH 05/22] trying tests --- appveyor.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9a87be5..2565504 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,5 +15,9 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:12:02 +0200 Subject: [PATCH 06/22] trying tests, fix ports --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2565504..7cde0c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:19:23 +0200 Subject: [PATCH 07/22] trying tests, try 3 --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7cde0c0..5e2b3d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,8 @@ build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:26:04 +0200 Subject: [PATCH 08/22] trying tests, try 4 --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5e2b3d1..b323184 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,9 +15,8 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:33:43 +0200 Subject: [PATCH 09/22] why --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b323184..a02bc3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:55:53 +0200 Subject: [PATCH 10/22] why, 2 --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a02bc3c..fd0b2f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,9 +15,8 @@ init: build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 15:58:20 +0200 Subject: [PATCH 11/22] added appveyor badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd46aa9..6712f16 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/TLINDEN/udpxd.svg?branch=master)](https://travis-ci.org/TLINDEN/udpxd) +[![Build status](https://ci.appveyor.com/api/projects/status/0tujxsr8u324dv9v?svg=true)](https://ci.appveyor.com/project/TLINDEN/udpxd) ## UDPXD - A general purpose UDP relay/port forwarder/proxy From 0bade3bf6890a5e9b155cc041a749fa30039555e Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sun, 26 Apr 2015 16:27:14 +0200 Subject: [PATCH 12/22] why, 3 --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index fd0b2f9..c953242 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,11 @@ build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 16:34:10 +0200 Subject: [PATCH 13/22] why, 4 --- appveyor.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c953242..b4e7606 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,14 @@ environment: global: CYG_ROOT: C:\cygwin CYG_BASH: C:\cygwin\bin\bash + CYG_MIRROR: http://cygwin.mirror.constant.com + CYG_CACHE: C:\cygwin\var\cache\setup os: unstable +cache: + - '%CYG_CACHE%' + platform: - Win32 @@ -13,15 +18,17 @@ test: off init: - git config --global core.autocrlf input +install: + - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat > NUL 2>&1' + - '%CYG_BASH% -lc "cygcheck -dc cygwin"' + build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 16:42:55 +0200 Subject: [PATCH 14/22] why, no bind? --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b4e7606..f918bdd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,13 +20,13 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat > NUL 2>&1' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 16:50:51 +0200 Subject: [PATCH 15/22] why, doch, but cygwin --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f918bdd..56e906f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,15 +20,14 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat > NUL 2>&1' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 17:01:00 +0200 Subject: [PATCH 16/22] why, 5 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 56e906f..7db7f34 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,13 +20,13 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat > NUL 2>&1' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 17:01:25 +0200 Subject: [PATCH 17/22] why, 5 --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7db7f34..464dfa9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,9 +19,9 @@ init: - git config --global core.autocrlf input install: - - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' - - '%CYG_BASH% -lc "cygcheck -dc cygwin"' + #- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' + #- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' + #- '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 17:08:36 +0200 Subject: [PATCH 18/22] why, 6 --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 464dfa9..7458b89 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,14 +19,14 @@ init: - git config --global core.autocrlf input install: - #- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - #- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' - #- '%CYG_BASH% -lc "cygcheck -dc cygwin"' + - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' + - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 17:33:24 +0200 Subject: [PATCH 19/22] clean up after testing --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 7458b89..d413a15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,5 +29,6 @@ build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 17:42:16 +0200 Subject: [PATCH 20/22] forgot procps --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d413a15..7f581fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat,procps > NUL 2>&1' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: From 4bab0bb99be29750fe71ed644c2a3cc59c49a65e Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sun, 26 Apr 2015 17:48:47 +0200 Subject: [PATCH 21/22] removed pkill, doesnt work --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7f581fe..7fd3196 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"' - - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat,procps > NUL 2>&1' + - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages bind,netcat > NUL 2>&1' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' build_script: @@ -29,6 +29,5 @@ build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Sun, 26 Apr 2015 18:03:33 +0200 Subject: [PATCH 22/22] restart --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 7fd3196..75cdf0c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,4 +30,5 @@ build_script: - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0