From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Leblond Subject: [Patch 1/2] libnfnetlink, iface conversion to string Date: Fri, 19 Jan 2007 00:30:50 +0100 Message-ID: <1169163050.8926.16.camel@localhost> References: <1167257854.31765.21.camel@localhost> <45940145.3020003@netfilter.org> <1167349247.15420.13.camel@localhost> <20070107142607.GC13543@prithivi.gnumonks.org> <1168296086.12298.6.camel@localhost> <20070109115120.GX7655@prithivi.gnumonks.org> <1169162676.8926.14.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-Gx0UdyxarzlCNi7JiGaw" Cc: Vincent Deffontaines , netfilter-devel@lists.netfilter.org, Patrick McHardy , Pablo Neira Ayuso Return-path: To: Harald Welte In-Reply-To: <1169162676.8926.14.camel@localhost> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org --=-Gx0UdyxarzlCNi7JiGaw Content-Type: multipart/mixed; boundary="=-BKsbpiV1JvF8OdUmTWLd" --=-BKsbpiV1JvF8OdUmTWLd Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Here's the patch against libnfnetlink. BR, --=20 Eric Leblond INL --=-BKsbpiV1JvF8OdUmTWLd Content-Disposition: attachment; filename=libnfnetlink_iface_name.diff Content-Type: text/x-patch; name=libnfnetlink_iface_name.diff; charset=ISO-8859-15 Content-Transfer-Encoding: base64 SW5kZXg6IGluY2x1ZGUvbGlibmZuZXRsaW5rL2xpYm5mbmV0bGluay5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gaW5jbHVkZS9saWJuZm5ldGxpbmsvbGlibmZuZXRsaW5rLmgJKHLDqXZpc2lvbiA2NzM2KQ0K KysrIGluY2x1ZGUvbGlibmZuZXRsaW5rL2xpYm5mbmV0bGluay5oCShjb3BpZSBkZSB0cmF2YWls KQ0KQEAgLTE3Niw2ICsxNzYsMTMgQEANCiANCiBleHRlcm4gdm9pZCBuZm5sX2R1bXBfcGFja2V0 KHN0cnVjdCBubG1zZ2hkciAqLCBpbnQsIGNoYXIgKik7DQogDQoraW50IG5saWZfdGFibGVfaW5p dCh2b2lkKTsNCit2b2lkIG5saWZfdGFibGVfZmluaSh2b2lkKTsNCisNCitjaGFyICpubGlmX2lu ZGV4XzJuYW1lKHVuc2lnbmVkIGludCBpbmRleCk7DQoraW50IG5saWZfdHJlYXRfbXNnKGludCBm ZCk7DQorDQorDQogLyogUGFibG86IFdoYXQgaXMgdGhlIGVxdWl2YWxlbmNlIG9mIGJlNjRfdG9f Y3B1IGluIHVzZXJzcGFjZT8NCiAgKiANCiAgKiBIYXJhbGQ6IEdvb2QgcXVlc3Rpb24uICBJIGRv bid0IHRoaW5rIHRoZXJlJ3MgYSBzdGFuZGFyZCB3YXkgW3lldD9dLCANCkluZGV4OiBzcmMvcnRu bC5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gc3JjL3J0bmwuYwkocsOpdmlzaW9uIDY3MzYpDQorKysgc3Jj L3J0bmwuYwkoY29waWUgZGUgdHJhdmFpbCkNCkBAIC0xMTYsNyArMTE2LDcgQEANCiAgICAgICAg IHN0cnVjdCBzb2NrYWRkcl9ubCBubGFkZHI7DQogDQogICAgICAgICBtZW1zZXQoJm5sYWRkciwg MCwgc2l6ZW9mKG5sYWRkcikpOw0KLQltZW1zZXQoJnJlcSwgMCwgc2l6ZW9mKHJlcSkpOw0KKyAg ICAgICAgbWVtc2V0KCZyZXEsIDAsIHNpemVvZihyZXEpKTsNCiAgICAgICAgIG5sYWRkci5ubF9m YW1pbHkgPSBBRl9ORVRMSU5LOw0KIA0KICAgICAgICAgcmVxLm5saC5ubG1zZ19sZW4gPSBzaXpl b2YocmVxKTsNCkBAIC0xMjcsMTEgKzEyNywxMSBAQA0KICAgICAgICAgcmVxLmcucnRnZW5fZmFt aWx5ID0gQUZfSU5FVDsNCiANCiAgICAgICAgIHJldHVybiBzZW5kdG8ocnRubF9mZCwgKHZvaWQq KSZyZXEsIHNpemVvZihyZXEpLCAwLCANCi0JCSAgICAgIChzdHJ1Y3Qgc29ja2FkZHIqKSZubGFk ZHIsIHNpemVvZihubGFkZHIpKTsNCisgICAgICAgICAgICAgICAgKHN0cnVjdCBzb2NrYWRkciop Jm5sYWRkciwgc2l6ZW9mKG5sYWRkcikpOw0KIH0NCiANCiAvKiBydG5sX3JlY2VpdmUgLSByZWNl aXZlIG5ldGxpbmsgcGFja2V0cyBmcm9tIHJ0bmV0bGluayBzb2NrZXQgKi8NCi1pbnQgcnRubF9y ZWNlaXZlKCkNCitpbnQgcnRubF9yZWNlaXZlKGludCBydG5sX2ZkKQ0KIHsNCiAJaW50IHN0YXR1 czsNCiAJY2hhciBidWZbODE5Ml07DQpJbmRleDogc3JjL2lmdGFibGUuYw0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K LS0tIHNyYy9pZnRhYmxlLmMJKHLDqXZpc2lvbiA2NzM2KQ0KKysrIHNyYy9pZnRhYmxlLmMJKGNv cGllIGRlIHRyYXZhaWwpDQpAQCAtMiw3ICsyLDcgQEANCiAgKg0KICAqIChDKSAyMDA0IGJ5IEFz dGFybyBBRywgd3JpdHRlbiBieSBIYXJhbGQgV2VsdGUgPGh3ZWx0ZUBhc3Rhcm8uY29tPg0KICAq DQotICogVGhpcyBzb2Z0d2FyZSBpcyBGcmVlIFNvZnR3YXJlIGFuZCBsaWNlbnNlZCB1bmRlciBH TlUgR1BMdjIuIA0KKyAqIFRoaXMgc29mdHdhcmUgaXMgRnJlZSBTb2Z0d2FyZSBhbmQgbGljZW5z ZWQgdW5kZXIgR05VIEdQTHYyLg0KICAqDQogICovDQogDQpAQCAtMjMsOCArMjMsOCBAQA0KIA0K ICNkZWZpbmUgaWZ0Yl9sb2coeCwgLi4uKQ0KIA0KLXN0cnVjdCBpZmluZGV4X21hcCB7DQotCXN0 cnVjdCBpZmluZGV4X21hcCAqbmV4dDsNCitzdHJ1Y3QgaWZpbmRleF9tYXBfdCB7DQorCXN0cnVj dCBpZmluZGV4X21hcF90ICpuZXh0Ow0KIA0KIAl1X2ludDMyX3QJaW5kZXg7DQogCXVfaW50MzJf dAl0eXBlOw0KQEAgLTM0LDcgKzM0LDcgQEANCiAJY2hhcgkJbmFtZVsxNl07DQogfTsNCiANCi1z dGF0aWMgc3RydWN0IGlmaW5kZXhfbWFwICppZmluZGV4X21hcFsxNl07DQorc3RhdGljIHN0cnVj dCBpZmluZGV4X21hcF90ICppZmluZGV4X21hcFsxNl07DQogDQogLyogaWZ0YWJsZV9kdW1wIC0g RHVtcCB0aGUgaW50ZXJmYWNlIHRhYmxlIHRvIGEgZ2l2ZW4gZmlsZSBzdHJlYW0NCiAgKiBAb3V0 ZmQ6CWZpbGUgc3RyZWFtIHRvIHdoaWNoIHRhYmxlIHNob3VsZCBiZSBkdW1wZWQNCkBAIC00NCw3 ICs0NCw3IEBADQogCWludCBpOw0KIA0KIAlmb3IgKGkgPSAwOyBpIDwgMTY7IGkrKykgew0KLQkJ c3RydWN0IGlmaW5kZXhfbWFwICppbTsNCisJCXN0cnVjdCBpZmluZGV4X21hcF90ICppbTsNCiAJ CWZvciAoaW0gPSBpZmluZGV4X21hcFtpXTsgaW07IGltID0gaW0tPm5leHQpIHsNCiAJCQlmcHJp bnRmKG91dGZkLCAiJXUgJXMiLCBpbS0+aW5kZXgsIGltLT5uYW1lKTsNCiAJCQlpZiAoIShpbS0+ ZmxhZ3MgJiBJRkZfVVApKQ0KQEAgLTY3LDcgKzY3LDcgQEANCiB7DQogCXVuc2lnbmVkIGludCBo YXNoOw0KIAlzdHJ1Y3QgaWZpbmZvbXNnICppZmlfbXNnID0gTkxNU0dfREFUQShuKTsNCi0Jc3Ry dWN0IGlmaW5kZXhfbWFwICppbSwgKippbXA7DQorCXN0cnVjdCBpZmluZGV4X21hcF90ICppbSwg KippbXA7DQogCXN0cnVjdCBydGF0dHIgKmNiW0lGTEFfTUFYKzFdOw0KIA0KIAlpZiAobi0+bmxt c2dfdHlwZSAhPSBSVE1fTkVXTElOSykNCkBAIC0xMDgsNyArMTA4LDcgQEANCiAJCWlmdGJfbG9n KExPR19ERUJVRywgImNyZWF0aW5nIG5ldyBpZnRhYmxlIChpZmluZGV4PSV1KSIsDQogCQkJIGlt LT5pbmRleCk7DQogCX0NCi0JDQorDQogCWltLT50eXBlID0gaWZpX21zZy0+aWZpX3R5cGU7DQog CWltLT5mbGFncyA9IGlmaV9tc2ctPmlmaV9mbGFnczsNCiAJaWYgKGNiW0lGTEFfQUREUkVTU10p IHsNCkBAIC0xMjksMTQgKzEyOSwxMyBAQA0KICAqIEBuOgkJbmV0bGluayBtZXNzYWdlIGhlYWRl ciBvZiBhIFJUTV9ERUxMSU5LIG5sbXNnDQogICogQGFyZzoJbm90IHVzZWQNCiAgKg0KLSAqIERl bGV0ZSBhbiBlbnRyeSBmcm9tIHRoZSBpbnRlcmZhY2UgdGFibGUuICANCisgKiBEZWxldGUgYW4g ZW50cnkgZnJvbSB0aGUgaW50ZXJmYWNlIHRhYmxlLg0KICAqIFJldHVybnMgLTEgb24gZXJyb3Is IDAgaWYgbm8gbWF0Y2hpbmcgZW50cnkgd2FzIGZvdW5kIG9yIDEgb24gc3VjY2Vzcy4NCiAgKi8N CiBpbnQgaWZ0YWJsZV9kZWwoc3RydWN0IG5sbXNnaGRyICpuLCB2b2lkICphcmcpDQogew0KIAlz dHJ1Y3QgaWZpbmZvbXNnICppZmlfbXNnID0gTkxNU0dfREFUQShuKTsNCiAJc3RydWN0IHJ0YXR0 ciAqY2JbSUZMQV9NQVgrMV07DQotCXN0cnVjdCBpZmluZGV4X21hcCAqaW07DQogDQogCWlmIChu LT5ubG1zZ190eXBlICE9IFJUTV9ERUxMSU5LKSB7DQogCQlpZnRiX2xvZyhMT0dfRVJST1IsDQpA QCAtMTU3LDE1ICsxNTYsMTUgQEANCiANCiAJcmV0dXJuIDE7DQogfQ0KLQkNCi0vKiBpZmluZGV4 XzJuYW1lIC0gZ2V0IHRoZSBuYW1lIGZvciBhbiBpZmluZGV4DQorDQorLyogbmxfaWZpbmRleF8y bmFtZSAtIGdldCB0aGUgbmFtZSBmb3IgYW4gaWZpbmRleA0KICAqIEBpbmRleDoJaWZpbmRleCB0 byBiZSByZXNvbHZlZA0KICAqDQogICogUmV0dXJuIHZhbHVlOiBjaGFyYWN0ZXIgc3RyaW5nIGNv bnRhaW5pbmcgbmFtZSBvZiBpbnRlcmZhY2UNCiAgKi8NCi1jaGFyICppZmluZGV4XzJuYW1lKHVu c2lnbmVkIGludCBpbmRleCkNCitjaGFyICpubGlmX2luZGV4XzJuYW1lKHVuc2lnbmVkIGludCBp bmRleCkNCiB7DQotCXN0cnVjdCBpZmluZGV4X21hcCAqaW07DQorCXN0cnVjdCBpZmluZGV4X21h cF90ICppbTsNCiANCiAJaWYgKGluZGV4ID09IDApDQogCQlyZXR1cm4gIioiOw0KQEAgLTE4Myw3 ICsxODIsNyBAQA0KICAqLw0KIGludCAgaWZ0YWJsZV91cCh1bnNpZ25lZCBpbnQgaW5kZXgpDQog ew0KLQlzdHJ1Y3QgaWZpbmRleF9tYXAgKmltOw0KKwlzdHJ1Y3QgaWZpbmRleF9tYXBfdCAqaW07 DQogDQogCWZvciAoaW0gPSBpZmluZGV4X21hcFtpbmRleCYweEZdOyBpbTsgaW0gPSBpbS0+bmV4 dCkgew0KIAkJaWYgKGltLT5pbmRleCA9PSBpbmRleCkgew0KQEAgLTIwOCw2ICsyMDcsMTQgQEAN CiAJaWYgKGZpbmkpDQogCQlnb3RvIGNsZWFudXA7DQogDQorCW1lbXNldChpZmluZGV4X21hcCww LHNpemVvZihpZmluZGV4X21hcCkpOw0KKw0KKwlyZXQgPSBydG5sX2luaXQoKTsNCisNCisJaWYg KHJldCA9PSAtMSkgew0KKwkJZ290byBjbGVhbnVwX25vbmU7DQorCX0NCisNCiAJaWYgKHJ0bmxf aGFuZGxlcl9yZWdpc3RlcigmaGFuZGxlcnNbMF0pIDwgMCkgew0KIAkJcmV0ID0gLTE7DQogCQln b3RvIGNsZWFudXBfbm9uZTsNCkBAIC0yMjMsNyArMjMwLDcgQEANCiAJCWdvdG8gY2xlYW51cF8x Ow0KIAl9DQogDQotCXJldHVybiAwOw0KKwlyZXR1cm4gcmV0Ow0KIA0KICNpZiAwDQogCWlmIChy dG5sX3dpbGRkdW1wX3JlcXVldChydG5sX2ZkLCBBRl9VTlNQRUMsIFJUTV9HRVRMSU5LKSA8IDAp IHsNCkBAIC0yNDMsMTkgKzI1MCwzMCBAQA0KIAlyZXR1cm4gcmV0Ow0KIH0NCiANCi0vKiBpZnRh YmxlX2luaXQgLSBJbml0aWFsaXplIGludGVyZmFjZSB0YWJsZQ0KKy8qKiBubF9pZnRhYmxlX2lu aXQgLSBJbml0aWFsaXplIGludGVyZmFjZSB0YWJsZQ0KKyAqDQorICogSW5pdGlhbGl6ZSBydG5s IGludGVyZmFjZSBhbmQgaW50ZXJmYWNlIHRhYmxlDQorICoNCisgKiBccmV0dXJuIGZpbGUgZGVz Y3JpcHRvciB0byBuZXRsaW5rIHNvY2tldA0KICAqLw0KLWludCBpZnRhYmxlX2luaXQodm9pZCkN CitpbnQgbmxpZl90YWJsZV9pbml0KHZvaWQpDQogew0KIAlpZnRiX2xvZyhMT0dfREVCVUcsICIl cyIsIF9fRlVOQ1RJT05fXyk7DQogCXJldHVybiBpbml0X29yX2ZpbmkoMCk7DQogfQ0KIA0KLS8q IGlmdGFibGVfZmluaSAtIERlc3RydWN0b3Igb2YgaW50ZXJmYWNlIHRhYmxlDQorLyogbmxfaWZ0 YWJsZV9maW5pIC0gRGVzdHJ1Y3RvciBvZiBpbnRlcmZhY2UgdGFibGUNCiAgKi8NCi12b2lkIGlm dGFibGVfZmluaSh2b2lkKQ0KK3ZvaWQgbmxpZl90YWJsZV9maW5pKHZvaWQpDQogew0KIAlpbml0 X29yX2ZpbmkoMSk7DQogfQ0KIA0KKy8qKg0KKyAqIFxyZXR1cm4gMCBpZiBPSw0KKyAqLw0KK2lu dCBubGlmX3RyZWF0X21zZyhpbnQgZmQpDQorew0KKwlyZXR1cm4gcnRubF9yZWNlaXZlKGZkKTsN Cit9DQogDQpJbmRleDogc3JjL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gc3JjL01ha2Vm aWxlLmFtCShyw6l2aXNpb24gNjczNikNCisrKyBzcmMvTWFrZWZpbGUuYW0JKGNvcGllIGRlIHRy YXZhaWwpDQpAQCAtOCw0ICs4LDQgQEANCiANCiBsaWJuZm5ldGxpbmtfbGFfTERGTEFHUyA9IC1X Yywtbm9zdGFydGZpbGVzCVwNCiAJCQkgIC12ZXJzaW9uLWluZm8gJChMSUJWRVJTSU9OKQ0KLWxp Ym5mbmV0bGlua19sYV9TT1VSQ0VTID0gbGlibmZuZXRsaW5rLmMgDQorbGlibmZuZXRsaW5rX2xh X1NPVVJDRVMgPSBsaWJuZm5ldGxpbmsuYyBpZnRhYmxlLmMgcnRubC5jDQo= --=-BKsbpiV1JvF8OdUmTWLd-- --=-Gx0UdyxarzlCNi7JiGaw Content-Type: application/pgp-signature; name=signature.asc Content-Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?= -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) iD8DBQBFsAMqnxA7CdMWjzIRArS1AJwKsK+ydamwcqLqymGA0UOHBhZ3MwCfWPjp HIAnie1AOFkxo6HaFVodACg= =NB85 -----END PGP SIGNATURE----- --=-Gx0UdyxarzlCNi7JiGaw--