Merge pull request #2580 from geky/nsapi-bind-again

sg- · web-flow · commit fb7ffcb5a33c · 2016-09-10T07:10:45.000-05:00
lwip - Add check for previously-bound socket
diff --git a/features/net/FEATURE_IPV4/lwip-interface/lwip_stack.c b/features/net/FEATURE_IPV4/lwip-interface/lwip_stack.c
@@ -278,6 +278,11 @@ static int lwip_socket_bind(nsapi_stack_t *stack, nsapi_socket_t handle, nsapi_a
         return NSAPI_ERROR_PARAMETER;
     }
 
+    if ((s->conn->type == NETCONN_TCP && s->conn->pcb.tcp->local_port != 0) ||
+        (s->conn->type == NETCONN_UDP && s->conn->pcb.udp->local_port != 0)) {
+        return NSAPI_ERROR_PARAMETER;
+    }
+
     err_t err = netconn_bind(s->conn, (ip_addr_t *)addr.bytes, port);
     return lwip_err_remap(err);
 }

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,11 @@ static int lwip_socket_bind(nsapi_stack_t *stack, nsapi_socket_t handle, nsapi_a`
`278`	`278`	`return NSAPI_ERROR_PARAMETER;`
`279`	`279`	`}`
`280`	`280`
	`281`	`+ if ((s->conn->type == NETCONN_TCP && s->conn->pcb.tcp->local_port != 0) \|\|`
	`282`	`+ (s->conn->type == NETCONN_UDP && s->conn->pcb.udp->local_port != 0)) {`
	`283`	`+ return NSAPI_ERROR_PARAMETER;`
	`284`	`+ }`
	`285`	`+`
`281`	`286`	`err_t err = netconn_bind(s->conn, (ip_addr_t *)addr.bytes, port);`
`282`	`287`	`return lwip_err_remap(err);`
`283`	`288`	`}`