diff --git a/Makefile.msvc b/Makefile.msvc index db8d4db..263c4af 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -28,16 +28,16 @@ TYPECOMMAND = type COMPATLIBS = MAKEFILE = Makefile.msvc PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin -VERFILE = 3proxyres.obj $(VERFILE) +VERFILE = $(VERFILE) + +#../3proxy.res: +# rc /fo../3proxy.res ../3proxy.rc + +#3proxyres.obj: ../3proxy.res +# cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res include Makefile.inc -../3proxy.res: - rc /fo../3proxy.res ../3proxy.rc - -3proxyres.obj: ../3proxy.res - cvtres /out:3proxyres.obj /MACHINE:X86 ../3proxy.res - allplugins: for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) \ No newline at end of file diff --git a/Makefile.msvc64 b/Makefile.msvc64 index f4d5d3c..59d64a3 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -28,16 +28,16 @@ TYPECOMMAND = type COMPATLIBS = MAKEFILE = Makefile.msvc64 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin -VERFILE = 3proxyres.obj $(VERFILE) +VERFILE = $(VERFILE) + +#../3proxy.res: +# rc /fo../3proxy.res ../3proxy.rc + +#3proxyres.obj: ../3proxy.res +# cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res include Makefile.inc -../3proxy.res: - rc /fo../3proxy.res ../3proxy.rc - -3proxyres.obj: ../3proxy.res - cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res - allplugins: for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) diff --git a/src/common.c b/src/common.c index a19ae56..fbd14fc 100644 --- a/src/common.c +++ b/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 *)¶m->req); + if(se) *se = ']'; + if(sp) *sp = ':'; *SAPORT(¶m->req) = htons(port); memset(¶m->sinsr, 0, sizeof(param->sinsr)); return 0; diff --git a/src/version.h b/src/version.h index 57d7b74..de844fb 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define VERSION "3proxy-0.8b-devel" -#define BUILDDATE "141103212413" +#define BUILDDATE "141103221444"