From: Eric Leblond Subject: [PATCH 1/3] fixed duration connection Date: Tue, 04 Apr 2006 10:36:26 +0200 Message-ID: <1144139786.5186.28.camel@localhost.localdomain> References: <1144139619.5186.24.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-hQX21H1YrDv8z0atp+1v" Cc: nufw-devel@nongnu.org Return-path: To: Netfilter Development Mailinglist In-Reply-To: <1144139619.5186.24.camel@localhost.localdomain> 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 --=-hQX21H1YrDv8z0atp+1v Content-Type: multipart/mixed; boundary="=-d4ob5iZWGniypaIUv/a/" --=-d4ob5iZWGniypaIUv/a/ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable This is patch against Linus's git tree. It adds support for fixed duration connection in ip_conntrack and nf_conntrack. BR, --=20 Eric Leblond NuFW: http://www.nufw.org/ --=-d4ob5iZWGniypaIUv/a/ Content-Disposition: attachment; filename=fixed_timeout.patch Content-Type: text/x-patch; name=fixed_timeout.patch; charset=us-ascii Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbmV0ZmlsdGVyL25mbmV0bGlua19jb25udHJhY2su aCBiL2luY2x1ZGUvbGludXgvbmV0ZmlsdGVyL25mbmV0bGlua19jb25udHJhY2suaA0KaW5kZXgg NjY4ZWM5NC4uMGEzMDBkZiAxMDA2NDQNCi0tLSBhL2luY2x1ZGUvbGludXgvbmV0ZmlsdGVyL25m bmV0bGlua19jb25udHJhY2suaA0KKysrIGIvaW5jbHVkZS9saW51eC9uZXRmaWx0ZXIvbmZuZXRs aW5rX2Nvbm50cmFjay5oDQpAQCAtMjksNiArMjksOSBAQCBlbnVtIGN0YXR0cl90eXBlIHsNCiAJ Q1RBX0hFTFAsDQogCUNUQV9OQVQsDQogCUNUQV9USU1FT1VULA0KKyNpZiBkZWZpbmVkKENPTkZJ R19JUF9ORl9DVF9GSVhFRF9USU1FT1VUKSB8fCBkZWZpbmVkKENPTkZJR19ORl9DVF9GSVhFRF9U SU1FT1VUKQ0KKwlDVEFfRklYRURfVElNRU9VVCwNCisjZW5kaWYNCiAJQ1RBX01BUkssDQogCUNU QV9DT1VOVEVSU19PUklHLA0KIAlDVEFfQ09VTlRFUlNfUkVQTFksDQpkaWZmIC0tZ2l0IGEvaW5j bHVkZS9saW51eC9uZXRmaWx0ZXJfaXB2NC9pcF9jb25udHJhY2suaCBiL2luY2x1ZGUvbGludXgv bmV0ZmlsdGVyX2lwdjQvaXBfY29ubnRyYWNrLmgNCmluZGV4IGQ1NGQ3YjIuLjYwOTNlZDUgMTAw NjQ0DQotLS0gYS9pbmNsdWRlL2xpbnV4L25ldGZpbHRlcl9pcHY0L2lwX2Nvbm50cmFjay5oDQor KysgYi9pbmNsdWRlL2xpbnV4L25ldGZpbHRlcl9pcHY0L2lwX2Nvbm50cmFjay5oDQpAQCAtODUs NiArODUsMTEgQEAgc3RydWN0IGlwX2Nvbm50cmFjaw0KIAkvKiBUaW1lciBmdW5jdGlvbjsgZHJv cHMgcmVmY250IHdoZW4gaXQgZ29lcyBvZmYuICovDQogCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVv dXQ7DQogDQorI2lmZGVmIENPTkZJR19JUF9ORl9DVF9GSVhFRF9USU1FT1VUDQorICAgIC8qIElz IHRpbWVvdXQgZml4ZWQgPyAqLw0KKyAgICBzdHJ1Y3QgdGltZXJfbGlzdCBmaXhlZF90aW1lb3V0 Ow0KKyNlbmRpZg0KKyAgICAgICAgDQogI2lmZGVmIENPTkZJR19JUF9ORl9DVF9BQ0NUDQogCS8q IEFjY291bnRpbmcgSW5mb3JtYXRpb24gKHNhbWUgY2FjaGUgbGluZSBhcyBvdGhlciB3cml0dGVu IG1lbWJlcnMpICovDQogCXN0cnVjdCBpcF9jb25udHJhY2tfY291bnRlciBjb3VudGVyc1tJUF9D VF9ESVJfTUFYXTsNCmRpZmYgLS1naXQgYS9pbmNsdWRlL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRy YWNrLmggYi9pbmNsdWRlL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrLmgNCmluZGV4IDkxNjAx M2MuLjdjMGI0NmQgMTAwNjQ0DQotLS0gYS9pbmNsdWRlL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRy YWNrLmgNCisrKyBiL2luY2x1ZGUvbmV0L25ldGZpbHRlci9uZl9jb25udHJhY2suaA0KQEAgLTk5 LDYgKzk5LDEyIEBAIHN0cnVjdCBuZl9jb25uDQogCS8qIFRpbWVyIGZ1bmN0aW9uOyBkcm9wcyBy ZWZjbnQgd2hlbiBpdCBnb2VzIG9mZi4gKi8NCiAJc3RydWN0IHRpbWVyX2xpc3QgdGltZW91dDsN CiANCisjaWZkZWYgQ09ORklHX05GX0NUX0ZJWEVEX1RJTUVPVVQNCisgICAgLyogSXMgdGltZW91 dCBmaXhlZCA/ICovDQorICAgIHN0cnVjdCB0aW1lcl9saXN0IGZpeGVkX3RpbWVvdXQ7DQorI2Vu ZGlmDQorICAgICANCisNCiAjaWZkZWYgQ09ORklHX05GX0NUX0FDQ1QNCiAJLyogQWNjb3VudGlu ZyBJbmZvcm1hdGlvbiAoc2FtZSBjYWNoZSBsaW5lIGFzIG90aGVyIHdyaXR0ZW4gbWVtYmVycykg Ki8NCiAJc3RydWN0IGlwX2Nvbm50cmFja19jb3VudGVyIGNvdW50ZXJzW0lQX0NUX0RJUl9NQVhd Ow0KZGlmZiAtLWdpdCBhL25ldC9pcHY0L25ldGZpbHRlci9LY29uZmlnIGIvbmV0L2lwdjQvbmV0 ZmlsdGVyL0tjb25maWcNCmluZGV4IDg4MmI4NDIuLjZjYWU1MTUgMTAwNjQ0DQotLS0gYS9uZXQv aXB2NC9uZXRmaWx0ZXIvS2NvbmZpZw0KKysrIGIvbmV0L2lwdjQvbmV0ZmlsdGVyL0tjb25maWcN CkBAIC00Niw2ICs0NiwxOCBAQCBjb25maWcgSVBfTkZfQ1RfQUNDVA0KIA0KIAkgIElmIHVuc3Vy ZSwgc2F5IGBOJy4NCiANCitjb25maWcgSVBfTkZfQ1RfRklYRURfVElNRU9VVA0KKwlib29sICJD b25uZWN0aW9uIHRyYWNraW5nIGZpeGVkIHRpbWVvdXQgKEVYUEVSSU1FTlRBTCkiDQorCWRlcGVu ZHMgb24gRVhQRVJJTUVOVEFMICYmIElQX05GX0NPTk5UUkFDSw0KKwloZWxwDQorCSAgSWYgdGhp cyBvcHRpb24gaXMgZW5hYmxlZCwgdGhlIGNvbm5lY3Rpb24gdHJhY2tpbmcgY29kZSB3aWxsDQor CSAgYmUgYWJsZSB0byBoYXZlIGNvbm5lY3Rpb24gdGhhdCB3aWxsIGV4cGlyZSBhdXRvbWF0aWNh bGx5IGFmdGVyDQorICAgICAgICAgIGEgZ2l2ZW4gdGltZS4NCisgICAgICAgICAgDQorCSAgVGhp cyBmZWF0dXJlIGNhbiBiZSB1c2VkIHdpdGggbGlibmV0ZmlsdGVyX2Nvbm50cmFjayBsaWJyYXJ5 Lg0KKw0KKwkgIElmIHVuc3VyZSwgc2F5IGBOJy4NCisNCiBjb25maWcgSVBfTkZfQ09OTlRSQUNL X01BUksNCiAJYm9vbCAgJ0Nvbm5lY3Rpb24gbWFyayB0cmFja2luZyBzdXBwb3J0Jw0KIAlkZXBl bmRzIG9uIElQX05GX0NPTk5UUkFDSw0KZGlmZiAtLWdpdCBhL25ldC9pcHY0L25ldGZpbHRlci9p cF9jb25udHJhY2tfY29yZS5jIGIvbmV0L2lwdjQvbmV0ZmlsdGVyL2lwX2Nvbm50cmFja19jb3Jl LmMNCmluZGV4IGNlYWFiYzEuLjE3ZWJlOWIgMTAwNjQ0DQotLS0gYS9uZXQvaXB2NC9uZXRmaWx0 ZXIvaXBfY29ubnRyYWNrX2NvcmUuYw0KKysrIGIvbmV0L2lwdjQvbmV0ZmlsdGVyL2lwX2Nvbm50 cmFja19jb3JlLmMNCkBAIC0zMTksNiArMzE5LDExIEBAIGRlc3Ryb3lfY29ubnRyYWNrKHN0cnVj dCBuZl9jb25udHJhY2sgKm4NCiAJSVBfTkZfQVNTRVJUKGF0b21pY19yZWFkKCZuZmN0LT51c2Up ID09IDApOw0KIAlJUF9ORl9BU1NFUlQoIXRpbWVyX3BlbmRpbmcoJmN0LT50aW1lb3V0KSk7DQog DQorI2lmZGVmIENPTkZJR19JUF9ORl9DVF9GSVhFRF9USU1FT1VUDQorICAgIGlmICh0aW1lcl9w ZW5kaW5nKCZjdC0+Zml4ZWRfdGltZW91dCkpIHsNCisgICAgICAgIGRlbF90aW1lcigmY3QtPmZp eGVkX3RpbWVvdXQpOw0KKyAgICB9DQorI2VuZGlmDQogCWlwX2Nvbm50cmFja19ldmVudChJUENU X0RFU1RST1ksIGN0KTsNCiAJc2V0X2JpdChJUFNfRFlJTkdfQklULCAmY3QtPnN0YXR1cyk7DQog DQpAQCAtMzU5LDYgKzM2NCwxNSBAQCBzdGF0aWMgdm9pZCBkZWF0aF9ieV90aW1lb3V0KHVuc2ln bmVkIGxvDQogew0KIAlzdHJ1Y3QgaXBfY29ubnRyYWNrICpjdCA9ICh2b2lkICopdWxfY29ubnRy YWNrOw0KIA0KKyNpZmRlZiBDT05GSUdfSVBfTkZfQ1RfRklYRURfVElNRU9VVA0KKyAgICAvKiBk ZWxldGUgdGhlIHRpbWVyIHdoaWNoIGhhcyBub3QgdGltZW91dCAqLw0KKyAgICBpZiAodGltZXJf cGVuZGluZygmY3QtPnRpbWVvdXQpKSB7DQorICAgICAgICBkZWxfdGltZXIoJmN0LT50aW1lb3V0 KTsNCisgICAgfQ0KKyAgICBpZiAodGltZXJfcGVuZGluZygmY3QtPmZpeGVkX3RpbWVvdXQpKSB7 DQorICAgICAgICBkZWxfdGltZXIoJmN0LT5maXhlZF90aW1lb3V0KTsNCisgICAgfQ0KKyNlbmRp Zg0KIAl3cml0ZV9sb2NrX2JoKCZpcF9jb25udHJhY2tfbG9jayk7DQogCS8qIEluc2lkZSBsb2Nr IHNvIHByZWVtcHQgaXMgZGlzYWJsZWQgb24gbW9kdWxlIHJlbW92YWwgcGF0aC4NCiAJICogT3Ro ZXJ3aXNlIHdlIGNhbiBnZXQgc3B1cmlvdXMgd2FybmluZ3MuICovDQpAQCAtNjcwLDYgKzY4NCwx MiBAQCBzdHJ1Y3QgaXBfY29ubnRyYWNrICppcF9jb25udHJhY2tfYWxsb2MoDQogCWNvbm50cmFj ay0+dGltZW91dC5kYXRhID0gKHVuc2lnbmVkIGxvbmcpY29ubnRyYWNrOw0KIAljb25udHJhY2st PnRpbWVvdXQuZnVuY3Rpb24gPSBkZWF0aF9ieV90aW1lb3V0Ow0KIA0KKyNpZmRlZiBDT05GSUdf SVBfTkZfQ1RfRklYRURfVElNRU9VVA0KKwlpbml0X3RpbWVyKCZjb25udHJhY2stPmZpeGVkX3Rp bWVvdXQpOw0KKwljb25udHJhY2stPmZpeGVkX3RpbWVvdXQuZGF0YSA9ICh1bnNpZ25lZCBsb25n KWNvbm50cmFjazsNCisJY29ubnRyYWNrLT5maXhlZF90aW1lb3V0LmZ1bmN0aW9uID0gZGVhdGhf YnlfdGltZW91dDsNCisjZW5kaWYNCisNCiAJYXRvbWljX2luYygmaXBfY29ubnRyYWNrX2NvdW50 KTsNCiANCiAJcmV0dXJuIGNvbm50cmFjazsNCkBAIC03MjQsNiArNzQ0LDcgQEAgaW5pdF9jb25u dHJhY2soc3RydWN0IGlwX2Nvbm50cmFja190dXBsZQ0KIAkJLyogdGhpcyBpcyB1Z2x5LCBidXQg dGhlcmUgaXMgbm8gb3RoZXIgcGxhY2Ugd2hlcmUgdG8gcHV0IGl0ICovDQogCQljb25udHJhY2st Pm5hdC5tYXNxX2luZGV4ID0gZXhwLT5tYXN0ZXItPm5hdC5tYXNxX2luZGV4Ow0KICNlbmRpZg0K Kw0KIAkJbmZfY29ubnRyYWNrX2dldCgmY29ubnRyYWNrLT5tYXN0ZXItPmN0X2dlbmVyYWwpOw0K IAkJQ09OTlRSQUNLX1NUQVRfSU5DKGV4cGVjdF9uZXcpOw0KIAl9IGVsc2Ugew0KQEAgLTExMzUs MTIgKzExNTYsMTIgQEAgdm9pZCBfX2lwX2N0X3JlZnJlc2hfYWNjdChzdHJ1Y3QgaXBfY29ubg0K IAkJY3QtPnRpbWVvdXQuZXhwaXJlcyA9IGV4dHJhX2ppZmZpZXM7DQogCQlldmVudCA9IElQQ1Rf UkVGUkVTSDsNCiAJfSBlbHNlIHsNCi0JCS8qIE5lZWQgZGVsX3RpbWVyIGZvciByYWNlIGF2b2lk YW5jZSAobWF5IGFscmVhZHkgYmUgZHlpbmcpLiAqLw0KLQkJaWYgKGRlbF90aW1lcigmY3QtPnRp bWVvdXQpKSB7DQotCQkJY3QtPnRpbWVvdXQuZXhwaXJlcyA9IGppZmZpZXMgKyBleHRyYV9qaWZm aWVzOw0KLQkJCWFkZF90aW1lcigmY3QtPnRpbWVvdXQpOw0KLQkJCWV2ZW50ID0gSVBDVF9SRUZS RVNIOw0KLQkJfQ0KKyAgICAgICAgICAgICAgIC8qIE5lZWQgZGVsX3RpbWVyIGZvciByYWNlIGF2 b2lkYW5jZSAobWF5IGFscmVhZHkgYmUgZHlpbmcpLiAqLw0KKyAgICAgICAgICAgICAgIGlmIChk ZWxfdGltZXIoJmN0LT50aW1lb3V0KSkgew0KKyAgICAgICAgICAgICAgICAgICAgICAgY3QtPnRp bWVvdXQuZXhwaXJlcyA9IGppZmZpZXMgKyBleHRyYV9qaWZmaWVzOw0KKyAgICAgICAgICAgICAg ICAgICAgICAgYWRkX3RpbWVyKCZjdC0+dGltZW91dCk7DQorICAgICAgICAgICAgICAgICAgICAg ICBldmVudCA9IElQQ1RfUkVGUkVTSDsNCisgICAgICAgICAgICAgICB9ICAgDQogCX0NCiANCiAj aWZkZWYgQ09ORklHX0lQX05GX0NUX0FDQ1QNCmRpZmYgLS1naXQgYS9uZXQvaXB2NC9uZXRmaWx0 ZXIvaXBfY29ubnRyYWNrX25ldGxpbmsuYyBiL25ldC9pcHY0L25ldGZpbHRlci9pcF9jb25udHJh Y2tfbmV0bGluay5jDQppbmRleCA5YjZlMTliLi4zMGEzMmYwIDEwMDY0NA0KLS0tIGEvbmV0L2lw djQvbmV0ZmlsdGVyL2lwX2Nvbm50cmFja19uZXRsaW5rLmMNCisrKyBiL25ldC9pcHY0L25ldGZp bHRlci9pcF9jb25udHJhY2tfbmV0bGluay5jDQpAQCAtNDIsNyArNDIsNyBAQA0KIA0KIE1PRFVM RV9MSUNFTlNFKCJHUEwiKTsNCiANCi1zdGF0aWMgY2hhciBfX2luaXRkYXRhIHZlcnNpb25bXSA9 ICIwLjkwIjsNCitzdGF0aWMgY2hhciBfX2luaXRkYXRhIHZlcnNpb25bXSA9ICIwLjkxIjsNCiAN CiAjaWYgMA0KICNkZWZpbmUgREVCVUdQIHByaW50aw0KQEAgLTk1Myw2ICs5NTMsMjYgQEAgY3Ru ZXRsaW5rX2NoYW5nZV90aW1lb3V0KHN0cnVjdCBpcF9jb25udA0KIAlyZXR1cm4gMDsNCiB9DQog DQorDQorI2lmZGVmIENPTkZJR19JUF9ORl9DVF9GSVhFRF9USU1FT1VUDQorc3RhdGljIGlubGlu ZSBpbnQNCitjdG5ldGxpbmtfY2hhbmdlX2ZpeGVkX3RpbWVvdXQoc3RydWN0IGlwX2Nvbm50cmFj ayAqY3QsIHN0cnVjdCBuZmF0dHIgKmNkYVtdKQ0KK3sNCisJdV9pbnQzMl90IHRpbWVvdXQgPSBu dG9obCgqKHVfaW50MzJfdCAqKU5GQV9EQVRBKGNkYVtDVEFfRklYRURfVElNRU9VVC0xXSkpOw0K KwkNCisgICAgICAgIC8qIHRlc3QgaWYgdGltZXIgaGFzIGFscmVhZHkgYmVlbiBzZXQgKi8NCisg ICAgICAgIGlmICh0aW1lcl9wZW5kaW5nKCZjdC0+Zml4ZWRfdGltZW91dCkpew0KKwkgICAgICAg IGlmICghZGVsX3RpbWVyKCZjdC0+Zml4ZWRfdGltZW91dCkpDQorCQkgICAgICAgIHJldHVybiAt RVRJTUU7DQorICAgICAgICB9DQorDQorCWN0LT5maXhlZF90aW1lb3V0LmV4cGlyZXMgPSBqaWZm aWVzICsgdGltZW91dCAqIEhaOw0KKwlhZGRfdGltZXIoJmN0LT5maXhlZF90aW1lb3V0KTsNCisN CisJcmV0dXJuIDA7DQorfQ0KKyNlbmRpZiAvKiBDT05GSUdfSVBfTkZfQ1RfRklYRURfVElNRU9V VCAqLw0KKw0KIHN0YXRpYyBpbmxpbmUgaW50DQogY3RuZXRsaW5rX2NoYW5nZV9wcm90b2luZm8o c3RydWN0IGlwX2Nvbm50cmFjayAqY3QsIHN0cnVjdCBuZmF0dHIgKmNkYVtdKQ0KIHsNCkBAIC05 OTEsNiArMTAxMSwxNCBAQCBjdG5ldGxpbmtfY2hhbmdlX2Nvbm50cmFjayhzdHJ1Y3QgaXBfY29u DQogCQkJcmV0dXJuIGVycjsNCiAJfQ0KIA0KKyNpZmRlZiBDT05GSUdfSVBfTkZfQ1RfRklYRURf VElNRU9VVA0KKwlpZiAoY2RhW0NUQV9GSVhFRF9USU1FT1VULTFdKSB7DQorCQllcnIgPSBjdG5l dGxpbmtfY2hhbmdlX2ZpeGVkX3RpbWVvdXQoY3QsIGNkYSk7DQorCQlpZiAoZXJyIDwgMCkNCisJ CQlyZXR1cm4gZXJyOw0KKyAgICAgICAgfQ0KKyNlbmRpZg0KKw0KIAlpZiAoY2RhW0NUQV9TVEFU VVMtMV0pIHsNCiAJCWVyciA9IGN0bmV0bGlua19jaGFuZ2Vfc3RhdHVzKGN0LCBjZGEpOw0KIAkJ aWYgKGVyciA8IDApDQpAQCAtMTAzMCw3ICsxMDU4LDE1IEBAIGN0bmV0bGlua19jcmVhdGVfY29u bnRyYWNrKHN0cnVjdCBuZmF0dHINCiAJCWdvdG8gZXJyOw0KIAljdC0+dGltZW91dC5leHBpcmVz ID0gbnRvaGwoKih1X2ludDMyX3QgKilORkFfREFUQShjZGFbQ1RBX1RJTUVPVVQtMV0pKTsNCiAN CisgICAgICAgIC8qIHdlIGFkbWl0IGppZmZpZXMgZGVsYXkgb24gdGltZW91dCBldmVuIGlmIGlz IGZpeGVkICovDQogCWN0LT50aW1lb3V0LmV4cGlyZXMgPSBqaWZmaWVzICsgY3QtPnRpbWVvdXQu ZXhwaXJlcyAqIEhaOw0KKw0KKyNpZmRlZiBDT05GSUdfSVBfTkZfQ1RfRklYRURfVElNRU9VVA0K KwlpZiAoY2RhW0NUQV9GSVhFRF9USU1FT1VULTFdKSB7DQorICAgICAgICAgICAgICAgIGN0LT5m aXhlZF90aW1lb3V0LmV4cGlyZXMgPSBudG9obCgqKHVfaW50MzJfdCAqKU5GQV9EQVRBKGNkYVtD VEFfRklYRURfVElNRU9VVC0xXSkpOw0KKyAgICB9DQorI2VuZGlmDQorICAgICAgICANCiAJY3Qt PnN0YXR1cyB8PSBJUFNfQ09ORklSTUVEOw0KIA0KIAllcnIgPSBjdG5ldGxpbmtfY2hhbmdlX3N0 YXR1cyhjdCwgY2RhKTsNCkBAIC0xMDUxLDYgKzEwODcsMTMgQEAgY3RuZXRsaW5rX2NyZWF0ZV9j b25udHJhY2soc3RydWN0IG5mYXR0cg0KIAljdC0+aGVscGVyID0gaXBfY29ubnRyYWNrX2hlbHBl cl9maW5kX2dldChydHVwbGUpOw0KIA0KIAlhZGRfdGltZXIoJmN0LT50aW1lb3V0KTsNCisNCisj aWZkZWYgQ09ORklHX0lQX05GX0NUX0ZJWEVEX1RJTUVPVVQNCisJaWYgKGNkYVtDVEFfRklYRURf VElNRU9VVC0xXSkgew0KKwkgICAgICAgIGFkZF90aW1lcigmY3QtPmZpeGVkX3RpbWVvdXQpOw0K KyAgICB9DQorI2VuZGlmDQorDQogCWlwX2Nvbm50cmFja19oYXNoX2luc2VydChjdCk7DQogDQog CWlmIChjdC0+aGVscGVyKQ0KZGlmZiAtLWdpdCBhL25ldC9uZXRmaWx0ZXIvS2NvbmZpZyBiL25l dC9uZXRmaWx0ZXIvS2NvbmZpZw0KaW5kZXggMzMyYWNiMy4uZTQ0MTU4ZiAxMDA2NDQNCi0tLSBh L25ldC9uZXRmaWx0ZXIvS2NvbmZpZw0KKysrIGIvbmV0L25ldGZpbHRlci9LY29uZmlnDQpAQCAt NjAsNiArNjAsMTggQEAgY29uZmlnIE5GX0NPTk5UUkFDS19NQVJLDQogCSAgb2YgcGFja2V0cywg YnV0IHRoaXMgbWFyayB2YWx1ZSBpcyBrZXB0IGluIHRoZSBjb25udHJhY2sgc2Vzc2lvbg0KIAkg IGluc3RlYWQgb2YgdGhlIGluZGl2aWR1YWwgcGFja2V0cy4NCiANCitjb25maWcgQ09ORklHX05G X0NUX0ZJWEVEX1RJTUVPVVQNCisJYm9vbCAgIkNvbm5lY3Rpb24gd2l0aCBmaXhlZCBleHBpcmF0 aW9uIGRlbGF5IChFWFBFUklNRU5UQUwpIg0KKwlkZXBlbmRzIG9uIEVYUEVSSU1FTlRBTCAmJiBO Rl9DT05OVFJBQ0sNCisJaGVscA0KKwkgIElmIHRoaXMgb3B0aW9uIGlzIGVuYWJsZWQsIHRoZSBj b25uZWN0aW9uIHRyYWNraW5nIGNvZGUgd2lsbA0KKwkgIGJlIGFibGUgdG8gaGF2ZSBjb25uZWN0 aW9uIHRoYXQgd2lsbCBleHBpcmUgYXV0b21hdGljYWxseSBhZnRlcg0KKyAgICAgICAgICBhIGdp dmVuIHRpbWUuDQorICAgICAgICAgIA0KKwkgIFRoaXMgZmVhdHVyZSBjYW4gYmUgdXNlZCB3aXRo IGxpYm5ldGZpbHRlcl9jb25udHJhY2sgbGlicmFyeS4NCisNCisJICBJZiB1bnN1cmUsIHNheSBg TicuDQorDQogY29uZmlnIE5GX0NPTk5UUkFDS19FVkVOVFMNCiAJYm9vbCAiQ29ubmVjdGlvbiB0 cmFja2luZyBldmVudHMgKEVYUEVSSU1FTlRBTCkiDQogCWRlcGVuZHMgb24gRVhQRVJJTUVOVEFM ICYmIE5GX0NPTk5UUkFDSw0KZGlmZiAtLWdpdCBhL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNr X2NvcmUuYyBiL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrX2NvcmUuYw0KaW5kZXggNTYzODlj OC4uN2IwZjJlOCAxMDA2NDQNCi0tLSBhL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrX2NvcmUu Yw0KKysrIGIvbmV0L25ldGZpbHRlci9uZl9jb25udHJhY2tfY29yZS5jDQpAQCAtNTcyLDYgKzU3 MiwxMiBAQCBkZXN0cm95X2Nvbm50cmFjayhzdHJ1Y3QgbmZfY29ubnRyYWNrICpuDQogCU5GX0NU X0FTU0VSVChhdG9taWNfcmVhZCgmbmZjdC0+dXNlKSA9PSAwKTsNCiAJTkZfQ1RfQVNTRVJUKCF0 aW1lcl9wZW5kaW5nKCZjdC0+dGltZW91dCkpOw0KIA0KKyNpZmRlZiBDT05GSUdfTkZfQ1RfRklY RURfVElNRU9VVA0KKyAgICBpZiAodGltZXJfcGVuZGluZygmY3QtPmZpeGVkX3RpbWVvdXQpKSB7 DQorICAgICAgICBkZWxfdGltZXIoJmN0LT5maXhlZF90aW1lb3V0KTsNCisgICAgfQ0KKyNlbmRp Zg0KKw0KIAluZl9jb25udHJhY2tfZXZlbnQoSVBDVF9ERVNUUk9ZLCBjdCk7DQogCXNldF9iaXQo SVBTX0RZSU5HX0JJVCwgJmN0LT5zdGF0dXMpOw0KIA0KQEAgLTYxNiw2ICs2MjIsMTYgQEAgc3Rh dGljIHZvaWQgZGVhdGhfYnlfdGltZW91dCh1bnNpZ25lZCBsbw0KIHsNCiAJc3RydWN0IG5mX2Nv bm4gKmN0ID0gKHZvaWQgKil1bF9jb25udHJhY2s7DQogDQorI2lmZGVmIENPTkZJR19ORl9DVF9G SVhFRF9USU1FT1VUDQorICAgIC8qIGRlbGV0ZSB0aGUgdGltZXIgd2hpY2ggaGFzIG5vdCB0aW1l b3V0ICovDQorICAgIGlmICh0aW1lcl9wZW5kaW5nKCZjdC0+dGltZW91dCkpIHsNCisgICAgICAg IGRlbF90aW1lcigmY3QtPnRpbWVvdXQpOw0KKyAgICB9DQorICAgIGlmICh0aW1lcl9wZW5kaW5n KCZjdC0+Zml4ZWRfdGltZW91dCkpIHsNCisgICAgICAgIGRlbF90aW1lcigmY3QtPmZpeGVkX3Rp bWVvdXQpOw0KKyAgICB9DQorI2VuZGlmDQorDQogCXdyaXRlX2xvY2tfYmgoJm5mX2Nvbm50cmFj a19sb2NrKTsNCiAJLyogSW5zaWRlIGxvY2sgc28gcHJlZW1wdCBpcyBkaXNhYmxlZCBvbiBtb2R1 bGUgcmVtb3ZhbCBwYXRoLg0KIAkgKiBPdGhlcndpc2Ugd2UgY2FuIGdldCBzcHVyaW91cyB3YXJu aW5ncy4gKi8NCkBAIC05MzAsNiArOTQ2LDEzIEBAIF9fbmZfY29ubnRyYWNrX2FsbG9jKGNvbnN0 IHN0cnVjdCBuZl9jb24NCiAJY29ubnRyYWNrLT50aW1lb3V0LmRhdGEgPSAodW5zaWduZWQgbG9u Zyljb25udHJhY2s7DQogCWNvbm50cmFjay0+dGltZW91dC5mdW5jdGlvbiA9IGRlYXRoX2J5X3Rp bWVvdXQ7DQogDQorI2lmZGVmIENPTkZJR19ORl9DVF9GSVhFRF9USU1FT1VUDQorCWluaXRfdGlt ZXIoJmNvbm50cmFjay0+Zml4ZWRfdGltZW91dCk7DQorCWNvbm50cmFjay0+Zml4ZWRfdGltZW91 dC5kYXRhID0gKHVuc2lnbmVkIGxvbmcpY29ubnRyYWNrOw0KKwljb25udHJhY2stPmZpeGVkX3Rp bWVvdXQuZnVuY3Rpb24gPSBkZWF0aF9ieV90aW1lb3V0Ow0KKyNlbmRpZg0KKw0KKw0KIAlhdG9t aWNfaW5jKCZuZl9jb25udHJhY2tfY291bnQpOw0KIG91dDoNCiAJcmVhZF91bmxvY2tfYmgoJm5m X2N0X2NhY2hlX2xvY2spOw0KZGlmZiAtLWdpdCBhL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNr X25ldGxpbmsuYyBiL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNrX25ldGxpbmsuYw0KaW5kZXgg MGUwZTlkNy4uODExNTYwYiAxMDA2NDQNCi0tLSBhL25ldC9uZXRmaWx0ZXIvbmZfY29ubnRyYWNr X25ldGxpbmsuYw0KKysrIGIvbmV0L25ldGZpbHRlci9uZl9jb25udHJhY2tfbmV0bGluay5jDQpA QCAtOTcxLDYgKzk3MSwyNiBAQCBjdG5ldGxpbmtfY2hhbmdlX3RpbWVvdXQoc3RydWN0IG5mX2Nv bm4gDQogCXJldHVybiAwOw0KIH0NCiANCisjaWZkZWYgQ09ORklHX05GX0NUX0ZJWEVEX1RJTUVP VVQNCitzdGF0aWMgaW5saW5lIGludA0KK2N0bmV0bGlua19jaGFuZ2VfZml4ZWRfdGltZW91dChz dHJ1Y3QgaXBfY29ubnRyYWNrICpjdCwgc3RydWN0IG5mYXR0ciAqY2RhW10pDQorew0KKwl1X2lu dDMyX3QgdGltZW91dCA9IG50b2hsKCoodV9pbnQzMl90ICopTkZBX0RBVEEoY2RhW0NUQV9GSVhF RF9USU1FT1VULTFdKSk7DQorCQ0KKyAgICAgICAgLyogdGVzdCBpZiB0aW1lciBoYXMgYWxyZWFk eSBiZWVuIHNldCAqLw0KKyAgICAgICAgaWYgKHRpbWVyX3BlbmRpbmcoJmN0LT5maXhlZF90aW1l b3V0KSl7DQorCSAgICAgICAgaWYgKCFkZWxfdGltZXIoJmN0LT5maXhlZF90aW1lb3V0KSkNCisJ CSAgICAgICAgcmV0dXJuIC1FVElNRTsNCisgICAgICAgIH0NCisNCisJY3QtPmZpeGVkX3RpbWVv dXQuZXhwaXJlcyA9IGppZmZpZXMgKyB0aW1lb3V0ICogSFo7DQorCWFkZF90aW1lcigmY3QtPmZp eGVkX3RpbWVvdXQpOw0KKw0KKwlyZXR1cm4gMDsNCit9DQorI2VuZGlmIC8qIENPTkZJR19ORl9D VF9GSVhFRF9USU1FT1VUICovIA0KKw0KKw0KIHN0YXRpYyBpbmxpbmUgaW50DQogY3RuZXRsaW5r X2NoYW5nZV9wcm90b2luZm8oc3RydWN0IG5mX2Nvbm4gKmN0LCBzdHJ1Y3QgbmZhdHRyICpjZGFb XSkNCiB7DQpAQCAtMTAxMCw2ICsxMDMwLDE1IEBAIGN0bmV0bGlua19jaGFuZ2VfY29ubnRyYWNr KHN0cnVjdCBuZl9jb24NCiAJCQlyZXR1cm4gZXJyOw0KIAl9DQogDQorDQorI2lmZGVmIENPTkZJ R19ORl9DVF9GSVhFRF9USU1FT1VUDQorCWlmIChjZGFbQ1RBX0ZJWEVEX1RJTUVPVVQtMV0pIHsN CisJCWVyciA9IGN0bmV0bGlua19jaGFuZ2VfZml4ZWRfdGltZW91dChjdCwgY2RhKTsNCisJCWlm IChlcnIgPCAwKQ0KKwkJCXJldHVybiBlcnI7DQorICAgICAgICB9DQorI2VuZGlmDQorDQogCWlm IChjZGFbQ1RBX1NUQVRVUy0xXSkgew0KIAkJZXJyID0gY3RuZXRsaW5rX2NoYW5nZV9zdGF0dXMo Y3QsIGNkYSk7DQogCQlpZiAoZXJyIDwgMCkNCkBAIC0xMDQ5LDYgKzEwNzgsMTIgQEAgY3RuZXRs aW5rX2NyZWF0ZV9jb25udHJhY2soc3RydWN0IG5mYXR0cg0KIAkJZ290byBlcnI7DQogCWN0LT50 aW1lb3V0LmV4cGlyZXMgPSBudG9obCgqKHVfaW50MzJfdCAqKU5GQV9EQVRBKGNkYVtDVEFfVElN RU9VVC0xXSkpOw0KIA0KKyNpZmRlZiBDT05GSUdfTkZfQ1RfRklYRURfVElNRU9VVA0KKwlpZiAo Y2RhW0NUQV9GSVhFRF9USU1FT1VULTFdKSB7DQorICAgICAgICAgICAgICAgIGN0LT5maXhlZF90 aW1lb3V0LmV4cGlyZXMgPSBudG9obCgqKHVfaW50MzJfdCAqKU5GQV9EQVRBKGNkYVtDVEFfRklY RURfVElNRU9VVC0xXSkpOw0KKyAgICB9DQorI2VuZGlmDQorIA0KIAljdC0+dGltZW91dC5leHBp cmVzID0gamlmZmllcyArIGN0LT50aW1lb3V0LmV4cGlyZXMgKiBIWjsNCiAJY3QtPnN0YXR1cyB8 PSBJUFNfQ09ORklSTUVEOw0KIA0KQEAgLTEwNjgsNiArMTEwMywxMyBAQCBjdG5ldGxpbmtfY3Jl YXRlX2Nvbm50cmFjayhzdHJ1Y3QgbmZhdHRyDQogI2VuZGlmDQogDQogCWFkZF90aW1lcigmY3Qt PnRpbWVvdXQpOw0KKw0KKyNpZmRlZiBDT05GSUdfTkZfQ1RfRklYRURfVElNRU9VVA0KKwlpZiAo Y2RhW0NUQV9GSVhFRF9USU1FT1VULTFdKSB7DQorCSAgICAgICAgYWRkX3RpbWVyKCZjdC0+Zml4 ZWRfdGltZW91dCk7DQorICAgIH0NCisjZW5kaWYNCisNCiAJbmZfY29ubnRyYWNrX2hhc2hfaW5z ZXJ0KGN0KTsNCiANCiAJREVCVUdQKCJjb25udHJhY2sgd2l0aCBpZCAldSBpbnNlcnRlZFxuIiwg Y3QtPmlkKTsNCk== --=-d4ob5iZWGniypaIUv/a/-- --=-hQX21H1YrDv8z0atp+1v 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.2 (GNU/Linux) iD8DBQBEMjAKnxA7CdMWjzIRAnnNAJ48K78Hu796gcTo2GvNJA7I/Co1TACfVHZj hf4jzzyeN+Ho9TW6lby1Hlo= =a0SS -----END PGP SIGNATURE----- --=-hQX21H1YrDv8z0atp+1v--