From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Leblond Subject: Resend: Ulogd2: code cleaning Date: Fri, 04 Jan 2008 00:56:29 +0100 Message-ID: <1199404589.16528.31.camel@localhost> References: <1199403921.16528.24.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-zEszr5OpGNo1eNeBSTnw" To: Netfilter Developer Mailing List Return-path: Received: from fydelkass.inl.fr ([195.101.59.116]:39340 "EHLO fydelkass.inl.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbYACX4b (ORCPT ); Thu, 3 Jan 2008 18:56:31 -0500 Received: from bayen.regit.org ([81.57.69.189] helo=[192.168.1.2]) by fydelkass.inl.fr with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JAZvK-0002vj-3B for netfilter-devel@vger.kernel.org; Fri, 04 Jan 2008 00:56:30 +0100 In-Reply-To: <1199403921.16528.24.camel@localhost> Sender: netfilter-devel-owner@vger.kernel.org List-ID: --=-zEszr5OpGNo1eNeBSTnw Content-Type: multipart/mixed; boundary="=-GSfvp80yKFlw/sR5i8J6" --=-GSfvp80yKFlw/sR5i8J6 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Hi, I've missed the previous patch by giving a bad revision number. Here's the correct one. Sorry, Le vendredi 04 janvier 2008 =E0 00:45 +0100, Eric Leblond a =E9crit : > Hi, >=20 > This patch adds an enum to get rid of access to array via numerical > index in NFLOG input plugin. >=20 > This replaces code like: > ret[0].flags |=3D ULOGD_RETF_VALID; > ret[11].u.value.ui16 =3D ntohs(hw->hw_addrlen); >=20 > with: > ret[NFLOG_KEY_RAW_MAC].flags |=3D ULOGD_RETF_VALID; > ret[NFLOG_KEY_RAW_MAC_LEN].u.value.ui16 =3D ntohs(hw->hw_addrlen); > which is more readable. >=20 > BR, --=20 Eric Leblond INL --=-GSfvp80yKFlw/sR5i8J6 Content-Disposition: attachment; filename=ulogd2-add-enum-to-clarify-code.diff Content-Type: text/x-patch; name=ulogd2-add-enum-to-clarify-code.diff; charset=ISO-8859-15 Content-Transfer-Encoding: base64 PT09IGlucHV0L3BhY2tldC91bG9nZF9pbnBwa3RfTkZMT0cuYw0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gaW5w dXQvcGFja2V0L3Vsb2dkX2lucHBrdF9ORkxPRy5jCShyZXZpc2lvbiAyMjQpDQorKysgaW5wdXQv cGFja2V0L3Vsb2dkX2lucHBrdF9ORkxPRy5jCShyZXZpc2lvbiAyMjUpDQpAQCAtMTQsNyArMTQs NyBAQA0KICNkZWZpbmUgTkZMT0dfR1JPVVBfREVGQVVMVAkwDQogI2VuZGlmDQogDQotLyogU2l6 ZSBvZiB0aGUgc29ja2V0IHJlY2V2aXZlIG1lbW9yeS4gIFNob3VsZCBiZSBhdCBsZWFzdCB0aGUg c2FtZSBzaXplIGFzIHRoZQ0KKy8qIFNpemUgb2YgdGhlIHNvY2tldCByZWNlaXZlIG1lbW9yeS4g IFNob3VsZCBiZSBhdCBsZWFzdCB0aGUgc2FtZSBzaXplIGFzIHRoZQ0KICAqICdubGJ1ZnNpeicg cGFyYW1ldGVyIG9mIG5mbmV0bGlua19sb2cua28NCiAgKiBJZiB5b3UgaGF2ZSBfYmlnXyBpbi1r ZXJuZWwgcXVldWVzLCB5b3UgbWF5IGhhdmUgdG8gaW5jcmVhc2UgdGhpcyBudW1iZXIuICAoDQog ICogLS1xdGhyZXNob2xkIDEwMCAqIDE1MDAgYnl0ZXMvcGFja2V0ID0gMTUwa0IgICovDQpAQCAt ODksNiArODksMjQgQEANCiAjZGVmaW5lIHNlcV9jZSh4KQkoeC0+Y2VzWzRdKQ0KICNkZWZpbmUg c2VxX2dsb2JhbF9jZSh4KQkoeC0+Y2VzWzVdKQ0KIA0KK2VudW0gbmZsb2dfa2V5cyB7DQorCU5G TE9HX0tFWV9SQVdfTUFDID0gMCwNCisJTkZMT0dfS0VZX1JBV19QQ0tULA0KKwlORkxPR19LRVlf UkFXX1BDS1RMRU4sDQorCU5GTE9HX0tFWV9SQVdfUENLVENPVU5ULA0KKwlORkxPR19LRVlfT09C X1BSRUZJWCwNCisJTkZMT0dfS0VZX09PQl9USU1FX1NFQywNCisJTkZMT0dfS0VZX09PQl9USU1F X1VTRUMsDQorCU5GTE9HX0tFWV9PT0JfTUFSSywNCisJTkZMT0dfS0VZX09PQl9JRklOREVYX0lO LA0KKwlORkxPR19LRVlfT09CX0lGSU5ERVhfT1VULA0KKwlORkxPR19LRVlfT09CX0hPT0ssDQor CU5GTE9HX0tFWV9SQVdfTUFDX0xFTiwNCisJTkZMT0dfS0VZX09PQl9TRVFfTE9DQUwsDQorCU5G TE9HX0tFWV9PT0JfU0VRX0dMT0JBTCwNCisJTkZMT0dfS0VZX09PQl9GQU1JTFksDQorCU5GTE9H X0tFWV9PT0JfUFJPVE9DT0wsDQorfTsNCiANCiBzdGF0aWMgc3RydWN0IHVsb2dkX2tleSBvdXRw dXRfa2V5c1tdID0gew0KIAl7IA0KQEAgLTI0MCw3MSArMjU4LDcxIEBADQogCXVfaW50MzJfdCBv dXRkZXYgPSBuZmxvZ19nZXRfb3V0ZGV2KGxkYXRhKTsNCiAJdV9pbnQzMl90IHNlcTsNCiANCi0J cmV0WzE0XS51LnZhbHVlLnVpOCA9IGFmX2NlKHVwaS0+Y29uZmlnX2tzZXQpLnUudmFsdWU7DQor CXJldFtORkxPR19LRVlfT09CX0ZBTUlMWV0udS52YWx1ZS51aTggPSBhZl9jZSh1cGktPmNvbmZp Z19rc2V0KS51LnZhbHVlOw0KIA0KIAlpZiAocGgpIHsNCiAJCS8qIEZJWE1FICovDQotCQlyZXRb MTBdLnUudmFsdWUudWk4ID0gcGgtPmhvb2s7DQotCQlyZXRbMTBdLmZsYWdzIHw9IFVMT0dEX1JF VEZfVkFMSUQ7DQotCQlyZXRbMTVdLnUudmFsdWUudWkxNiA9IG50b2hzKHBoLT5od19wcm90b2Nv bCk7DQotCQlyZXRbMTVdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQorCQlyZXRbTkZMT0df S0VZX09PQl9IT09LXS51LnZhbHVlLnVpOCA9IHBoLT5ob29rOw0KKwkJcmV0W05GTE9HX0tFWV9P T0JfSE9PS10uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCisJCXJldFtORkxPR19LRVlfT09C X1BST1RPQ09MXS51LnZhbHVlLnVpMTYgPSBudG9ocyhwaC0+aHdfcHJvdG9jb2wpOw0KKwkJcmV0 W05GTE9HX0tFWV9PT0JfUFJPVE9DT0xdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQogCX0N CiANCiAJaWYgKGh3KSB7DQotCQlyZXRbMF0udS52YWx1ZS5wdHIgPSBody0+aHdfYWRkcjsNCi0J CXJldFswXS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KLQkJcmV0WzExXS51LnZhbHVlLnVp MTYgPSBudG9ocyhody0+aHdfYWRkcmxlbik7DQotCQlyZXRbMTFdLmZsYWdzIHw9IFVMT0dEX1JF VEZfVkFMSUQ7DQorCQlyZXRbTkZMT0dfS0VZX1JBV19NQUNdLnUudmFsdWUucHRyID0gaHctPmh3 X2FkZHI7DQorCQlyZXRbTkZMT0dfS0VZX1JBV19NQUNdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFM SUQ7DQorCQlyZXRbTkZMT0dfS0VZX1JBV19NQUNfTEVOXS51LnZhbHVlLnVpMTYgPSBudG9ocyho dy0+aHdfYWRkcmxlbik7DQorCQlyZXRbTkZMT0dfS0VZX1JBV19NQUNfTEVOXS5mbGFncyB8PSBV TE9HRF9SRVRGX1ZBTElEOw0KIAl9DQogDQogCWlmIChwYXlsb2FkX2xlbiA+PSAwKSB7DQogCQkv KiBpbmNsdWRlIHBvaW50ZXIgdG8gcmF3IHBhY2tldCAqLw0KLQkJcmV0WzFdLnUudmFsdWUucHRy ID0gcGF5bG9hZDsNCi0JCXJldFsxXS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkJcmV0 W05GTE9HX0tFWV9SQVdfUENLVF0udS52YWx1ZS5wdHIgPSBwYXlsb2FkOw0KKwkJcmV0W05GTE9H X0tFWV9SQVdfUENLVF0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCiANCi0JCXJldFsyXS51 LnZhbHVlLnVpMzIgPSBwYXlsb2FkX2xlbjsNCi0JCXJldFsyXS5mbGFncyB8PSBVTE9HRF9SRVRG X1ZBTElEOw0KKwkJcmV0W05GTE9HX0tFWV9SQVdfUENLVExFTl0udS52YWx1ZS51aTMyID0gcGF5 bG9hZF9sZW47DQorCQlyZXRbTkZMT0dfS0VZX1JBV19QQ0tUTEVOXS5mbGFncyB8PSBVTE9HRF9S RVRGX1ZBTElEOw0KIAl9DQogDQogCS8qIG51bWJlciBvZiBwYWNrZXRzICovDQotCXJldFszXS51 LnZhbHVlLnVpMzIgPSAxOw0KLQlyZXRbM10uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCisJ cmV0W05GTE9HX0tFWV9SQVdfUENLVENPVU5UXS51LnZhbHVlLnVpMzIgPSAxOw0KKwlyZXRbTkZM T0dfS0VZX1JBV19QQ0tUQ09VTlRdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQogDQogCWlm IChwcmVmaXgpIHsNCi0JCXJldFs0XS51LnZhbHVlLnB0ciA9IHByZWZpeDsNCi0JCXJldFs0XS5m bGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkJcmV0W05GTE9HX0tFWV9PT0JfUFJFRklYXS51 LnZhbHVlLnB0ciA9IHByZWZpeDsNCisJCXJldFtORkxPR19LRVlfT09CX1BSRUZJWF0uZmxhZ3Mg fD0gVUxPR0RfUkVURl9WQUxJRDsNCiAJfQ0KIA0KIAkvKiBnb2Qga25vd3Mgd2h5IHRpbWVzdGFt cF91c2VjIGNvbnRhaW5zIGNyYXAgaWYgdGltZXN0YW1wX3NlYw0KIAkgKiA9PSAwIGlmIChwa3Qt PnRpbWVzdGFtcF9zZWMgfHwgcGt0LT50aW1lc3RhbXBfdXNlYykgeyAqLw0KIAlpZiAobmZsb2df Z2V0X3RpbWVzdGFtcChsZGF0YSwgJnRzKSA9PSAwICYmIHRzLnR2X3NlYykgew0KIAkJLyogRklY TUU6IGNvbnZlcnQgZW5kaWFubmVzcyAqLw0KLQkJcmV0WzVdLnUudmFsdWUudWkzMiA9IHRzLnR2 X3NlYyAmIDB4ZmZmZmZmZmY7DQotCQlyZXRbNV0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsN Ci0JCXJldFs2XS51LnZhbHVlLnVpMzIgPSB0cy50dl91c2VjICYgMHhmZmZmZmZmZjsNCi0JCXJl dFs2XS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkJcmV0W05GTE9HX0tFWV9PT0JfVElN RV9TRUNdLnUudmFsdWUudWkzMiA9IHRzLnR2X3NlYyAmIDB4ZmZmZmZmZmY7DQorCQlyZXRbTkZM T0dfS0VZX09PQl9USU1FX1NFQ10uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCisJCXJldFtO RkxPR19LRVlfT09CX1RJTUVfVVNFQ10udS52YWx1ZS51aTMyID0gdHMudHZfdXNlYyAmIDB4ZmZm ZmZmZmY7DQorCQlyZXRbTkZMT0dfS0VZX09PQl9USU1FX1VTRUNdLmZsYWdzIHw9IFVMT0dEX1JF VEZfVkFMSUQ7DQogCX0NCiANCi0JcmV0WzddLnUudmFsdWUudWkzMiA9IG1hcms7DQotCXJldFs3 XS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwlyZXRbTkZMT0dfS0VZX09PQl9NQVJLXS51 LnZhbHVlLnVpMzIgPSBtYXJrOw0KKwlyZXRbTkZMT0dfS0VZX09PQl9NQVJLXS5mbGFncyB8PSBV TE9HRF9SRVRGX1ZBTElEOw0KIA0KIAlpZiAoaW5kZXYgPiAwKSB7DQotCQlyZXRbOF0udS52YWx1 ZS51aTMyID0gaW5kZXY7DQotCQlyZXRbOF0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCisJ CXJldFtORkxPR19LRVlfT09CX0lGSU5ERVhfSU5dLnUudmFsdWUudWkzMiA9IGluZGV2Ow0KKwkJ cmV0W05GTE9HX0tFWV9PT0JfSUZJTkRFWF9JTl0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsN CiAJfQ0KIA0KIAlpZiAob3V0ZGV2ID4gMCkgew0KLQkJcmV0WzldLnUudmFsdWUudWkzMiA9IG91 dGRldjsNCi0JCXJldFs5XS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkJcmV0W05GTE9H X0tFWV9PT0JfSUZJTkRFWF9PVVRdLnUudmFsdWUudWkzMiA9IG91dGRldjsNCisJCXJldFtORkxP R19LRVlfT09CX0lGSU5ERVhfT1VUXS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KIAl9DQog DQogCWlmIChuZmxvZ19nZXRfc2VxKGxkYXRhLCAmc2VxKSkgew0KLQkJcmV0WzEyXS51LnZhbHVl LnVpMzIgPSBzZXE7DQotCQlyZXRbMTJdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQorCQly ZXRbTkZMT0dfS0VZX09PQl9TRVFfTE9DQUxdLnUudmFsdWUudWkzMiA9IHNlcTsNCisJCXJldFtO RkxPR19LRVlfT09CX1NFUV9MT0NBTF0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCiAJfQ0K IAlpZiAobmZsb2dfZ2V0X3NlcV9nbG9iYWwobGRhdGEsICZzZXEpKSB7DQotCQlyZXRbMTNdLnUu dmFsdWUudWkzMiA9IHNlcTsNCi0JCXJldFsxM10uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsN CisJCXJldFtORkxPR19LRVlfT09CX1NFUV9HTE9CQUxdLnUudmFsdWUudWkzMiA9IHNlcTsNCisJ CXJldFtORkxPR19LRVlfT09CX1NFUV9HTE9CQUxdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7 DQogCX0NCiAJdWxvZ2RfcHJvcGFnYXRlX3Jlc3VsdHModXBpKTsNCiAJcmV0dXJuIDA7DQo= --=-GSfvp80yKFlw/sR5i8J6-- --=-zEszr5OpGNo1eNeBSTnw 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.6 (GNU/Linux) iD8DBQBHfXYtnxA7CdMWjzIRAnvNAKCIXhMSSdqOY37ERio3RYH7sEXe0QCbBdcs Egox6Ycr8xQaDG0oNmgIj/I= =2iE2 -----END PGP SIGNATURE----- --=-zEszr5OpGNo1eNeBSTnw--