From 6d0a8a85c7e38cadcec7b4ace1326ee00839478b Mon Sep 17 00:00:00 2001
From: jani <jani>
Date: Fri, 24 Jan 2003 09:24:44 +0000
Subject: [PATCH] Fix locking for disconnect operation (use post and fetch on
 the connection's mbox in the two threads like other operations).Make
 netconn_peer take a pointer to addr instead of pointer to pointer to
 addr.Addr is a 4 byte struct an IP address so use structure assignment not
 just pointer assignment when saving the peer.This way the address is really
 saved :fixes bug #1897

---
 src/api/api_lib.c      | 7 ++++---
 src/api/api_msg.c      | 1 +
 src/api/sockets.c      | 8 ++++----
 src/include/lwip/api.h | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/api/api_lib.c b/src/api/api_lib.c
index c4740aaa..486b08ee 100644
--- a/src/api/api_lib.c
+++ b/src/api/api_lib.c
@@ -279,7 +279,7 @@ netconn_type(struct netconn *conn)
 }
 /*-----------------------------------------------------------------------------------*/
 err_t
-netconn_peer(struct netconn *conn, struct ip_addr **addr,
+netconn_peer(struct netconn *conn, struct ip_addr *addr,
 	     u16_t *port)
 {
   switch(conn->type) {
@@ -288,11 +288,11 @@ netconn_peer(struct netconn *conn, struct ip_addr **addr,
   case NETCONN_UDP:
     if ((conn->pcb.udp->flags & UDP_FLAGS_CONNECTED) == 0)
      return -1;
-    *addr = &(conn->pcb.udp->remote_ip);
+    *addr = (conn->pcb.udp->remote_ip);
     *port = conn->pcb.udp->remote_port;
     break;
   case NETCONN_TCP:
-    *addr = &(conn->pcb.tcp->remote_ip);
+    *addr = (conn->pcb.tcp->remote_ip);
     *port = conn->pcb.tcp->remote_port;
     break;
   }
@@ -394,6 +394,7 @@ netconn_disconnect(struct netconn *conn)
   msg->type = API_MSG_DISCONNECT;
   msg->msg.conn = conn;  
   api_msg_post(msg);
+  sys_mbox_fetch(conn->mbox, NULL);
   memp_freep(MEMP_API_MSG, msg);
   return conn->err;
 
diff --git a/src/api/api_msg.c b/src/api/api_msg.c
index 1b84e0de..c3df8d77 100644
--- a/src/api/api_msg.c
+++ b/src/api/api_msg.c
@@ -387,6 +387,7 @@ do_disconnect(struct api_msg_msg *msg)
   case NETCONN_TCP:
     break;
   }
+  sys_mbox_post(msg->conn->mbox, NULL);
 }
 
 /*-----------------------------------------------------------------------------------*/
diff --git a/src/api/sockets.c b/src/api/sockets.c
index f71fa9af..45cf5b9b 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -87,7 +87,7 @@ lwip_accept(int s, struct sockaddr *addr, int *addrlen)
 {
   struct lwip_socket *sock;
   struct netconn *newconn;
-  struct ip_addr *naddr;
+  struct ip_addr naddr;
   u16_t port;
   int newsock;
 
@@ -101,7 +101,7 @@ lwip_accept(int s, struct sockaddr *addr, int *addrlen)
   /* get the IP address and port of the remote host */
   netconn_peer(newconn, &naddr, &port);
   
-  ((struct sockaddr_in *)addr)->sin_addr.s_addr = naddr->addr;
+  ((struct sockaddr_in *)addr)->sin_addr.s_addr = naddr.addr;
   ((struct sockaddr_in *)addr)->sin_port = port;
 
   newsock = alloc_socket(newconn);
@@ -345,7 +345,7 @@ lwip_sendto(int s, void *data, int size, unsigned int flags,
        struct sockaddr *to, int tolen)
 {
   struct lwip_socket *sock;
-  struct ip_addr remote_addr, *addr;
+  struct ip_addr remote_addr, addr;
   u16_t remote_port, port;
   int ret,connected;
 
@@ -366,7 +366,7 @@ lwip_sendto(int s, void *data, int size, unsigned int flags,
   /* reset the remote address and port number
      of the connection */
   if (connected)
-    netconn_connect(sock->conn, addr, port);
+    netconn_connect(sock->conn, &addr, port);
   else
     netconn_disconnect(sock->conn);	  
   return ret;
diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h
index c19b903d..bb57a671 100644
--- a/src/include/lwip/api.h
+++ b/src/include/lwip/api.h
@@ -111,7 +111,7 @@ struct netconn *  netconn_new     (enum netconn_type type);
 err_t             netconn_delete  (struct netconn *conn);
 enum netconn_type netconn_type    (struct netconn *conn);
 err_t             netconn_peer    (struct netconn *conn,
-				   struct ip_addr **addr,
+				   struct ip_addr *addr,
 				   u16_t *port);
 err_t             netconn_addr    (struct netconn *conn,
 				   struct ip_addr **addr,