Changeset 4c53333 in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (10 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -44 +44 @@
 #include <errno.h>
 #include <task.h>
+#include <ns.h>
 #include <ipc/services.h>
 #include <ipc/socket.h>
-#include <net/modules.h>
 #include <net/in.h>
 #include <net/socket.h>
@@ -87 +87 @@
         /** Parent module service. */
         services_t service;
+        /** Socket family */
+        int family;
 
         /**
@@ -192 +194 @@
 /** Default thread for new connections.
  *
- * @param[in] iid       The initial message identifier.
- * @param[in] icall     The initial message call structure.
- * @param[in] arg       Local argument.
+ * @param[in] iid   The initial message identifier.
+ * @param[in] icall The initial message call structure.
+ * @param[in] arg   Local argument.
+ *
  */
 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall, void *arg)
 {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        socket_t *socket;
-        int rc;
-
-loop:
-        callid = async_get_call(&call);
-
-        switch (IPC_GET_IMETHOD(call)) {
-        case NET_SOCKET_RECEIVED:
-        case NET_SOCKET_ACCEPTED:
-        case NET_SOCKET_DATA_FRAGMENT_SIZE:
-                fibril_rwlock_read_lock(&socket_globals.lock);
-
-                /* Find the socket */
-                socket = sockets_find(socket_get_sockets(),
-                    SOCKET_GET_SOCKET_ID(call));
-                if (!socket) {
-                        rc = ENOTSOCK;
-                        fibril_rwlock_read_unlock(&socket_globals.lock);
-                        break;
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        async_answer_0(callid, 0);
+                        return;
                 }
+                
+                int rc;
                 
                 switch (IPC_GET_IMETHOD(call)) {
                 case NET_SOCKET_RECEIVED:
-                        fibril_mutex_lock(&socket->receive_lock);
-                        /* Push the number of received packet fragments */
-                        rc = dyn_fifo_push(&socket->received,
-                            SOCKET_GET_DATA_FRAGMENTS(call),
-                            SOCKET_MAX_RECEIVED_SIZE);
-                        if (rc == EOK) {
-                                /* Signal the received packet */
-                                fibril_condvar_signal(&socket->receive_signal);
+                case NET_SOCKET_ACCEPTED:
+                case NET_SOCKET_DATA_FRAGMENT_SIZE:
+                        fibril_rwlock_read_lock(&socket_globals.lock);
+                        
+                        /* Find the socket */
+                        socket_t *socket = sockets_find(socket_get_sockets(),
+                            SOCKET_GET_SOCKET_ID(call));
+                        if (!socket) {
+                                rc = ENOTSOCK;
+                                fibril_rwlock_read_unlock(&socket_globals.lock);
+                                break;
                         }
-                        fibril_mutex_unlock(&socket->receive_lock);
+                        
+                        switch (IPC_GET_IMETHOD(call)) {
+                        case NET_SOCKET_RECEIVED:
+                                fibril_mutex_lock(&socket->receive_lock);
+                                /* Push the number of received packet fragments */
+                                rc = dyn_fifo_push(&socket->received,
+                                    SOCKET_GET_DATA_FRAGMENTS(call),
+                                    SOCKET_MAX_RECEIVED_SIZE);
+                                if (rc == EOK) {
+                                        /* Signal the received packet */
+                                        fibril_condvar_signal(&socket->receive_signal);
+                                }
+                                fibril_mutex_unlock(&socket->receive_lock);
+                                break;
+                                
+                        case NET_SOCKET_ACCEPTED:
+                                /* Push the new socket identifier */
+                                fibril_mutex_lock(&socket->accept_lock);
+                                rc = dyn_fifo_push(&socket->accepted, 1,
+                                    SOCKET_MAX_ACCEPTED_SIZE);
+                                if (rc == EOK) {
+                                        /* Signal the accepted socket */
+                                        fibril_condvar_signal(&socket->accept_signal);
+                                }
+                                fibril_mutex_unlock(&socket->accept_lock);
+                                break;
+                        
+                        default:
+                                rc = ENOTSUP;
+                        }
+                        
+                        if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) &&
+                            (SOCKET_GET_DATA_FRAGMENT_SIZE(call) !=
+                            socket->data_fragment_size)) {
+                                fibril_rwlock_write_lock(&socket->sending_lock);
+                                
+                                /* Set the data fragment size */
+                                socket->data_fragment_size =
+                                    SOCKET_GET_DATA_FRAGMENT_SIZE(call);
+                                
+                                fibril_rwlock_write_unlock(&socket->sending_lock);
+                        }
+                        
+                        fibril_rwlock_read_unlock(&socket_globals.lock);
                         break;
-
-                case NET_SOCKET_ACCEPTED:
-                        /* Push the new socket identifier */
-                        fibril_mutex_lock(&socket->accept_lock);
-                        rc = dyn_fifo_push(&socket->accepted, 1,
-                            SOCKET_MAX_ACCEPTED_SIZE);
-                        if (rc == EOK) {
-                                /* Signal the accepted socket */
-                                fibril_condvar_signal(&socket->accept_signal);
-                        }
-                        fibril_mutex_unlock(&socket->accept_lock);
-                        break;
-
+                        
                 default:
                         rc = ENOTSUP;
                 }
-
-                if ((SOCKET_GET_DATA_FRAGMENT_SIZE(call) > 0) &&
-                    (SOCKET_GET_DATA_FRAGMENT_SIZE(call) !=
-                    socket->data_fragment_size)) {
-                        fibril_rwlock_write_lock(&socket->sending_lock);
-
-                        /* Set the data fragment size */
-                        socket->data_fragment_size =
-                            SOCKET_GET_DATA_FRAGMENT_SIZE(call);
-
-                        fibril_rwlock_write_unlock(&socket->sending_lock);
-                }
-
-                fibril_rwlock_read_unlock(&socket_globals.lock);
-                break;
-
-        default:
-                rc = ENOTSUP;
-        }
-
-        async_answer_0(callid, (sysarg_t) rc);
-        goto loop;
+                
+                async_answer_0(callid, (sysarg_t) rc);
+        }
 }
 
