From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Famhs-0005XJ-LS for qemu-devel@nongnu.org; Tue, 02 May 2006 00:41:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Famhr-0005Vp-JN for qemu-devel@nongnu.org; Tue, 02 May 2006 00:41:51 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Famhq-0005VN-B3 for qemu-devel@nongnu.org; Tue, 02 May 2006 00:41:50 -0400 Received: from [64.233.162.193] (helo=nz-out-0102.google.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1Famhu-0003nh-Vb for qemu-devel@nongnu.org; Tue, 02 May 2006 00:41:55 -0400 Received: by nz-out-0102.google.com with SMTP id 14so2905890nzn for ; Mon, 01 May 2006 21:41:49 -0700 (PDT) Message-ID: Date: Mon, 1 May 2006 21:41:48 -0700 From: "Ed Swierk" Sender: eswierk@gmail.com Subject: Re: [Qemu-devel] [PATCH] Separate alias_addr (10.0.2.2) from our_addr in slirp In-Reply-To: <24734323.1146531502885.JavaMail.root@eastrmwml06.mgt.cox.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_761_21791873.1146544908934" References: <24734323.1146531502885.JavaMail.root@eastrmwml06.mgt.cox.net> 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_761_21791873.1146544908934 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 Content-Disposition: inline T24gNS8xLzA2LCBCZW4gVGF5bG9yIDxzb2wxMHg4NkBjb3gubmV0PiB3cm90ZToKPiBBbSBJIHNl ZWluZyBhIHByb2JsZW0gaW4gbGluZSA5OCBvZiBzbGlycC9taXNjLmM/CgpZZXMtLXRoYW5rcyBm b3IgZmluZGluZyB0aGF0LgoKQW4gYW1lbmRlZCBwYXRjaCBpcyBhdHRhY2hlZC4KCi0tRWQK ------=_Part_761_21791873.1146544908934 Content-Type: text/x-patch; name="qemu-alias-addr.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="qemu-alias-addr.patch" X-Attachment-Id: f_empr5gko ZGlmZiAtQnVyTiBxZW11Lm9yaWcvc2xpcnAvaXBfaWNtcC5jIHFlbXUvc2xpcnAvaXBfaWNtcC5j Ci0tLSBxZW11Lm9yaWcvc2xpcnAvaXBfaWNtcC5jCTIwMDQtMDQtMjIgMDA6MTA6NDcuMDAwMDAw MDAwICswMDAwCisrKyBxZW11L3NsaXJwL2lwX2ljbXAuYwkyMDA2LTA1LTAxIDIyOjA1OjA1LjAw MDAwMDAwMCArMDAwMApAQCAtMTE0LDggKzExNCw3IEBACiAgIGNhc2UgSUNNUF9FQ0hPOgogICAg IGljcC0+aWNtcF90eXBlID0gSUNNUF9FQ0hPUkVQTFk7CiAgICAgaXAtPmlwX2xlbiArPSBobGVu OwkgICAgICAgICAgICAgLyogc2luY2UgaXBfaW5wdXQgc3VidHJhY3RzIHRoaXMgKi8KLSAgICBp ZiAoaXAtPmlwX2RzdC5zX2FkZHIgPT0gb3VyX2FkZHIuc19hZGRyIHx8IAotCShpcC0+aXBfZHN0 LnNfYWRkciA9PSAoc3BlY2lhbF9hZGRyLnNfYWRkcnxodG9ubChDVExfQUxJQVMpKSkgKSB7Cisg ICAgaWYgKGlwLT5pcF9kc3Quc19hZGRyID09IGFsaWFzX2FkZHIuc19hZGRyKSB7CiAgICAgICBp Y21wX3JlZmxlY3QobSk7CiAgICAgfSBlbHNlIHsKICAgICAgIHN0cnVjdCBzb2NrZXQgKnNvOwpA QCAtMTYxLDcgKzE2MCw3IEBACiAJaWNtcF9lcnJvcihtLCBJQ01QX1VOUkVBQ0gsSUNNUF9VTlJF QUNIX05FVCwgMCxzdHJlcnJvcihlcnJubykpOyAKIAl1ZHBfZGV0YWNoKHNvKTsKICAgICAgIH0K LSAgICB9IC8qIGlmIGlwLT5pcF9kc3Quc19hZGRyID09IG91cl9hZGRyLnNfYWRkciAqLworICAg IH0gLyogaWYgaXAtPmlwX2RzdC5zX2FkZHIgPT0gYWxpYXNfYWRkci5zX2FkZHIgKi8KICAgICBi cmVhazsKICAgY2FzZSBJQ01QX1VOUkVBQ0g6CiAgICAgLyogWFhYPyByZXBvcnQgZXJyb3I/IGNs b3NlIHNvY2tldD8gKi8KQEAgLTMxMSw3ICszMTAsNyBAQAogICBpcC0+aXBfdHRsID0gTUFYVFRM OwogICBpcC0+aXBfcCA9IElQUFJPVE9fSUNNUDsKICAgaXAtPmlwX2RzdCA9IGlwLT5pcF9zcmM7 ICAgIC8qIGlwIGFkcmVzc2VzICovCi0gIGlwLT5pcF9zcmMgPSBvdXJfYWRkcjsKKyAgaXAtPmlw X3NyYyA9IGFsaWFzX2FkZHI7CiAKICAgKHZvaWQgKSBpcF9vdXRwdXQoKHN0cnVjdCBzb2NrZXQg KilOVUxMLCBtKTsKICAgCmRpZmYgLUJ1ck4gcWVtdS5vcmlnL3NsaXJwL21haW4uaCBxZW11L3Ns aXJwL21haW4uaAotLS0gcWVtdS5vcmlnL3NsaXJwL21haW4uaAkyMDA0LTA3LTEyIDIyOjMzOjA0 LjAwMDAwMDAwMCArMDAwMAorKysgcWVtdS9zbGlycC9tYWluLmgJMjAwNi0wNS0wMSAyMjowNTow NS4wMDAwMDAwMDAgKzAwMDAKQEAgLTM0LDYgKzM0LDcgQEAKIGV4dGVybiBmZF9zZXQgKmdsb2Jh bF9yZWFkZmRzLCAqZ2xvYmFsX3dyaXRlZmRzLCAqZ2xvYmFsX3hmZHM7CiBleHRlcm4gc3RydWN0 IGluX2FkZHIgY3RsX2FkZHI7CiBleHRlcm4gc3RydWN0IGluX2FkZHIgc3BlY2lhbF9hZGRyOwor ZXh0ZXJuIHN0cnVjdCBpbl9hZGRyIGFsaWFzX2FkZHI7CiBleHRlcm4gc3RydWN0IGluX2FkZHIg b3VyX2FkZHI7CiBleHRlcm4gc3RydWN0IGluX2FkZHIgbG9vcGJhY2tfYWRkcjsKIGV4dGVybiBz dHJ1Y3QgaW5fYWRkciBkbnNfYWRkcjsKZGlmZiAtQnVyTiBxZW11Lm9yaWcvc2xpcnAvbWlzYy5j IHFlbXUvc2xpcnAvbWlzYy5jCi0tLSBxZW11Lm9yaWcvc2xpcnAvbWlzYy5jCTIwMDYtMDQtMjMg MTk6NDE6MTcuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L3NsaXJwL21pc2MuYwkyMDA2LTA1LTAx IDIyOjA2OjA4LjAwMDAwMDAwMCArMDAwMApAQCAtOTQsMTAgKzk0LDggQEAKICAgICAgICAgICAg IGhlID0gZ2V0aG9zdGJ5bmFtZShidWZmKTsKICAgICAgICAgaWYgKGhlKQogICAgICAgICAgICAg b3VyX2FkZHIgPSAqKHN0cnVjdCBpbl9hZGRyICopaGUtPmhfYWRkcjsKLSAgICAgICAgLyogSWYg dGhlIGhvc3QgZG9lc24ndCBoYXZlIGEgdXNlZnVsIElQIGFkZHJlc3MgdGhlbiB1c2UgdGhlCi0g ICAgICAgICAgIGd1ZXN0IHNpZGUgYWRkcmVzcy4gICovCi0gICAgICAgIGlmIChvdXJfYWRkci5z X2FkZHIgPT0gMCB8fCBvdXJfYWRkci5zX2FkZHIgPT0gbG9vcGJhY2tfYWRkci5zX2FkZHIpCi0g ICAgICAgICAgICBvdXJfYWRkci5zX2FkZHIgPSBzcGVjaWFsX2FkZHIuc19hZGRyIHwgaHRvbmwo Q1RMX0FMSUFTKTsKKyAgICAgICAgaWYgKG91cl9hZGRyLnNfYWRkciA9PSAwKQorICAgICAgICAg ICAgb3VyX2FkZHIuc19hZGRyID0gbG9vcGJhY2tfYWRkci5zX2FkZHI7CiB9CiAKICNpZiBTSVpF T0ZfQ0hBUl9QID09IDgKZGlmZiAtQnVyTiBxZW11Lm9yaWcvc2xpcnAvc2xpcnAuYyBxZW11L3Ns aXJwL3NsaXJwLmMKLS0tIHFlbXUub3JpZy9zbGlycC9zbGlycC5jCTIwMDYtMDUtMDEgMTY6MDU6 MjcuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L3NsaXJwL3NsaXJwLmMJMjAwNi0wNS0wMSAyMjow NTowNS4wMDAwMDAwMDAgKzAwMDAKQEAgLTksNiArOSw4IEBACiAKIC8qIGFkZHJlc3MgZm9yIHNs aXJwIHZpcnR1YWwgYWRkcmVzc2VzICovCiBzdHJ1Y3QgaW5fYWRkciBzcGVjaWFsX2FkZHI7Cisv KiB2aXJ0dWFsIGFkZHJlc3MgYWxpYXMgZm9yIGhvc3QgKi8KK3N0cnVjdCBpbl9hZGRyIGFsaWFz X2FkZHI7CiAKIGNvbnN0IHVpbnQ4X3Qgc3BlY2lhbF9ldGhhZGRyWzZdID0geyAKICAgICAweDUy LCAweDU0LCAweDAwLCAweDEyLCAweDM1LCAweDAwCkBAIC0xNTQsNiArMTU2LDcgQEAKICAgICB9 CiAKICAgICBpbmV0X2F0b24oQ1RMX1NQRUNJQUwsICZzcGVjaWFsX2FkZHIpOworICAgIGFsaWFz X2FkZHIuc19hZGRyID0gc3BlY2lhbF9hZGRyLnNfYWRkciB8IGh0b25sKENUTF9BTElBUyk7CiAg ICAgZ2V0b3VyYWRkcigpOwogfQogCmRpZmYgLUJ1ck4gcWVtdS5vcmlnL3NsaXJwL3NvY2tldC5j IHFlbXUvc2xpcnAvc29ja2V0LmMKLS0tIHFlbXUub3JpZy9zbGlycC9zb2NrZXQuYwkyMDA2LTA0 LTI1IDIyOjM2OjA2LjAwMDAwMDAwMCArMDAwMAorKysgcWVtdS9zbGlycC9zb2NrZXQuYwkyMDA2 LTA1LTAxIDIyOjA1OjA1LjAwMDAwMDAwMCArMDAwMApAQCAtNTk2LDcgKzU5Niw3IEBACiAJZ2V0 c29ja25hbWUocywoc3RydWN0IHNvY2thZGRyICopJmFkZHIsJmFkZHJsZW4pOwogCXNvLT5zb19m cG9ydCA9IGFkZHIuc2luX3BvcnQ7CiAJaWYgKGFkZHIuc2luX2FkZHIuc19hZGRyID09IDAgfHwg YWRkci5zaW5fYWRkci5zX2FkZHIgPT0gbG9vcGJhY2tfYWRkci5zX2FkZHIpCi0JICAgc28tPnNv X2ZhZGRyID0gb3VyX2FkZHI7CisJICAgc28tPnNvX2ZhZGRyID0gYWxpYXNfYWRkcjsKIAllbHNl CiAJICAgc28tPnNvX2ZhZGRyID0gYWRkci5zaW5fYWRkcjsKIApkaWZmIC1CdXJOIHFlbXUub3Jp Zy9zbGlycC90Y3Bfc3Vici5jIHFlbXUvc2xpcnAvdGNwX3N1YnIuYwotLS0gcWVtdS5vcmlnL3Ns aXJwL3RjcF9zdWJyLmMJMjAwNC0wOS0xOCAxOTozMzo1Ni4wMDAwMDAwMDAgKzAwMDAKKysrIHFl bXUvc2xpcnAvdGNwX3N1YnIuYwkyMDA2LTA1LTAxIDIyOjA1OjA1LjAwMDAwMDAwMCArMDAwMApA QCAtNTA0LDcgKzUwNCw3IEBACiAJc28tPnNvX2ZhZGRyID0gYWRkci5zaW5fYWRkcjsKIAkvKiBU cmFuc2xhdGUgY29ubmVjdGlvbnMgZnJvbSBsb2NhbGhvc3QgdG8gdGhlIHJlYWwgaG9zdG5hbWUg Ki8KIAlpZiAoc28tPnNvX2ZhZGRyLnNfYWRkciA9PSAwIHx8IHNvLT5zb19mYWRkci5zX2FkZHIg PT0gbG9vcGJhY2tfYWRkci5zX2FkZHIpCi0JICAgc28tPnNvX2ZhZGRyID0gb3VyX2FkZHI7CisJ ICAgc28tPnNvX2ZhZGRyID0gYWxpYXNfYWRkcjsKIAkKIAkvKiBDbG9zZSB0aGUgYWNjZXB0KCkg c29ja2V0LCBzZXQgcmlnaHQgc3RhdGUgKi8KIAlpZiAoaW5zby0+c29fc3RhdGUgJiBTU19GQUND RVBUT05DRSkgewpAQCAtODQwLDcgKzg0MCw3IEBACiAKIAkJCQlpZiAobnMtPnNvX2ZhZGRyLnNf YWRkciA9PSAwIHx8IAogCQkJCQlucy0+c29fZmFkZHIuc19hZGRyID09IGxvb3BiYWNrX2FkZHIu c19hZGRyKQotICAgICAgICAgICAgICAgICAgbnMtPnNvX2ZhZGRyID0gb3VyX2FkZHI7CisgICAg ICAgICAgICAgICAgICBucy0+c29fZmFkZHIgPSBhbGlhc19hZGRyOwogCiAJCQkJbnMtPnNvX2lw dG9zID0gdGNwX3Rvcyhucyk7CiAJCQkJdHAgPSBzb3RvdGNwY2IobnMpOwpkaWZmIC1CdXJOIHFl bXUub3JpZy9zbGlycC91ZHAuYyBxZW11L3NsaXJwL3VkcC5jCi0tLSBxZW11Lm9yaWcvc2xpcnAv dWRwLmMJMjAwNS0wNy0wMyAxNzowODo0My4wMDAwMDAwMDAgKzAwMDAKKysrIHFlbXUvc2xpcnAv dWRwLmMJMjAwNi0wNS0wMSAyMjowNTowNS4wMDAwMDAwMDAgKzAwMDAKQEAgLTY1Nyw3ICs2NTcs NyBAQAogCWdldHNvY2tuYW1lKHNvLT5zLChzdHJ1Y3Qgc29ja2FkZHIgKikmYWRkciwmYWRkcmxl bik7CiAJc28tPnNvX2Zwb3J0ID0gYWRkci5zaW5fcG9ydDsKIAlpZiAoYWRkci5zaW5fYWRkci5z X2FkZHIgPT0gMCB8fCBhZGRyLnNpbl9hZGRyLnNfYWRkciA9PSBsb29wYmFja19hZGRyLnNfYWRk cikKLQkgICBzby0+c29fZmFkZHIgPSBvdXJfYWRkcjsKKwkgICBzby0+c29fZmFkZHIgPSBhbGlh c19hZGRyOwogCWVsc2UKIAkgICBzby0+c29fZmFkZHIgPSBhZGRyLnNpbl9hZGRyOwogCQo= ------=_Part_761_21791873.1146544908934--