diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-28 00:27:16 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-28 00:27:16 +0200 |
| commit | c8d669fd508f354bc51435d050bc144af748cd9b (patch) | |
| tree | 50c9bb15e4c784bb6e854e0f945d058a0eb87486 /src | |
| parent | compat: work around odd kernels that backport kv[mz]alloc (diff) | |
| download | wireguard-monolithic-historical-c8d669fd508f354bc51435d050bc144af748cd9b.tar.xz wireguard-monolithic-historical-c8d669fd508f354bc51435d050bc144af748cd9b.zip | |
recieve: cleanup variable usage
Diffstat (limited to 'src')
| -rw-r--r-- | src/receive.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/receive.c b/src/receive.c index 3d7a330..867703c 100644 --- a/src/receive.c +++ b/src/receive.c @@ -180,16 +180,12 @@ static void keep_key_fresh(struct wireguard_peer *peer) void packet_consume_data_done(struct sk_buff *skb, struct wireguard_peer *peer, struct endpoint *endpoint, bool used_new_key) { - struct net_device *dev; + struct net_device *dev = peer->device->dev; struct wireguard_peer *routed_peer; - struct wireguard_device *wg; unsigned int len; socket_set_peer_endpoint(peer, endpoint); - wg = peer->device; - dev = wg->dev; - if (unlikely(used_new_key)) { peer->sent_lastminute_handshake = false; packet_send_queue(peer); @@ -200,7 +196,7 @@ void packet_consume_data_done(struct sk_buff *skb, struct wireguard_peer *peer, /* A packet with length 0 is a keepalive packet */ if (unlikely(!skb->len)) { - net_dbg_ratelimited("%s: Receiving keepalive packet from peer %Lu (%pISpfsc)\n", peer->device->dev->name, peer->internal_id, &peer->endpoint.addr); + net_dbg_ratelimited("%s: Receiving keepalive packet from peer %Lu (%pISpfsc)\n", dev->name, peer->internal_id, &peer->endpoint.addr); goto packet_processed; } @@ -234,7 +230,7 @@ void packet_consume_data_done(struct sk_buff *skb, struct wireguard_peer *peer, timers_data_received(peer); - routed_peer = routing_table_lookup_src(&wg->peer_routing_table, skb); + routed_peer = routing_table_lookup_src(&peer->device->peer_routing_table, skb); peer_put(routed_peer); /* We don't need the extra reference. */ if (unlikely(routed_peer != peer)) @@ -245,22 +241,22 @@ void packet_consume_data_done(struct sk_buff *skb, struct wireguard_peer *peer, rx_stats(peer, len); else { ++dev->stats.rx_dropped; - net_dbg_ratelimited("%s: Failed to give packet to userspace from peer %Lu (%pISpfsc)\n", peer->device->dev->name, peer->internal_id, &peer->endpoint.addr); + net_dbg_ratelimited("%s: Failed to give packet to userspace from peer %Lu (%pISpfsc)\n", dev->name, peer->internal_id, &peer->endpoint.addr); } goto continue_processing; dishonest_packet_peer: - net_dbg_skb_ratelimited("%s: Packet has unallowed src IP (%pISc) from peer %Lu (%pISpfsc)\n", peer->device->dev->name, skb, peer->internal_id, &peer->endpoint.addr); + net_dbg_skb_ratelimited("%s: Packet has unallowed src IP (%pISc) from peer %Lu (%pISpfsc)\n", dev->name, skb, peer->internal_id, &peer->endpoint.addr); ++dev->stats.rx_errors; ++dev->stats.rx_frame_errors; goto packet_processed; dishonest_packet_type: - net_dbg_ratelimited("%s: Packet is neither ipv4 nor ipv6 from peer %Lu (%pISpfsc)\n", peer->device->dev->name, peer->internal_id, &peer->endpoint.addr); + net_dbg_ratelimited("%s: Packet is neither ipv4 nor ipv6 from peer %Lu (%pISpfsc)\n", dev->name, peer->internal_id, &peer->endpoint.addr); ++dev->stats.rx_errors; ++dev->stats.rx_frame_errors; goto packet_processed; dishonest_packet_size: - net_dbg_ratelimited("%s: Packet has incorrect size from peer %Lu (%pISpfsc)\n", peer->device->dev->name, peer->internal_id, &peer->endpoint.addr); + net_dbg_ratelimited("%s: Packet has incorrect size from peer %Lu (%pISpfsc)\n", dev->name, peer->internal_id, &peer->endpoint.addr); ++dev->stats.rx_errors; ++dev->stats.rx_length_errors; goto packet_processed; |