diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-06-07 22:00:19 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-06-07 22:00:19 +0000 |
| commit | 9ff075d9f32863b462dd5da68574bf253a2615f5 (patch) | |
| tree | f67fe6501b540bb78cce93e25a1230e69a134adc /apps/nshlib | |
| parent | e34b62094f3655377d30929d82189f6f15c801f2 (diff) | |
| download | nuttx-9ff075d9f32863b462dd5da68574bf253a2615f5.tar.gz nuttx-9ff075d9f32863b462dd5da68574bf253a2615f5.tar.bz2 nuttx-9ff075d9f32863b462dd5da68574bf253a2615f5.zip | |
First round of compile fixes for IPv6
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4813 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/nsh_fscmds.c | 11 |
1 files changed, 10 insertions, 1 deletions
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; |