* Added "is_in_socket_list" member to determine whether the socket is in the

sSocketList or not (to see if it has to be removed when the socket is
  deleted).
* This fixes the bug reported by Romain when trying to open an unsupported
  protocol (like AF_INET6). Thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30188 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/network/stack/net_socket.cpp

@@ -62,6 +62,7 @@ struct net_socket_private : net_socket,
 	mutex						lock;
 
 	bool						is_connected;
+	bool						is_in_socket_list;
 };
 
 
@@ -82,7 +83,8 @@ net_socket_private::net_socket_private()
 	max_backlog(0),
 	child_count(0),
 	select_pool(NULL),
-	is_connected(false)
+	is_connected(false),
+	is_in_socket_list(false)
 {
 	first_protocol = NULL;
 	first_info = NULL;
@@ -111,9 +113,10 @@ net_socket_private::~net_socket_private()
 	if (parent != NULL)
 		panic("socket still has a parent!");
 
-	mutex_lock(&sSocketLock);
+	if (is_in_socket_list) {
-	sSocketList.Remove(this);
+		MutexLocker _(sSocketLock);
-	mutex_unlock(&sSocketLock);
+		sSocketList.Remove(this);
+	}
 
 	mutex_lock(&lock);
 
@@ -135,6 +138,8 @@ net_socket_private::~net_socket_private()
 void
 net_socket_private::RemoveFromParent()
 {
+	ASSERT(!is_in_socket_list && parent != NULL);
+
 	parent->RemoveReference();
 	parent = NULL;
 
@@ -142,6 +147,8 @@ net_socket_private::RemoveFromParent()
 	sSocketList.Add(this);
 	mutex_unlock(&sSocketLock);
 
+	is_in_socket_list = true;
+
 	RemoveReference();
 }
 
@@ -383,6 +390,7 @@ socket_open(int family, int type, int protocol, net_socket** _socket)
 	}
 
 	socket->owner = team_get_current_team_id();
+	socket->is_in_socket_list = true;
 
 	mutex_lock(&sSocketLock);
 	sSocketList.Add(socket);