diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-06-07 22:00:19 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-06-07 22:00:19 +0000 |
commit | 11d938dd21a34494406ce4bbc6a875891c56ec01 (patch) | |
tree | f67fe6501b540bb78cce93e25a1230e69a134adc /apps | |
parent | f21df2e6f5340903bb8457171fe3be784f63ff53 (diff) | |
download | px4-firmware-11d938dd21a34494406ce4bbc6a875891c56ec01.tar.gz px4-firmware-11d938dd21a34494406ce4bbc6a875891c56ec01.tar.bz2 px4-firmware-11d938dd21a34494406ce4bbc6a875891c56ec01.zip |
First round of compile fixes for IPv6
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4813 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps')
-rw-r--r-- | apps/netutils/uiplib/uip_gethostaddr.c | 1 | ||||
-rw-r--r-- | apps/netutils/uiplib/uip_setdraddr.c | 1 | ||||
-rw-r--r-- | apps/netutils/uiplib/uip_sethostaddr.c | 1 | ||||
-rw-r--r-- | apps/netutils/uiplib/uip_setnetmask.c | 1 | ||||
-rw-r--r-- | apps/nshlib/nsh_fscmds.c | 11 |
5 files changed, 10 insertions, 5 deletions
diff --git a/apps/netutils/uiplib/uip_gethostaddr.c b/apps/netutils/uiplib/uip_gethostaddr.c index 0de639d6c..7fe26e6b9 100644 --- a/apps/netutils/uiplib/uip_gethostaddr.c +++ b/apps/netutils/uiplib/uip_gethostaddr.c @@ -92,7 +92,6 @@ int uip_gethostaddr(const char *ifname, struct in_addr *addr) if (!ret) { #ifdef CONFIG_NET_IPv6 -#error "req.ifr_addr.s_addr not big enough for IPv6 address" memcpy(addr, &req.ifr_addr, sizeof(struct in6_addr)); #else memcpy(addr, &req.ifr_addr, sizeof(struct in_addr)); diff --git a/apps/netutils/uiplib/uip_setdraddr.c b/apps/netutils/uiplib/uip_setdraddr.c index 79eac5b97..6ab516afa 100644 --- a/apps/netutils/uiplib/uip_setdraddr.c +++ b/apps/netutils/uiplib/uip_setdraddr.c @@ -96,7 +96,6 @@ int uip_setdraddr(const char *ifname, const struct in_addr *addr) /* Add the INET address to the request */ #ifdef CONFIG_NET_IPv6 -#error "req.ifr_addr.s_addr not big enough for IPv6 address" inaddr = (struct sockaddr_in6 *)&req.ifr_addr; inaddr->sin_family = AF_INET6; inaddr->sin_port = 0; diff --git a/apps/netutils/uiplib/uip_sethostaddr.c b/apps/netutils/uiplib/uip_sethostaddr.c index ccc7526b9..4db268783 100644 --- a/apps/netutils/uiplib/uip_sethostaddr.c +++ b/apps/netutils/uiplib/uip_sethostaddr.c @@ -96,7 +96,6 @@ int uip_sethostaddr(const char *ifname, const struct in_addr *addr) /* Add the INET address to the request */ #ifdef CONFIG_NET_IPv6 -#error "req.ifr_addr.s_addr not big enough for IPv6 address" inaddr = (struct sockaddr_in6 *)&req.ifr_addr; inaddr->sin_family = AF_INET6; inaddr->sin_port = 0; diff --git a/apps/netutils/uiplib/uip_setnetmask.c b/apps/netutils/uiplib/uip_setnetmask.c index 2cdc38474..edce31a2a 100644 --- a/apps/netutils/uiplib/uip_setnetmask.c +++ b/apps/netutils/uiplib/uip_setnetmask.c @@ -95,7 +95,6 @@ int uip_setnetmask(const char *ifname, const struct in_addr *addr) /* Add the INET address to the request */ #ifdef CONFIG_NET_IPv6 -#error "req.ifr_addr.s_addr not big enough for IPv6 address" inaddr = (struct sockaddr_in6 *)&req.ifr_addr; inaddr->sin_family = AF_INET6; inaddr->sin_port = 0; diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c index 041809faa..c67ccf3b2 100644 --- a/apps/nshlib/nsh_fscmds.c +++ b/apps/nshlib/nsh_fscmds.c @@ -1226,11 +1226,12 @@ int cmd_nfsmount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) FAR char *address; FAR char *lpath; FAR char *rpath; - FAR struct sockaddr_in *sin; bool badarg = false; #ifdef CONFIG_NET_IPv6 + FAR struct sockaddr_in6 *sin; struct in6_addr inaddr; #else + FAR struct sockaddr_in *sin; struct in_addr inaddr; #endif bool tcp = false; @@ -1346,11 +1347,19 @@ int cmd_nfsmount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) memset(&data, 0, sizeof(data)); +#ifdef CONFIG_NET_IPv6 + sin = (FAR struct sockaddr_in6 *)&data.addr; + sin->sin_family = AF_INET6; + sin->sin_port = htons(NFS_PMAPPORT); + memcpy(&sin->sin6_addr, &inaddr, sizeof(struct in6_addr)); + data.addrlen = sizeof(struct sockaddr_in6); +#else sin = (FAR struct sockaddr_in *)&data.addr; sin->sin_family = AF_INET; sin->sin_port = htons(NFS_PMAPPORT); sin->sin_addr = inaddr; data.addrlen = sizeof(struct sockaddr_in); +#endif data.version = NFS_ARGSVERSION; data.sotype = (tcp) ? SOCK_STREAM : SOCK_DGRAM; |