tons of fixes and support for new stuff

Author: benavento

Makefile

@@ -1,10 +1,11 @@
 export MACOSX_DEPLOYMENT_TARGET=10.5
-export ARCHS=-arch i386 -arch x86_64 -arch ppc
+export ARCHS=-arch i386 -arch x86_64 #-arch ppc
 export SYSROOT=/Developer/SDKs/MacOSX10.6.sdk
-export WARNINGS=-Wall -Wmost -Wextra -Wno-missing-braces -Wno-trigraphs #-Werror
-export CFLAGS=-isysroot $(SYSROOT) $(WARNINGS) -g
-export LFLAGS=-isysroot $(SYSROOT)
+export WARNINGS=-Wall -Wmost -Wextra -Wno-missing-braces -Wno-trigraphs -Werror
+export CFLAGS=-g -isysroot $(SYSROOT) $(WARNINGS)
+export LFLAGS=-g -isysroot $(SYSROOT)
 export CC=gcc-4.2
+export CC=clang
 
 DIRS=kext load mount plugin inst
 

inst/InstallationCheck

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+KEXT=com.lab-fgb.kext.9p
+if /usr/sbin/kextstat -b $KEXT -l | grep -q $KEXT; then
+    /sbin/kextunload -b $KEXT > /dev/null 2>&1 || exit 112
+fi
+exit 0

inst/InstallationCheck.strings

@@ -0,0 +1 @@
+"16" = "There are 9P volumes currently in use. Unmount them and try again.";

inst/License.rtf

@@ -1,31 +1,32 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf1138
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
 \f0\b\fs24 \cf0 Mac9P
 \b0  is a package developed by Federico G. Benavento  and is covered under the following BSD license:\
 \
 Copyright (c) 2011 by Federico G. Benavento.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
 \cf0 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
