Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IzuaD-0002QH-Bs for qemu-devel@nongnu.org; Wed, 05 Dec 2007 08:46:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IzuaB-0002OA-GL for qemu-devel@nongnu.org; Wed, 05 Dec 2007 08:46:36 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IzuaB-0002Nz-CC for qemu-devel@nongnu.org; Wed, 05 Dec 2007 08:46:35 -0500 Received: from web57002.mail.re3.yahoo.com ([66.196.97.106]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1IzuaA-0006yX-VI for qemu-devel@nongnu.org; Wed, 05 Dec 2007 08:46:35 -0500 Date: Wed, 5 Dec 2007 05:46:33 -0800 (PST) From: "Balazs Attila-Mihaly \(Cd-MaN\)" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-2139476594-1196862393=:1667" Message-ID: <100449.1667.qm@web57002.mail.re3.yahoo.com> Subject: [Qemu-devel] [PATCH] Capture traffic to a 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 --0-2139476594-1196862393=:1667 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable This patch allows to capture the traffic flowing through a particular vlan = in a tcpdump compatible pcap file.=0A=0AThe patch is identical to the one c= reated some time back, however it was updated to apply to HEAD.=0A=0AUsage:= -net nic,pcap=3Dcapture_file.pcap=0A=0A=0A=0A=0A ____________________= ______________________________________=0ASent from Yahoo! - the World's fav= ourite mail http://uk.mail.yahoo.com=0A --0-2139476594-1196862393=:1667 Content-Type: text/x-patch; name="=?utf-8?q?capture=5Fnetwork=5Ftraffic.patch?=" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="=?utf-8?q?capture=5Fnetwork=5Ftraffic.patch?=" SW5kZXg6IHZsLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L3NvdXJjZXMvcWVtdS9xZW11L3ZsLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuMzc2CmRpZmYgLXUgLXIxLjM3NiB2bC5jCi0tLSB2bC5jCTQgRGVjIDIw MDcgMDA6MTA6MzQgLTAwMDAJMS4zNzYKKysrIHZsLmMJNSBEZWMgMjAwNyAx MzozODowNCAtMDAwMApAQCAtMzU4OCw2ICszNTg4LDggQEAKICAgICAgICAg cmV0dXJuIE5VTEw7CiAgICAgdmxhbi0+aWQgPSBpZDsKICAgICB2bGFuLT5u ZXh0ID0gTlVMTDsKKyAgICB2bGFuLT5wY2FwX2ZoID0gLTE7CisgICAgdmxh bi0+bGFzdF9wYWNrZXRfdGltZSA9IDA7CiAgICAgcHZsYW4gPSAmZmlyc3Rf dmxhbjsKICAgICB3aGlsZSAoKnB2bGFuICE9IE5VTEwpCiAgICAgICAgIHB2 bGFuID0gJigqcHZsYW4pLT5uZXh0OwpAQCAtMzYzNSw2ICszNjM3LDIyIEBA CiB7CiAgICAgVkxBTlN0YXRlICp2bGFuID0gdmMxLT52bGFuOwogICAgIFZM QU5DbGllbnRTdGF0ZSAqdmM7CisgICAgCisgICAgaWYgKHZsYW4tPnBjYXBf ZmggPj0gMCkgeworICAgICAgICB2bGFuLT5wYWNrZXRfaGVhZGVyLnRpbWVz dGFtcF9zZWMgPSB0aW1lKE5VTEwpOworICAgICAgICBpZiAodmxhbi0+cGFj a2V0X2hlYWRlci50aW1lc3RhbXBfc2VjID09IHZsYW4tPmxhc3RfcGFja2V0 X3RpbWUpIHsKKyAgICAgICAgICAgIGlmICh2bGFuLT5wYWNrZXRfaGVhZGVy LnRpbWVzdGFtcF91c2VjIDwgMTAwMDAwMCkKKyAgICAgICAgICAgIAkrK3Zs YW4tPnBhY2tldF9oZWFkZXIudGltZXN0YW1wX3VzZWM7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgIAl2bGFuLT5wYWNrZXRfaGVhZGVyLnRpbWVzdGFt cF91c2VjID0gMDsKKyAgICAgICAgCXZsYW4tPmxhc3RfcGFja2V0X3RpbWUg PSB2bGFuLT5wYWNrZXRfaGVhZGVyLnRpbWVzdGFtcF9zZWM7CisgICAgICAg IH0KKyAgICAgICAgCisgICAgICAgIHZsYW4tPnBhY2tldF9oZWFkZXIub3Jp Z19sZW4gPSBzaXplOworICAgICAgICB2bGFuLT5wYWNrZXRfaGVhZGVyLnNh dmVkX2xlbiA9IChzaXplID4gTUFYX0NBUFRVUkVEX1BBQ0tFVF9TSVpFKSA/ IE1BWF9DQVBUVVJFRF9QQUNLRVRfU0laRSA6IHNpemU7CisgICAgICAgIHdy aXRlKHZsYW4tPnBjYXBfZmgsICZ2bGFuLT5wYWNrZXRfaGVhZGVyLCBzaXpl b2YoUENBUFBhY2tldEhlYWRlcikpOworICAgICAgICB3cml0ZSh2bGFuLT5w Y2FwX2ZoLCBidWYsIHZsYW4tPnBhY2tldF9oZWFkZXIuc2F2ZWRfbGVuKTsK KyAgICB9ICAgIAogCiAjaWYgMAogICAgIHByaW50ZigidmxhbiAlZCBzZW5k OlxuIiwgdmxhbi0+aWQpOwpAQCAtNDY0Miw2ICs0NjYwLDcgQEAKICAgICBj aGFyIGJ1ZlsxMDI0XTsKICAgICBpbnQgdmxhbl9pZCwgcmV0OwogICAgIFZM QU5TdGF0ZSAqdmxhbjsKKyAgICBQQ0FQSGVhZGVyIGluaXRpYWxfaGVhZGVy OwogCiAgICAgcCA9IHN0cjsKICAgICBxID0gZGV2aWNlOwpAQCAtNDY2Miw2 ICs0NjgxLDIyIEBACiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiQ291bGQg bm90IGNyZWF0ZSB2bGFuICVkXG4iLCB2bGFuX2lkKTsKICAgICAgICAgcmV0 dXJuIC0xOwogICAgIH0KKyAgICBpZiAoZ2V0X3BhcmFtX3ZhbHVlKGJ1Ziwg c2l6ZW9mKGJ1ZiksICJwY2FwIiwgcCkpIHsKKyAgICAJdmxhbi0+cGNhcF9m aCA9IG9wZW4oYnVmLCBPX1dST05MWSB8IE9fQ1JFQVQgfCBPX1RSVU5DIHwg T19CSU5BUlksIDA2NDQpOworICAgIAlpZiAodmxhbi0+cGNhcF9maCA8IDAp IHsKKyAgICAJCWZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIG9wZW4gY2Fw dHVyZSBmaWxlIFwiJXNcIjogJWRcbiIsIGJ1ZiwgZXJybm8pOworICAgIAkJ cmV0dXJuIC0xOworICAgIAl9CisgICAgCQorICAgIAlpbml0aWFsX2hlYWRl ci5tYWdpY19udW1iZXIgID0gMHhhMWIyYzNkNDsKKyAgICAJaW5pdGlhbF9o ZWFkZXIudmVyc2lvbl9tYWpvciA9IDI7CisgICAgCWluaXRpYWxfaGVhZGVy LnZlcnNpb25fbWlub3IgPSA0OworICAgIAlpbml0aWFsX2hlYWRlci50aGlz em9uZSAgICAgID0gMDsKKyAgICAJaW5pdGlhbF9oZWFkZXIuc2lnZmlncyAg ICAgICA9IDA7CisgICAgCWluaXRpYWxfaGVhZGVyLnNuYXBsZW4gICAgICAg PSBNQVhfQ0FQVFVSRURfUEFDS0VUX1NJWkU7CisgICAgCWluaXRpYWxfaGVh ZGVyLm5ldHdvcmsgICAgICAgPSAxOyAvKiBFdGhlcm5ldCAqLworICAgIAl3 cml0ZSh2bGFuLT5wY2FwX2ZoLCAmaW5pdGlhbF9oZWFkZXIsIHNpemVvZihp bml0aWFsX2hlYWRlcikpOworICAgIH0KICAgICBpZiAoIXN0cmNtcChkZXZp Y2UsICJuaWMiKSkgewogICAgICAgICBOSUNJbmZvICpuZDsKICAgICAgICAg dWludDhfdCAqbWFjYWRkcjsKQEAgLTc0ODEsOCArNzUxNiwxMCBAQAogICAg ICAgICAgICAiLW5hbWUgc3RyaW5nICAgIHNldCB0aGUgbmFtZSBvZiB0aGUg Z3Vlc3RcbiIKICAgICAgICAgICAgIlxuIgogICAgICAgICAgICAiTmV0d29y ayBvcHRpb25zOlxuIgotICAgICAgICAgICAiLW5ldCBuaWNbLHZsYW49bl1b LG1hY2FkZHI9YWRkcl1bLG1vZGVsPXR5cGVdXG4iCisgICAgICAgICAgICIt bmV0IG5pY1ssdmxhbj1uXVssbWFjYWRkcj1hZGRyXVssbW9kZWw9dHlwZV1b LHBjYXA9ZmlsZW5hbWVdXG4iCiAgICAgICAgICAgICIgICAgICAgICAgICAg ICAgY3JlYXRlIGEgbmV3IE5ldHdvcmsgSW50ZXJmYWNlIENhcmQgYW5kIGNv bm5lY3QgaXQgdG8gVkxBTiAnbidcbiIKKyAgICAgICAgICAgIiAgICAgICAg ICAgICAgICBvcHRpb25hbGx5IHNhdmUgdGhlIHRyYWZmaWMgd2hpY2ggZmxv d3MgdGhyb3VnaCBWTEFOICduJyB0b1xuIgorICAgICAgICAgICAiICAgICAg ICAgICAgICAgICdmaWxlbmFtZScgaW4gcGNhcCAodGNwZHVtcCkgZm9ybWF0 XG4iCiAjaWZkZWYgQ09ORklHX1NMSVJQCiAgICAgICAgICAgICItbmV0IHVz ZXJbLHZsYW49bl1bLGhvc3RuYW1lPWhvc3RdXG4iCiAgICAgICAgICAgICIg ICAgICAgICAgICAgICAgY29ubmVjdCB0aGUgdXNlciBtb2RlIG5ldHdvcmsg c3RhY2sgdG8gVkxBTiAnbicgYW5kIHNlbmRcbiIKQEAgLTg5MzEsNSArODk2 OCwxMSBAQAogICAgIH0KICAgICB9CiAjZW5kaWYKKworICAgIC8qIGNsb3Nl IGNhcHR1cmUgZmlsZXMgYXNzb2NpYXRlZCB3aXRoIGFueSB2bGFuICovCisg ICAgZm9yKHZsYW4gPSBmaXJzdF92bGFuOyB2bGFuICE9IE5VTEw7IHZsYW4g PSB2bGFuLT5uZXh0KQorICAgICAgICBpZiAodmxhbi0+cGNhcF9maCA+PSAw KQorICAgICAgICAgICAgY2xvc2Uodmxhbi0+cGNhcF9maCk7CisgICAgICAg ICAgICAKICAgICByZXR1cm4gMDsKIH0KSW5kZXg6IG5ldC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9zb3VyY2VzL3FlbXUvcWVtdS9u ZXQuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xCmRpZmYgLXUgLXIxLjEg bmV0LmgKLS0tIG5ldC5oCTE3IE5vdiAyMDA3IDE3OjE0OjM4IC0wMDAwCTEu MQorKysgbmV0LmgJNSBEZWMgMjAwNyAxMzozODowNCAtMDAwMApAQCAtMSw2 ICsxLDI3IEBACiAjaWZuZGVmIFFFTVVfTkVUX0gKICNkZWZpbmUgUUVNVV9O RVRfSAogCisvKiBQQ0FQIHN1cHBvcnQgKi8KKy8qIHNvdXJjZTogaHR0cDov L3dpa2kud2lyZXNoYXJrLm9yZy9EZXZlbG9wbWVudC9MaWJwY2FwRmlsZUZv cm1hdCAqLwordHlwZWRlZiBzdHJ1Y3QgeworICAgIHVpbnQzMl90IG1hZ2lj X251bWJlcjsKKyAgICB1aW50MTZfdCB2ZXJzaW9uX21ham9yOworICAgIHVp bnQxNl90IHZlcnNpb25fbWlub3I7CisgICAgaW50MzJfdCB0aGlzem9uZTsK KyAgICB1aW50MzJfdCBzaWdmaWdzOworICAgIHVpbnQzMl90IHNuYXBsZW47 CisgICAgdWludDMyX3QgbmV0d29yazsKK30gUENBUEhlYWRlcjsKKwordHlw ZWRlZiBzdHJ1Y3QgeworCXVpbnQzMl90IHRpbWVzdGFtcF9zZWM7CisJdWlu dDMyX3QgdGltZXN0YW1wX3VzZWM7CisJdWludDMyX3Qgc2F2ZWRfbGVuOwor CXVpbnQzMl90IG9yaWdfbGVuOworfSBQQ0FQUGFja2V0SGVhZGVyOworCisj ZGVmaW5lIE1BWF9DQVBUVVJFRF9QQUNLRVRfU0laRSAweEZGRkYKKwogLyog VkxBTnMgc3VwcG9ydCAqLwogCiB0eXBlZGVmIHN0cnVjdCBWTEFOQ2xpZW50 U3RhdGUgVkxBTkNsaWVudFN0YXRlOwpAQCAtMjEsNiArNDIsMTAgQEAKICAg ICBWTEFOQ2xpZW50U3RhdGUgKmZpcnN0X2NsaWVudDsKICAgICBzdHJ1Y3Qg VkxBTlN0YXRlICpuZXh0OwogICAgIHVuc2lnbmVkIGludCBuYl9ndWVzdF9k ZXZzLCBuYl9ob3N0X2RldnM7CisgICAgLyogRmlsZWhhbmRsZSBmb3IgdGhl IGNhcHR1cmUgZmlsZSAqLworICAgIGludCBwY2FwX2ZoOyAgICAKKyAgICB0 aW1lX3QgbGFzdF9wYWNrZXRfdGltZTsKKyAgICBQQ0FQUGFja2V0SGVhZGVy IHBhY2tldF9oZWFkZXI7CiB9OwogCiBWTEFOU3RhdGUgKnFlbXVfZmluZF92 bGFuKGludCBpZCk7Cg== --0-2139476594-1196862393=:1667--