giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added explicit functions uiplib_ip6addrconv and uiplib_ip4addrconv for converting IPv6 and IPv4 addresses, regardless of whether uIP was configured to run as an IPv4 or an IPv6 stack.

This commit is contained in:
Adam Dunkels 2012-11-26 19:43:17 +01:00
parent 0bad2b1748
commit 289a01b389
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/net/uiplib.c
View File

@ -42,9 +42,8 @@
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr) uiplib_ip6addrconv(const char *addrstr, uip_ip6addr_t *ipaddr)
{ {
#if UIP_CONF_IPV6
uint16_t value; uint16_t value;
int tmp, zero; int tmp, zero;
unsigned int len; unsigned int len;
@ -54,7 +53,7 @@ uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr)
zero = -1; zero = -1;
if(*addrstr == '[') addrstr++; if(*addrstr == '[') addrstr++;
for(len = 0; len < sizeof(uip_ipaddr_t) - 1; addrstr++) { for(len = 0; len < sizeof(uip_ip6addr_t) - 1; addrstr++) {
c = *addrstr; c = *addrstr;
if(c == ':' || c == '\0' || c == ']' || c == '/') { if(c == ':' || c == '\0' || c == ']' || c == '/') {
ipaddr->u8[len] = (value >> 8) & 0xff; ipaddr->u8[len] = (value >> 8) & 0xff;
@ -91,45 +90,63 @@ uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr)
PRINTF("uiplib: too large address\n"); PRINTF("uiplib: too large address\n");
return 0; return 0;
} }
if(len < sizeof(uip_ipaddr_t)) { if(len < sizeof(uip_ip6addr_t)) {
if(zero < 0) { if(zero < 0) {
PRINTF("uiplib: too short address\n"); PRINTF("uiplib: too short address\n");
return 0; return 0;
} }
memmove(&ipaddr->u8[zero + sizeof(uip_ipaddr_t) - len], memmove(&ipaddr->u8[zero + sizeof(uip_ip6addr_t) - len],
&ipaddr->u8[zero], len - zero); &ipaddr->u8[zero], len - zero);
memset(&ipaddr->u8[zero], 0, sizeof(uip_ipaddr_t) - len); memset(&ipaddr->u8[zero], 0, sizeof(uip_ip6addr_t) - len);
} }
#else /* UIP_CONF_IPV6 */ return 1;
}
/*-----------------------------------------------------------------------------------*/
/* Parse a IPv4-address from a string. Returns the number of characters read
* for the address. */
int
uiplib_ip4addrconv(const char *addrstr, uip_ip4addr_t *ipaddr)
{
unsigned char tmp; unsigned char tmp;
char c; char c;
unsigned char i, j; unsigned char i, j;
uint8_t charsread = 0;
tmp = 0; tmp = 0;
for(i = 0; i < 4; ++i) { for(i = 0; i < 4; ++i) {
j = 0; j = 0;
do { do {
c = *addrstr; c = *addrstr;
++j; ++j;
if(j > 4) { if(j > 4) {
return 0; return 0;
} }
if(c == '.' || c == 0) { if(c == '.' || c == 0 || c == ' ') {
ipaddr->u8[i] = tmp; ipaddr->u8[i] = tmp;
tmp = 0; tmp = 0;
} else if(c >= '0' && c <= '9') { } else if(c >= '0' && c <= '9') {
tmp = (tmp * 10) + (c - '0'); tmp = (tmp * 10) + (c - '0');
} else { } else {
return 0; return 0;
} }
++addrstr; ++addrstr;
} while(c != '.' && c != 0); ++charsread;
} while(c != '.' && c != 0 && c != ' ');
} }
return charsread-1;
}
/*-----------------------------------------------------------------------------------*/
int
uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr)
{
#if UIP_CONF_IPV6
return uiplib_ip6addrconv(addrstr, ipaddr);
#else /* UIP_CONF_IPV6 */
return uiplib_ip4addrconv(addrstr, ipaddr);
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
return 1;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/

4
core/net/uiplib.h
View File

@ -60,7 +60,7 @@
* \param addrstr A pointer to a string containing the IP address in * \param addrstr A pointer to a string containing the IP address in
* textual form. * textual form.
* *
* \param addr A pointer to a uip_ipaddr_t that will be filled in with * \param addr A pointer to a uip_ip4addr_t that will be filled in with
* the numerical representation of the address. * the numerical representation of the address.
* *
* \retval 0 If the IP address could not be parsed. * \retval 0 If the IP address could not be parsed.
@ -68,6 +68,8 @@
*/ */
CCIF int uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *addr); CCIF int uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *addr);
CCIF int uiplib_ip4addrconv(const char *addrstr, uip_ip4addr_t *addr);
CCIF int uiplib_ip6addrconv(const char *addrstr, uip_ip6addr_t *addr);
/** @} */ /** @} */
#endif /* __UIPLIB_H__ */ #endif /* __UIPLIB_H__ */