-\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural
+\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720
 \ls1\ilvl0\cf0 {\listtext	\'95	}Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
 {\listtext	\'95	}Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\
 {\listtext	\'95	}Neither the name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
 \cf0 \
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT OWNER  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 \cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
 \cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 Portions of this package were derived from u9fs and which is distributed under the following license:\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+\cf0 Portions of this package were derived from u9fs which is distributed under the following license:\
 \
 The authors of this software are Bob Flandrena, Ken Thompson, Rob Pike, and Russ Cox.\
 \

inst/Makefile

@@ -11,13 +11,18 @@ PKGRESDIR=$(PKG)/Contents/Resources
 PKGRESFILES=\
 	License.rtf\
 	Welcome.rtf\
+	InstallationCheck\
+	InstallationCheck.strings\
 #	background.tiff\
 
 PKGDEP=\
 	../kext/9p\
 	../mount/mount_9p\
 	../load/load_9p\
 	../plugin/9p\
+	FSInfo.plist\
+	KEInfo.plist\
+	NPInfo.plist\
 	$(PKGRESFILES)
 
 all: pkg dmg
@@ -34,14 +39,19 @@ $(PKG): $(PKGDEP)
 	cp -pX FSInfo.plist $(FSDIR)/Contents/Info.plist
 	mkdir -p $(FSDIR)/Contents/Resources
 	cp -pX ../mount/mount_9p $(FSDIR)/Contents/Resources
-#	mkdir -p $(NPDIR)/Contents
-#	cp -pX NPInfo.plist $(NPDIR)/Contents/Info.plist
-#	mkdir -p $(NPDIR)/Contents/MacOS
-#	cp -pX ../plugin/9p $(NPDIR)/Contents/MacOS/9p
+	mkdir -p $(NPDIR)/Contents
+	cp -pX NPInfo.plist $(NPDIR)/Contents/Info.plist
+	mkdir -p $(NPDIR)/Contents/MacOS
+	cp -pX ../plugin/9p $(NPDIR)/Contents/MacOS/9p
 	sudo chown -R root:wheel $(PKGROOT)
 	sudo chmod u+s $(KEDIR)/Contents/Resources/load_9p
-	/Developer/usr/bin/packagemaker --root $(PKGROOT) --id com.lab-fgb.9p \
-		--domain system --no-recommend --root-volume-only --out $@
+	/Developer/usr/bin/packagemaker \
+		--root $(PKGROOT) \
+		--id com.lab-fgb.9p \
+		--domain system \
+		--no-recommend \
+		--root-volume-only \
+		--out $@
 	cp -pX $(PKGRESFILES) $(PKGRESDIR)
 	sudo rm -fr $(PKGROOT)
 
@@ -53,11 +63,11 @@ $(DMG): $(PKG) #volume.icns
 	cp -pRX $(PKG) $(VOLUME)
 #	cp -pX volume.icns $(VOLUME)/.VolumeIcon.icns
 #	/Developer/usr/bin/SetFile -a -C $(VOLUME)
-#	ln -s $(VOLUME)/$(PKGRESDIR)/License.rtf $(VOLUME)/License.rtf
+	ln -s $(VOLUME)/$(PKGRESDIR)/License.rtf $(VOLUME)/License.rtf
 	cp -pX Uninstall.tool $(VOLUME)
 #	cp -pX DS_Store $(VOLUME)/.DS_Store
 	hdiutil detach -quiet $(VOLUME)
-	hdiutil convert -quiet -format UDZO -imagekey zlib-level=9 $(TDMG) -o /tmp/$@
+	hdiutil convert -quiet -format UDBZ $(TDMG) -o /tmp/$@
 	mv -f /tmp/$@ $@
 	rm -f $(TDMG)
 

kext/9p.h

@@ -44,6 +44,7 @@ typedef struct  {
 #include <sys/dirent.h>
 #include <sys/socket.h>
 #include <sys/random.h>
+#include <sys/ubc.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -89,6 +90,9 @@ typedef uint32_t fid_9p;
 enum {
 	NODE_INIT		= 1<<0,
 	NODE_WAITINIT	= 1<<1,
+	NODE_RECL		= 1<<2,
+	NODE_WAITRECL	= 1<<3,
+	NODE_MMAPPED	= 1<<4,
 };
 
 typedef enum {
@@ -106,17 +110,17 @@ struct node_9p {
 	LIST_ENTRY(node_9p) next;
 	mount_9p *nmp;
 	vnode_t vp;
-	fid_9p fid;
-	qid_9p qid;
-
-	time_t dirtimer;
-	dir_9p *dir;
 
 	lck_rw_t *lck;
 	lcktype_9p lcktype;
-	int flags;
+	uint32_t flags;
 	uint32_t iounit;
+	fid_9p fid;
+	dir_9p dir;
+	time_t dirtimer;
 	openfid_9p openfid[3]; /* rd, wr, rdwr */
+	dir_9p *direntries;
+	uint32_t ndirentries;
 };
 
 /* socket flags */
@@ -155,7 +159,7 @@ struct mount_9p {
 	fid_9p nfid;
 	uint16_t ntag;
 
-	uint8_t rpcbuf[1024];
+	uint8_t rpcbuf[MAXMSG];
 
 	/* reqs  */
 	TAILQ_HEAD(hreq_9p, req_9p) req;
@@ -171,31 +175,30 @@ struct mount_9p {
 __private_extern__ int authp9any_9p(mount_9p*, fid_9p, struct sockaddr*, char*, char*);
 
 /* proto.c */
-__private_extern__ int version_9p(mount_9p*, char*, uint32_t, char**, uint32_t*);
+__private_extern__ int version_9p(mount_9p*, char*, char**);
 __private_extern__ int auth_9p(mount_9p*, char*, char*, fid_9p*, qid_9p*);
 __private_extern__ int attach_9p(mount_9p*, char*, char*, fid_9p, fid_9p*, qid_9p*);
 __private_extern__ int walk_9p(mount_9p*, fid_9p, char*, int, fid_9p*, qid_9p*);
 __private_extern__ int open_9p(mount_9p*, fid_9p, uint8_t, qid_9p*, uint32_t*);
 __private_extern__ int create_9p(mount_9p*, fid_9p, char*, int, uint8_t, uint32_t, qid_9p*, uint32_t*);
-__private_extern__ int read_9p(mount_9p*, fid_9p, void*, int, off_t, int*);
-__private_extern__ int write_9p(mount_9p*, fid_9p, void*, int, off_t, int*);
+__private_extern__ int read_9p(mount_9p*, fid_9p, void*, uint32_t, uint64_t, uint32_t*);
+__private_extern__ int write_9p(mount_9p*, fid_9p, void*, uint32_t, uint64_t, uint32_t*);
 __private_extern__ int clunk_9p(mount_9p*, fid_9p);
 __private_extern__ int remove_9p(mount_9p*, fid_9p);
 __private_extern__ int stat_9p(mount_9p*, fid_9p, dir_9p**);
 __private_extern__ int wstat_9p(mount_9p*, fid_9p, dir_9p*);
-__private_extern__ int readdir_9p(mount_9p*, fid_9p, off_t, dir_9p**, int*, int*);
+__private_extern__ int readdirs_9p(mount_9p*, fid_9p, dir_9p**, uint32_t*);
 
 /* socket.c */
 __private_extern__ int connect_9p(mount_9p*, struct sockaddr*);
 __private_extern__ void disconnect_9p(mount_9p*);
 __private_extern__ int recvn_9p(socket_t, void*, size_t);
 __private_extern__ int sendn_9p(socket_t, void*, size_t);
-__private_extern__ int setbufsize_9p(mount_9p*);
 __private_extern__ int rpc_9p(mount_9p*, Fcall*, Fcall*, void**);
 __private_extern__ void cancelrpcs_9p(mount_9p*);
 
 /* vfsops.c */
-__private_extern__ void* malloc_9p(uint32_t);
+__private_extern__ void* malloc_9p(size_t);
 __private_extern__ void free_9p(void*);
 
 /* vnops.c */
@@ -208,7 +211,9 @@ __private_extern__ lck_grp_t *lck_grp_9p;
 #define MTO9P(m)		((mount_9p*)vfs_fsprivate(m))
 #define NTO9P(vp)		((node_9p*)vnode_fsnode(vp))
 #define QTOI(q)			(q.path | ((uint64_t)q.type<<56))
-#define TRACE()			printf("%d: %s...\n", proc_selfpid(), __FUNCTION__)
+#define ITOP(i)			((i)&0xFF0000000000)
+#define ITOT(i)			((i)>>56)
+#define TRACE()			//printf("%d: %s...\n", proc_selfpid(), __FUNCTION__)
 #define DEBUG(f, a...)	printf("%d: %s: "f"\n", proc_selfpid(),  __FUNCTION__, ## a)
 
 #endif /* KERNEL */

kext/auth.c

@@ -263,13 +263,14 @@ gettickets(struct sockaddr *sa, char *trbuf, char *tbuf)
 }
 
 static int
-p9sk1(mount_9p* nmp, fid_9p afid, struct sockaddr *addr, char *uname, char *akey, off_t off)
+p9sk1(mount_9p* nmp, fid_9p afid, struct sockaddr *addr, char *uname, char *akey, uint64_t off)
 {
 	char cchal[CHALLEN], *tbuf, *trbuf;
-	int e, l;
+	uint32_t l;
 	Authenticator auth;
 	Ticketreq tr;
 	Ticket t;
+	int e;
 
 	TRACE();
 	tbuf = malloc_9p(TICKETLEN+TICKETLEN+AUTHENTLEN);
@@ -296,7 +297,7 @@ p9sk1(mount_9p* nmp, fid_9p afid, struct sockaddr *addr, char *uname, char *akey
 		goto error;
 	}
 
-	DEBUG("authdom: %s", tr.authdom);
+	// DEBUG("authdom: %s", tr.authdom);
 
 	tr.type = AuthTreq;
 	bcopy(uname, tr.hostid, NAMELEN);
@@ -359,8 +360,9 @@ __private_extern__ int
 authp9any_9p(mount_9p *nmp, fid_9p afid, struct sockaddr *addr, char *uname, char *akey)
 {
 	char *buf, *buf2, *dom, *p, *q;
-	off_t off;
-	int e, n, l, v2;
+	uint32_t n, l;
+	uint64_t off;
+	int e, v2;
 
 	TRACE();
 	buf = malloc_9p(BSIZ);
@@ -373,7 +375,7 @@ authp9any_9p(mount_9p *nmp, fid_9p afid, struct sockaddr *addr, char *uname, cha
 
 	off += l;
 	buf[l] = '\0';
-	DEBUG("%s", buf);
+	// DEBUG("%s", buf);
 	v2 = 0;
 	p = buf;
 	if (strncmp(p, "v.2 ", 4) == 0) {