Use the source/destination address and address mask.

Address mask is used for broadcasting the packet like IPv4.

Change-Id: If1e4298852403985c7e927d82ecec3419a558ab9

diff --git a/include/com-core_packet-router.h b/include/com-core_packet-router.h
index a6c3a59..c76b08a 100644 (file)
--- a/include/com-core_packet-router.h
+++ b/include/com-core_packet-router.h
@@ -11,9 +11,9 @@ enum com_core_route_event_type {
        COM_CORE_ROUTE_ERROR,
 };
 
-extern int com_core_packet_router_add_link(int handle, int from, int to);
-extern int com_core_packet_router_del_link_by_from(int handle, int from);
-extern int com_core_packet_router_del_link_by_to(int handle, int to);
+extern int com_core_packet_router_add_route(int handle, unsigned long address, int to);
+extern int com_core_packet_router_del_route(int handle, unsigned long address);
+extern int com_core_packet_router_update_route(int handle, unsigned long address, int to);
 
 extern int com_core_packet_router_add_event_callback(enum com_core_route_event_type type, int (*evt_cb)(int handle, void *data), void *data);
 extern int com_core_packet_router_del_event_callback(enum com_core_route_event_type type, int (*evt_cb)(int handle, void *data), void *data);

diff --git a/include/packet.h b/include/packet.h
index bbc717c..cfbd838 100644 (file)
--- a/include/packet.h
+++ b/include/packet.h
@@ -37,7 +37,7 @@ enum packet_flag {
        PACKET_FLAG_ERROR = 0xFF, /*!< Invalid flag */
 };
 
-#define PACKET_VERSION 1
+#define PACKET_VERSION 2
 #define PACKET_MAX_CMD 24
 
 extern struct packet *packet_create(const char *command, const char *fmt, ...);
@@ -51,7 +51,16 @@ extern struct packet *packet_unref(struct packet *packet);
 extern const void * const packet_data(const struct packet *packet);
 extern const double const packet_seq(const struct packet *packet);
 extern const enum packet_type const packet_type(const struct packet *packet);
+
 extern const enum packet_flag const packet_flag(const struct packet *packet);
+extern int packet_set_flag(struct packet *packet, enum packet_flag flag);
+extern const unsigned long const packet_source(const struct packet *packet);
+extern int packet_set_source(struct packet *packet, unsigned long source);
+extern const unsigned long const packet_destination(const struct packet *packet);
+extern int packet_set_destination(struct packet *packet, unsigned long destination);
+extern int packet_set_mask(struct packet *packet, unsigned long mask);
+extern unsigned long packet_mask(const struct packet *packet);
+
 extern const int const packet_version(const struct packet *packet);
 extern const int const packet_payload_size(const struct packet *packet);
 extern const char * const packet_command(const const struct packet *packet);

