mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
find -type f | xargs sed -i 's/[\t ]*$//g' # Yes, again. Note the star in the regex.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3177 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths
parent
ef18c8839e
commit
3b46e62427
173 changed files with 1557 additions and 1557 deletions
|
|
@ -38,10 +38,10 @@ static int get_dns_addr(struct in_addr *pdns_addr)
|
|||
DWORD ret;
|
||||
IP_ADDR_STRING *pIPAddr;
|
||||
struct in_addr tmp_addr;
|
||||
|
||||
|
||||
FixedInfo = (FIXED_INFO *)GlobalAlloc(GPTR, sizeof(FIXED_INFO));
|
||||
BufLen = sizeof(FIXED_INFO);
|
||||
|
||||
|
||||
if (ERROR_BUFFER_OVERFLOW == GetNetworkParams(FixedInfo, &BufLen)) {
|
||||
if (FixedInfo) {
|
||||
GlobalFree(FixedInfo);
|
||||
|
|
@ -58,14 +58,14 @@ static int get_dns_addr(struct in_addr *pdns_addr)
|
|||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
pIPAddr = &(FixedInfo->DnsServerList);
|
||||
inet_aton(pIPAddr->IpAddress.String, &tmp_addr);
|
||||
*pdns_addr = tmp_addr;
|
||||
#if 0
|
||||
printf( "DNS Servers:\n" );
|
||||
printf( "DNS Addr:%s\n", pIPAddr->IpAddress.String );
|
||||
|
||||
|
||||
pIPAddr = FixedInfo -> DnsServerList.Next;
|
||||
while ( pIPAddr ) {
|
||||
printf( "DNS Addr:%s\n", pIPAddr ->IpAddress.String );
|
||||
|
|
@ -88,7 +88,7 @@ static int get_dns_addr(struct in_addr *pdns_addr)
|
|||
FILE *f;
|
||||
int found = 0;
|
||||
struct in_addr tmp_addr;
|
||||
|
||||
|
||||
f = fopen("/etc/resolv.conf", "r");
|
||||
if (!f)
|
||||
return -1;
|
||||
|
|
@ -130,7 +130,7 @@ void slirp_cleanup(void)
|
|||
void slirp_init(void)
|
||||
{
|
||||
// debug_init("/tmp/slirp.log", DEBUG_DEFAULT);
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
{
|
||||
WSADATA Data;
|
||||
|
|
@ -201,7 +201,7 @@ void slirp_select_fill(int *pnfds,
|
|||
global_readfds = NULL;
|
||||
global_writefds = NULL;
|
||||
global_xfds = NULL;
|
||||
|
||||
|
||||
nfds = *pnfds;
|
||||
/*
|
||||
* First, TCP sockets
|
||||
|
|
@ -214,23 +214,23 @@ void slirp_select_fill(int *pnfds,
|
|||
*/
|
||||
do_slowtimo = ((tcb.so_next != &tcb) ||
|
||||
((struct ipasfrag *)&ipq != (struct ipasfrag *)ipq.next));
|
||||
|
||||
|
||||
for (so = tcb.so_next; so != &tcb; so = so_next) {
|
||||
so_next = so->so_next;
|
||||
|
||||
|
||||
/*
|
||||
* See if we need a tcp_fasttimo
|
||||
*/
|
||||
if (time_fasttimo == 0 && so->so_tcpcb->t_flags & TF_DELACK)
|
||||
time_fasttimo = curtime; /* Flag when we want a fasttimo */
|
||||
|
||||
|
||||
/*
|
||||
* NOFDREF can include still connecting to local-host,
|
||||
* newly socreated() sockets etc. Don't want to select these.
|
||||
*/
|
||||
if (so->so_state & SS_NOFDREF || so->s == -1)
|
||||
continue;
|
||||
|
||||
|
||||
/*
|
||||
* Set for reading sockets which are accepting
|
||||
*/
|
||||
|
|
@ -239,7 +239,7 @@ void slirp_select_fill(int *pnfds,
|
|||
UPD_NFDS(so->s);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Set for writing sockets which are connecting
|
||||
*/
|
||||
|
|
@ -248,7 +248,7 @@ void slirp_select_fill(int *pnfds,
|
|||
UPD_NFDS(so->s);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Set for writing if we are connected, can send more, and
|
||||
* we have something to send
|
||||
|
|
@ -257,7 +257,7 @@ void slirp_select_fill(int *pnfds,
|
|||
FD_SET(so->s, writefds);
|
||||
UPD_NFDS(so->s);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Set for reading (and urgent data) if we are connected, can
|
||||
* receive more, and we have room for it XXX /2 ?
|
||||
|
|
@ -268,13 +268,13 @@ void slirp_select_fill(int *pnfds,
|
|||
UPD_NFDS(so->s);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* UDP sockets
|
||||
*/
|
||||
for (so = udb.so_next; so != &udb; so = so_next) {
|
||||
so_next = so->so_next;
|
||||
|
||||
|
||||
/*
|
||||
* See if it's timed out
|
||||
*/
|
||||
|
|
@ -285,7 +285,7 @@ void slirp_select_fill(int *pnfds,
|
|||
} else
|
||||
do_slowtimo = 1; /* Let socket expire */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* When UDP packets are received from over the
|
||||
* link, they're sendto()'d straight away, so
|
||||
|
|
@ -324,13 +324,13 @@ void slirp_select_fill(int *pnfds,
|
|||
timeout.tv_usec = 0;
|
||||
else if (timeout.tv_usec > 510000)
|
||||
timeout.tv_usec = 510000;
|
||||
|
||||
|
||||
/* Can only fasttimo if we also slowtimo */
|
||||
if (time_fasttimo) {
|
||||
tmp_time = (200 - (curtime - time_fasttimo)) * 1000;
|
||||
if (tmp_time < 0)
|
||||
tmp_time = 0;
|
||||
|
||||
|
||||
/* Choose the smallest of the 2 */
|
||||
if (tmp_time < timeout.tv_usec)
|
||||
timeout.tv_usec = (u_int)tmp_time;
|
||||
|
|
@ -375,14 +375,14 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
*/
|
||||
for (so = tcb.so_next; so != &tcb; so = so_next) {
|
||||
so_next = so->so_next;
|
||||
|
||||
|
||||
/*
|
||||
* FD_ISSET is meaningless on these sockets
|
||||
* (and they can crash the program)
|
||||
*/
|
||||
if (so->so_state & SS_NOFDREF || so->s == -1)
|
||||
continue;
|
||||
|
||||
|
||||
/*
|
||||
* Check for URG data
|
||||
* This will soread as well, so no need to
|
||||
|
|
@ -402,12 +402,12 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
continue;
|
||||
} /* else */
|
||||
ret = soread(so);
|
||||
|
||||
|
||||
/* Output it if we read something */
|
||||
if (ret > 0)
|
||||
tcp_output(sototcpcb(so));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Check sockets for writing
|
||||
*/
|
||||
|
|
@ -418,19 +418,19 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
if (so->so_state & SS_ISFCONNECTING) {
|
||||
/* Connected */
|
||||
so->so_state &= ~SS_ISFCONNECTING;
|
||||
|
||||
|
||||
ret = send(so->s, &ret, 0, 0);
|
||||
if (ret < 0) {
|
||||
/* XXXXX Must fix, zero bytes is a NOP */
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK ||
|
||||
errno == EINPROGRESS || errno == ENOTCONN)
|
||||
continue;
|
||||
|
||||
|
||||
/* else failed */
|
||||
so->so_state = SS_NOFDREF;
|
||||
}
|
||||
/* else so->so_state &= ~SS_ISFCONNECTING; */
|
||||
|
||||
|
||||
/*
|
||||
* Continue tcp_input
|
||||
*/
|
||||
|
|
@ -445,7 +445,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
* a window probe to get things going again
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Probe a still-connecting, non-blocking socket
|
||||
* to check if it's still alive
|
||||
|
|
@ -453,16 +453,16 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
#ifdef PROBE_CONN
|
||||
if (so->so_state & SS_ISFCONNECTING) {
|
||||
ret = recv(so->s, (char *)&ret, 0,0);
|
||||
|
||||
|
||||
if (ret < 0) {
|
||||
/* XXX */
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK ||
|
||||
errno == EINPROGRESS || errno == ENOTCONN)
|
||||
continue; /* Still connecting, continue */
|
||||
|
||||
|
||||
/* else failed */
|
||||
so->so_state = SS_NOFDREF;
|
||||
|
||||
|
||||
/* tcp_input will take care of it */
|
||||
} else {
|
||||
ret = send(so->s, &ret, 0,0);
|
||||
|
|
@ -475,13 +475,13 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
so->so_state = SS_NOFDREF;
|
||||
} else
|
||||
so->so_state &= ~SS_ISFCONNECTING;
|
||||
|
||||
|
||||
}
|
||||
tcp_input((struct mbuf *)NULL, sizeof(struct ip),so);
|
||||
} /* SS_ISFCONNECTING */
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Now UDP sockets.
|
||||
* Incoming packets are sent straight away, they're not buffered.
|
||||
|
|
@ -489,7 +489,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
|
|||
*/
|
||||
for (so = udb.so_next; so != &udb; so = so_next) {
|
||||
so_next = so->so_next;
|
||||
|
||||
|
||||
if (so->s != -1 && FD_ISSET(so->s, readfds)) {
|
||||
sorecvfrom(so);
|
||||
}
|
||||
|
|
@ -600,7 +600,7 @@ void slirp_input(const uint8_t *pkt, int pkt_len)
|
|||
|
||||
if (pkt_len < ETH_HLEN)
|
||||
return;
|
||||
|
||||
|
||||
proto = ntohs(*(uint16_t *)(pkt + 12));
|
||||
switch(proto) {
|
||||
case ETH_P_ARP:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue