From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I1SA1-00041U-N4 for qemu-devel@nongnu.org; Thu, 21 Jun 2007 15:17:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I1SA1-00041I-2U for qemu-devel@nongnu.org; Thu, 21 Jun 2007 15:17:41 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I1SA0-00041F-Tz for qemu-devel@nongnu.org; Thu, 21 Jun 2007 15:17:40 -0400 Received: from web57005.mail.re3.yahoo.com ([66.196.97.109]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1I1SA0-0004eL-6F for qemu-devel@nongnu.org; Thu, 21 Jun 2007 15:17:40 -0400 Date: Thu, 21 Jun 2007 12:17:39 -0700 (PDT) From: "Balazs Attila-Mihaly \(Cd-MaN\)" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-956029236-1182453459=:59735" Message-ID: <876510.59735.qm@web57005.mail.re3.yahoo.com> Subject: [Qemu-devel] [PATCH] Dump traffic on virtual network to pcap file 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 --0-956029236-1182453459=:59735 Content-Type: text/plain; charset=ascii Hello all. As promised I'll start to provide patches for modifications I've made to the Qemu source code as part of the project. Attached you find the first of these patches - an option to dump the traffic on a virtual interface to a tcpdump compatible file. I welcome any feedback since this is the first time I contributed actual code to an open source project. My main concern is that the code performing the actual dump is bound to the vlan not to the interface (it does the saving in the "qemu_send_packet" procedure). While this is generally speaking ok (since there is usually one vlan per interface per virtual computer), I welcome any suggestion where the code should be put. Best regards, Cd-MaN ___________________________________________________________ New Yahoo! Mail is the ultimate force in competitive emailing. Find out more at the Yahoo! Mail Championships. Plus: play games and win prizes. http://uk.rd.yahoo.com/evt=44106/*http://mail.yahoo.net/uk --0-956029236-1182453459=:59735 Content-Type: text/x-patch; name="=?utf-8?q?dump=5Ftraffic=5Fto=5Fpcap.diff?=" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="=?utf-8?q?dump=5Ftraffic=5Fto=5Fpcap.diff?=" SW5kZXg6IHZsLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L3NvdXJjZXMvcWVtdS9xZW11L3ZsLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuMzA2CmRpZmYgLXUgLXIxLjMwNiB2bC5jCi0tLSB2bC5jCTEwIEp1biAy MDA3IDE5OjIxOjA0IC0wMDAwCTEuMzA2CisrKyB2bC5jCTIxIEp1biAyMDA3 IDE5OjEzOjMyIC0wMDAwCkBAIC0zMTU3LDYgKzMxNTcsMTIgQEAKICAgICB3 aGlsZSAoKnB2bGFuICE9IE5VTEwpCiAgICAgICAgIHB2bGFuID0gJigqcHZs YW4pLT5uZXh0OwogICAgICpwdmxhbiA9IHZsYW47CisJCisJLy9pbml0aWFs aXplIHRoZSBwYWNrZXQgY2FwdHVyZSBvcHRpb25zCisJdmxhbi0+cGNhcF9m aWxlID0gTlVMTDsJCisJdmxhbi0+bGFzdF93cml0dGVuX3RpbWUgPSAwOwor CXZsYW4tPnBhY2tldF9zZXJpYWxfbnVtID0gMDsKKwkKICAgICByZXR1cm4g dmxhbjsKIH0KIApAQCAtMzIwMCw2ICszMjA2LDIyIEBACiB7CiAgICAgVkxB TlN0YXRlICp2bGFuID0gdmMxLT52bGFuOwogICAgIFZMQU5DbGllbnRTdGF0 ZSAqdmM7CisJUENBUFJlY29yZEhlYWRlciBwY2FwX3JlY29yZF9oZWFkZXI7 CisJCisJaWYgKHZsYW4tPnBjYXBfZmlsZSkgeworCQlwY2FwX3JlY29yZF9o ZWFkZXIudHNfc2VjID0gdGltZShOVUxMKTsKKwkJaWYgKHBjYXBfcmVjb3Jk X2hlYWRlci50c19zZWMgPT0gdmxhbi0+bGFzdF93cml0dGVuX3RpbWUpIHsK KwkJCXBjYXBfcmVjb3JkX2hlYWRlci50c191c2VjID0gdmxhbi0+bGFzdF93 cml0dGVuX3RpbWU7CisJCQlpZiAodmxhbi0+bGFzdF93cml0dGVuX3RpbWUg PCA5OTk5KSB2bGFuLT5sYXN0X3dyaXR0ZW5fdGltZSsrOworCQl9IGVsc2Ug eworCQkJcGNhcF9yZWNvcmRfaGVhZGVyLnRzX3VzZWMgPSAwOworCQkJdmxh bi0+bGFzdF93cml0dGVuX3RpbWUgPSAwOworCQl9CQkKKwkJcGNhcF9yZWNv cmRfaGVhZGVyLm9yaWdfbGVuID0gc2l6ZTsKKwkJcGNhcF9yZWNvcmRfaGVh ZGVyLmluY2xfbGVuID0gKHNpemUgPiAweEZGRkYpID8gMHhGRkZGIDogc2l6 ZTsKKwkJZndyaXRlKCZwY2FwX3JlY29yZF9oZWFkZXIsIHNpemVvZihwY2Fw X3JlY29yZF9oZWFkZXIpLCAxLCB2bGFuLT5wY2FwX2ZpbGUpOworCQlmd3Jp dGUoYnVmLCBwY2FwX3JlY29yZF9oZWFkZXIuaW5jbF9sZW4sIDEsIHZsYW4t PnBjYXBfZmlsZSk7CQkKKwl9CiAKICNpZiAwCiAgICAgcHJpbnRmKCJ2bGFu ICVkIHNlbmQ6XG4iLCB2bGFuLT5pZCk7CkBAIC00MTk0LDYgKzQyMTYsMjQg QEAKICAgICAgICAgaWYgKGdldF9wYXJhbV92YWx1ZShidWYsIHNpemVvZihi dWYpLCAibW9kZWwiLCBwKSkgewogICAgICAgICAgICAgbmQtPm1vZGVsID0g c3RyZHVwKGJ1Zik7CiAgICAgICAgIH0KKwkJaWYgKGdldF9wYXJhbV92YWx1 ZShidWYsIHNpemVvZihidWYpLCAicGNhcCIsIHApKSB7CisJCQl2bGFuLT5w Y2FwX2ZpbGUgPSBmb3BlbihidWYsICJ3YiIpOworCQkJaWYgKCF2bGFuLT5w Y2FwX2ZpbGUpIHsKKwkJCQlmcHJpbnRmKHN0ZGVyciwgImZhaWxlZCB0byBv cGVuIHBjYXAgZmlsZTogJWRcbiIsIGVycm5vKTsKKwkJCQlyZXR1cm4gLTE7 CisJCQl9CisJCQkvL3dyaXRlIG91dCB0aGUgc3RhbmRhcmQgdGNwZHVtcCBm aWxlIGhlYWRlcgorCQkJLy9yZWZlcmVuY2U6IGh0dHA6Ly93aWtpLndpcmVz aGFyay5vcmcvRGV2ZWxvcG1lbnQvTGlicGNhcEZpbGVGb3JtYXQKKwkJCVBD QVBIZWFkZXIgaGRyOworCQkJaGRyLm1hZ2ljX251bWJlciA9IDB4YTFiMmMz ZDQ7CisJCQloZHIudmVyc2lvbl9tYWpvciA9IDI7CisJCQloZHIudmVyc2lv bl9taW5vciA9IDQ7CisJCQloZHIudGhpc3pvbmUgPSAwOworCQkJaGRyLnNp Z2ZpZ3MgPSAwOworCQkJaGRyLnNuYXBsZW4gPSAweEZGRkY7CisJCQloZHIu bmV0d29yayA9IDE7CisJCQlmd3JpdGUoJmhkciwgc2l6ZW9mKGhkciksIDEs IHZsYW4tPnBjYXBfZmlsZSk7CQkJCisJCX0KICAgICAgICAgbmQtPnZsYW4g PSB2bGFuOwogICAgICAgICBuYl9uaWNzKys7CiAgICAgICAgIHZsYW4tPm5i X2d1ZXN0X2RldnMrKzsKQEAgLTY1ODUsNyArNjYyNSw3IEBACiAgICAgICAg ICAgICItbmFtZSBzdHJpbmcgICAgc2V0IHRoZSBuYW1lIG9mIHRoZSBndWVz dFxuIgogICAgICAgICAgICAiXG4iCiAgICAgICAgICAgICJOZXR3b3JrIG9w dGlvbnM6XG4iCi0gICAgICAgICAgICItbmV0IG5pY1ssdmxhbj1uXVssbWFj YWRkcj1hZGRyXVssbW9kZWw9dHlwZV1cbiIKKyAgICAgICAgICAgIi1uZXQg bmljWyx2bGFuPW5dWyxtYWNhZGRyPWFkZHJdWyxtb2RlbD10eXBlXVsscGNh cD1maWxlXVxuIgogICAgICAgICAgICAiICAgICAgICAgICAgICAgIGNyZWF0 ZSBhIG5ldyBOZXR3b3JrIEludGVyZmFjZSBDYXJkIGFuZCBjb25uZWN0IGl0 IHRvIFZMQU4gJ24nXG4iCiAjaWZkZWYgQ09ORklHX1NMSVJQCiAgICAgICAg ICAgICItbmV0IHVzZXJbLHZsYW49bl1bLGhvc3RuYW1lPWhvc3RdXG4iCklu ZGV4OiB2bC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9z b3VyY2VzL3FlbXUvcWVtdS92bC5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAx LjI1MgpkaWZmIC11IC1yMS4yNTIgdmwuaAotLS0gdmwuaAkxOCBKdW4gMjAw NyAxODo1NTo0NiAtMDAwMAkxLjI1MgorKysgdmwuaAkyMSBKdW4gMjAwNyAx OToxNDoxMSAtMDAwMApAQCAtMzkwLDYgKzM5MCwxMiBAQAogICAgIFZMQU5D bGllbnRTdGF0ZSAqZmlyc3RfY2xpZW50OwogICAgIHN0cnVjdCBWTEFOU3Rh dGUgKm5leHQ7CiAgICAgdW5zaWduZWQgaW50IG5iX2d1ZXN0X2RldnMsIG5i X2hvc3RfZGV2czsKKwkJCisJLy91c2VkIHRvIHBlcmZvcm0gcGFja2VkIGNh cHR1cmUKKwkvL2FuZCB0byBzZXQgdGhlIHRpbWUgc3RhbXBzIG9uIHRoZSBj YXB0dXJlZCBwYWNrZXRzCisJRklMRSAqcGNhcF9maWxlOworCXRpbWVfdCBs YXN0X3dyaXR0ZW5fdGltZTsKKwlpbnQgcGFja2V0X3NlcmlhbF9udW07CiB9 IFZMQU5TdGF0ZTsKIAogVkxBTlN0YXRlICpxZW11X2ZpbmRfdmxhbihpbnQg aWQpOwpAQCAtNDAyLDYgKzQwOCwyNCBAQAogdm9pZCBxZW11X2hhbmRsZXJf dHJ1ZSh2b2lkICpvcGFxdWUpOwogCiB2b2lkIGRvX2luZm9fbmV0d29yayh2 b2lkKTsKKy8qIFBDQVAgZmlsZSBzdHJ1Y3R1cmVzICovCisKK3R5cGVkZWYg c3RydWN0IFBDQVBIZWFkZXIgeyAKKyAgICAgICAgdW5zaWduZWQgaW50IG1h Z2ljX251bWJlcjsgICAvKiBtYWdpYyBudW1iZXIgKi8KKyAgICAgICAgdW5z aWduZWQgc2hvcnQgaW50IHZlcnNpb25fbWFqb3I7ICAvKiBtYWpvciB2ZXJz aW9uIG51bWJlciAqLworICAgICAgICB1bnNpZ25lZCBzaG9ydCBpbnQgdmVy c2lvbl9taW5vcjsgIC8qIG1pbm9yIHZlcnNpb24gbnVtYmVyICovCisgICAg ICAgIGludCAgdGhpc3pvbmU7ICAgICAgIC8qIEdNVCB0byBsb2NhbCBjb3Jy ZWN0aW9uICovCisgICAgICAgIHVuc2lnbmVkIGludCBzaWdmaWdzOyAgICAg ICAgLyogYWNjdXJhY3kgb2YgdGltZXN0YW1wcyAqLworICAgICAgICB1bnNp Z25lZCBpbnQgc25hcGxlbjsgICAgICAgIC8qIG1heCBsZW5ndGggb2YgY2Fw dHVyZWQgcGFja2V0cywgaW4gb2N0ZXRzICovCisgICAgICAgIHVuc2lnbmVk IGludCBuZXR3b3JrOyAgICAgICAgLyogZGF0YSBsaW5rIHR5cGUgKi8KK30g UENBUEhlYWRlcjsKKwordHlwZWRlZiBzdHJ1Y3QgUENBUFJlY29yZEhlYWRl ciB7IAorICAgICAgICB1bnNpZ25lZCBpbnQgdHNfc2VjOyAgICAgICAgIC8q IHRpbWVzdGFtcCBzZWNvbmRzICovCisgICAgICAgIHVuc2lnbmVkIGludCB0 c191c2VjOyAgICAgICAgLyogdGltZXN0YW1wIG1pY3Jvc2Vjb25kcyAqLwor ICAgICAgICB1bnNpZ25lZCBpbnQgaW5jbF9sZW47ICAgICAgIC8qIG51bWJl ciBvZiBvY3RldHMgb2YgcGFja2V0IHNhdmVkIGluIGZpbGUgKi8KKyAgICAg ICAgdW5zaWduZWQgaW50IG9yaWdfbGVuOyAgICAgICAvKiBhY3R1YWwgbGVu Z3RoIG9mIHBhY2tldCAqLworfSBQQ0FQUmVjb3JkSGVhZGVyOwogCiAvKiBU QVAgd2luMzIgKi8KIGludCB0YXBfd2luMzJfaW5pdChWTEFOU3RhdGUgKnZs YW4sIGNvbnN0IGNoYXIgKmlmbmFtZSk7Cg== --0-956029236-1182453459=:59735--