@@ -283 +289 @@
 static async_sess_t *socket_get_tcp_sess(void)
 {
-        if (socket_globals.tcp_sess == NULL) {
-                socket_globals.tcp_sess = bind_service(SERVICE_TCP,
+        if (socket_globals.tcp_sess == NULL)
+                socket_globals.tcp_sess = service_bind(SERVICE_TCP,
                     0, 0, SERVICE_TCP, socket_connection);
-        }
-
+        
         return socket_globals.tcp_sess;
 }
@@ -300 +305 @@
 static async_sess_t *socket_get_udp_sess(void)
 {
-        if (socket_globals.udp_sess == NULL) {
-                socket_globals.udp_sess = bind_service(SERVICE_UDP,
+        if (socket_globals.udp_sess == NULL)
+                socket_globals.udp_sess = service_bind(SERVICE_UDP,
                     0, 0, SERVICE_UDP, socket_connection);
-        }
-
+        
         return socket_globals.udp_sess;
 }
@@ -378 +382 @@
  * @return              Other error codes as defined for the NET_SOCKET message.
  * @return              Other error codes as defined for the
- *                      bind_service() function.
+ *                      service_bind() function.
  */
 int socket(int domain, int type, int protocol)
@@ -393 +397 @@
         switch (domain) {
         case PF_INET:
+        case PF_INET6:
                 switch (type) {
                 case SOCK_STREAM:
@@ -431 +436 @@
                 break;
 
-        case PF_INET6:
         default:
                 return EPFNOSUPPORT;
@@ -444 +448 @@
                 return ENOMEM;
 
-        bzero(socket, sizeof(*socket));
+        memset(socket, 0, sizeof(*socket));
+        socket->family = domain;
         fibril_rwlock_write_lock(&socket_globals.lock);
 
@@ -655 +660 @@
                 return ENOMEM;
         }
-        bzero(new_socket, sizeof(*new_socket));
+        memset(new_socket, 0, sizeof(*new_socket));
         socket_id = socket_generate_new_id();
         if (socket_id <= 0) {