[Qemu-devel] [PATCH 03/18] slirp: Reindent after refactoring

[Samuel Thibault <samuel.thibault@ens-lyon.org>]

No code change.

Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/slirp.c | 107 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/slirp/slirp.c b/slirp/slirp.c
index 676c86d..bfc4832 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -780,50 +780,51 @@ int if_encap(Slirp *slirp, struct mbuf *ifm)
 
     switch (iph->ip_v) {
     case IPVERSION:
-    if (!arp_table_search(slirp, iph->ip_dst.s_addr, ethaddr)) {
-        uint8_t arp_req[ETH_HLEN + sizeof(struct arphdr)];
-        struct ethhdr *reh = (struct ethhdr *)arp_req;
-        struct arphdr *rah = (struct arphdr *)(arp_req + ETH_HLEN);
-
-        if (!ifm->resolution_requested) {
-            /* If the client addr is not known, send an ARP request */
-            memset(reh->h_dest, 0xff, ETH_ALEN);
-            memcpy(reh->h_source, special_ethaddr, ETH_ALEN - 4);
-            memcpy(&reh->h_source[2], &slirp->vhost_addr, 4);
-            reh->h_proto = htons(ETH_P_ARP);
-            rah->ar_hrd = htons(1);
-            rah->ar_pro = htons(ETH_P_IP);
-            rah->ar_hln = ETH_ALEN;
-            rah->ar_pln = 4;
-            rah->ar_op = htons(ARPOP_REQUEST);
-
-            /* source hw addr */
-            memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
-            memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
-
-            /* source IP */
-            rah->ar_sip = slirp->vhost_addr.s_addr;
-
-            /* target hw addr (none) */
-            memset(rah->ar_tha, 0, ETH_ALEN);
-
-            /* target IP */
-            rah->ar_tip = iph->ip_dst.s_addr;
-            slirp->client_ipaddr = iph->ip_dst;
-            slirp_output(slirp->opaque, arp_req, sizeof(arp_req));
-            ifm->resolution_requested = true;
-
-            /* Expire request and drop outgoing packet after 1 second */
-            ifm->expiration_date = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL;
+        if (!arp_table_search(slirp, iph->ip_dst.s_addr, ethaddr)) {
+            uint8_t arp_req[ETH_HLEN + sizeof(struct arphdr)];
+            struct ethhdr *reh = (struct ethhdr *)arp_req;
+            struct arphdr *rah = (struct arphdr *)(arp_req + ETH_HLEN);
+
+            if (!ifm->resolution_requested) {
+                /* If the client addr is not known, send an ARP request */
+                memset(reh->h_dest, 0xff, ETH_ALEN);
+                memcpy(reh->h_source, special_ethaddr, ETH_ALEN - 4);
+                memcpy(&reh->h_source[2], &slirp->vhost_addr, 4);
+                reh->h_proto = htons(ETH_P_ARP);
+                rah->ar_hrd = htons(1);
+                rah->ar_pro = htons(ETH_P_IP);
+                rah->ar_hln = ETH_ALEN;
+                rah->ar_pln = 4;
+                rah->ar_op = htons(ARPOP_REQUEST);
+
+                /* source hw addr */
+                memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
+                memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
+
+                /* source IP */
+                rah->ar_sip = slirp->vhost_addr.s_addr;
+
+                /* target hw addr (none) */
+                memset(rah->ar_tha, 0, ETH_ALEN);
+
+                /* target IP */
+                rah->ar_tip = iph->ip_dst.s_addr;
+                slirp->client_ipaddr = iph->ip_dst;
+                slirp_output(slirp->opaque, arp_req, sizeof(arp_req));
+                ifm->resolution_requested = true;
+
+                /* Expire request and drop outgoing packet after 1 second */
+                ifm->expiration_date =
+                    qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL;
+            }
+            return 0;
+        } else {
+            memcpy(eh->h_source, special_ethaddr, ETH_ALEN - 4);
+            /* XXX: not correct */
+            memcpy(&eh->h_source[2], &slirp->vhost_addr, 4);
+            eh->h_proto = htons(ETH_P_IP);
+            break;
         }
-        return 0;
-    } else {
-        memcpy(eh->h_source, special_ethaddr, ETH_ALEN - 4);
-        /* XXX: not correct */
-        memcpy(&eh->h_source[2], &slirp->vhost_addr, 4);
-        eh->h_proto = htons(ETH_P_IP);
-        break;
-    }
 
     default:
         /* Do not assert while we don't manage IP6VERSION */
@@ -831,16 +832,16 @@ int if_encap(Slirp *slirp, struct mbuf *ifm)
         break;
     }
 
-        memcpy(eh->h_dest, ethaddr, ETH_ALEN);
-        DEBUG_ARGS((dfd, " src = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                    eh->h_source[0], eh->h_source[1], eh->h_source[2],
-                    eh->h_source[3], eh->h_source[4], eh->h_source[5]));
-        DEBUG_ARGS((dfd, " dst = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                    eh->h_dest[0], eh->h_dest[1], eh->h_dest[2],
-                    eh->h_dest[3], eh->h_dest[4], eh->h_dest[5]));
-        memcpy(buf + sizeof(struct ethhdr), ifm->m_data, ifm->m_len);
-        slirp_output(slirp->opaque, buf, ifm->m_len + ETH_HLEN);
-        return 1;
+    memcpy(eh->h_dest, ethaddr, ETH_ALEN);
+    DEBUG_ARGS((dfd, " src = %02x:%02x:%02x:%02x:%02x:%02x\n",
+                eh->h_source[0], eh->h_source[1], eh->h_source[2],
+                eh->h_source[3], eh->h_source[4], eh->h_source[5]));
+    DEBUG_ARGS((dfd, " dst = %02x:%02x:%02x:%02x:%02x:%02x\n",
+                eh->h_dest[0], eh->h_dest[1], eh->h_dest[2],
+                eh->h_dest[3], eh->h_dest[4], eh->h_dest[5]));
+    memcpy(buf + sizeof(struct ethhdr), ifm->m_data, ifm->m_len);
+    slirp_output(slirp->opaque, buf, ifm->m_len + ETH_HLEN);
+    return 1;
 }
 
 /* Drop host forwarding rule, return 0 if found. */
-- 
1.9.0