Changeset 0e94b979 in mainline for uspace/srv/inet/addrobj.c

Timestamp:

2012-03-08T21:12:44Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

291c792

Parents:

a88a6eac

Message:

Listing configured addresses.

File:

• uspace/srv/inet/addrobj.c (modified) (6 diffs)

uspace/srv/inet/addrobj.c

@@ -36 +36 @@
 
 #include <bitops.h>
+#include <errno.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -47 +48 @@
 static FIBRIL_MUTEX_INITIALIZE(addr_list_lock);
 static LIST_INITIALIZE(addr_list);
+static sysarg_t addr_id = 0;
 
 static uint32_t inet_netmask(int bits)
@@ -67 +69 @@
 
         link_initialize(&addr->addr_list);
+        fibril_mutex_lock(&addr_list_lock);
+        addr->id = ++addr_id;
+        fibril_mutex_unlock(&addr_list_lock);
 
         return addr;
@@ -73 +78 @@
 void inet_addrobj_delete(inet_addrobj_t *addr)
 {
+        if (addr->name != NULL)
+                free(addr->name);
         free(addr);
 }
@@ -123 +130 @@
 }
 
+/** Find address object matching address @a addr.
+ *
+ * @param id    Address object ID
+ * @return      Address object
+ */
+inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t id)
+{
+        log_msg(LVL_DEBUG, "inet_addrobj_get_by_id(%zu)", (size_t)id);
+
+        fibril_mutex_lock(&addr_list_lock);
+
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *naddr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
+                if (naddr->id == id) {
+                        fibril_mutex_unlock(&addr_list_lock);
+                        return naddr;
+                }
+        }
+
+        fibril_mutex_unlock(&addr_list_lock);
+
+        return NULL;
+}
+
 /** Send datagram to directly reachable destination */
 int inet_addrobj_send_dgram(inet_addrobj_t *addr, inet_dgram_t *dgram,
@@ -137 +170 @@
 }
 
+/** Get IDs of all address objects. */
+int inet_addrobj_get_id_list(sysarg_t **rid_list, size_t *rcount)
+{
+        sysarg_t *id_list;
+        size_t count, i;
+
+        fibril_mutex_lock(&addr_list_lock);
+        count = list_count(&addr_list);
+
+        id_list = calloc(count, sizeof(sysarg_t));
+        if (id_list == NULL) {
+                fibril_mutex_unlock(&addr_list_lock);
+                return ENOMEM;
+        }
+
+        i = 0;
+        list_foreach(addr_list, link) {
+                inet_addrobj_t *addr = list_get_instance(link,
+                    inet_addrobj_t, addr_list);
+
+                id_list[i++] = addr->id;
+        }
+
+        fibril_mutex_unlock(&addr_list_lock);
+
+        *rid_list = id_list;
+        *rcount = count;
+
+        return EOK;
+}
+
 /** @}
  */