Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-01-23 02:34:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix the unknown number of args with strzcat.

Browse source 
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@188 bc163920-b10d-0410-b2c5-a5491ca2ceef
This commit is contained in:
Dag Wieers 2008-01-21 12:57:05 +00:00
parent 4ff3677231
commit 06af6e1548
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
http.c
View file

@ -110,19 +110,14 @@ void print_line_prefix(char *buf, char *prefix)
/*
* Append an variable number of strings together
*/
size_t strzcat(char *strz, ...)
size_t strzcat(char *strz, char *fmt, ...)
{
int offset = strlen(strz);
va_list ap;
char *z;
int i;
size_t dlen = 0;
va_start(ap, strz);
for(i=0; i<sizeof(*ap); i+=sizeof(ap[0])) {
z = va_arg(ap, char *);
dlen += strlcat(strz, z, SIZE);
}
va_start(ap, fmt);
size_t dlen = vsnprintf(&strz[offset], SIZE-offset, fmt, ap);
va_end(ap);
return dlen;
return dlen+offset;
}
/*
@ -156,23 +151,23 @@ void proxy_protocol(PTSTREAM *pts)
if (ntlm_challenge == 1)
{
build_type3_response();
strzcat( buf, "Proxy-Authorization: NTLM ", ntlm_type3_buf, "\r\n" );
strzcat( buf, "Proxy-Authorization: NTLM %s\r\n", ntlm_type3_buf );
}
else if (ntlm_challenge == 0)
{
strzcat( buf, "Proxy-Authorization: NTLM ", ntlm_type1_buf, "\r\n" );
strzcat( buf, "Proxy-Authorization: NTLM %s\r\n", ntlm_type1_buf );
}
}
else
{
strzcat( buf, "Proxy-authorization: Basic ", basicauth, "\r\n" );
strzcat( buf, "Proxy-authorization: Basic %s\r\n", basicauth );
}
}
/* Add extra header(s) */
if ( args_info.header_given )
{
strzcat( buf, args_info.header_arg, "\r\n" );
strzcat( buf, "%s\r\n", args_info.header_arg );
}
strzcat( buf, "Proxy-Connection: Keep-Alive\r\n\r\n");
@ -218,12 +213,12 @@ void proxy_protocol(PTSTREAM *pts)
*/
if ( args_info.header_given )
{
strzcat( buf, args_info.header_arg, "\r\n" );
strzcat( buf, "%s\r\n", args_info.header_arg );
}
if ( args_info.user_given && args_info.pass_given )
{
strzcat( buf, "Proxy-authorization: Basic ", basicauth, "\r\n" );
strzcat( buf, "Proxy-authorization: Basic %s\r\n", basicauth );
}
strzcat( buf, "Proxy-Connection: Keep-Alive\r\n\r\n" );