sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net: env: getenv_ip use resolv 

Introduce getenv_ip_dns to be able to do not do the resolv when using it in
resolv for the nameserver (Do not loop).

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-03-26 11:40:53 +08:00
parent f76899fa98
commit 9c29dab5aa
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net.h
View File

@ -277,7 +277,11 @@ char *ip_to_string (IPaddr_t x, char *s);
/* Convert a string to ip address */
int string_to_ip(const char *s, IPaddr_t *ip);
IPaddr_t getenv_ip(const char *name);
IPaddr_t getenv_ip_dns(const char *name, int dns);
static inline IPaddr_t getenv_ip(const char *name)
{
return getenv_ip_dns(name, 0);
}
int setenv_ip(const char *name, IPaddr_t ip);
int string_to_ethaddr(const char *str, char *enetaddr);

2
net/dns.c
View File

@ -205,7 +205,7 @@ IPaddr_t resolv(char *host)
dns_state = STATE_INIT;
ip = getenv_ip("nameserver");
ip = getenv_ip_dns("nameserver", 0);
if (!ip)
return 0;

9
net/net.c
View File

@ -127,7 +127,7 @@ int string_to_ip(const char *s, IPaddr_t *ip)
return 0;
}
IPaddr_t getenv_ip(const char *name)
IPaddr_t getenv_ip_dns(const char *name, int dns)
{
IPaddr_t ip;
const char *var = getenv(name);
@ -135,10 +135,13 @@ IPaddr_t getenv_ip(const char *name)
if (!var)
return 0;
if (string_to_ip(var, &ip))
if (!string_to_ip(var, &ip))
return ip;
if (!dns)
return 0;
return ip;
return resolv((char*)var);
}
int setenv_ip(const char *name, IPaddr_t ip)