[Qemu-devel] [PATCH v4 RESEND 1/5] slirp/tcp_subr.c: fix coding style in tcp_connect

[MORITA Kazutaka]

Fix coding style in tcp_connect before the next patch.

Signed-off-by: MORITA Kazutaka <address@hidden>
---
 slirp/tcp_subr.c | 140 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 72 insertions(+), 68 deletions(-)

diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 1542e43..317dc07 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -384,83 +384,87 @@ int tcp_fconnect(struct socket *so)
  * the time it gets to accept(), so... We simply accept
  * here and SYN the local-host.
  */
-void
-tcp_connect(struct socket *inso)
+void tcp_connect(struct socket *inso)
 {
-       Slirp *slirp = inso->slirp;
-       struct socket *so;
-       struct sockaddr_in addr;
-       socklen_t addrlen = sizeof(struct sockaddr_in);
-       struct tcpcb *tp;
-       int s, opt;
+    Slirp *slirp = inso->slirp;
+    struct socket *so;
+    struct sockaddr_in addr;
+    socklen_t addrlen = sizeof(struct sockaddr_in);
+    struct tcpcb *tp;
+    int s, opt;
 
-       DEBUG_CALL("tcp_connect");
-       DEBUG_ARG("inso = %lx", (long)inso);
+    DEBUG_CALL("tcp_connect");
+    DEBUG_ARG("inso = %lx", (long)inso);
 
-       /*
-        * If it's an SS_ACCEPTONCE socket, no need to socreate()
-        * another socket, just use the accept() socket.
-        */
-       if (inso->so_state & SS_FACCEPTONCE) {
-               /* FACCEPTONCE already have a tcpcb */
-               so = inso;
-       } else {
-               if ((so = socreate(slirp)) == NULL) {
-                       /* If it failed, get rid of the pending connection */
-                       closesocket(accept(inso->s,(struct sockaddr 
*)&addr,&addrlen));
-                       return;
-               }
-               if (tcp_attach(so) < 0) {
-                       free(so); /* NOT sofree */
-                       return;
-               }
-               so->so_laddr = inso->so_laddr;
-               so->so_lport = inso->so_lport;
-       }
+    /*
+     * If it's an SS_ACCEPTONCE socket, no need to socreate()
+     * another socket, just use the accept() socket.
+     */
+    if (inso->so_state & SS_FACCEPTONCE) {
+        /* FACCEPTONCE already have a tcpcb */
+        so = inso;
+    } else {
+        so = socreate(slirp);
+        if (so == NULL) {
+            /* If it failed, get rid of the pending connection */
+            closesocket(accept(inso->s, (struct sockaddr *)&addr, &addrlen));
+            return;
+        }
+        if (tcp_attach(so) < 0) {
+            free(so); /* NOT sofree */
+            return;
+        }
+        so->so_laddr = inso->so_laddr;
+        so->so_lport = inso->so_lport;
+    }
 
-       (void) tcp_mss(sototcpcb(so), 0);
+    tcp_mss(sototcpcb(so), 0);
 
-       if ((s = accept(inso->s,(struct sockaddr *)&addr,&addrlen)) < 0) {
-               tcp_close(sototcpcb(so)); /* This will sofree() as well */
-               return;
-       }
-       socket_set_nonblock(s);
-       opt = 1;
-       setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
-       opt = 1;
-       setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
-       opt = 1;
-       setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int));
-
-       so->so_fport = addr.sin_port;
-       so->so_faddr = addr.sin_addr;
-       /* Translate connections from localhost to the real hostname */
-        if (so->so_faddr.s_addr == 0 ||
-            (so->so_faddr.s_addr & loopback_mask) ==
-            (loopback_addr.s_addr & loopback_mask)) {
-            so->so_faddr = slirp->vhost_addr;
-        }
+    s = accept(inso->s, (struct sockaddr *)&addr, &addrlen);
+    if (s < 0) {
+        tcp_close(sototcpcb(so)); /* This will sofree() as well */
+        return;
+    }
+    socket_set_nonblock(s);
+    opt = 1;
+    setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(int));
+    opt = 1;
+    setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&opt, sizeof(int));
+    opt = 1;
+    setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *)&opt, sizeof(int));
+
+    so->so_fport = addr.sin_port;
+    so->so_faddr = addr.sin_addr;
+    /* Translate connections from localhost to the real hostname */
+    if (so->so_faddr.s_addr == 0 ||
+        (so->so_faddr.s_addr & loopback_mask) ==
+        (loopback_addr.s_addr & loopback_mask)) {
+        so->so_faddr = slirp->vhost_addr;
+    }
 
-       /* Close the accept() socket, set right state */
-       if (inso->so_state & SS_FACCEPTONCE) {
-               closesocket(so->s); /* If we only accept once, close the 
accept() socket */
-               so->so_state = SS_NOFDREF; /* Don't select it yet, even though 
we have an FD */
-                                          /* if it's not FACCEPTONCE, it's 
already NOFDREF */
-       }
-       so->s = s;
-       so->so_state |= SS_INCOMING;
+    /* Close the accept() socket, set right state */
+    if (inso->so_state & SS_FACCEPTONCE) {
+        /* If we only accept once, close the accept() socket */
+        closesocket(so->s);
+
+        /* Don't select it yet, even though we have an FD */
+        /* if it's not FACCEPTONCE, it's already NOFDREF */
+        so->so_state = SS_NOFDREF;
+    }
+    so->s = s;
+    so->so_state |= SS_INCOMING;
 
-       so->so_iptos = tcp_tos(so);
-       tp = sototcpcb(so);
+    so->so_iptos = tcp_tos(so);
+    tp = sototcpcb(so);
 
-       tcp_template(tp);
+    tcp_template(tp);
 
-       tp->t_state = TCPS_SYN_SENT;
-       tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
-       tp->iss = slirp->tcp_iss;
-       slirp->tcp_iss += TCP_ISSINCR/2;
-       tcp_sendseqinit(tp);
-       tcp_output(tp);
+    tp->t_state = TCPS_SYN_SENT;
+    tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
+    tp->iss = slirp->tcp_iss;
+    slirp->tcp_iss += TCP_ISSINCR/2;
+    tcp_sendseqinit(tp);
+    tcp_output(tp);
 }
 
 /*
-- 
1.8.1.3.566.gaa39828