qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 14/16] slirp: Handle IPv6 in TCP functions


From: Samuel Thibault
Subject: [Qemu-devel] [PATCH 14/16] slirp: Handle IPv6 in TCP functions
Date: Sun, 17 Nov 2013 16:04:46 +0100

This patch adds IPv6 case in TCP functions refactored by the last
patches.
This also adds IPv6 pseudo-header in tcpiphdr structure.
Finally, tcp_input() is called by ip6_input().

Signed-off-by: Guillaume Subiron <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
 slirp/ip6_input.c  |  4 ++--
 slirp/tcp.h        |  2 ++
 slirp/tcp_input.c  | 58 +++++++++++++++++++++++++++++++++++++++++-------------
 slirp/tcp_output.c | 16 +++++++++++++++
 slirp/tcp_subr.c   | 36 +++++++++++++++++++++++++++++----
 slirp/tcpip.h      |  9 +++++++++
 6 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/slirp/ip6_input.c b/slirp/ip6_input.c
index 3290af8..b03b795 100644
--- a/slirp/ip6_input.c
+++ b/slirp/ip6_input.c
@@ -58,8 +58,8 @@ void ip6_input(struct mbuf *m)
      */
     switch (ip6->ip_nh) {
     case IPPROTO_TCP:
-        /* :TODO:maethor:130307: TCP */
-        icmp6_send_error(m, ICMP6_UNREACH, ICMP6_UNREACH_NO_ROUTE);
+        NTOHS(ip6->ip_pl);
+        tcp_input(m, sizeof(struct ip6), (struct socket *)NULL, AF_INET6);
         break;
     case IPPROTO_UDP:
         udp6_input(m);
diff --git a/slirp/tcp.h b/slirp/tcp.h
index 2e2b403..61befcd 100644
--- a/slirp/tcp.h
+++ b/slirp/tcp.h
@@ -106,6 +106,8 @@ struct tcphdr {
  */
 #undef TCP_MSS
 #define        TCP_MSS 1460
+#undef TCP6_MSS
+#define TCP6_MSS 1440
 
 #undef TCP_MAXWIN
 #define        TCP_MAXWIN      65535   /* largest value for (unscaled) window 
*/
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index 3409557..e5056f8 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -215,7 +215,8 @@ present:
 void
 tcp_input(struct mbuf *m, int iphlen, struct socket *inso, sa_family_t af)
 {
-       struct ip save_ip, *ip;
+       struct ip save_ip, *ip;
+       struct ip6 save_ip6, *ip6;
        register struct tcpiphdr *ti;
        caddr_t optp = NULL;
        int optlen = 0;
@@ -254,6 +255,11 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, 
sa_family_t af)
        }
        slirp = m->slirp;
 
+       ip = mtod(m, struct ip *);
+       ip6 = mtod(m, struct ip6 *);
+       save_ip = *ip;
+       save_ip6 = *ip6;
+
        switch (af) {
        case AF_INET:
            if (iphlen > sizeof(struct ip)) {
@@ -262,13 +268,6 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, 
sa_family_t af)
            }
            /* XXX Check if too short */
 
-
-           /*
-            * Save a copy of the IP header in case we want restore it
-            * for sending an ICMP error message in response.
-            */
-           ip = mtod(m, struct ip *);
-           save_ip = *ip;
            save_ip.ip_len += iphlen;
 
            /*
@@ -293,16 +292,35 @@ tcp_input(struct mbuf *m, int iphlen, struct socket 
*inso, sa_family_t af)
            ti->ti_dst = save_ip.ip_dst;
            ti->ti_pr = save_ip.ip_p;
            ti->ti_len = htons((uint16_t)tlen);
-           len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
-           if (cksum(m, len)) {
-               goto drop;
-           }
+           break;
+
+       case AF_INET6:
+           m->m_data -= sizeof(struct tcpiphdr) - (sizeof(struct ip6)
+                                                + sizeof(struct tcphdr));
+           m->m_len  += sizeof(struct tcpiphdr) - (sizeof(struct ip6)
+                                                + sizeof(struct tcphdr));
+           ti = mtod(m, struct tcpiphdr *);
+
+           tlen = ip6->ip_pl;
+           tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL;
+           memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr));
+           memset(&ti->ti, 0, sizeof(ti->ti));
+           ti->ti_x0 = 0;
+           ti->ti_src6 = save_ip6.ip_src;
+           ti->ti_dst6 = save_ip6.ip_dst;
+           ti->ti_nh6 = save_ip6.ip_nh;
+           ti->ti_len = htons((uint16_t)tlen);
            break;
 
        default:
            goto drop;
        }
 
+       len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
+       if (cksum(m, len)) {
+           goto drop;
+       }
+
        /*
         * Check that TCP offset makes sense,
         * pull out TCP options and adjust length.              XXX
@@ -346,6 +364,12 @@ findso:
            ((struct sockaddr_in *)&fhost)->sin_addr = ti->ti_dst;
            ((struct sockaddr_in *)&fhost)->sin_port = ti->ti_dport;
            break;
+       case AF_INET6:
+           ((struct sockaddr_in6 *)&lhost)->sin6_addr = ti->ti_src6;
+           ((struct sockaddr_in6 *)&lhost)->sin6_port = ti->ti_sport;
+           ((struct sockaddr_in6 *)&fhost)->sin6_addr = ti->ti_dst6;
+           ((struct sockaddr_in6 *)&fhost)->sin6_port = ti->ti_dport;
+           break;
        default:
            goto drop;
        }
@@ -405,7 +429,6 @@ findso:
                  so->so_iptos = ((struct ip *)ti)->ip_tos;
                  break;
              default:
-                 goto drop;
                  break;
              }
          }
@@ -634,6 +657,9 @@ findso:
              case AF_INET:
                  *ip = save_ip;
                  break;
+             case AF_INET6:
+                 *ip6 = save_ip6;
+                 break;
              default:
                  goto drop;
              }
@@ -1509,8 +1535,12 @@ tcp_mss(struct tcpcb *tp, u_int offer)
            mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr)
                                      + sizeof(struct ip);
            break;
+       case AF_INET6:
+           mss = min(IF_MTU, IF_MRU) - sizeof(struct tcphdr)
+                                     + sizeof(struct ip6);
+           break;
        default:
-           /* :TODO:maethor:130319: ??? */
+           assert(0);
            break;
        }
 
diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
index ce0d0e6..64742a2 100644
--- a/slirp/tcp_output.c
+++ b/slirp/tcp_output.c
@@ -62,6 +62,7 @@ tcp_output(struct tcpcb *tp)
        register struct mbuf *m;
        register struct tcpiphdr *ti, tcpiph_save;
        struct ip *ip;
+       struct ip6 *ip6;
        u_char opt[MAX_TCPOPTLEN];
        unsigned optlen, hdrlen;
        int idle, sendalot;
@@ -467,6 +468,21 @@ send:
            error = ip_output(so, m);
            break;
 
+       case AF_INET6:
+           m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip6);
+           m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip6);
+           ip6 = mtod(m, struct ip6 *);
+
+           ip6->ip_pl = tcpiph_save.ti_len;
+           ip6->ip_dst = tcpiph_save.ti_dst6;
+           ip6->ip_src = tcpiph_save.ti_src6;
+           ip6->ip_nh = tcpiph_save.ti_nh6;
+
+           error = ip6_output(so, m, 0);
+           break;
+
        default:
            goto out;
        }
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index ba4eb80..6c087e3 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -87,8 +87,17 @@ tcp_template(struct tcpcb *tp)
            n->ti_dport = so->so_lport;
            break;
 
+       case AF_INET6:
+           n->ti_nh6 = IPPROTO_TCP;
+           n->ti_len = htons(sizeof(struct tcphdr));
+           n->ti_src6 = so->so_faddr6;
+           n->ti_dst6 = so->so_laddr6;
+           n->ti_sport = so->so_fport6;
+           n->ti_dport = so->so_lport6;
+           break;
+
        default:
-           /* :TODO:maethor:130321: ? */
+           assert(0);
            break;
        }
 
@@ -156,8 +165,12 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct 
mbuf *m,
                    xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
                    xchg(ti->ti_dport, ti->ti_sport, uint16_t);
                    break;
+               case AF_INET6:
+                   xchg(ti->ti_dst6, ti->ti_src6, struct in6_addr);
+                   xchg(ti->ti_dport, ti->ti_sport, uint16_t);
+                   break;
                default:
-                   /* :TODO:maethor:130321: ? */
+                   assert(0);
                    break;
                }
 #undef xchg
@@ -183,6 +196,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct 
mbuf *m,
 
        struct tcpiphdr tcpiph_save = *(mtod(m, struct tcpiphdr *));
        struct ip *ip;
+       struct ip6 *ip6;
 
        switch (af) {
        case AF_INET:
@@ -205,8 +219,22 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct 
mbuf *m,
            (void) ip_output((struct socket *)0, m);
            break;
 
+       case AF_INET6:
+           m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip6);
+           m->m_len  -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
+                                                - sizeof(struct ip6);
+           ip6 = mtod(m, struct ip6 *);
+           ip6->ip_pl = tlen;
+           ip6->ip_dst = tcpiph_save.ti_dst6;
+           ip6->ip_src = tcpiph_save.ti_src6;
+           ip6->ip_nh = tcpiph_save.ti_nh6;
+
+           (void) ip6_output((struct socket *)0, m, 0);
+           break;
+
        default:
-           /* :TODO:maethor:130321: ? */
+           assert(0);
            break;
        }
 }
@@ -227,7 +255,7 @@ tcp_newtcpcb(struct socket *so)
 
        memset((char *) tp, 0, sizeof(struct tcpcb));
        tp->seg_next = tp->seg_prev = (struct tcpiphdr*)tp;
-       tp->t_maxseg = TCP_MSS;
+       tp->t_maxseg = (so->so_ffamily == AF_INET) ? TCP_MSS : TCP6_MSS;
 
        tp->t_flags = TCP_DO_RFC1323 ? (TF_REQ_SCALE|TF_REQ_TSTMP) : 0;
        tp->t_socket = so;
diff --git a/slirp/tcpip.h b/slirp/tcpip.h
index d9b5d70..4a2987f 100644
--- a/slirp/tcpip.h
+++ b/slirp/tcpip.h
@@ -45,6 +45,12 @@ struct tcpiphdr {
             uint8_t ih_x1;          /* (unused) */
             uint8_t ih_pr;          /* protocol */
         } ti_i4;
+        struct {
+            struct  in6_addr ih_src;
+            struct  in6_addr ih_dst;
+            uint8_t ih_x1;
+            uint8_t ih_nh;
+        } ti_i6;
     } ti;
     uint16_t    ti_x0;
     uint16_t    ti_len;             /* protocol length */
@@ -54,6 +60,9 @@ struct tcpiphdr {
 #define        ti_pr           ti.ti_i4.ih_pr
 #define        ti_src          ti.ti_i4.ih_src
 #define        ti_dst          ti.ti_i4.ih_dst
+#define        ti_src6         ti.ti_i6.ih_src
+#define        ti_dst6         ti.ti_i6.ih_dst
+#define        ti_nh6          ti.ti_i6.ih_nh
 #define        ti_sport        ti_t.th_sport
 #define        ti_dport        ti_t.th_dport
 #define        ti_seq          ti_t.th_seq
-- 
1.8.4.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]