From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FaONS-00076V-Dj for qemu-devel@nongnu.org; Sun, 30 Apr 2006 22:43:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FaONQ-00072y-Lm for qemu-devel@nongnu.org; Sun, 30 Apr 2006 22:43:10 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FaONQ-00072W-FV for qemu-devel@nongnu.org; Sun, 30 Apr 2006 22:43:08 -0400 Received: from [64.233.162.199] (helo=nz-out-0102.google.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FaOR9-0006a5-0D for qemu-devel@nongnu.org; Sun, 30 Apr 2006 22:46:59 -0400 Received: by nz-out-0102.google.com with SMTP id 14so2646254nzn for ; Sun, 30 Apr 2006 19:43:07 -0700 (PDT) Message-ID: Date: Sun, 30 Apr 2006 19:43:07 -0700 From: "Ed Swierk" Sender: eswierk@gmail.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_8616_22813418.1146451387158" Subject: [Qemu-devel] [PATCH] Always use 10.0.2.2 as host addr for -net user (slirp) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_8616_22813418.1146451387158 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Content-Disposition: inline QSBjb3VwbGUgb2Ygc2VyaW91cyBwcm9ibGVtcyByZW1haW4gaW4gdGhlIHNsaXJwIHJlZGlyZWN0 aW9uIGNvZGUKYWZ0ZXIgdGhlIHBhdGNoIFBhdWwgYXBwbGllZCBvbiAyMyBBcHJpbC4KCiogSWYg dGhlIElQIGFkZHJlc3MgcmV0dXJuZWQgYnkgZ2V0aG9zdGJ5bmFtZShnZXRob3N0bmFtZSgpKSBp cyB0aGUKYWRkcmVzcyBvZiBvbmUgb2YgdGhlIGhvc3QncyBFdGhlcm5ldCBpbnRlcmZhY2VzLCBi cmluZ2luZyBkb3duIHRoYXQKaW50ZXJmYWNlIG9yIGNoYW5naW5nIGl0cyBJUCBhZGRyZXNzIGRp c3J1cHRzIHJlZGlyIGNvbm5lY3Rpb25zCmJldHdlZW4gdGhlIGhvc3QgYW5kIFZNLgoKKiBJZiB0 aGUgSVAgYWRkcmVzcyByZXR1cm5lZCBieSBnZXRob3N0YnluYW1lKGdldGhvc3RuYW1lKCkpIGlz Cm91dHNpZGUgdGhlIDEwLjAuMi4wLzI0IHN1Ym5ldCwgYW5kIHRoZSB1c2VyIGhhcyBub3QgbWFu dWFsbHkgYWRkZWQKdGhpcyBhZGRyZXNzIHRvIHRoZSByb3V0aW5nIHRhYmxlIHdpdGhpbiB0aGUg Vk0gKGluIGFkZGl0aW9uIHRvIHRoZQoxMC4wLjIuMC8yNCByb3V0ZSBhZGRlZCBieSBESENQKSwg VENQIGNvbm5lY3Rpb25zIGZyb20gdGhlIGhvc3QgdG8gdGhlClZNIGFyZSBuZXZlciBhbnN3ZXJl ZCwgYmVjYXVzZSB0aGUgcmVzcG9uc2UgcGFja2V0cyBhcmUgZHJvcHBlZCBvbiB0aGUKZmxvb3Iu CgpUaGUgYXR0YWNoZWQgcGF0Y2ggc29sdmVzIGJvdGggb2YgdGhlc2UgcHJvYmxlbXMgc2ltcGx5 IGJ5IGFsd2F5cwp1c2luZyAxMC4wLjIuMiBhcyBvdXJfYWRkci4gVGhlcmUgc2VlbXMgdG8gYmUg bm8gdmFsdWUgaW4gZXhwb3NpbmcgdGhlCmhvc3QncyAicmVhbCIgYWRkcmVzcyB0byB0aGUgVk07 IHRoYW5rcyB0byBOQVQsIDEwLjAuMi4yIGFsd2F5cyB3b3Jrcy4KCi0tRWQK ------=_Part_8616_22813418.1146451387158 Content-Type: text/x-patch; name=qemu-nat-bug.patch; charset=us-ascii Content-Transfer-Encoding: 7bit X-Attachment-Id: f_emo7hv44 Content-Disposition: attachment; filename="qemu-nat-bug.patch" diff -BurN qemu-snapshot-2006-04-27_23.orig/slirp/misc.c qemu-snapshot-2006-04-27_23/slirp/misc.c --- qemu-snapshot-2006-04-27_23.orig/slirp/misc.c 2006-04-23 19:41:17.000000000 +0000 +++ qemu-snapshot-2006-04-27_23/slirp/misc.c 2006-04-27 22:19:40.000000000 +0000 @@ -87,17 +87,7 @@ void getouraddr() { - char buff[256]; - struct hostent *he = NULL; - - if (gethostname(buff,256) == 0) - he = gethostbyname(buff); - if (he) - our_addr = *(struct in_addr *)he->h_addr; - /* If the host doesn't have a useful IP address then use the - guest side address. */ - if (our_addr.s_addr == 0 || our_addr.s_addr == loopback_addr.s_addr) - our_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + our_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); } #if SIZEOF_CHAR_P == 8 ------=_Part_8616_22813418.1146451387158--