Commitb83c110

culyerr

authored and

committed

Fixed IPv4+Port address parsing

1 parentb1ee051 commitb83c110Copy full SHA for b83c110

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,10 @@ class REQUEST_STORED_CONTEXT : public IHttpStoredContext`
`88`	`88`
`89`	`89`	`char GetIpAddr(apr_pool_t pool, PSOCKADDR pAddr)`
`90`	`90`	`{`
	`91`	`+constchar *format ="%15[0-9.]:%5[0-9]";`
	`92`	`+char ip[16] = {0 };// ip4 addresses have max len 15`
	`93`	`+char port[6] = {0 };// port numbers are 16bit, ie 5 digits max`
	`94`	`+`
`91`	`95`	`DWORD len =50;`
`92`	`96`	`char buf = (char )apr_palloc(pool, len);`
`93`	`97`
`@@ -98,6 +102,14 @@ char GetIpAddr(apr_pool_t pool, PSOCKADDR pAddr)`
`98`	`102`
`99`	`103`	`WSAAddressToString(pAddr,sizeof(SOCKADDR),NULL, buf, &len);`
`100`	`104`
	`105`	`+// test for IPV4 with port on the end`
	`106`	`+if (sscanf(buf, format, ip, port) ==2) {`
	`107`	`+// IPV4 but with port - remove the port`
	`108`	`+char* input =":";`
	`109`	`+char* ipv4 =strtok(buf, input);`
	`110`	`+return ipv4;`
	`111`	`+}`
	`112`	`+`
`101`	`113`	`return buf;`
`102`	`114`	`}`
`103`	`115`

Comments

(0)