From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Leblond Subject: Resend: ulogd2: fix ULOG input plugin Date: Fri, 04 Jan 2008 00:58:58 +0100 Message-ID: <1199404738.16528.34.camel@localhost> References: <1199404112.16528.29.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-t6cE5R+Fik5mUZ2zaZqb" To: Netfilter Developer Mailing List Return-path: Received: from fydelkass.inl.fr ([195.101.59.116]:39466 "EHLO fydelkass.inl.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751607AbYACX7A (ORCPT ); Thu, 3 Jan 2008 18:59:00 -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 1JAZxi-0002xq-QN for netfilter-devel@vger.kernel.org; Fri, 04 Jan 2008 00:58:59 +0100 In-Reply-To: <1199404112.16528.29.camel@localhost> Sender: netfilter-devel-owner@vger.kernel.org List-ID: --=-t6cE5R+Fik5mUZ2zaZqb Content-Type: multipart/mixed; boundary="=-um7ji1vAzUiYGOYfmlw7" --=-um7ji1vAzUiYGOYfmlw7 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Hi, Same problem as in previous patch. Here's the correct one. BR, Le vendredi 04 janvier 2008 =E0 00:48 +0100, Eric Leblond a =E9crit : > Hi, >=20 > The ULOG input plugin of ulogd2 was not working. This patch fixes this > and cleans the code via introduction of an enum. >=20 > BR, --=20 Eric Leblond INL --=-um7ji1vAzUiYGOYfmlw7 Content-Disposition: attachment; filename=ulogd2-make-ulog-input-work.diff Content-Type: text/x-patch; name=ulogd2-make-ulog-input-work.diff; charset=ISO-8859-15 Content-Transfer-Encoding: base64 PT09IGlucHV0L3BhY2tldC91bG9nZF9pbnBwa3RfVUxPRy5jDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBpbnB1 dC9wYWNrZXQvdWxvZ2RfaW5wcGt0X1VMT0cuYwkocmV2aXNpb24gMjI1KQ0KKysrIGlucHV0L3Bh Y2tldC91bG9nZF9pbnBwa3RfVUxPRy5jCShyZXZpc2lvbiAyMjYpDQpAQCAtNSw3ICs1LDkgQEAN CiANCiAjaW5jbHVkZSA8dW5pc3RkLmg+DQogI2luY2x1ZGUgPHN0ZGxpYi5oPg0KKyNpbmNsdWRl IDxhcnBhL2luZXQuaD4NCiANCisNCiAjaW5jbHVkZSA8dWxvZ2QvdWxvZ2QuaD4NCiAjaW5jbHVk ZSA8bGliaXB1bG9nL2xpYmlwdWxvZy5oPg0KIA0KQEAgLTU0LDEyICs1NiwzMSBAQA0KIAl9LA0K IAl9DQogfTsNCitlbnVtIHVsb2dfa2V5cyB7DQorCVVMT0dfS0VZX1JBV19NQUMgPSAwLA0KKwlV TE9HX0tFWV9SQVdfUENLVCwNCisJVUxPR19LRVlfUkFXX1BDS1RMRU4sDQorCVVMT0dfS0VZX1JB V19QQ0tUQ09VTlQsDQorCVVMT0dfS0VZX09PQl9QUkVGSVgsDQorCVVMT0dfS0VZX09PQl9USU1F X1NFQywNCisJVUxPR19LRVlfT09CX1RJTUVfVVNFQywNCisJVUxPR19LRVlfT09CX01BUkssDQor CVVMT0dfS0VZX09PQl9JTiwNCisJVUxPR19LRVlfT09CX09VVCwNCisJVUxPR19LRVlfUkFXX01B Q19MRU4sDQorCVVMT0dfS0VZX09PQl9GQU1JTFksDQorCVVMT0dfS0VZX09PQl9QUk9UT0NPTCwN Cit9Ow0KIA0KIHN0YXRpYyBzdHJ1Y3QgdWxvZ2Rfa2V5IG91dHB1dF9rZXlzW10gPSB7DQogCXsg DQotCQkudHlwZSA9IFVMT0dEX1JFVF9TVFJJTkcsIA0KKwkJLnR5cGUgPSBVTE9HRF9SRVRfUkFX LCANCiAJCS5mbGFncyA9IFVMT0dEX1JFVEZfTk9ORSwgDQogCQkubmFtZSA9ICJyYXcubWFjIiwg DQorCQkuaXBmaXggPSB7DQorCQkJLnZlbmRvciA9IElQRklYX1ZFTkRPUl9JRVRGLA0KKwkJCS5m aWVsZF9pZCA9IElQRklYX3NvdXJjZU1hY0FkZHJlc3MsDQorCQl9LA0KIAl9LA0KIAl7DQogCQku dHlwZSA9IFVMT0dEX1JFVF9SQVcsDQpAQCAtMTIxLDYxICsxNDIsNzIgQEANCiAJCS5mbGFncyA9 IFVMT0dEX1JFVEZfTk9ORSwNCiAJCS5uYW1lID0gIm9vYi5vdXQiLCANCiAJfSwNCisJeyANCisJ CS50eXBlID0gVUxPR0RfUkVUX1NUUklORywgDQorCQkuZmxhZ3MgPSBVTE9HRF9SRVRGX05PTkUs IA0KKwkJLm5hbWUgPSAicmF3Lm1hY19sZW4iLCANCisJfSwNCisJew0KKwkJLnR5cGUgPSBVTE9H RF9SRVRfVUlOVDgsDQorCQkuZmxhZ3MgPSBVTE9HRF9SRVRGX05PTkUsDQorCQkubmFtZSA9ICJv b2IuZmFtaWx5IiwNCisJfSwNCisJew0KKwkJLnR5cGUgPSBVTE9HRF9SRVRfVUlOVDE2LA0KKwkJ LmZsYWdzID0gVUxPR0RfUkVURl9OT05FLA0KKwkJLm5hbWUgPSAib29iLnByb3RvY29sIiwNCisJ fSwNCisNCiB9Ow0KIA0KIHN0YXRpYyBpbnQgaW50ZXJwX3BhY2tldChzdHJ1Y3QgdWxvZ2RfcGx1 Z2luc3RhbmNlICppcCwgdWxvZ19wYWNrZXRfbXNnX3QgKnBrdCkNCiB7DQotCXVuc2lnbmVkIGNo YXIgKnA7DQotCWludCBpOw0KLQljaGFyICpidWYsICpvbGRidWYgPSBOVUxMOw0KIAlzdHJ1Y3Qg dWxvZ2Rfa2V5ICpyZXQgPSBpcC0+b3V0cHV0LmtleXM7DQogDQogCWlmIChwa3QtPm1hY19sZW4p IHsNCi0JCWJ1ZiA9IChjaGFyICopIG1hbGxvYygzICogcGt0LT5tYWNfbGVuICsgMSk7DQotCQlp ZiAoIWJ1Zikgew0KLQkJCXVsb2dkX2xvZyhVTE9HRF9FUlJPUiwgIk9PTSEhIVxuIik7DQotCQkJ cmV0dXJuIC0xOw0KLQkJfQ0KLQkJKmJ1ZiA9ICdcMCc7DQotDQotCQlwID0gcGt0LT5tYWM7DQot CQlvbGRidWYgPSBidWY7DQotCQlmb3IgKGkgPSAwOyBpIDwgcGt0LT5tYWNfbGVuOyBpKyssIHAr KykNCi0JCQlzcHJpbnRmKGJ1ZiwgIiVzJTAyeCVjIiwgb2xkYnVmLCAqcCwgaT09cGt0LT5tYWNf bGVuLTEgPyAnICc6JzonKTsNCi0JCXJldFswXS51LnZhbHVlLnB0ciA9IGJ1ZjsNCi0JCXJldFsw XS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkJcmV0W1VMT0dfS0VZX1JBV19NQUNdLnUu dmFsdWUucHRyID0gcGt0LT5tYWM7DQorCQlyZXRbVUxPR19LRVlfUkFXX01BQ10uZmxhZ3MgfD0g VUxPR0RfUkVURl9WQUxJRDsNCisJCXJldFtVTE9HX0tFWV9SQVdfTUFDX0xFTl0udS52YWx1ZS51 aTE2ID0gbnRvaHMocGt0LT5tYWNfbGVuKTsNCisJCXJldFtVTE9HX0tFWV9SQVdfTUFDX0xFTl0u ZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCiAJfQ0KIA0KIAkvKiBpbmNsdWRlIHBvaW50ZXIg dG8gcmF3IGlwdjQgcGFja2V0ICovDQotCXJldFsxXS51LnZhbHVlLnB0ciA9IHBrdC0+cGF5bG9h ZDsNCi0JcmV0WzFdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQotCXJldFsyXS51LnZhbHVl LnVpMzIgPSBwa3QtPmRhdGFfbGVuOw0KLQlyZXRbMl0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJ RDsNCi0JcmV0WzNdLnUudmFsdWUudWkzMiA9IDE7DQotCXJldFszXS5mbGFncyB8PSBVTE9HRF9S RVRGX1ZBTElEOw0KKwlyZXRbVUxPR19LRVlfUkFXX1BDS1RdLnUudmFsdWUucHRyID0gcGt0LT5w YXlsb2FkOw0KKwlyZXRbVUxPR19LRVlfUkFXX1BDS1RdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFM SUQ7DQorCXJldFtVTE9HX0tFWV9SQVdfUENLVExFTl0udS52YWx1ZS51aTMyID0gcGt0LT5kYXRh X2xlbjsNCisJcmV0W1VMT0dfS0VZX1JBV19QQ0tUTEVOXS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZB TElEOw0KKwlyZXRbVUxPR19LRVlfUkFXX1BDS1RDT1VOVF0udS52YWx1ZS51aTMyID0gMTsNCisJ cmV0W1VMT0dfS0VZX1JBV19QQ0tUQ09VTlRdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQog DQotCXJldFs0XS51LnZhbHVlLnB0ciA9IHBrdC0+cHJlZml4Ow0KLQlyZXRbNF0uZmxhZ3MgfD0g VUxPR0RfUkVURl9WQUxJRDsNCisJcmV0W1VMT0dfS0VZX09PQl9QUkVGSVhdLnUudmFsdWUucHRy ID0gcGt0LT5wcmVmaXg7DQorCXJldFtVTE9HX0tFWV9PT0JfUFJFRklYXS5mbGFncyB8PSBVTE9H RF9SRVRGX1ZBTElEOw0KIA0KIAkvKiBnb2Qga25vd3Mgd2h5IHRpbWVzdGFtcF91c2VjIGNvbnRh aW5zIGNyYXAgaWYgdGltZXN0YW1wX3NlYyA9PSAwDQogCSAqIGlmIChwa3QtPnRpbWVzdGFtcF9z ZWMgfHwgcGt0LT50aW1lc3RhbXBfdXNlYykgeyAqLw0KIAlpZiAocGt0LT50aW1lc3RhbXBfc2Vj KSB7DQotCQlyZXRbNV0udS52YWx1ZS51aTMyID0gcGt0LT50aW1lc3RhbXBfc2VjOw0KLQkJcmV0 WzVdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQotCQlyZXRbNl0udS52YWx1ZS51aTMyID0g cGt0LT50aW1lc3RhbXBfdXNlYzsNCi0JCXJldFs2XS5mbGFncyB8PSBVTE9HRF9SRVRGX1ZBTElE Ow0KKwkJcmV0W1VMT0dfS0VZX09PQl9USU1FX1NFQ10udS52YWx1ZS51aTMyID0gcGt0LT50aW1l c3RhbXBfc2VjOw0KKwkJcmV0W1VMT0dfS0VZX09PQl9USU1FX1NFQ10uZmxhZ3MgfD0gVUxPR0Rf UkVURl9WQUxJRDsNCisJCXJldFtVTE9HX0tFWV9PT0JfVElNRV9VU0VDXS51LnZhbHVlLnVpMzIg PSBwa3QtPnRpbWVzdGFtcF91c2VjOw0KKwkJcmV0W1VMT0dfS0VZX09PQl9USU1FX1VTRUNdLmZs YWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQogCX0gZWxzZSB7DQotCQlyZXRbNV0uZmxhZ3MgJj0g flVMT0dEX1JFVEZfVkFMSUQ7DQotCQlyZXRbNl0uZmxhZ3MgJj0gflVMT0dEX1JFVEZfVkFMSUQ7 DQorCQlyZXRbVUxPR19LRVlfT09CX1RJTUVfU0VDXS5mbGFncyAmPSB+VUxPR0RfUkVURl9WQUxJ RDsNCisJCXJldFtVTE9HX0tFWV9PT0JfVElNRV9VU0VDXS5mbGFncyAmPSB+VUxPR0RfUkVURl9W QUxJRDsNCiAJfQ0KIA0KLQlyZXRbN10udS52YWx1ZS51aTMyID0gcGt0LT5tYXJrOw0KLQlyZXRb N10uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCi0JcmV0WzhdLnUudmFsdWUucHRyID0gcGt0 LT5pbmRldl9uYW1lOw0KLQlyZXRbOF0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCi0JcmV0 WzldLnUudmFsdWUucHRyID0gcGt0LT5vdXRkZXZfbmFtZTsNCi0JcmV0WzldLmZsYWdzIHw9IFVM T0dEX1JFVEZfVkFMSUQ7DQotCQ0KKwlyZXRbVUxPR19LRVlfT09CX01BUktdLnUudmFsdWUudWkz MiA9IHBrdC0+bWFyazsNCisJcmV0W1VMT0dfS0VZX09PQl9NQVJLXS5mbGFncyB8PSBVTE9HRF9S RVRGX1ZBTElEOw0KKwlyZXRbVUxPR19LRVlfT09CX0lOXS51LnZhbHVlLnB0ciA9IHBrdC0+aW5k ZXZfbmFtZTsNCisJcmV0W1VMT0dfS0VZX09PQl9JTl0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJ RDsNCisJcmV0W1VMT0dfS0VZX09PQl9PVVRdLnUudmFsdWUucHRyID0gcGt0LT5vdXRkZXZfbmFt ZTsNCisJcmV0W1VMT0dfS0VZX09PQl9PVVRdLmZsYWdzIHw9IFVMT0dEX1JFVEZfVkFMSUQ7DQor DQorCS8qIFVMT0cgaXMgSVB2NCBvbmx5ICovDQorCXJldFtVTE9HX0tFWV9PT0JfRkFNSUxZXS51 LnZhbHVlLnVpOCA9IEFGX0lORVQ7DQorCXJldFtVTE9HX0tFWV9PT0JfRkFNSUxZXS5mbGFncyB8 PSBVTE9HRF9SRVRGX1ZBTElEOw0KKwkvKiBVbmRlZiBpbiBVTE9HIGJ1dCBuZWNlc3NhcnkgKi8N CisJcmV0W1VMT0dfS0VZX09PQl9QUk9UT0NPTF0udS52YWx1ZS51aTE2ID0gMDsNCisJcmV0W1VM T0dfS0VZX09PQl9QUk9UT0NPTF0uZmxhZ3MgfD0gVUxPR0RfUkVURl9WQUxJRDsNCisNCiAJdWxv Z2RfcHJvcGFnYXRlX3Jlc3VsdHMoaXApOw0KIAlyZXR1cm4gMDsNCiB9DQo9PT0gdWxvZ2QuY29u Zi5pbg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gdWxvZ2QuY29uZi5pbgkocmV2aXNpb24gMjI1KQ0KKysrIHVs b2dkLmNvbmYuaW4JKHJldmlzaW9uIDIyNikNCkBAIC00NCw2ICs0NCw5IEBADQogIyB0aGlzIGlz IGEgc3RhY2sgZm9yIHBhY2tldC1iYXNlZCBsb2dnaW5nIHZpYSBMT0dFTVUNCiAjc3RhY2s9bG9n MTpORkxPRyxiYXNlMTpCQVNFLGlmaTE6SUZJTkRFWCxwcmludDE6UFJJTlRQS1QsZW11MTpMT0dF TVUNCiANCisjIHRoaXMgaXMgYSBzdGFjayBmb3IgVUxPRyBwYWNrZXQtYmFzZWQgbG9nZ2luZyB2 aWEgTE9HRU1VDQorI3N0YWNrPXVsb2cxOlVMT0csYmFzZTE6QkFTRSxwcmludDE6UFJJTlRQS1Qs ZW11MTpMT0dFTVUNCisNCiAjIHRoaXMgaXMgYSBzdGFjayBmb3IgZmxvdy1iYXNlZCBsb2dnaW5n IHZpYSBMT0dFTVUNCiAjc3RhY2s9Y3QxOk5GQ1QscHJpbnQxOlBSSU5URkxPVyxlbXUxOkxPR0VN VQ0KIA0KQEAgLTU2LDYgKzU5LDkgQEANCiAjIG5ldGxpbmsgbXVsdGljYXN0IGdyb3VwICh0aGUg c2FtZSBhcyB0aGUgaXB0YWJsZXMgLS11bG9nLW5sZ3JvdXAgcGFyYW0pDQogZ3JvdXA9MA0KIA0K K1t1bG9nMV0NCitubGdyb3VwPTENCisNCiBbZW11MV0NCiBmaWxlPSIvdmFyL2xvZy91bG9nZF9z eXNsb2dlbXUubG9nIg0KIHN5bmM9MQ0K --=-um7ji1vAzUiYGOYfmlw7-- --=-t6cE5R+Fik5mUZ2zaZqb 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) iD8DBQBHfXbCnxA7CdMWjzIRAudIAJ4i95fGkjR3JBwjyCy8GWdy9odYzgCfXMW6 wSgUIs/ibrXYB01c5ksAL7I= =mAl1 -----END PGP SIGNATURE----- --=-t6cE5R+Fik5mUZ2zaZqb--