name resolution bugfixes

Makefile.msvc

@@ -28,15 +28,15 @@ TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin
-VERFILE = 3proxyres.obj $(VERFILE)
+VERFILE = $(VERFILE)
 
-include Makefile.inc
+#../3proxy.res:
+#	rc /fo../3proxy.res ../3proxy.rc
 
-../3proxy.res:
-	rc /fo../3proxy.res ../3proxy.rc
+#3proxyres.obj: ../3proxy.res
+#	cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res
 
-3proxyres.obj: ../3proxy.res
-	cvtres /out:3proxyres.obj /MACHINE:X86 ../3proxy.res
+include Makefile.inc
 
 allplugins:
 	for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..)

Makefile.msvc64

@@ -28,15 +28,15 @@ TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc64
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
-VERFILE = 3proxyres.obj $(VERFILE)
+VERFILE = $(VERFILE)
 
-include Makefile.inc
+#../3proxy.res:
+#	rc /fo../3proxy.res ../3proxy.rc
 
-../3proxy.res:
-	rc /fo../3proxy.res ../3proxy.rc
+#3proxyres.obj: ../3proxy.res
+#	cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res
 
-3proxyres.obj: ../3proxy.res
-	cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res
+include Makefile.inc
 
 allplugins:
 	for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..)

src/common.c

@@ -214,7 +214,7 @@ int ceparseargs(const char *str){
 #endif
 
 int parsehostname(char *hostname, struct clientparam *param, unsigned short port){
-	char *sp,*se;
+	char *sp=NULL,*se=NULL;
 
 	if(!hostname || !*hostname)return 1;
 	if(*hostname == '[') se=strchr(hostname, ']');
@@ -228,10 +228,10 @@ int parsehostname(char *hostname, struct clientparam *param, unsigned short port
 	}
 	if(sp){
 		port = atoi(sp+1);
-		*sp = ':';
 	}
-	if(se) *se = ']';
 	getip46(param->srv->family, param->hostname + (se!=0), (struct sockaddr *)&param->req);
+	if(se) *se = ']';
+	if(sp) *sp = ':';
 	*SAPORT(&param->req) = htons(port);
 	memset(&param->sinsr, 0, sizeof(param->sinsr));
 	return 0;

src/version.h

@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8b-devel"
-#define BUILDDATE "141103212413"
+#define BUILDDATE "141103221444"