diff options
| author | Kyle.Hu.GZ <[email protected]> | 2009-10-15 20:05:59 +0000 |
|---|---|---|
| committer | Kyle.Hu.GZ <[email protected]> | 2009-10-15 20:05:59 +0000 |
| commit | 72adcb331c43798721d9a1e3516ae8df99c73bde (patch) | |
| tree | 1314d8ae49bee344da3bb336c77b0d3207ba33d8 | |
| parent | 0250b19e252d9b611f47390be39a54616c2b2b76 (diff) | |
Update http.c to resolve domain name correctly.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@103 bbd45198-f89e-11dd-88c7-29a3b14d5316
| -rw-r--r-- | bsp/stm32_radio/http.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/bsp/stm32_radio/http.c b/bsp/stm32_radio/http.c index 58421b0b19..e7f53466b0 100644 --- a/bsp/stm32_radio/http.c +++ b/bsp/stm32_radio/http.c @@ -109,7 +109,8 @@ const char *http_resolve_address( struct sockaddr_in *server, const char * url, {
char *ptr;
char port[6] = "80"; /* default port of 80(HTTP) */
- int i = 0, rv, is_domain;
+ int i = 0, is_domain;
+ struct hostent *hptr;
/* strip http: */
ptr = strchr(url, ':');
@@ -142,23 +143,24 @@ const char *http_resolve_address( struct sockaddr_in *server, const char * url, }
/* get host addr ok. */
host_addr[i] = '\0';
- inet_aton(host_addr, (struct in_addr*)&(server->sin_addr));
- if (!is_domain)
- {
- /* set the port */
- server->sin_port = htons((int) strtol(port, NULL, 10));
- }
- else
+ if (is_domain)
{
/* resolve the host name. */
- rv = dns_gethostbyname(host_addr, &server->sin_addr, RT_NULL, RT_NULL);
- if(rv != 0)
+ hptr = gethostbyname(host_addr);
+ if(hptr == 0)
{
rt_kprintf("HTTP: failed to resolve domain '%s'\n", host_addr);
return RT_NULL;
}
+ memcpy(&server->sin_addr, *hptr->h_addr_list, sizeof(server->sin_addr));
+ }
+ else
+ {
+ inet_aton(host_addr, (struct in_addr*)&(server->sin_addr));
}
+ /* set the port */
+ server->sin_port = htons((int) strtol(port, NULL, 10));
server->sin_family = AF_INET;
while (*url != '/') url ++;
|