Changeset 4f64a523 in mainline for uspace/lib/c

Timestamp:

2012-02-12T19:36:32Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

df15e5f

Parents:

1493811

Message:

Need to limit iplink to a single client connection.

Location:

uspace/lib/c

Files:

• generic/iplink_srv.c (modified) (7 diffs)
• include/inet/iplink_srv.h (modified) (3 diffs)

uspace/lib/c/generic/iplink_srv.c

@@ -41 +41 @@
 #include <inet/iplink_srv.h>
 
-static void iplink_get_mtu_srv(iplink_conn_t *conn, ipc_callid_t callid,
+static void iplink_get_mtu_srv(iplink_srv_t *srv, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -47 +47 @@
         size_t mtu;
 
-        rc = conn->srv->ops->get_mtu(conn, &mtu);
+        rc = srv->ops->get_mtu(srv, &mtu);
         async_answer_1(callid, rc, mtu);
 }
 
-static void iplink_send_srv(iplink_conn_t *conn, ipc_callid_t callid,
+static void iplink_send_srv(iplink_srv_t *srv, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -66 +66 @@
         }
 
-        rc = conn->srv->ops->send(conn, &sdu);
+        rc = srv->ops->send(srv, &sdu);
         free(sdu.data);
         async_answer_0(callid, rc);
+}
+
+void iplink_srv_init(iplink_srv_t *srv)
+{
+        fibril_mutex_initialize(&srv->lock);
+        srv->connected = false;
+        srv->ops = NULL;
+        srv->arg = NULL;
+        srv->client_sess = NULL;
 }
 
@@ -74 +83 @@
 {
         iplink_srv_t *srv = (iplink_srv_t *)arg;
-        iplink_conn_t conn;
         int rc;
+
+        fibril_mutex_lock(&srv->lock);
+        if (srv->connected) {
+                fibril_mutex_unlock(&srv->lock);
+                async_answer_0(iid, EBUSY);
+                return EBUSY;
+        }
+
+        srv->connected = true;
+        fibril_mutex_unlock(&srv->lock);
 
         /* Accept the connection */
@@ -84 +102 @@
                 return ENOMEM;
 
-        conn.srv = srv;
-        conn.client_sess = sess;
+        srv->client_sess = sess;
 
-        rc = srv->ops->open(&conn);
+        rc = srv->ops->open(srv);
         if (rc != EOK)
                 return rc;
@@ -104 +121 @@
                 switch (method) {
                 case IPLINK_GET_MTU:
-                        iplink_get_mtu_srv(&conn, callid, &call);
+                        iplink_get_mtu_srv(srv, callid, &call);
                         break;
                 case IPLINK_SEND:
-                        iplink_send_srv(&conn, callid, &call);
+                        iplink_send_srv(srv, callid, &call);
                         break;
                 default:
@@ -114 +131 @@
         }
 
-        return srv->ops->close(&conn);
+        return srv->ops->close(srv);
 }
 
-int iplink_ev_recv(iplink_conn_t *conn, iplink_srv_sdu_t *sdu)
+int iplink_ev_recv(iplink_srv_t *srv, iplink_srv_sdu_t *sdu)
 {
-        async_exch_t *exch = async_exchange_begin(conn->client_sess);
+        if (srv->client_sess == NULL)
+                return EIO;
+
+        async_exch_t *exch = async_exchange_begin(srv->client_sess);
 
         ipc_call_t answer;

uspace/lib/c/include/inet/iplink_srv.h

@@ -37 +37 @@
 
 #include <async.h>
+#include <fibril_synch.h>
+#include <bool.h>
 #include <sys/types.h>
 
@@ -42 +44 @@
 
 typedef struct {
+        fibril_mutex_t lock;
+        bool connected;
         struct iplink_ops *ops;
         void *arg;
+        async_sess_t *client_sess;
 } iplink_srv_t;
-
-typedef struct {
-        iplink_srv_t *srv;
-        async_sess_t *client_sess;
-} iplink_conn_t;
 
 typedef struct {
@@ -68 +68 @@
 
 typedef struct iplink_ops {
-        int (*open)(iplink_conn_t *);
-        int (*close)(iplink_conn_t *);
-        int (*send)(iplink_conn_t *, iplink_srv_sdu_t *);
-        int (*get_mtu)(iplink_conn_t *, size_t *);
+        int (*open)(iplink_srv_t *);
+        int (*close)(iplink_srv_t *);
+        int (*send)(iplink_srv_t *, iplink_srv_sdu_t *);
+        int (*get_mtu)(iplink_srv_t *, size_t *);
 } iplink_ops_t;
 
+extern void iplink_srv_init(iplink_srv_t *);
+
 extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
-extern int iplink_ev_recv(iplink_conn_t *, iplink_srv_sdu_t *);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_srv_sdu_t *);
 
 #endif