From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Leblond Subject: [PATCH] ulogd fix for kernel 64bits/userspace 32bits system Date: Thu, 12 Oct 2006 14:03:27 +0200 Message-ID: <1160654607.9238.5.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-e7DZ741qyKCvo25Z3tNv" Return-path: To: netfilter-devel@lists.netfilter.org 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 --=-e7DZ741qyKCvo25Z3tNv Content-Type: multipart/mixed; boundary="=-4oITA1eCYeXacbmhd4zj" --=-4oITA1eCYeXacbmhd4zj Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello, This patch fixes ulogd for system with kernel space 64 bits and userspace 32 bits. Auto detection of system type is taken from iptables. BR, --=20 Eric Leblond --=-4oITA1eCYeXacbmhd4zj Content-Disposition: attachment; filename=ulogd-kernel64-user32.patch Content-Type: text/x-patch; name=ulogd-kernel64-user32.patch; charset=us-ascii Content-Transfer-Encoding: base64 SW5kZXg6IE1ha2VmaWxlLmluDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gTWFrZWZpbGUuaW4JKHLpdmlzaW9u IDY2ODcpDQorKysgTWFrZWZpbGUuaW4JKGNvcGllIGRlIHRyYXZhaWwpDQpAQCAtMzEsNiArMzEs MzkgQEANCiANCiAjICBOb3JtYWxseSBZb3Ugc2hvdWxkIG5vdCBuZWVkIHRvIGNoYW5nZSBhbnl0 aGluZyBiZWxvdw0KIA0KKyMgU3BhcmM2NCBoYWNrDQoraWZlcSAoJChzaGVsbCB1bmFtZSAtbSks c3BhcmM2NCkNCisJUE9JTlRFUlRFU1Q6PTENCisJMzJiaXR1c2VyIDo9ICQoc2hlbGwgZWNobyAt ZSAiXCNpbmNsdWRlIDxzdGRpby5oPlxuXCNpZiAhZGVmaW5lZChfX3NwYXJjdjkpICYmICFkZWZp bmVkKF9fYXJjaDY0X18pICYmICFkZWZpbmVkKF9MUDY0KVxudXNlcnNwYWNlX2lzXzMyYml0XG5c I2VuZGlmIiB8ICQoQ0MpICQoQ0ZMQUdTKSAtRSAtIHwgZ3JlcCB1c2Vyc3BhY2VfaXNfMzJiaXQp DQorCWlmZGVmIDMyYml0dXNlcg0KKwkJIyBUaGUga2VybmVsIGlzIDY0LWJpdCwgZXZlbiB0aG91 Z2ggdXNlcnNwYWNlIGlzIDMyLg0KKwkJQ0ZMQUdTKz0tRElQVF9NSU5fQUxJR049OCAtREtFUk5F TF82NF9VU0VSU1BBQ0VfMzINCisJZWxzZQ0KKwkJRVhUX0xERkxBR1M9LW0gZWxmNjRfc3BhcmMN CisJZW5kaWYNCitlbmRpZg0KKw0KKyMgQWxwaGEgb25seSBoYXMgNjRiaXQgdXNlcnNwYWNlIGFu ZCBmYWlscyB0aGUgdGVzdCBiZWxvdw0KK2lmZXEgKCQoc2hlbGwgdW5hbWUgLW0pLCBhbHBoYSkN CisJUE9JTlRFUlRFU1Q6PTENCitlbmRpZg0KKw0KKyMgR2VuZXJpYyB0ZXN0IGlmIGFyY2ggd2Fz bid0IGZvdW5kIGFib3ZlDQoraWZuZXEgKCQoUE9JTlRFUlRFU1QpLDEpDQorCSMgVHJ5IHRvIGRl dGVybWluZSBpZiBrZXJuZWwgaXMgNjRiaXQgYW5kIHdlIGFyZSBjb21waWxpbmcgZm9yIDMyYml0 DQorCWlmZXEgKCQoc2hlbGwgWyAtYSAkKEtFUk5FTF9ESVIpL2luY2x1ZGUvYXNtIF0gJiYgZWNo byBZRVMpLCBZRVMpDQorCQk2NGJpdGtlcm5lbCA6PSAkKHNoZWxsIGVjaG8gLWUgIlwjaW5jbHVk ZSA8YXNtL3R5cGVzLmg+XG5cI2lmIEJJVFNfUEVSX0xPTkcgPT0gNjRcbmtlcm5lbF9pc182NGJp dHNcblwjZW5kaWYiIHwgJChDQykgJChDRkxBR1MpIC1EX19LRVJORUxfXyAtRSAtIHwgZ3JlcCBr ZXJuZWxfaXNfNjRiaXRzKQ0KKwkJaWZkZWYgNjRiaXRrZXJuZWwNCisJCQkzMmJpdHVzZXIgOj0g JChzaGVsbCBlY2hvIC1lICJcI2luY2x1ZGUgPHN0ZGlvLmg+XG5cI2lmICFkZWZpbmVkKF9fYXJj aDY0X18pICYmICFkZWZpbmVkKF9MUDY0KVxudXNlcnNwYWNlX2lzXzMyYml0XG5cI2VuZGlmIiB8 ICQoQ0MpICQoQ0ZMQUdTKSAtRSAtIHwgZ3JlcCB1c2Vyc3BhY2VfaXNfMzJiaXQpDQorCQkJaWZk ZWYgMzJiaXR1c2VyDQorCQkJCUNGTEFHUys9LURJUFRfTUlOX0FMSUdOPTggLURLRVJORUxfNjRf VVNFUlNQQUNFXzMyDQorCQkJZW5kaWYNCisJCWVuZGlmDQorCWVsc2UNCisJCUNGTEFHUys9LURf VU5LTk9XTl9LRVJORUxfUE9JTlRFUl9TSVpFDQorCWVuZGlmDQorZW5kaWYNCisNCiBhbGw6IHJl Y3Vyc2UgdWxvZ2QNCiANCiAuUEhPTlk6IGRpc3RjbGVhbg0KSW5kZXg6IGxpYmlwdWxvZy9pbmNs dWRlL2xpbnV4L25ldGZpbHRlcl9pcHY0L2lwdF9VTE9HLmgNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBsaWJp cHVsb2cvaW5jbHVkZS9saW51eC9uZXRmaWx0ZXJfaXB2NC9pcHRfVUxPRy5oCShy6XZpc2lvbiAw KQ0KKysrIGxpYmlwdWxvZy9pbmNsdWRlL2xpbnV4L25ldGZpbHRlcl9pcHY0L2lwdF9VTE9HLmgJ KHLpdmlzaW9uIDApDQpAQCAtMCwwICsxLDYyIEBADQorLyogSGVhZGVyIGZpbGUgZm9yIElQIHRh YmxlcyB1c2Vyc3BhY2UgbG9nZ2luZywgVmVyc2lvbiAxLjgNCisgKg0KKyAqIChDKSAyMDAwLTIw MDIgYnkgSGFyYWxkIFdlbHRlIDxsYWZvcmdlQGdudW1vbmtzLm9yZz4NCisgKiANCisgKiBEaXN0 cmlidXRlZCB1bmRlciB0aGUgdGVybXMgb2YgR05VIEdQTCAqLw0KKyNpZm5kZWYgX0lQVF9VTE9H X0gNCisjZGVmaW5lIF9JUFRfVUxPR19IDQorDQorI2lmbmRlZiBORVRMSU5LX05GTE9HDQorI2Rl ZmluZSBORVRMSU5LX05GTE9HIAk1DQorI2VuZGlmDQorDQorI2RlZmluZSBVTE9HX0RFRkFVTFRf TkxHUk9VUAkxDQorI2RlZmluZSBVTE9HX0RFRkFVTFRfUVRIUkVTSE9MRAkxDQorDQorI2RlZmlu ZSBVTE9HX01BQ19MRU4JODANCisjZGVmaW5lIFVMT0dfUFJFRklYX0xFTgkzMg0KKw0KKyNkZWZp bmUgVUxPR19NQVhfUUxFTgk1MA0KKy8qIFdoeSA1MD8gV2VsbC4uLiB0aGVyZSBpcyBhIGxpbWl0 IGltcG9zZWQgYnkgdGhlIHNsYWIgY2FjaGUgMTMxMDAwDQorICogYnl0ZXMuIFNvIHRoZSBtdWx0 aXBhcnQgbmV0bGluay1tZXNzYWdlIGhhcyB0byBiZSA8IDEzMTAwMCBieXRlcy4NCisgKiBBc3N1 bWluZyBhIHN0YW5kYXJkIGV0aGVybmV0LW10dSBvZiAxNTAwLCB3ZSBjb3VsZCBkZWZpbmUgdGhp cyB1cA0KKyAqIHRvIDgwLi4uIGJ1dCBldmVuIDUwIHNlZW1zIHRvIGJlIGJpZyBlbm91Z2guICov DQorDQorLyogcHJpdmF0ZSBkYXRhIHN0cnVjdHVyZSBmb3IgZWFjaCBydWxlIHdpdGggYSBVTE9H IHRhcmdldCAqLw0KK3N0cnVjdCBpcHRfdWxvZ19pbmZvIHsNCisJdW5zaWduZWQgaW50IG5sX2dy b3VwOw0KKyNpZmRlZiBLRVJORUxfNjRfVVNFUlNQQUNFXzMyDQorCXVuc2lnbmVkIGxvbmcgbG9u ZyBjb3B5X3JhbmdlOw0KKwl1bnNpZ25lZCBsb25nIGxvbmcgcXRocmVzaG9sZDsNCisjZWxzZQ0K KwlzaXplX3QgY29weV9yYW5nZTsNCisJc2l6ZV90IHF0aHJlc2hvbGQ7DQorI2VuZGlmDQorCWNo YXIgcHJlZml4W1VMT0dfUFJFRklYX0xFTl07DQorfTsNCisNCisvKiBGb3JtYXQgb2YgdGhlIFVM T0cgcGFja2V0cyBwYXNzZWQgdGhyb3VnaCBuZXRsaW5rICovDQordHlwZWRlZiBzdHJ1Y3QgdWxv Z19wYWNrZXRfbXNnIHsNCisJdW5zaWduZWQgbG9uZyBtYXJrOw0KKyNpZmRlZiBLRVJORUxfNjRf VVNFUlNQQUNFXzMyDQorCWxvbmcgbG9uZyB0aW1lc3RhbXBfc2VjOw0KKwlsb25nIGxvbmcgdGlt ZXN0YW1wX3VzZWM7DQorI2Vsc2UNCisJbG9uZyB0aW1lc3RhbXBfc2VjOw0KKwlsb25nIHRpbWVz dGFtcF91c2VjOw0KKyNlbmRpZg0KKwl1bnNpZ25lZCBpbnQgaG9vazsNCisJY2hhciBpbmRldl9u YW1lW0lGTkFNU0laXTsNCisJY2hhciBvdXRkZXZfbmFtZVtJRk5BTVNJWl07DQorI2lmZGVmIEtF Uk5FTF82NF9VU0VSU1BBQ0VfMzINCisJdW5zaWduZWQgbG9uZyBsb25nIGRhdGFfbGVuOw0KKyNl bHNlDQorCXNpemVfdCBkYXRhX2xlbjsNCisjZW5kaWYNCisJY2hhciBwcmVmaXhbVUxPR19QUkVG SVhfTEVOXTsNCisJdW5zaWduZWQgY2hhciBtYWNfbGVuOw0KKwl1bnNpZ25lZCBjaGFyIG1hY1tV TE9HX01BQ19MRU5dOw0KKwl1bnNpZ25lZCBjaGFyIHBheWxvYWRbMF07DQorfSB1bG9nX3BhY2tl dF9tc2dfdDsNCisNCisjZW5kaWYgLypfSVBUX1VMT0dfSCovDQpJbmRleDogbGliaXB1bG9nL2lu Y2x1ZGUvbGliaXB1bG9nL2xpYmlwdWxvZy5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gbGliaXB1bG9nL2lu Y2x1ZGUvbGliaXB1bG9nL2xpYmlwdWxvZy5oCShy6XZpc2lvbiA2Njg3KQ0KKysrIGxpYmlwdWxv Zy9pbmNsdWRlL2xpYmlwdWxvZy9saWJpcHVsb2cuaAkoY29waWUgZGUgdHJhdmFpbCkNCkBAIC0x LDcgKzEsNyBAQA0KICNpZm5kZWYgX0xJQklQVUxPR19IDQogI2RlZmluZSBfTElCSVBVTE9HX0gN CiANCi0vKiAkSWQ6IGxpYmlwdWxvZy5oLHYgMS42IDIwMDIvMDcvMzAgMDc6MjM6MzYgbGFmb3Jn ZSBFeHAgJCAqLw0KKy8qICRJZCQgKi8NCiANCiAjaW5jbHVkZSA8ZXJybm8uaD4NCiAjaW5jbHVk ZSA8dW5pc3RkLmg+DQpAQCAtMTIsNyArMTIsNyBAQA0KICNpbmNsdWRlIDxhc20vdHlwZXMuaD4N CiAjaW5jbHVkZSA8bGludXgvbmV0bGluay5oPg0KICNpbmNsdWRlIDxuZXQvaWYuaD4NCi0jaW5j bHVkZSA8bGludXgvbmV0ZmlsdGVyX2lwdjQvaXB0X1VMT0cuaD4NCisjaW5jbHVkZSAibGludXgv bmV0ZmlsdGVyX2lwdjQvaXB0X1VMT0cuaCINCiANCiAvKiBGSVhNRTogZ2xpYmMgc3Vja3MgKi8N CiAjaWZuZGVmIE1TR19UUlVOQyANCkluZGV4OiBSdWxlcy5tYWtlLmluDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gUnVsZXMubWFrZS5pbgkocul2aXNpb24gNjY4NykNCisrKyBSdWxlcy5tYWtlLmluCShjb3Bp ZSBkZSB0cmF2YWlsKQ0KQEAgLTIxLDcgKzIxLDcgQEANCiBDRkxBR1M9QENGTEFHU0AgQENQUEZM QUdTQCAtV2FsbA0KIENGTEFHUys9LURVTE9HRF9DT05GSUdGSUxFPVwiJChVTE9HRF9DT05GSUdG SUxFKVwiDQogIyBkb2Vzbid0IHdvcmsgZm9yIHN1YmRpcnMNCi0jQ0ZMQUdTKz0kKElOQ0lQVUxP RykgJChJTkNDT05GRklMRSkNCitDRkxBR1MrPSQoSU5DSVBVTE9HKQ0KIENGTEFHUys9LUkvbGli L21vZHVsZXMvYHVuYW1lIC1yYC9idWlsZC9pbmNsdWRlDQogI0NGTEFHUys9QERFRlNADQogI0NG TEFHUys9LWcgLURERUJVRyAtRERFQlVHX01ZU1FMIC1EREVCVUdfUEdTUUwNCg== --=-4oITA1eCYeXacbmhd4zj-- --=-e7DZ741qyKCvo25Z3tNv 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.5 (GNU/Linux) iD8DBQBFLi8PnxA7CdMWjzIRAl0iAJwIa3pBOutZ1gcijdme2mE0JMHbfwCfYuw+ 6Xt4PyNGRvV66pr89dllkDw= =aUFa -----END PGP SIGNATURE----- --=-e7DZ741qyKCvo25Z3tNv--