minor changes

yinghuocho · Apr 26, 2016 · ac5c0a2 · ac5c0a2
1 parent 722a9f4
commit ac5c0a2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/client/.gitignore b/client/.gitignore
@@ -1,4 +1,5 @@
 firefly
+firefly.exe
 Firefly.app
 firefly_darwin_amd64
 firefly_linux_amd64

diff --git a/client/Makefile b/client/Makefile
@@ -1,6 +1,8 @@
 VERSION := 0.4.1
 SHORTVERSION := 0.4.1
 
+DESC := "A proxy software for censorship circumvention"
+
 .PHONY: windows package-windows linux package-linux darwin package-darwin clean
 
 define fpm-debian-build 
@@ -24,7 +26,7 @@ define fpm-debian-build
 	chmod -x $$WORKDIR/usr/bin/firefly-bin && \
 	chmod +x $$WORKDIR/usr/bin/firefly && \
 	\
-	fpm -a $$PKG_ARCH -s dir -t deb -n firefly -v $$VERSION -C $$WORKDIR -f usr;
+	fpm --license BSD --description "$$DESC" --vendor yinghuocho --maintainer "yinghuocho <[email protected]>" --url https://gofirefly.org/ -a $$PKG_ARCH -s dir -t deb -n firefly -v $$VERSION -C $$WORKDIR -f usr;
 endef
 
 windows:

diff --git a/client/tunnel.go b/client/tunnel.go
@@ -167,8 +167,8 @@ func (t *tunnelHandler) dialParallel(timeout time.Duration) (net.Conn, tunnelPee
 			}
 			close(quit)
 			return r.c, r.p, failedPeers
-		case <-time.After(100 * time.Millisecond):
-			// every 100 ms, fire a waiting one
+		case <-time.After(200 * time.Millisecond):
+			// every 200 ms, fire a waiting one
 			if waiting > 0 {
 				token <- true
 				waiting -= 1

diff --git a/server/.gitignore b/server/.gitignore
@@ -0,0 +1 @@
+server