diff options
| author | Martin Willi <martin@revosec.ch> | 2011-01-12 13:54:13 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-01-12 14:37:09 +0100 |
| commit | 8ba805f4db08b4d9dbab2ba84cbc719aa0d92fbc (patch) | |
| tree | 6bdb55953950cde892bebffbb18691db735f2361 /src/libcharon/sa/task_manager.c | |
| parent | 213281de0476f636bc4b63eb56bdd06933ab9c9f (diff) | |
| download | strongswan-8ba805f4db08b4d9dbab2ba84cbc719aa0d92fbc.tar.bz2 strongswan-8ba805f4db08b4d9dbab2ba84cbc719aa0d92fbc.tar.xz | |
Avoid variable name overloading
Diffstat (limited to 'src/libcharon/sa/task_manager.c')
| -rw-r--r-- | src/libcharon/sa/task_manager.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c index 8e4177409..16ddb25c5 100644 --- a/src/libcharon/sa/task_manager.c +++ b/src/libcharon/sa/task_manager.c @@ -880,8 +880,12 @@ static status_t process_request(private_task_manager_t *this, METHOD(task_manager_t, process_message, status_t, private_task_manager_t *this, message_t *msg) { - u_int32_t mid = msg->get_message_id(msg); - host_t *me = msg->get_destination(msg), *other = msg->get_source(msg); + host_t *me, *other; + u_int32_t mid; + + mid = msg->get_message_id(msg); + me = msg->get_destination(msg); + other = msg->get_source(msg); if (msg->get_request(msg)) { @@ -911,15 +915,15 @@ METHOD(task_manager_t, process_message, status_t, else if ((mid == this->responding.mid - 1) && this->responding.packet) { packet_t *clone; - host_t *me, *other; + host_t *host; DBG1(DBG_IKE, "received retransmit of request with ID %d, " "retransmitting response", mid); clone = this->responding.packet->clone(this->responding.packet); - me = msg->get_destination(msg); - other = msg->get_source(msg); - clone->set_source(clone, me->clone(me)); - clone->set_destination(clone, other->clone(other)); + host = msg->get_destination(msg); + clone->set_source(clone, host->clone(host)); + host = msg->get_source(msg); + clone->set_destination(clone, host->clone(host)); charon->sender->send(charon->sender, clone); } else |