Changeset 1800 for Whitix/trunk/net

Timestamp:

01/20/09 23:27:54 (3 years ago)

Author:

mwhitworth

Message:

Update socket code to reflect new file table code, fix connection problems for local sockets, add POLL_ERR case.

Location:

Whitix/trunk/net

Files:

• local.c (modified) (8 diffs)
• socket.c (modified) (6 diffs)

Whitix/trunk/net/local.c

@@ -108 +108 @@
         struct LocalSocketAddr* socketAddr=(struct LocalSocketAddr*)addr;
         struct LocalSocketAddr* serverSockAddr;
-        struct LocalSockInfo* serverInfo;
-        struct Socket* curr, *serverSock=NULL;
+        struct LocalSockInfo* serverInfo, *clientInfo;
+        struct Socket* curr, *curr2, *serverSock=NULL;
 
         /* Can only connect to local sockets. */
@@ -116 +116 @@
 
         /* Find server socket. */
-        ListForEachEntry(curr, &localListenSockets, next)
+        ListForEachEntrySafe(curr, curr2, &localListenSockets, next)
         {
                 serverSockAddr=(struct LocalSocketAddr*)&curr->addr;
@@ -129 +129 @@
                 return -ENOENT;
 
+        clientInfo = (struct LocalSockInfo*)(socket->protoInfo);
+
         serverInfo=(struct LocalSockInfo*)(serverSock->protoInfo);
         socket->state=SOCKET_STATE_WAITING;
@@ -140 +142 @@
         WakeUp(&serverInfo->waitQueue);
 
-        while (socket->state != SOCKET_STATE_CONNECTED) /* FIXME: or socket state is error. */
-                ThrSchedule();
+        WAIT_ON(&clientInfo->waitQueue, socket->state == SOCKET_STATE_CONNECTED);
                 
         return 0;
@@ -200 +201 @@
         struct Socket* client, *child;
         struct LocalSockInfo* info=(struct LocalSockInfo*)(socket->protoInfo);
+        struct LocalSockInfo* clientInfo;
         int ret;
 
@@ -213 +215 @@
         if (ret < 0)
                 return ret;
-
+        
         if (addr)
         {
@@ -229 +231 @@
         LocalSetPeer(child, client);
         LocalSetPeer(client, child);
+
+        clientInfo = (struct LocalSockInfo*)(client->protoInfo);
+        WakeUp(&clientInfo->waitQueue);
 
         return ret;
@@ -302 +307 @@
                 PreemptEnable();
         }
+        
+        return pos-orig;
+}
+
+int LocalPoll(struct Socket* socket, struct PollItem* item, struct PollQueue* pollQueue)
+{
+        struct LocalSockInfo* info=(struct LocalSockInfo*)(socket->protoInfo);
+        
+        PollAddWait(pollQueue, &info->waitQueue);
+        
+        if ((socket->type & SOCKET_TYPE_SERVER) && !ListEmpty(&info->waitingSocks))
+                item->revents |= POLL_IN;
                 
-        return pos-orig;
-}
-
-int LocalPoll(struct Socket* socket, struct PollItem* item, struct PollQueue* pollQueue)
-{
-        struct LocalSockInfo* info=(struct LocalSockInfo*)(socket->protoInfo);
-        
-        if (((socket->type & SOCKET_TYPE_SERVER && !ListEmpty(&info->waitingSocks)) || 
-                        (!(socket->type & SOCKET_TYPE_SERVER) && !ListEmpty(&socket->recvPackets))))
-        {
-                item->revents|=POLL_IN;
-        }
+        if ((!(socket->type & SOCKET_TYPE_SERVER) && !ListEmpty(&socket->recvPackets)))
+                item->revents |= POLL_IN;
 
         item->revents |= POLL_OUT;
 
-        PollAddWait(pollQueue, &info->waitQueue);
+        if (!(socket->type & SOCKET_TYPE_SERVER) && !info->peer)
+                item->revents |= POLL_ERR;
 
         return 0;

Whitix/trunk/net/socket.c

@@ -101 +101 @@
         struct File* file;
 
-        file=FileGet(fd);
-
+        file = FileGet(fd);
+        
         if (!file)
                 return NULL;
@@ -126 +126 @@
         struct File* file;
 
-        file=FileGet(socket->fd);
+        file = FileGet(socket->fd);
 
         if (UNLIKELY(!file))
                 return;
-
-        /* When the VFS allocates a file descriptor to a process, it looks
-         * for a NULL vNode pointer in the file structure to indicate a 'free'
-         * file structure. */
-        file->vNode=NULL;
 }
 
@@ -228 +223 @@
                 return newFd;
 
-        newSocket=SOCKET_GET(current->files[newFd].vNode);
+        newSocket=SOCKET_GET(current->files[newFd]->vNode);
         SocketSetupChild(server, newSocket);
         *child=newSocket;
@@ -306 +301 @@
 int SocketCreateFile(struct File* file, struct Socket* socket)
 {
-        file->vNode=VNodeGetEmpty();
-        file->fileOps=file->vNode->fileOps=&sockFileOps;
-        file->vNode->extraInfo=(void*)socket;
-        file->vNode->superBlock=&socketSuperBlock;
+        file->vNode = VNodeGetEmpty();
+        file->fileOps = file->vNode->fileOps=&sockFileOps;
+        file->vNode->extraInfo = (void*)socket;
+        file->vNode->superBlock = &socketSuperBlock;
 
         return 0;
@@ -329 +324 @@
                 return -ENOMEM;
 
-        sockFd=VfsGetFreeFd(current);
+        sockFd = VfsGetFreeFd(current);
 
         if (sockFd < 0)
                 return sockFd;
-
-        SocketCreateFile(&current->files[sockFd], socket);
+                
+        current->files[sockFd] = FileAllocate();
+
+        SocketCreateFile(current->files[sockFd], socket);
 
         return sockFd;
@@ -367 +364 @@
         struct Socket* socket;
 
-        socket=SocketGet(fd);
+        socket = SocketGet(fd);
 
         if (!socket)