summaryrefslogtreecommitdiff
path: root/kernel/file.c
diff options
context:
space:
mode:
authorSanjit Bhat <[email protected]>2023-10-25 19:42:59 -0400
committerSanjit Bhat <[email protected]>2023-10-25 19:42:59 -0400
commit1ed40716eb54e371df9d1814b9129666b3fe4f09 (patch)
tree84666aacb6d6a9554b09500c0b0420870af2e19e /kernel/file.c
parent74c1eba516fdb0ec1a17b16be7e76613ccba92bf (diff)
downloadxv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.tar.gz
xv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.tar.bz2
xv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.zip
release lab net
Diffstat (limited to 'kernel/file.c')
-rw-r--r--kernel/file.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/kernel/file.c b/kernel/file.c
index 25fa226..0fba21b 100644
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -80,6 +80,11 @@ fileclose(struct file *f)
iput(ff.ip);
end_op();
}
+#ifdef LAB_NET
+ else if(ff.type == FD_SOCK){
+ sockclose(ff.sock);
+ }
+#endif
}
// Get metadata about file f.
@@ -122,7 +127,13 @@ fileread(struct file *f, uint64 addr, int n)
if((r = readi(f->ip, 1, addr, f->off, n)) > 0)
f->off += r;
iunlock(f->ip);
- } else {
+ }
+#ifdef LAB_NET
+ else if(f->type == FD_SOCK){
+ r = sockread(f->sock, addr, n);
+ }
+#endif
+ else {
panic("fileread");
}
@@ -173,7 +184,13 @@ filewrite(struct file *f, uint64 addr, int n)
i += r;
}
ret = (i == n ? n : -1);
- } else {
+ }
+#ifdef LAB_NET
+ else if(f->type == FD_SOCK){
+ ret = sockwrite(f->sock, addr, n);
+ }
+#endif
+ else {
panic("filewrite");
}