riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2789 from Lotterleben/aodvv2_mutex_fix

Browse Source 
AODVv2: fix mutex for route message creation
This commit is contained in:
BytesGalore 2015-04-13 11:08:44 +02:00
commit c47563a745
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/routing/aodvv2/aodv.c
View File

@ -53,6 +53,10 @@ static ipv6_addr_t _v6_addr_local, _v6_addr_mcast, _v6_addr_loopback;
static struct netaddr na_local; /* the same as _v6_addr_local, but to save us static struct netaddr na_local; /* the same as _v6_addr_local, but to save us
* constant calls to ipv6_addr_t_to_netaddr()... */ * constant calls to ipv6_addr_t_to_netaddr()... */
static struct writer_target *wt; static struct writer_target *wt;
static mutex_t rreq_mutex;
static mutex_t rrep_mutex;
static mutex_t rerr_mutex;
struct netaddr na_mcast = (struct netaddr){}; struct netaddr na_mcast = (struct netaddr){};
void aodv_init(void) void aodv_init(void)
@ -63,6 +67,10 @@ void aodv_init(void)
int if_id = 0; int if_id = 0;
net_if_set_src_address_mode(if_id, NET_IF_TRANS_ADDR_M_SHORT); net_if_set_src_address_mode(if_id, NET_IF_TRANS_ADDR_M_SHORT);
mutex_init(&rreq_mutex);
mutex_init(&rrep_mutex);
mutex_init(&rerr_mutex);
aodv_set_metric_type(AODVV2_DEFAULT_METRIC_TYPE); aodv_set_metric_type(AODVV2_DEFAULT_METRIC_TYPE);
_init_addresses(); _init_addresses();
_init_sock_snd(); _init_sock_snd();
@ -103,6 +111,9 @@ void aodv_set_metric_type(aodvv2_metric_t metric_type)
void aodv_send_rreq(struct aodvv2_packet_data *packet_data) void aodv_send_rreq(struct aodvv2_packet_data *packet_data)
{ {
/* Make sure only one thread is dispatching a RREQ at a time */
mutex_lock(&rreq_mutex);
AODV_DEBUG("%s()\n", __func__); AODV_DEBUG("%s()\n", __func__);
struct aodvv2_packet_data *pd = malloc(sizeof(struct aodvv2_packet_data)); struct aodvv2_packet_data *pd = malloc(sizeof(struct aodvv2_packet_data));
@ -124,10 +135,14 @@ void aodv_send_rreq(struct aodvv2_packet_data *packet_data)
msg.content.ptr = (char *) mc; msg.content.ptr = (char *) mc;
msg_try_send(&msg, sender_thread); msg_try_send(&msg, sender_thread);
mutex_unlock(&rreq_mutex);
} }
void aodv_send_rrep(struct aodvv2_packet_data *packet_data, struct netaddr *next_hop) void aodv_send_rrep(struct aodvv2_packet_data *packet_data, struct netaddr *next_hop)
{ {
/* Make sure only one thread is dispatching a RREP at a time */
mutex_lock(&rrep_mutex);
AODV_DEBUG("%s()\n", __func__); AODV_DEBUG("%s()\n", __func__);
struct aodvv2_packet_data *pd = malloc(sizeof(struct aodvv2_packet_data)); struct aodvv2_packet_data *pd = malloc(sizeof(struct aodvv2_packet_data));
@ -152,10 +167,14 @@ void aodv_send_rrep(struct aodvv2_packet_data *packet_data, struct netaddr *next
msg.content.ptr = (char *) mc; msg.content.ptr = (char *) mc;
msg_try_send(&msg, sender_thread); msg_try_send(&msg, sender_thread);
mutex_unlock(&rrep_mutex);
} }
void aodv_send_rerr(struct unreachable_node unreachable_nodes[], size_t len, struct netaddr *next_hop) void aodv_send_rerr(struct unreachable_node unreachable_nodes[], size_t len, struct netaddr *next_hop)
{ {
/* Make sure only one thread is dispatching a RERR at a time */
mutex_lock(&rerr_mutex);
AODV_DEBUG("%s()\n", __func__); AODV_DEBUG("%s()\n", __func__);
struct rerr_data *rerrd = malloc(sizeof(struct rerr_data)); struct rerr_data *rerrd = malloc(sizeof(struct rerr_data));
@ -176,6 +195,7 @@ void aodv_send_rerr(struct unreachable_node unreachable_nodes[], size_t len, str
msg2.content.ptr = (char *) mc2; msg2.content.ptr = (char *) mc2;
msg_try_send(&msg2, sender_thread); msg_try_send(&msg2, sender_thread);
mutex_unlock(&rerr_mutex);
} }
/* /*

11
sys/net/routing/aodvv2/writer.c
View File

@ -35,8 +35,6 @@ static void _cb_rreq_addAddresses(struct rfc5444_writer *wr);
static void _cb_rrep_addAddresses(struct rfc5444_writer *wr); static void _cb_rrep_addAddresses(struct rfc5444_writer *wr);
static void _cb_rerr_addAddresses(struct rfc5444_writer *wr); static void _cb_rerr_addAddresses(struct rfc5444_writer *wr);
static mutex_t writer_mutex;
struct rfc5444_writer writer; struct rfc5444_writer writer;
static struct writer_target _target; static struct writer_target _target;
@ -220,8 +218,6 @@ void aodv_packet_writer_init(write_packet_func_ptr ptr)
{ {
AODV_DEBUG("%s()\n", __func__); AODV_DEBUG("%s()\n", __func__);
mutex_init(&writer_mutex);
/* define interface for generating rfc5444 packets */ /* define interface for generating rfc5444 packets */
_target.interface.packet_buffer = _packet_buffer; _target.interface.packet_buffer = _packet_buffer;
_target.interface.packet_size = sizeof(_packet_buffer); _target.interface.packet_size = sizeof(_packet_buffer);
@ -278,7 +274,6 @@ void aodv_packet_writer_send_rreq(struct aodvv2_packet_data *packet_data, struct
} }
/* Make sure no other thread is using the writer right now */ /* Make sure no other thread is using the writer right now */
mutex_lock(&writer_mutex);
memcpy(&_target.packet_data, packet_data, sizeof(struct aodvv2_packet_data)); memcpy(&_target.packet_data, packet_data, sizeof(struct aodvv2_packet_data));
_target.type = RFC5444_MSGTYPE_RREQ; _target.type = RFC5444_MSGTYPE_RREQ;
_target.packet_data.hoplimit = packet_data->hoplimit; _target.packet_data.hoplimit = packet_data->hoplimit;
@ -288,7 +283,6 @@ void aodv_packet_writer_send_rreq(struct aodvv2_packet_data *packet_data, struct
rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RREQ); rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RREQ);
rfc5444_writer_flush(&writer, &_target.interface, false); rfc5444_writer_flush(&writer, &_target.interface, false);
mutex_unlock(&writer_mutex);
} }
@ -306,8 +300,6 @@ void aodv_packet_writer_send_rrep(struct aodvv2_packet_data *packet_data, struct
return; return;
} }
/* Make sure no other thread is using the writer right now */
mutex_lock(&writer_mutex);
memcpy(&_target.packet_data, packet_data, sizeof(struct aodvv2_packet_data)); memcpy(&_target.packet_data, packet_data, sizeof(struct aodvv2_packet_data));
_target.type = RFC5444_MSGTYPE_RREP; _target.type = RFC5444_MSGTYPE_RREP;
_target.packet_data.hoplimit = AODVV2_MAX_HOPCOUNT; _target.packet_data.hoplimit = AODVV2_MAX_HOPCOUNT;
@ -317,7 +309,6 @@ void aodv_packet_writer_send_rrep(struct aodvv2_packet_data *packet_data, struct
rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RREP); rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RREP);
rfc5444_writer_flush(&writer, &_target.interface, false); rfc5444_writer_flush(&writer, &_target.interface, false);
mutex_unlock(&writer_mutex);
} }
/** /**
@ -338,7 +329,6 @@ void aodv_packet_writer_send_rerr(struct unreachable_node unreachable_nodes[], s
return; return;
} }
mutex_lock(&writer_mutex);
_target.packet_data.hoplimit = hoplimit; _target.packet_data.hoplimit = hoplimit;
_target.type = RFC5444_MSGTYPE_RERR; _target.type = RFC5444_MSGTYPE_RERR;
_unreachable_nodes = unreachable_nodes; _unreachable_nodes = unreachable_nodes;
@ -349,7 +339,6 @@ void aodv_packet_writer_send_rerr(struct unreachable_node unreachable_nodes[], s
rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RERR); rfc5444_writer_create_message_alltarget(&writer, RFC5444_MSGTYPE_RERR);
rfc5444_writer_flush(&writer, &_target.interface, false); rfc5444_writer_flush(&writer, &_target.interface, false);
mutex_unlock(&writer_mutex);
} }
void aodv_packet_writer_cleanup(void) void aodv_packet_writer_cleanup(void)