netread and netwrite implementations

abc4e71f · Silas Boyd-Wickizer · 5df8a6fb · abc4e71f · abc4e71f
--- a/file.c
+++ b/file.c
@@ -65,7 +65,7 @@ filestat(struct file *f, struct stat *st)
 int
 fileread(struct file *f, char *addr, int n)
 {
-  extern int netread(int, const char *, int);
+  extern int netread(int, char *, int);
  int r;

  if(f->readable == 0)

--- a/net.c
+++ b/net.c
@@ -268,16 +268,47 @@ netclose(int sock)
 }

 int
-netwrite(int sock, char *buf, int len)
+netwrite(int sock, char *ubuf, int len)
 {
+  void *kbuf;
+  int cc;
+  int r;
+
+  kbuf = kalloc();
+  if (kbuf == NULL)
+    return -1;

+  cc = MIN(len, PGSIZE);
+  if (umemcpy(kbuf, ubuf, cc)) {
+    kfree(kbuf);
    return -1;
+  }
+  r = lwip_write(sock, kbuf, cc);
+  kfree(kbuf);
+  return r;
 }

 int
-netread(int sock, const char *buf, int len)
+netread(int sock, char *ubuf, int len)
 {
+  void *kbuf;
+  int cc;
+  int r;
+
+  kbuf = kalloc();
+  if (kbuf == NULL)
    return -1;
+
+  cc = MIN(len, PGSIZE);
+  r = lwip_read(sock, kbuf, cc);
+  if (r < 0) {
+    kfree(kbuf);
+    return r;
+  }
+
+  kmemcpy(ubuf, kbuf, r);
+  kfree(kbuf);
+  return r;
 }

 #else