lwIP/net compile fixes

d7a94965 · Silas Boyd-Wickizer · 91346098 · d7a94965 · d7a94965 · d7a94965
--- a/include/unet.h
+++ b/include/unet.h
@@ -7,7 +7,7 @@ extern int socket(int domain, int type, int protocol);
 extern int bind(int sockfd, const struct sockaddr *addr,
                int addrlen);
 extern int listen(int sockfd, int backlog);
-extern int accept(int sockfd, struct sockaddr *addr, int *addrlen);
+extern int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
 }

 static inline const char *

--- a/kernel/net.cc
+++ b/kernel/net.cc
@@ -273,12 +273,12 @@ netsocket(int domain, int type, int protocol)
 }

 long
-netbind(int sock, const sockaddr *xaddr, int xaddrlen)
+netbind(int sock, const sockaddr* xaddr, int xaddrlen)
 {
-  const sockaddr *addr;
+  struct sockaddr* addr;
  long r;
  
-  addr = kmalloc(xaddrlen, "sockaddr");
+  addr = (sockaddr*) kmalloc(xaddrlen, "sockaddr");
  if (addr == nullptr)
    return -1;

@@ -304,7 +304,7 @@ netlisten(int sock, int backlog)
 }

 long
-netaccept(int sock, struct sockaddr *xaddr, int *xaddrlen)
+netaccept(int sock, struct sockaddr* xaddr, u32* xaddrlen)
 {
  socklen_t len;
  void *addr;
@@ -424,7 +424,7 @@ netlisten(int sock, int backlog)
 }

 long
-netaccept(int sock, struct sockaddr *xaddr, int *xaddrlen)
+netaccept(int sock, struct sockaddr* xaddr, u32* xaddrlen)
 {
  return -1;
 }

--- a/kernel/sysfile.cc
+++ b/kernel/sysfile.cc
@@ -586,9 +586,9 @@ sys_listen(int xsock, int backlog)

 //SYSCALL
 int
-sys_accept(int xsock, struct sockaddr *xaddr, int *xaddrlen)
+sys_accept(int xsock, struct sockaddr* xaddr, u32* xaddrlen)
 {
-  extern long netaccept(int, struct sockaddr*, int*);
+  extern long netaccept(int, struct sockaddr*, u32*);
  file *cf;
  sref<file> f;
  int cfd;