i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed parsing of param string. It now starts mounting, but blocks waiting for a reply. Is udp working already ??

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19892 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-01-21 16:41:14 +00:00
parent 02f3505a31
commit 34b5fabe88
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
+13 -8
View File
@@ -1159,22 +1159,27 @@ dprintf("nfs:ip!\n");
params->server = malloc(e - p); params->server = malloc(e - p);
strncpy(params->server, p, e - p); strncpy(params->server, p, e - p);
// hack // hack
params->serverIP = 0;
v = strtol(p, &p, 10); v = strtol(p, &p, 10);
dprintf("IP:%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
p++;
params->serverIP |= (v << 24); params->serverIP |= (v << 24);
p++;
v = strtol(p, &p, 10); v = strtol(p, &p, 10);
dprintf("%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
p++;
params->serverIP |= (v << 16); params->serverIP |= (v << 16);
p++;
v = strtol(p, &p, 10); v = strtol(p, &p, 10);
dprintf("%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
p++;
params->serverIP |= (v << 8); params->serverIP |= (v << 8);
p++;
v = strtol(p, &p, 10); v = strtol(p, &p, 10);
dprintf("%ld\n", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
params->serverIP |= (v); params->serverIP |= (v);
@@ -1226,7 +1231,9 @@ fs_mount(nspace_id nsid, const char *devname, uint32 flags, const char *_parms,
fs_mount(nspace_id nsid, const char *devname, ulong flags, const char *_parms, size_t len, fs_nspace **data, vnode_id *vnid) fs_mount(nspace_id nsid, const char *devname, ulong flags, const char *_parms, size_t len, fs_nspace **data, vnode_id *vnid)
#endif #endif
{ {
#ifndef PARAMS_AS_STRING
struct mount_nfs_params *parms = (struct mount_nfs_params *)_parms; // XXX: FIXME struct mount_nfs_params *parms = (struct mount_nfs_params *)_parms; // XXX: FIXME
#endif
status_t result; status_t result;
fs_nspace *ns; fs_nspace *ns;
fs_node *rootNode; fs_node *rootNode;
@@ -1235,7 +1242,7 @@ fs_mount(nspace_id nsid, const char *devname, ulong flags, const char *_parms, s
(void) len; (void) len;
#endif #endif
if (parms==NULL) if (_parms==NULL)
return EINVAL; return EINVAL;
dprintf("nfs: mount(%d, %s, %08lx)\n", nsid, devname, flags); dprintf("nfs: mount(%d, %s, %08lx)\n", nsid, devname, flags);
@@ -1280,14 +1287,12 @@ dprintf("nfs: nfs_params: %s\n", _parms);
ns->params.uid=parms->uid; ns->params.uid=parms->uid;
ns->params.gid=parms->gid; ns->params.gid=parms->gid;
ns->params.hostname=strdup(parms->hostname); ns->params.hostname=strdup(parms->hostname);
#endif
ns->xid=0; ns->xid=0;
ns->mountAddr.sin_family=AF_INET; ns->mountAddr.sin_family=AF_INET;
ns->mountAddr.sin_addr.s_addr=htonl(parms->serverIP); ns->mountAddr.sin_addr.s_addr=htonl(ns->params.serverIP);
memset (ns->mountAddr.sin_zero,0,sizeof(ns->mountAddr.sin_zero)); memset (ns->mountAddr.sin_zero,0,sizeof(ns->mountAddr.sin_zero));
#endif
// XXX: cleanup error handling
if ((result=create_socket(ns))<B_OK) if ((result=create_socket(ns))<B_OK)
goto err_socket; goto err_socket;