diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-03-06 23:06:18 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-03-06 23:06:18 +0100 |
| commit | f8a2fec8f399229d15d3481be0ce8567b2ed6851 (patch) | |
| tree | c214fcb30a99791dabe3076ea8c449b3d6538c89 /src/fastd.c | |
| parent | 1d18f972554c8bad0f08b3ff6727c87586e97094 (diff) | |
| download | fastd-f8a2fec8f399229d15d3481be0ce8567b2ed6851.tar fastd-f8a2fec8f399229d15d3481be0ce8567b2ed6851.zip | |
Simplify queue functions
Diffstat (limited to 'src/fastd.c')
| -rw-r--r-- | src/fastd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/fastd.c b/src/fastd.c index e0a03ad..6db09b6 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -355,22 +355,22 @@ static void update_time(fastd_context *ctx) { static void handle_tasks(fastd_context *ctx) { fastd_task *task; while ((task = fastd_task_get(ctx)) != NULL) { - switch (task->any.type) { + switch (task->type) { case TASK_SEND: - if (task->send.peer) { + if (task->peer) { int sockfd; struct msghdr msg; memset(&msg, 0, sizeof(msg)); - switch (task->send.peer->address.sa.sa_family) { + switch (task->peer->address.sa.sa_family) { case AF_INET: - msg.msg_name = &task->send.peer->address.in; + msg.msg_name = &task->peer->address.in; msg.msg_namelen = sizeof(struct sockaddr_in); sockfd = ctx->sockfd; break; case AF_INET6: - msg.msg_name = &task->send.peer->address.in6; + msg.msg_name = &task->peer->address.in6; msg.msg_namelen = sizeof(struct sockaddr_in6); sockfd = ctx->sock6fd; break; @@ -398,7 +398,7 @@ static void handle_tasks(fastd_context *ctx) { const fastd_eth_addr *src_addr = fastd_get_source_address(ctx, task->handle_recv.buffer); if (fastd_eth_addr_is_unicast(src_addr)) - fastd_peer_add_eth_addr(ctx, task->handle_recv.peer, src_addr); + fastd_peer_add_eth_addr(ctx, task->peer, src_addr); } write(ctx->tunfd, task->handle_recv.buffer.data, task->handle_recv.buffer.len); @@ -406,14 +406,14 @@ static void handle_tasks(fastd_context *ctx) { break; case TASK_HANDSHAKE: - if (task->handshake.peer->state != STATE_WAIT && task->handshake.peer->state != STATE_TEMP) + if (task->peer->state != STATE_WAIT && task->peer->state != STATE_TEMP) break; pr_debug(ctx, "Sending handshake..."); - fastd_handshake_send(ctx, task->handshake.peer); + fastd_handshake_send(ctx, task->peer); - if (task->handshake.peer->state == STATE_WAIT) - fastd_task_schedule_handshake(ctx, task->handshake.peer, 20000); + if (task->peer->state == STATE_WAIT) + fastd_task_schedule_handshake(ctx, task->peer, 20000); break; default: |