mirror of https://gitee.com/openkylin/qemu.git
slirp: Reindent after refactoring
No code change. Signed-off-by: Guillaume Subiron <maethor@subiron.org> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Guillaume Subiron
Samuel Thibault
parent
9dfbf250d2
commit
1252cf40a8
|
|
@ -258,48 +258,48 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned short af)
|
||||||
|
|
||||||
switch (af) {
|
switch (af) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
if (iphlen > sizeof(struct ip )) {
|
if (iphlen > sizeof(struct ip)) {
|
||||||
ip_stripoptions(m, (struct mbuf *)0);
|
ip_stripoptions(m, (struct mbuf *)0);
|
||||||
iphlen=sizeof(struct ip );
|
iphlen = sizeof(struct ip);
|
||||||
}
|
}
|
||||||
/* XXX Check if too short */
|
/* XXX Check if too short */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Save a copy of the IP header in case we want restore it
|
* Save a copy of the IP header in case we want restore it
|
||||||
* for sending an ICMP error message in response.
|
* for sending an ICMP error message in response.
|
||||||
*/
|
*/
|
||||||
ip=mtod(m, struct ip *);
|
ip = mtod(m, struct ip *);
|
||||||
save_ip = *ip;
|
save_ip = *ip;
|
||||||
save_ip.ip_len+= iphlen;
|
save_ip.ip_len += iphlen;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get IP and TCP header together in first mbuf.
|
* Get IP and TCP header together in first mbuf.
|
||||||
* Note: IP leaves IP header in first mbuf.
|
* Note: IP leaves IP header in first mbuf.
|
||||||
*/
|
*/
|
||||||
m->m_data -= sizeof(struct tcpiphdr) - sizeof(struct ip)
|
m->m_data -= sizeof(struct tcpiphdr) - sizeof(struct ip)
|
||||||
- sizeof(struct tcphdr);
|
- sizeof(struct tcphdr);
|
||||||
m->m_len += sizeof(struct tcpiphdr) - sizeof(struct ip)
|
m->m_len += sizeof(struct tcpiphdr) - sizeof(struct ip)
|
||||||
- sizeof(struct tcphdr);
|
- sizeof(struct tcphdr);
|
||||||
ti = mtod(m, struct tcpiphdr *);
|
ti = mtod(m, struct tcpiphdr *);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Checksum extended TCP header and data.
|
* Checksum extended TCP header and data.
|
||||||
*/
|
*/
|
||||||
tlen = ip->ip_len;
|
tlen = ip->ip_len;
|
||||||
tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL;
|
tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = NULL;
|
||||||
memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr));
|
memset(&ti->ih_mbuf, 0 , sizeof(struct mbuf_ptr));
|
||||||
memset(&ti->ti, 0, sizeof(ti->ti));
|
memset(&ti->ti, 0, sizeof(ti->ti));
|
||||||
ti->ti_x0 = 0;
|
ti->ti_x0 = 0;
|
||||||
ti->ti_src = save_ip.ip_src;
|
ti->ti_src = save_ip.ip_src;
|
||||||
ti->ti_dst = save_ip.ip_dst;
|
ti->ti_dst = save_ip.ip_dst;
|
||||||
ti->ti_pr = save_ip.ip_p;
|
ti->ti_pr = save_ip.ip_p;
|
||||||
ti->ti_len = htons((uint16_t)tlen);
|
ti->ti_len = htons((uint16_t)tlen);
|
||||||
len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
|
len = ((sizeof(struct tcpiphdr) - sizeof(struct tcphdr)) + tlen);
|
||||||
if(cksum(m, len)) {
|
if (cksum(m, len)) {
|
||||||
goto drop;
|
goto drop;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
|
|
@ -343,12 +343,12 @@ findso:
|
||||||
fhost.ss_family = af;
|
fhost.ss_family = af;
|
||||||
switch (af) {
|
switch (af) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
lhost4 = (struct sockaddr_in *) &lhost;
|
lhost4 = (struct sockaddr_in *) &lhost;
|
||||||
lhost4->sin_addr = ti->ti_src;
|
lhost4->sin_addr = ti->ti_src;
|
||||||
lhost4->sin_port = ti->ti_sport;
|
lhost4->sin_port = ti->ti_sport;
|
||||||
fhost4 = (struct sockaddr_in *) &fhost;
|
fhost4 = (struct sockaddr_in *) &fhost;
|
||||||
fhost4->sin_addr = ti->ti_dst;
|
fhost4->sin_addr = ti->ti_dst;
|
||||||
fhost4->sin_port = ti->ti_dport;
|
fhost4->sin_port = ti->ti_dport;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
|
|
@ -591,8 +591,8 @@ findso:
|
||||||
* tcp_ctl once connected, otherwise connect
|
* tcp_ctl once connected, otherwise connect
|
||||||
*/
|
*/
|
||||||
if (af == AF_INET &&
|
if (af == AF_INET &&
|
||||||
(so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
|
(so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
|
||||||
slirp->vnetwork_addr.s_addr) {
|
slirp->vnetwork_addr.s_addr) {
|
||||||
if (so->so_faddr.s_addr != slirp->vhost_addr.s_addr &&
|
if (so->so_faddr.s_addr != slirp->vhost_addr.s_addr &&
|
||||||
so->so_faddr.s_addr != slirp->vnameserver_addr.s_addr) {
|
so->so_faddr.s_addr != slirp->vnameserver_addr.s_addr) {
|
||||||
/* May be an add exec */
|
/* May be an add exec */
|
||||||
|
|
@ -645,12 +645,12 @@ findso:
|
||||||
m->m_len += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
|
m->m_len += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
|
||||||
switch (af) {
|
switch (af) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct ip)
|
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct ip)
|
||||||
- sizeof(struct tcphdr);
|
- sizeof(struct tcphdr);
|
||||||
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct ip)
|
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct ip)
|
||||||
- sizeof(struct tcphdr);
|
- sizeof(struct tcphdr);
|
||||||
*ip=save_ip;
|
*ip = save_ip;
|
||||||
icmp_send_error(m, ICMP_UNREACH, code, 0, strerror(errno));
|
icmp_send_error(m, ICMP_UNREACH, code, 0, strerror(errno));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
|
|
|
||||||
|
|
@ -452,21 +452,20 @@ send:
|
||||||
|
|
||||||
switch (so->so_ffamily) {
|
switch (so->so_ffamily) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
||||||
- sizeof(struct ip);
|
- sizeof(struct ip);
|
||||||
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
||||||
- sizeof(struct ip);
|
- sizeof(struct ip);
|
||||||
ip = mtod(m, struct ip *);
|
ip = mtod(m, struct ip *);
|
||||||
|
|
||||||
ip->ip_len = m->m_len;
|
ip->ip_len = m->m_len;
|
||||||
ip->ip_dst = tcpiph_save.ti_dst;
|
ip->ip_dst = tcpiph_save.ti_dst;
|
||||||
ip->ip_src = tcpiph_save.ti_src;
|
ip->ip_src = tcpiph_save.ti_src;
|
||||||
ip->ip_p = tcpiph_save.ti_pr;
|
ip->ip_p = tcpiph_save.ti_pr;
|
||||||
|
|
||||||
ip->ip_ttl = IPDEFTTL;
|
ip->ip_ttl = IPDEFTTL;
|
||||||
ip->ip_tos = so->so_iptos;
|
ip->ip_tos = so->so_iptos;
|
||||||
|
error = ip_output(so, m);
|
||||||
error = ip_output(so, m);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -80,12 +80,12 @@ tcp_template(struct tcpcb *tp)
|
||||||
n->ti_x0 = 0;
|
n->ti_x0 = 0;
|
||||||
switch (so->so_ffamily) {
|
switch (so->so_ffamily) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
n->ti_pr = IPPROTO_TCP;
|
n->ti_pr = IPPROTO_TCP;
|
||||||
n->ti_len = htons(sizeof(struct tcphdr));
|
n->ti_len = htons(sizeof(struct tcphdr));
|
||||||
n->ti_src = so->so_faddr;
|
n->ti_src = so->so_faddr;
|
||||||
n->ti_dst = so->so_laddr;
|
n->ti_dst = so->so_laddr;
|
||||||
n->ti_sport = so->so_fport;
|
n->ti_sport = so->so_fport;
|
||||||
n->ti_dport = so->so_lport;
|
n->ti_dport = so->so_lport;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
@ -153,8 +153,8 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
|
||||||
#define xchg(a,b,type) { type t; t=a; a=b; b=t; }
|
#define xchg(a,b,type) { type t; t=a; a=b; b=t; }
|
||||||
switch (af) {
|
switch (af) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
|
xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, uint32_t);
|
||||||
xchg(ti->ti_dport, ti->ti_sport, uint16_t);
|
xchg(ti->ti_dport, ti->ti_sport, uint16_t);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
|
|
@ -185,23 +185,23 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
|
||||||
|
|
||||||
switch (af) {
|
switch (af) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
m->m_data += sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
||||||
- sizeof(struct ip);
|
- sizeof(struct ip);
|
||||||
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
m->m_len -= sizeof(struct tcpiphdr) - sizeof(struct tcphdr)
|
||||||
- sizeof(struct ip);
|
- sizeof(struct ip);
|
||||||
ip = mtod(m, struct ip *);
|
ip = mtod(m, struct ip *);
|
||||||
ip->ip_len = tlen;
|
ip->ip_len = tlen;
|
||||||
ip->ip_dst = tcpiph_save.ti_dst;
|
ip->ip_dst = tcpiph_save.ti_dst;
|
||||||
ip->ip_src = tcpiph_save.ti_src;
|
ip->ip_src = tcpiph_save.ti_src;
|
||||||
ip->ip_p = tcpiph_save.ti_pr;
|
ip->ip_p = tcpiph_save.ti_pr;
|
||||||
|
|
||||||
if (flags & TH_RST) {
|
if (flags & TH_RST) {
|
||||||
ip->ip_ttl = MAXTTL;
|
ip->ip_ttl = MAXTTL;
|
||||||
} else {
|
} else {
|
||||||
ip->ip_ttl = IPDEFTTL;
|
ip->ip_ttl = IPDEFTTL;
|
||||||
}
|
}
|
||||||
|
|
||||||
(void) ip_output((struct socket *)0, m);
|
(void) ip_output((struct socket *)0, m);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue