Changeset fe4310f in mainline for uspace/srv/inet/inet.c

Timestamp:

2012-02-12T22:40:15Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2ff150e

Parents:

bd8bfc5a

Message:

Distinguish between datagram and packet. Deliver received datagrams to
clients based on protocol number.

File:

• uspace/srv/inet/inet.c (modified) (2 diffs)

uspace/srv/inet/inet.c

@@ -262 +262 @@
 }
 
+static inet_client_t *inet_client_find(uint8_t proto)
+{
+        fibril_mutex_lock(&client_list_lock);
+
+        list_foreach(client_list, link) {
+                inet_client_t *client = list_get_instance(link, inet_client_t,
+                    client_list);
+
+                if (client->protocol == proto) {
+                        fibril_mutex_unlock(&client_list_lock);
+                        return client;
+                }
+        }
+
+        fibril_mutex_unlock(&client_list_lock);
+        return NULL;
+}
+
 int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
 {
@@ -285 +303 @@
 }
 
-int inet_recv_packet(inet_dgram_t *dgram, uint8_t ttl, int df)
-{
-        return inet_route_packet(dgram, ttl, df);
+static int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
+{
+        inet_client_t *client;
+
+        log_msg(LVL_DEBUG, "inet_recv_dgram_local()");
+
+        client = inet_client_find(proto);
+        if (client == NULL) {
+                log_msg(LVL_DEBUG, "No client found for protocol 0x%" PRIx8,
+                    proto);
+                return ENOENT;
+        }
+
+        return inet_ev_recv(client, dgram);
+}
+
+int inet_recv_packet(inet_packet_t *packet)
+{
+        inet_addrobj_t *addr;
+        inet_dgram_t dgram;
+
+        addr = inet_addrobj_find(&packet->dest, iaf_addr);
+        if (addr != NULL) {
+                /* Destined for one of the local addresses */
+
+                /* XXX Reassemble packets */
+                dgram.src = packet->src;
+                dgram.dest = packet->dest;
+                dgram.tos = packet->tos;
+                dgram.data = packet->data;
+                dgram.size = packet->size;
+
+                return inet_recv_dgram_local(&dgram, packet->proto);
+        }
+
+        return ENOENT;
 }