diff --git a/src/com-core_packet-router.c b/src/com-core_packet-router.c
index 05fc22e..20b7ebc 100644 (file)
--- a/src/com-core_packet-router.c
+++ b/src/com-core_packet-router.c
@@ -29,8 +29,9 @@ struct packet_item {
 };
 
 struct route {
-       int from;
-       int to;
+       unsigned long address;
+       int handle;
+       int invalid;
 };
 
 struct client {
@@ -131,8 +132,28 @@ static inline int invoke_disconnected_cb(struct router *router, int handle)
        struct dlist *l;
        struct dlist *n;
        struct event_item *item;
+       struct route *route;
        int ret;
 
+       /*!
+        * Update the routing table.
+        */
+       ret = pthread_mutex_lock(&router->route_list_lock);
+       if (ret != 0)
+               ErrPrint("Failed to lock: %s\n", strerror(ret));
+
+       dlist_foreach(router->route_list, l, route) {
+               if (route->handle == handle)
+                       route->invalid = 1;
+       }
+
+       ret = pthread_mutex_unlock(&router->route_list_lock);
+       if (ret != 0)
+               ErrPrint("Failed to unlock: %s\n", strerror(ret));
+
+       /*!
+        * Invoke the disconnected callback
+        */
        dlist_foreach_safe(s_info.disconnected_list, l, n, item) {
                ret = item->evt_cb(handle, item->data);
                if (ret < 0 && dlist_find_data(s_info.disconnected_list, item)) {
@@ -555,32 +576,59 @@ static inline int destroy_router(struct router *router)
  * \NOTE
  * Running thread: Client / Server leaf thread
  */
-static inline int route_packet(struct router *router, int from, struct packet *packet)
+static inline int route_packet(struct router *router, int handle, struct packet *packet)
 {
        struct dlist *l;
        struct route *route;
-       int processed;
-       int ret;
+       unsigned long destination;
+       unsigned long source;
+       unsigned long mask;
+       int status;
+       int processed = 0;
 
-       processed = 0;
-       dlist_foreach(router->route_list, l, route) {
-               if (route->from != from)
-                       continue;
+       destination = packet_destination(packet);
+       source = packet_destination(packet);
+       mask = packet_mask(packet);
 
-               if (route->to < 0)
-                       continue;
+       /*!
+        * Can we believe this source?
+        */
 
-               ret = com_core_send(route->to, (void *)packet_data(packet), packet_size(packet), router->timeout);
-               if (ret != packet_size(packet)) {
-                       ErrPrint("Failed to send whole packet\n");
-                       continue;
+       if (destination && source) {
+               status = pthread_mutex_lock(&router->route_list_lock);
+               if (status != 0)
+                       ErrPrint("Failed to lock: %s\n", strerror(status));
+
+               dlist_foreach(router->route_list, l, route) {
+                       if (!route->invalid && (route->address & mask) == (destination & mask)) {
+                               int ret;
+
+                               /*!
+                                * This code is executed in the CRITICAL SECTION
+                                * If possible, we have to do this from the out of the CRITICAL SECTION
+                                * 
+                                * This code can makes the system slow.
+                                *
+                                * We have to optimize the processing time in the CRITICAL SECTION
+                                */
+                               ret = com_core_send(route->handle, (void *)packet_data(packet), packet_size(packet), router->timeout);
+                               if (ret != packet_size(packet)) {
+                                       ErrPrint("Failed to send whole packet\n");
+                               }
+
+                               processed++;
+                       }
                }
 
-               processed++;
+               status = pthread_mutex_unlock(&router->route_list_lock);
+               if (status != 0)
+                       ErrPrint("Failed to unlock: %s\n", strerror(status));
        }
 
-       if (processed == 0)
+       if (processed == 0) {
+               DbgPrint("Drop a packet\n");
                router->count_of_dropped_packet++;
+       }
 
        packet_destroy(packet);
        return 0;
@@ -1204,12 +1252,15 @@ EAPI struct packet *com_core_packet_router_oneshot_send(const char *addr, struct
  * \NOTE
  * Running thread: Main
  */
-EAPI int com_core_packet_router_add_link(int handle, int from, int to)
+EAPI int com_core_packet_router_add_route(int handle, unsigned long address, int h)
 {
        struct router *router;
        struct route *route;
        int status;
 
+       if (handle < 0 || !address || h < 0)
+               return -EINVAL;
+
        router = find_router_by_handle(handle);
        if (!router) {
                ErrPrint("Router is not exists\n");
@@ -1222,8 +1273,9 @@ EAPI int com_core_packet_router_add_link(int handle, int from, int to)
                return -ENOMEM;
        }
 
-       route->from = from;
-       route->to = to;
+       route->address = address;
+       route->handle = h;
+       route->invalid = 0;
 
        status = pthread_mutex_lock(&router->route_list_lock);
        if (status != 0)
@@ -1242,7 +1294,7 @@ EAPI int com_core_packet_router_add_link(int handle, int from, int to)
  * \NOTE
  * Running thread: Main
  */
-EAPI int com_core_packet_router_del_link_by_from(int handle, int from)
+EAPI int com_core_packet_router_del_route(int handle, unsigned long address)
 {
        struct router *router;
        struct route *route;
@@ -1250,6 +1302,9 @@ EAPI int com_core_packet_router_del_link_by_from(int handle, int from)
        struct dlist *n;
        int status;
 
+       if (handle < 0 || !address)
+               return -EINVAL;
+
        router = find_router_by_handle(handle);
        if (!router) {
                ErrPrint("Router is not exists\n");
@@ -1261,13 +1316,14 @@ EAPI int com_core_packet_router_del_link_by_from(int handle, int from)
                ErrPrint("Failed to lock: %s\n", strerror(status));
 
        dlist_foreach_safe(router->route_list, l, n, route) {
-               if (route->from != from)
+               if (route->address != address)
                        continue;
 
                router->route_list = dlist_remove(router->route_list, l);
 
-               DbgPrint("Delete an entry from the table (%d <-> %d)\n", route->from, route->to);
+               DbgPrint("Delete an entry from the table (%lu : %d)\n", route->address, route->handle);
                free(route);
+               break;
        }
 
        status = pthread_mutex_unlock(&router->route_list_lock);
@@ -1277,17 +1333,16 @@ EAPI int com_core_packet_router_del_link_by_from(int handle, int from)
        return 0;
 }
 
-/*!
- * \NOTE
- * Running thread: Main
- */
-EAPI int com_core_packet_router_del_link_by_to(int handle, int to)
+EAPI int com_core_packet_router_update_route(int handle, unsigned long address, int h)
 {
        struct router *router;
        struct route *route;
        struct dlist *l;
-       struct dlist *n;
        int status;
+       int found = 0;
+
+       if (handle < 0 || !address || h < 0)
+               return -EINVAL;
 
        router = find_router_by_handle(handle);
        if (!router) {
@@ -1299,20 +1354,21 @@ EAPI int com_core_packet_router_del_link_by_to(int handle, int to)
        if (status != 0)
                ErrPrint("Failed to lock: %s\n", strerror(status));
 
-       dlist_foreach_safe(router->route_list, l, n, route) {
-               if (route->to != to)
+       dlist_foreach(router->route_list, l, route) {
+               if (route->address != address)
                        continue;
 
-               router->route_list = dlist_remove(router->route_list, l);
-               DbgPrint("Delete an entry from the table (%d <-> %d)\n", route->from, route->to);
-               free(route);
+               route->handle = h;
+               route->invalid = 0;
+               found = 1;
+               break;
        }
 
        status = pthread_mutex_unlock(&router->route_list_lock);
        if (status != 0)
                ErrPrint("Failed to unlock: %s\n", strerror(status));
 
-       return 0;
+       return found ? 0 : -ENOENT;
 }
 
 /*!

diff --git a/src/packet.c b/src/packet.c
index 908ebd7..302a839 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -37,6 +37,9 @@ struct data {
                enum packet_type type;
                enum packet_flag flag;
                double seq;
+               unsigned long source;
+               unsigned long destination;
+               unsigned long mask;
        } head;
 
        char payload[];
@@ -59,6 +62,23 @@ EAPI const enum packet_type const packet_type(const struct packet *packet)
        return packet->data->head.type;
 }
 
+EAPI unsigned long packet_mask(const struct packet *packet)
+{
+       if (!packet || packet->state != VALID || !packet->data)
+               return 0;
+
+       return packet->data->head.mask;
+}
+
+EAPI int packet_set_mask(struct packet *packet, unsigned long mask)
+{
+       if (!packet || packet->state != VALID || !packet->data)
+               return -EINVAL;
+
+       packet->data->head.mask = mask;
+       return 0;
+}
+
 EAPI const enum packet_flag const packet_flag(const struct packet *packet)
 {
        if (!packet || packet->state != VALID || !packet->data)
@@ -67,6 +87,49 @@ EAPI const enum packet_flag const packet_flag(const struct packet *packet)
        return packet->data->head.flag;
 }
 
+EAPI int packet_set_flag(struct packet *packet, enum packet_flag flag)
+{
+       if (!packet || packet->state != VALID || !packet->data)
+               return -EINVAL;
+
+       packet->data->head.flag = flag;
+       return 0;
+}
+
+EAPI const unsigned long const packet_source(const struct packet *packet)
+{
+       if (!packet || packet->state != VALID || !packet->data)
+               return 0;
+
+       return packet->data->head.source;
+}
+
+EAPI int packet_set_source(struct packet *packet, unsigned long source)
+{
+       if (!packet || packet->state != VALID || !packet->data || !source)
+               return -EINVAL;
+
+       packet->data->head.source = source;
+       return 0;
+}
+
+EAPI const unsigned long const packet_destination(const struct packet *packet)
+{
+       if (!packet || packet->state != VALID || !packet->data)
+               return 0;
+
+       return packet->data->head.destination;
+}
+
+EAPI int packet_set_destination(struct packet *packet, unsigned long destination)
+{
+       if (!packet || packet->state != VALID || !packet->data || !destination)
+               return -EINVAL;
+
+       packet->data->head.destination = destination;
+       return 0;
+}
+
 EAPI const int const packet_version(const struct packet *packet)
 {
        if (!packet || packet->state != VALID || !packet->data)
@@ -245,6 +308,11 @@ EAPI struct packet *packet_create_reply(const struct packet *packet, const char
        }
 
        result->state = VALID;
+
+       result->data->head.source = 0lu;
+       result->data->head.destination = 0lu;
+       result->data->head.mask = 0xFFFFFFFF;
+
        result->data->head.seq = packet->data->head.seq;
        result->data->head.type = PACKET_ACK;
        result->data->head.version = packet->data->head.version;
@@ -289,6 +357,9 @@ EAPI struct packet *packet_create(const char *cmd, const char *fmt, ...)
 
        packet->state = VALID;
        gettimeofday(&tv, NULL);
+       packet->data->head.source = 0lu;
+       packet->data->head.destination = 0lu;
+       packet->data->head.mask = 0xFFFFFFFF;
        packet->data->head.seq = tv.tv_sec + tv.tv_usec / 1000000.0f;
        packet->data->head.type = PACKET_REQ;
        packet->data->head.version = PACKET_VERSION;
@@ -333,6 +404,9 @@ EAPI struct packet *packet_create_noack(const char *cmd, const char *fmt, ...)
 
        result->state = VALID;
        gettimeofday(&tv, NULL);
+       result->data->head.source = 0lu;
+       result->data->head.destination = 0lu;
+       result->data->head.mask = 0xFFFFFFFF;
        result->data->head.seq = tv.tv_sec + tv.tv_usec / 1000000.0f;
        result->data->head.type = PACKET_REQ_NOACK;
        result->data->head.version = PACKET_VERSION;
@@ -463,6 +537,7 @@ EAPI struct packet *packet_build(struct packet *packet, int offset, void *data,
 
                packet->state = VALID;
                memcpy(packet->data, data, size);
+               packet->data->head.mask = 0xFFFFFFFF;
                return packet;
        }