From: Cathryn Mataga Subject: [PATCH] ax25ipd Date: Tue, 15 Dec 2009 15:14:01 -0800 Message-ID: <4B281839.8040509@junglevision.com> References: <4B142D5A.7010803@junglevision.com> <4B143564.2060206@junglevision.com> <4B143DC9.9060601@junglevision.com> <4B14B22E.6010901@junglevision.com> <4B1CD943.6030808@junglevision.com> <20091207162523.GC6537@x-berg.in-berlin.de> <4B1D5F4A.7050002@junglevision.com> <20091207202650.GM19524@x-berg.in-berlin.de> <4B1D84C4.8000206@exemail.com.au> <20091207235111.GS19524@x-berg.in-berlin.de> <4B1ED008.4090302@junglevision.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010607070308040005070701" Return-path: In-Reply-To: <4B1ED008.4090302@junglevision.com> Sender: linux-hams-owner@vger.kernel.org List-ID: To: Thomas Osterried Cc: linux-hams@vger.kernel.org This is a multi-part message in MIME format. --------------010607070308040005070701 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I've been sitting on this code for about a week, and it's been running fine here. I've made a few small changes, mostly to the comments. 1. This patch adds the ability to route packets over axip links that are not from the gateway callsign. 2. Integrates the Dynamic DNS patch and uses mutex and a thread as suggested. 3. If DNS fails during startup for a route, the IP of a route is set to 0. Then later, after about an hour or so, DNS for the route is checked again. 4. ax25ipd.conf has two new flags for routes. l and p. route KE6I-1 0.0.0.0 l The route to KE6I-1 will be updated based on the IP addresses of incoming packets. route KE6I-2 ke6i.ampr.org p the 'p' flag forces the code to not recheck DNS later for this route. If DNS fails at startup, however, DNS will be checked until it succeeds, and then DNS will not be checked again. ax25ipd should route as before, except in the case when packets not from the callsign of the route but from the same IP would have gone to the default route, they now will go to the ip from which they originate. (Ugh, that's an awkward sentence.) Anyway, let me know what you think, good or bad. --------------010607070308040005070701 Content-Type: application/x-itunes-itlp; name="ax25ipddyn.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ax25ipddyn.patch" QmluYXJ5IGZpbGVzIGF4MjVpcGQvYXgyNWlwZCBhbmQgYXgyNWlwZGR5bi9heDI1aXBkIGRp ZmZlcgpkaWZmIC1ydU4gYXgyNWlwZC9heDI1aXBkLmggYXgyNWlwZGR5bi9heDI1aXBkLmgK LS0tIGF4MjVpcGQvYXgyNWlwZC5oCTIwMDktMDYtMTQgMDE6MTE6NDguMDAwMDAwMDAwIC0w NzAwCisrKyBheDI1aXBkZHluL2F4MjVpcGQuaAkyMDA5LTEyLTEzIDEzOjE0OjUxLjQwMzYw OTkyMCAtMDgwMApAQCAtMTE4LDYgKzExOCwxMSBAQAogCiAjZGVmaW5lCUFYUlRfQkNBU1QJ MQogI2RlZmluZQlBWFJUX0RFRkFVTFQJMgorI2RlZmluZQlBWFJUX1BFUk1BTkVOVAk0Cisj ZGVmaW5lCUFYUlRfTEVBUk4JOAkKKworCisjZGVmaW5lIElQU1RPUkFHRVNJWkUgNiAvKiBC eXRlcyBuZWVkZWQgZm9yIGNhbGxfdG9faXAgKi8KIAogLyogc3RhcnQgZXh0ZXJuYWwgcHJv dG90eXBlcyAqLwogLyogZW5kIGV4dGVybmFsIHByb3RvdHlwZXMgKi8KQEAgLTEzMywxMiAr MTM4LDE2IEBACiAKIC8qIHJvdXRpbmcuYyAqLwogdm9pZCByb3V0ZV9pbml0KHZvaWQpOwot dm9pZCByb3V0ZV9hZGQodW5zaWduZWQgY2hhciAqLCB1bnNpZ25lZCBjaGFyICosIGludCwg dW5zaWduZWQgaW50KTsKK3ZvaWQgcm91dGVfYWRkKGNoYXIgKiwgdW5zaWduZWQgY2hhciAq LCB1bnNpZ25lZCBjaGFyICosIGludCwgdW5zaWduZWQgaW50KTsKK2ludCByb3V0ZV9pcG1h dGNoKHN0cnVjdCBzb2NrYWRkcl9pbiAqLCB1bnNpZ25lZCBjaGFyICopOwordW5zaWduZWQg Y2hhciAqcmV0cmlldmVpcCh1bnNpZ25lZCBjaGFyICosIHVuc2lnbmVkIGNoYXIgKik7Cit2 b2lkIHJvdXRlX3Byb2Nlc3Moc3RydWN0IHNvY2thZGRyX2luICosIHVuc2lnbmVkIGNoYXIg Kik7CiB2b2lkIGJjYXN0X2FkZCh1bnNpZ25lZCBjaGFyICopOwotdW5zaWduZWQgY2hhciAq Y2FsbF90b19pcCh1bnNpZ25lZCBjaGFyICopOwordW5zaWduZWQgY2hhciAqY2FsbF90b19p cCh1bnNpZ25lZCBjaGFyICosIHVuc2lnbmVkIGNoYXIgKik7CiBpbnQgaXNfY2FsbF9iY2Fz dCh1bnNpZ25lZCBjaGFyICopOwogdm9pZCBzZW5kX2Jyb2FkY2FzdCh1bnNpZ25lZCBjaGFy ICosIGludCk7CiB2b2lkIGR1bXBfcm91dGVzKHZvaWQpOwordm9pZCB1cGRhdGVfZG5zKHVu c2lnbmVkKTsKIAogLyogY29uZmlnLmMgKi8KIHZvaWQgY29uZmlnX2luaXQodm9pZCk7CkBA IC0xNTEsMTEgKzE2MCwxMyBAQAogLyogcHJvY2Vzcy5jICovCiB2b2lkIHByb2Nlc3NfaW5p dCh2b2lkKTsKIHZvaWQgZnJvbV9raXNzKHVuc2lnbmVkIGNoYXIgKiwgaW50KTsKLXZvaWQg ZnJvbV9pcCh1bnNpZ25lZCBjaGFyICosIGludCk7Cit2b2lkIGZyb21faXAodW5zaWduZWQg Y2hhciAqLCBpbnQsIHN0cnVjdCBzb2NrYWRkcl9pbiAqKTsKIC8qIHZvaWQgZG9fYnJvYWRj YXN0KHZvaWQpOyAgd2hlcmUgZGlkIHRoaXMgZ28gPz8geHh4ICovCiB2b2lkIGRvX2JlYWNv bih2b2lkKTsKIGludCBhZGRybWF0Y2godW5zaWduZWQgY2hhciAqLCB1bnNpZ25lZCBjaGFy ICopOworaW50IGFkZHJjb21wYXJlKHVuc2lnbmVkIGNoYXIgKiwgdW5zaWduZWQgY2hhciAq KTsKIHVuc2lnbmVkIGNoYXIgKm5leHRfYWRkcih1bnNpZ25lZCBjaGFyICopOwordW5zaWdu ZWQgY2hhciAqZnJvbV9hZGRyKHVuc2lnbmVkIGNoYXIgKik7CiB2b2lkIGFkZF9jcmModW5z aWduZWQgY2hhciAqLCBpbnQpOwogdm9pZCBkdW1wX2F4MjVmcmFtZShjaGFyICosIHVuc2ln bmVkIGNoYXIgKiwgaW50KTsKIApCaW5hcnkgZmlsZXMgYXgyNWlwZC9heDI1aXBkLm8gYW5k IGF4MjVpcGRkeW4vYXgyNWlwZC5vIGRpZmZlcgpCaW5hcnkgZmlsZXMgYXgyNWlwZC9icHFl dGhlci5vIGFuZCBheDI1aXBkZHluL2JwcWV0aGVyLm8gZGlmZmVyCmRpZmYgLXJ1TiBheDI1 aXBkL2NvbmZpZy5jIGF4MjVpcGRkeW4vY29uZmlnLmMKLS0tIGF4MjVpcGQvY29uZmlnLmMJ MjAwOS0wNi0xNCAwMTowNzoxMS4wMDAwMDAwMDAgLTA3MDAKKysrIGF4MjVpcGRkeW4vY29u ZmlnLmMJMjAwOS0xMi0xMyAxMzoxODoyNC44NzU2MDc0NDkgLTA4MDAKQEAgLTI5Miw2ICsy OTIsOCBAQAogCQlyZXR1cm4gMDsKIAogCX0gZWxzZSBpZiAoc3RyY21wKHAsICJyb3V0ZSIp ID09IDApIHsKKwkJY2hhciAqdGhvc3Q7CisJCiAJCXVwb3J0ID0gMDsKIAkJZmxhZ3MgPSAw OwogCkBAIC0zMDUsMTUgKzMwNywyNiBAQAogCQlxID0gc3RydG9rKE5VTEwsICIgXHRcblxy Iik7CiAJCWlmIChxID09IE5VTEwpCiAJCQlyZXR1cm4gLTE7Ci0JCWhlID0gZ2V0aG9zdGJ5 bmFtZShxKTsKLQkJaWYgKGhlICE9IE5VTEwpIHsKLQkJCW1lbWNweSh0aXAsIGhlLT5oX2Fk ZHJfbGlzdFswXSwgNCk7Ci0JCX0gZWxzZSB7CS8qIG1heWJlIHVzZXIgc3BlY2lmaWVkIGEg bnVtZXJpYyBhZGRyPyAqLwotCQkJaiA9IGluZXRfYWRkcihxKTsKLQkJCWlmIChqID09IC0x KQotCQkJCXJldHVybiAtNTsJLyogaWYgLTEsIGJhZCBkZWFsISAqLworCQl0aG9zdCA9IHN0 cmR1cChxKTsKKwkJaiA9IGluZXRfYWRkcihxKTsKKwkJaWYgKGogIT0gLTEpeyAvKiBtYXli ZSB1c2VyIHNwZWNpZmllZCBhIG51bWVyaWMgYWRkcj8gKi8KKwkJCWZsYWdzIHw9IEFYUlRf UEVSTUFORU5UOyAvKiBQcmV2ZW50IHVzZWxlc3MgZG5zIGNoZWNrIG9uIGRvdHRlZCBpcCAq LwogCQkJbWVtY3B5KHRpcCwgKGNoYXIgKikgJmosIDQpOworCQkJaWYgKCFqKXsvKiBJUCBv ZiAwLjAuMC4wLiBMZWFybiBmcm9tIGluY29taW5nIHBhY2tldHMgKi8KKwkJCQlmbGFncyB8 PSBBWFJUX0xFQVJOOworCQkJfQorCQl9CisJCWVsc2UgeworCQkJaGUgPSBnZXRob3N0Ynlu YW1lKHEpOyAKKwkJCWlmIChoZSAhPSBOVUxMKSB7CisJCQkJbWVtY3B5KHRpcCwgaGUtPmhf YWRkcl9saXN0WzBdLCA0KTsKKwkJCX0gZWxzZSB7CQorCQkJCWogPSBpbmV0X2FkZHIoIjAu MC4wLjAiKTsvKiB0cnkgdG8gcmVzY3VlIHRoaXMgaWRlYSBvZiBjaGVja2luZyBsYXRlci4q LworCQkJCW1lbWNweSh0aXAsICAoY2hhciAqKSAmaiwgNCk7CisJCQkJZnByaW50ZihzdGRl cnIsImF4MjVpcGQ6ICVzIGhvc3QgSVAgYWRkcmVzcyB1bmtub3duIC0gd2lsbCBwcm9iZSBp dCBhZ2FpbiBsYXRlclxuIix0aG9zdCk7CisJCQl9CiAJCX0KKwkKIAogCQl3aGlsZSAoKHEg PSBzdHJ0b2soTlVMTCwgIiBcdFxuXHIiKSkgIT0gTlVMTCkgewogCQkJaWYgKHN0cmNtcChx LCAidWRwIikgPT0gMCkgewpAQCAtMzM0LDkgKzM0NywxOSBAQAogCQkJCWlmIChzdHJjaHIo cSwgJ2QnKSkgewogCQkJCQlmbGFncyB8PSBBWFJUX0RFRkFVTFQ7CiAJCQkJfQorCisJCQkJ LyogVGVzdCBmb3IgInBlcm1hbmVudCIgZmxhZyAqLworCQkJCWlmIChzdHJjaHIocSwgJ3An KSkgeworCQkJCQlmbGFncyB8PSBBWFJUX1BFUk1BTkVOVDsKKwkJCQl9CisJCQkJLyogVGVz dCBmb3IgImxlYXJuIiBmbGFnICovCisJCQkJaWYgKHN0cmNocihxLCAnbCcpKSB7CisJCQkJ CWZsYWdzIHw9IEFYUlRfTEVBUk47CisJCQkJfQogCQkJfQogCQl9Ci0JCXJvdXRlX2FkZCh0 aXAsIHRjYWxsLCB1cG9ydCwgZmxhZ3MpOworCQlyb3V0ZV9hZGQodGhvc3QsIHRpcCwgdGNh bGwsIHVwb3J0LCBmbGFncyk7CisJCWZyZWUodGhvc3QpOwogCQlyZXR1cm4gMDsKIAogCX0g ZWxzZSBpZiAoc3RyY21wKHAsICJicm9hZGNhc3QiKSA9PSAwKSB7CkJpbmFyeSBmaWxlcyBh eDI1aXBkL2NvbmZpZy5vIGFuZCBheDI1aXBkZHluL2NvbmZpZy5vIGRpZmZlcgpCaW5hcnkg ZmlsZXMgYXgyNWlwZC9jcmMubyBhbmQgYXgyNWlwZGR5bi9jcmMubyBkaWZmZXIKZGlmZiAt cnVOIGF4MjVpcGQvLmRlcHMvcm91dGluZy5QbyBheDI1aXBkZHluLy5kZXBzL3JvdXRpbmcu UG8KLS0tIGF4MjVpcGQvLmRlcHMvcm91dGluZy5QbwkyMDA5LTEyLTA3IDEyOjMxOjQwLjcy NDM3MTg2NSAtMDgwMAorKysgYXgyNWlwZGR5bi8uZGVwcy9yb3V0aW5nLlBvCTIwMDktMTIt MTMgMTM6MTQ6NTYuMTI5NjAzMDE4IC0wODAwCkBAIC01Miw3ICs1Miw4IEBACiAgL3Vzci9p bmNsdWRlL3Rlcm1pb3MuaCAvdXNyL2luY2x1ZGUvYml0cy90ZXJtaW9zLmggXAogIC91c3Iv aW5jbHVkZS9zeXMvdGVybWlvcy5oIC91c3IvaW5jbHVkZS9zeXMvdGltZS5oIFwKICAvdXNy L2xvY2FsL2luY2x1ZGUvbmV0YXgyNS9kYWVtb24uaCAvdXNyL2luY2x1ZGUvc3lzbG9nLmgg XAotIC91c3IvaW5jbHVkZS9zeXMvc3lzbG9nLmggL3Vzci9pbmNsdWRlL2JpdHMvc3lzbG9n LXBhdGguaAorIC91c3IvaW5jbHVkZS9zeXMvc3lzbG9nLmggL3Vzci9pbmNsdWRlL2JpdHMv c3lzbG9nLXBhdGguaCBcCisgL3Vzci9pbmNsdWRlL3B0aHJlYWQuaCAvdXNyL2luY2x1ZGUv c2NoZWQuaCAvdXNyL2luY2x1ZGUvYml0cy9zY2hlZC5oCiAKIC91c3IvaW5jbHVkZS9zdGRp by5oOgogCkBAIC0yNzcsMyArMjc4LDkgQEAKIC91c3IvaW5jbHVkZS9zeXMvc3lzbG9nLmg6 CiAKIC91c3IvaW5jbHVkZS9iaXRzL3N5c2xvZy1wYXRoLmg6CisKKy91c3IvaW5jbHVkZS9w dGhyZWFkLmg6CisKKy91c3IvaW5jbHVkZS9zY2hlZC5oOgorCisvdXNyL2luY2x1ZGUvYml0 cy9zY2hlZC5oOgpkaWZmIC1ydU4gYXgyNWlwZC9pby5jIGF4MjVpcGRkeW4vaW8uYwotLS0g YXgyNWlwZC9pby5jCTIwMDktMDYtMTQgMDg6NDI6MTEuMDAwMDAwMDAwIC0wNzAwCisrKyBh eDI1aXBkZHluL2lvLmMJMjAwOS0xMi0wOCAwMTowMTowMC44ODYzNzc3NTQgLTA4MDAKQEAg LTM3OCwxMCArMzc4LDExIEBACiAJCWlmIChuYiA9PSAwKSB7CiAJCQlmZmx1c2goc3Rkb3V0 KTsKIAkJCWZmbHVzaChzdGRlcnIpOworCQkJdXBkYXRlX2Rucyg2MCo2MCk7IC8vIE9uY2Uv aG91cgogCQkJLyoganVzdCBzbyB3ZSBnbyBiYWNrIHRvIHRoZSB0b3Agb2YgdGhlIGxvb3Ah ICovCiAJCQljb250aW51ZTsKIAkJfQotCisJCXVwZGF0ZV9kbnMoNjAqNjApOyAvLyBvbmNl L2hvdXIKIAkJaWYgKEZEX0lTU0VUKHR0eWZkLCAmcmVhZGZkcykpIHsKIAkJCWRvIHsKIAkJ CQluID0gcmVhZCh0dHlmZCwgYnVmLCBNQVhfRlJBTUUpOwpAQCAtNDE4LDcgKzQxOSw3IEBA CiAJCQkJTE9HTDQoInVkcGRhdGEgZnJvbT0lcyBwb3J0PSVkIGw9JWRcbiIsIChjaGFyICop IGluZXRfbnRvYShmcm9tLiAgc2luX2FkZHIpLCBudG9ocyhmcm9tLiAgc2luX3BvcnQpLCBu KTsKIAkJCQlzdGF0cy51ZHBfaW4rKzsKIAkJCQlpZiAobiA+IDApCi0JCQkJCWZyb21faXAo YnVmLCBuKTsKKwkJCQkJZnJvbV9pcChidWYsIG4sICZmcm9tKTsKIAkJCX0KIAkJfQogCQkv KiBpZiB1ZHBfbW9kZSAqLwpAQCAtNDM0LDcgKzQzNSw3IEBACiAJCQkJTE9HTDQoImlwZGF0 YSBmcm9tPSVzIGw9JWQsIGhsPSVkXG4iLCAoY2hhciAqKSBpbmV0X250b2EoZnJvbS4gIHNp bl9hZGRyKSwgbiwgaGRyX2xlbik7CiAJCQkJc3RhdHMuaXBfaW4rKzsKIAkJCQlpZiAobiA+ IGhkcl9sZW4pCi0JCQkJCWZyb21faXAoYnVmICsgaGRyX2xlbiwgbiAtIGhkcl9sZW4pOwor CQkJCQlmcm9tX2lwKGJ1ZiArIGhkcl9sZW4sIG4gLSBoZHJfbGVuLCAmZnJvbSk7CiAJCQl9 CiAjaWZkZWYgVVNFX0lDTVAKIAkJCWlmIChGRF9JU1NFVChpY21wc29jaywgJnJlYWRmZHMp KSB7CkBAIC00NjEsNiArNDYyLDkgQEAKIAogCWlmIChsIDw9IDApCiAJCXJldHVybjsKKwlp ZiAoKiAodW5zaWduZWQgKikgdGFyZ2V0aXAgPT0gMCl7IC8qIElmIHRoZSBpcCBpcyBzZXQg dG8gMCBkb24ndCBzZW5kIGFueXRoaW5nLiBJJ20gbm90IHN1cmUgd2hhdCBzZW5kaW5nIHRv IDAgZG9lcywgYnV0IEkgZG9uJ3QgbGlrZSB0aGUgaWRlYS4gKi8KKwkJcmV0dXJuOyAKKwl9 CiAJbWVtY3B5KChjaGFyICopICZ0by5zaW5fYWRkciwKIAkgICAgICAgdGFyZ2V0aXAsIDQp OwogCW1lbWNweSgoY2hhciAqKSAmdG8uc2luX3BvcnQsCkJpbmFyeSBmaWxlcyBheDI1aXBk L2lvLm8gYW5kIGF4MjVpcGRkeW4vaW8ubyBkaWZmZXIKQmluYXJ5IGZpbGVzIGF4MjVpcGQv a2lzcy5vIGFuZCBheDI1aXBkZHluL2tpc3MubyBkaWZmZXIKZGlmZiAtcnVOIGF4MjVpcGQv TWFrZWZpbGUgYXgyNWlwZGR5bi9NYWtlZmlsZQotLS0gYXgyNWlwZC9NYWtlZmlsZQkyMDA5 LTEyLTEzIDEzOjA2OjEwLjA1MTU5OTc5NSAtMDgwMAorKysgYXgyNWlwZGR5bi9NYWtlZmls ZQkyMDA5LTEyLTA3IDIzOjU1OjE0LjkxNTM3NjcxNyAtMDgwMApAQCAtOTIsNyArOTIsNyBA QAogQVgyNV9MSUIgPSAtbGF4MjUKIENDID0gZ2NjCiBDQ0RFUE1PREUgPSBkZXBtb2RlPWdj YzMKLUNGTEFHUyA9IC1nIC1PMiAtV2FsbAorQ0ZMQUdTID0gLWcgLU8yIC1XYWxsIC1wdGhy ZWFkCiBDUFAgPSBnY2MgLUUKIENQUEZMQUdTID0gCiBDWUdQQVRIX1cgPSBlY2hvCmRpZmYg LXJ1TiBheDI1aXBkL3Byb2Nlc3MuYyBheDI1aXBkZHluL3Byb2Nlc3MuYwotLS0gYXgyNWlw ZC9wcm9jZXNzLmMJMjAwOS0wNi0xNCAwMTowNzoxMS4wMDAwMDAwMDAgLTA3MDAKKysrIGF4 MjVpcGRkeW4vcHJvY2Vzcy5jCTIwMDktMTItMDggMTM6MTA6NDMuMTExMzc5MzAyIC0wODAw CkBAIC02OCw2ICs2OCw3IEBACiB2b2lkIGZyb21fa2lzcyh1bnNpZ25lZCBjaGFyICpidWYs IGludCBsKQogewogCXVuc2lnbmVkIGNoYXIgKmEsICppcGFkZHI7CisgICAgICAgIHVuc2ln bmVkIGNoYXIgaXBzdG9yYWdlW0lQU1RPUkFHRVNJWkVdOy8vIFByb3ZpZGUgc3RvcmFnZSBm b3IgdGhlIElQLiAgVG8ga2VlcCBhbGwgdGhlIGxvY2tpbmcgc3R1ZmYgY2VudHJhbGl6ZWQu IAogCiAJaWYgKGwgPCAxNSkgewogCQlMT0dMMigiZnJvbV9raXNzOiBkdW1wZWQgLSBsZW5n dGggd3JvbmchXG4iKTsKQEAgLTEwNSw3ICsxMDYsNyBAQAogCX0JCQkvKiBlbmQgb2YgdG5j IG1vZGUgKi8KIAogCS8qIExvb2t1cCB0aGUgSVAgYWRkcmVzcyBmb3IgdGhpcyByb3V0ZSAq LwotCWlwYWRkciA9IGNhbGxfdG9faXAoYSk7CisJaXBhZGRyID0gY2FsbF90b19pcChhLCBp cHN0b3JhZ2UpOwogCiAJaWYgKGlwYWRkciA9PSBOVUxMKSB7CiAJCWlmIChpc19jYWxsX2Jj YXN0KGEpKSB7CkBAIC0xNDYsMTAgKzE0NywxMSBAQAogICogV2Ugc2ltcGx5IHNlbmQgdGhl IHBhY2tldCB0byB0aGUgS0lTUyBzZW5kIHJvdXRpbmUuCiAgKi8KIAotdm9pZCBmcm9tX2lw KHVuc2lnbmVkIGNoYXIgKmJ1ZiwgaW50IGwpCit2b2lkIGZyb21faXAodW5zaWduZWQgY2hh ciAqYnVmLCBpbnQgbCwgc3RydWN0IHNvY2thZGRyX2luICppcF9hZGRyKQogewogCWludCBw b3J0ID0gMDsKIAl1bnNpZ25lZCBjaGFyICphOworCXVuc2lnbmVkIGNoYXIgKmY7CiAKIAlp ZiAoIW9rX2NyYyhidWYsIGwpKSB7CiAJCXN0YXRzLmlwX2ZhaWxlZF9jcmMrKzsKQEAgLTE5 NCw2ICsxOTYsMTAgQEAKIAkJfQogI2VuZGlmCiAJfQkJCS8qIGVuZCBvZiB0bmMgbW9kZSAq LworCisJZiA9IGZyb21fYWRkcihidWYpOworCXJvdXRlX3Byb2Nlc3MoaXBfYWRkciwgZik7 CisKIAlpZiAoIXR0eWZkX2JwcSkKIAkJc2VuZF9raXNzKHBvcnQsIGJ1ZiwgbCk7CiAJZWxz ZSB7CkBAIC0yNzcsNiArMjgzLDMxIEBACiB9CiAKIC8qCisgKiByZXR1cm4gMCBpZiB0aGUg YWRkcmVzc2VzIHN1cHBsaWVkIG1hdGNoCisgKiByZXR1cm4gYSBwb3NpdGl2ZSBvciBuZWdh dGl2ZSB2YWx1ZSBvdGhlcndpc2UgCisgKi8KK2ludCBhZGRyY29tcGFyZSh1bnNpZ25lZCBj aGFyICphLCB1bnNpZ25lZCBjaGFyICpiKQoreworCXNpZ25lZCBjaGFyIGRpZmY7CisKKwlp ZiAoKGRpZmYgPSAoc2lnbmVkIGNoYXIgKSgoKmErKyAtICpiKyspICYgMHhmZSkpKQorCQly ZXR1cm4gZGlmZjsJLyogIksiICovCisJaWYgKChkaWZmID0gKHNpZ25lZCBjaGFyICkoKCph KysgLSAqYisrKSAmIDB4ZmUpKSkKKwkJcmV0dXJuIGRpZmY7CS8qICJBIiAqLworCWlmICgo ZGlmZiA9IChzaWduZWQgY2hhciApKCgqYSsrIC0gKmIrKykgJiAweGZlKSkpCisJCXJldHVy biBkaWZmOwkvKiAiOSIgKi8KKwlpZiAoKGRpZmYgPSAoc2lnbmVkIGNoYXIgKSgoKmErKyAt ICpiKyspICYgMHhmZSkpKQorCQlyZXR1cm4gZGlmZjsJLyogIlciICovCisJaWYgKChkaWZm ID0gKHNpZ25lZCBjaGFyICkoKCphKysgLSAqYisrKSAmIDB4ZmUpKSkKKwkJcmV0dXJuIGRp ZmY7CS8qICJTIiAqLworCWlmICgoZGlmZiA9IChzaWduZWQgY2hhciApKCgqYSsrIC0gKmIr KykgJiAweGZlKSkpCisJCXJldHVybiBkaWZmOwkvKiAiQiIgKi8KKwlpZiAoKGRpZmYgPSAo c2lnbmVkIGNoYXIgKSgoKmErKyAtICpiKyspICYgMHhmZSkpKQorCQlyZXR1cm4gZGlmZjsJ Lyogc3NpZCAqLworCXJldHVybiAwOworfQorCisvKgogICogcmV0dXJuIHBvaW50ZXIgdG8g dGhlIG5leHQgc3RhdGlvbiB0byBnZXQgdGhpcyBwYWNrZXQKICAqLwogdW5zaWduZWQgY2hh ciAqbmV4dF9hZGRyKHVuc2lnbmVkIGNoYXIgKmYpCkBAIC0zMDEsNiArMzMyLDMyIEBACiB9 CiAKIC8qCisgKiByZXR1cm4gcG9pbnRlciB0byB0aGUgbGFzdCBzdGF0aW9uIHRoaXMgcGFj a2V0IGNhbWUgZnJvbSAKKyAqLwordW5zaWduZWQgY2hhciAqZnJvbV9hZGRyKHVuc2lnbmVk IGNoYXIgKmYpCit7CisJdW5zaWduZWQgY2hhciAqYTsKKworCWEgPSBmICsgNzsKKy8qIElm IG5vIGRpZ2lzLCByZXR1cm4gdGhlIHNvdXJjZSBhZGRyZXNzICovCisJaWYgKE5PX0RJR0lT KGYpKQorCQlyZXR1cm4gYTsKKworLyogY2hlY2sgZWFjaCBkaWdpIGZpZWxkLiBHbyB0byBs YXN0IHRoYXQgaGFzIHNlZW4gaXQgKi8KKwlkbworCQlhICs9IDc7CisJd2hpbGUgKE5PVF9M QVNUKGEpICYmIFJFUEVBVEVEKGEpKTsKKworLyogaW4gRElHSSBtb2RlOiB3ZSBoYXZlIHNl dCBSRVBFQVRFRCBhbHJlYWR5LCBzbyB0aGUgb25lIGJlZm9yZSBpcyBpdCAqLwkKKwlpZiAo ZGlnaSB8fCAhUkVQRUFURUQoYSkpCisJCWEgLT0gNzsKKworLyogaW4gVE5DIG1vZGU6IGFs d2F5cyB0aGUgbGFzdCBpcyBpdCAqLworCXJldHVybiBhOworfQorCisKKy8qCiAgKiB0YWNr IG9uIHRoZSBDUkMgZm9yIHRoZSBmcmFtZS4gIE5vdGUgd2UgYXNzdW1lIHRoZSBidWZmZXIg aXMgbG9uZwogICogZW5vdWdoIHRvIGhhdmUgdGhlIHR3byBieXRlcyB0YWNrZWQgb24uCiAg Ki8KQmluYXJ5IGZpbGVzIGF4MjVpcGQvcHJvY2Vzcy5vIGFuZCBheDI1aXBkZHluL3Byb2Nl c3MubyBkaWZmZXIKZGlmZiAtcnVOIGF4MjVpcGQvcm91dGluZy5jIGF4MjVpcGRkeW4vcm91 dGluZy5jCi0tLSBheDI1aXBkL3JvdXRpbmcuYwkyMDA5LTA2LTE0IDAxOjA3OjExLjAwMDAw MDAwMCAtMDcwMAorKysgYXgyNWlwZGR5bi9yb3V0aW5nLmMJMjAwOS0xMi0xMyAxMzoxNDoy NS43NzM2MDE0NTAgLTA4MDAKQEAgLTEyLDYgKzEyLDggQEAKICNpbmNsdWRlIDxuZXRpbmV0 L2luLmg+CiAjaW5jbHVkZSA8bWVtb3J5Lmg+CiAjaW5jbHVkZSA8c3lzbG9nLmg+CisjaW5j bHVkZSA8c3RyaW5nLmg+CisjaW5jbHVkZSA8cHRocmVhZC5oPgogCiAvKiBUaGUgcm91dGlu ZyB0YWJsZSBzdHJ1Y3R1cmUgaXMgbm90IHZpc2libGUgb3V0c2lkZSB0aGlzIG1vZHVsZS4g Ki8KIApAQCAtMjMsNiArMjUsNyBAQAogCXVuc2lnbmVkIGNoYXIgcGFkMTsKIAl1bnNpZ25l ZCBjaGFyIHBhZDI7CiAJdW5zaWduZWQgaW50IGZsYWdzOwkvKiByb3V0ZSBmbGFncyAqLwor CWNoYXIgKmhvc3RubTsgLyogaG9zdCBuYW1lICovCiAJc3RydWN0IHJvdXRlX3RhYmxlX2Vu dHJ5ICpuZXh0OwogfTsKIApAQCAtMzgsMTYgKzQxLDMxIEBACiAKIHN0cnVjdCBiY2FzdF90 YWJsZV9lbnRyeSAqYmNhc3RfdGJsOwogCitzdHJ1Y3QgY2FsbHNpZ25fbG9va3VwX2VudHJ5 IHsKKwl1bnNpZ25lZCBjaGFyIGNhbGxzaWduWzddOworCXN0cnVjdCByb3V0ZV90YWJsZV9l bnRyeSAqcm91dGU7CisJc3RydWN0IGNhbGxzaWduX2xvb2t1cF9lbnRyeSAqcHJldiwgKm5l eHQ7Cit9OworCitzdHJ1Y3QgY2FsbHNpZ25fbG9va3VwX2VudHJ5ICpjYWxsc2lnbl9sb29r dXA7CisKK3RpbWVfdCBsYXN0X2Ruc190aW1lOwordm9sYXRpbGUgaW50IHRocmVhZHJ1bm5p bmc7CitwdGhyZWFkX211dGV4X3QgZG5zbXV0ZXggPSBQVEhSRUFEX01VVEVYX0lOSVRJQUxJ WkVSOworCiAvKiBJbml0aWFsaXplIHRoZSByb3V0aW5nIG1vZHVsZSAqLwogdm9pZCByb3V0 ZV9pbml0KHZvaWQpCiB7CiAJcm91dGVfdGJsID0gTlVMTDsKIAlkZWZhdWx0X3JvdXRlID0g TlVMTDsKIAliY2FzdF90YmwgPSBOVUxMOworCWNhbGxzaWduX2xvb2t1cCA9IE5VTEw7CisJ bGFzdF9kbnNfdGltZSA9IHRpbWUoTlVMTCk7CisJdGhyZWFkcnVubmluZyA9IDA7CiB9CiAK IC8qIEFkZCBhIG5ldyByb3V0ZSBlbnRyeSAqLwotdm9pZCByb3V0ZV9hZGQodW5zaWduZWQg Y2hhciAqaXAsIHVuc2lnbmVkIGNoYXIgKmNhbGwsIGludCB1ZHBwb3J0LAordm9pZCByb3V0 ZV9hZGQoY2hhciAqaG9zdCwgdW5zaWduZWQgY2hhciAqaXAsIHVuc2lnbmVkIGNoYXIgKmNh bGwsIGludCB1ZHBwb3J0LAogCXVuc2lnbmVkIGludCBmbGFncykKIHsKIAlzdHJ1Y3Qgcm91 dGVfdGFibGVfZW50cnkgKnJsLCAqcm47CkBAIC03NSw2ICs5Myw3IEBACiAJCXJuLT5jYWxs c2lnbltpXSA9IGNhbGxbaV0gJiAweGZlOwogCXJuLT5jYWxsc2lnbls2XSA9IChjYWxsWzZd ICYgMHgxZSkgfCAweDYwOwogCXJuLT5wYWRjYWxsID0gMDsKKwlybi0+aG9zdG5tID0gc3Ry ZHVwKGhvc3QpOwogCW1lbWNweShybi0+aXBfYWRkciwgaXAsIDQpOwogCXJuLT51ZHBfcG9y dCA9IGh0b25zKHVkcHBvcnQpOwogCXJuLT5wYWQxID0gMDsKQEAgLTEwMCw2ICsxMTksMTMw IEBACiAJcmV0dXJuOwogfQogCisvKiBGb3Igcm91dGUgcm4sIGEgZGlmZmVyZW50IElQIGlz IGJlaW5nIHVzZWQuICBUcmlnZ2VyIGEgRE5TIGNoZWNrLiAKKyAqIGFzIGxvbmcgYXMgRE5T IGhhc24ndCBiZWVuIGNoZWNrZWQgd2l0aGluIDUgbWludXRlcyAoMzAwIHNlY29uZHMpCisg KiAqLwordm9pZCByb3V0ZV91cGRhdGVkeW5kbnMoc3RydWN0IHNvY2thZGRyX2luICppcF9h ZGRyLCBzdHJ1Y3Qgcm91dGVfdGFibGVfZW50cnkgKnJuKQoreworCWlmIChybi0+ZmxhZ3Mg JiBBWFJUX0xFQVJOKXsKKwkJcHRocmVhZF9tdXRleF9sb2NrKCZkbnNtdXRleCk7CisJCSog KHVuc2lnbmVkICopIHJuLT5pcF9hZGRyID0gKHVuc2lnbmVkKSBpcF9hZGRyLT5zaW5fYWRk ci5zX2FkZHI7CisJCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkbnNtdXRleCk7CisJfQorCWlm ICghKHJuLT5mbGFncyAmIEFYUlRfUEVSTUFORU5UKSl7CisJCUxPR0w0KCJyZWNlaXZlZCBj aGFuZ2VkIGlwOiAlcyIsIGNhbGxfdG9fYShybi0+Y2FsbHNpZ24pKTsKKwkJdXBkYXRlX2Ru cygzMDApOworCX0KK30KKworLyogU2F2ZSB0aGUgY2FsbHMgaW4gYSBiaW5hcnkgdHJlZS4g IFRoaXMgY29kZSBsaW5rcyBuZXcgY2FsbHNpZ25zIAorICogYmFjayB0byBhbiBleGlzdGlu ZyByb3V0ZS4gIE5vIG5ldyByb3V0ZXMgYXJlIGNyZWF0ZWQuICovCit2b2lkIHJvdXRlX3Vw ZGF0ZXJldHVybnBhdGgodW5zaWduZWQgY2hhciAqbXljYWxsLCBzdHJ1Y3Qgcm91dGVfdGFi bGVfZW50cnkgKnJuKQoreworCXN0cnVjdCBjYWxsc2lnbl9sb29rdXBfZW50cnkgKipjbG9v a3VwcCA9ICZjYWxsc2lnbl9sb29rdXA7CisJc3RydWN0IGNhbGxzaWduX2xvb2t1cF9lbnRy eSAqY2xvb2t1cCA9IGNhbGxzaWduX2xvb2t1cDsKKwlmb3IgKDs7KXsKKwkJaW50IGNoazsK KwkJaWYgKCFjbG9va3VwKXsKKwkJCWNsb29rdXAgPSAqY2xvb2t1cHAgPSBjYWxsb2Moc2l6 ZW9mKHN0cnVjdCBjYWxsc2lnbl9sb29rdXBfZW50cnkpLCAxKTsKKwkJCW1lbWNweShjbG9v a3VwLT5jYWxsc2lnbiwgbXljYWxsLCA3KTsKKwkJCUxPR0w0KCJhZGRlZCByZXR1cm4gcm91 dGU6ICVzICVzICVzICVkXG4iLAorCSAgICAgIAkJCWNhbGxfdG9fYShteWNhbGwpLAorCQkJ CShjaGFyICopIGluZXRfbnRvYSgqKHN0cnVjdCBpbl9hZGRyICopIHJuLT5pcF9hZGRyKSwK KwkgICAgICAJCQlybi0+dWRwX3BvcnQgPyAidWRwIiA6ICJpcCIsIG50b2hzKHJuLT51ZHBf cG9ydCkpOworCisJCQljbG9va3VwLT5yb3V0ZSA9IHJuOworCQkJcmV0dXJuOworCQl9CisJ CWNoayA9IGFkZHJjb21wYXJlKG15Y2FsbCwgY2xvb2t1cC0+Y2FsbHNpZ24pOworCQlpZiAo Y2hrID4gMCl7CisJCQljbG9va3VwcCA9ICZjbG9va3VwLT5uZXh0OworCQkJY2xvb2t1cCA9 ICpjbG9va3VwcDsKKwkJfQorCQllbHNlIGlmIChjaGsgPCAwKXsKKwkJCWNsb29rdXBwID0g JmNsb29rdXAtPnByZXY7CisJCQljbG9va3VwID0gKmNsb29rdXBwOworCQkJfQorCQllbHNl eworCQkJCisJCQlpZiAoY2xvb2t1cC0+cm91dGUgIT0gcm4peworCQkJCWNsb29rdXAtPnJv dXRlID0gcm47CisJCQl9CisJCQlyZXR1cm47CisJCX0JCisJfQorCisKK30KKworCisvKiBD b21wYXJlIGlwX2FkZHIgdG8gdGhlIGZvcm1hdCB1c2VkIGJ5IHJvdXRlX3RhYmxlX2VudHJ5 ICovCitpbnQgcm91dGVfaXBtYXRjaChzdHJ1Y3Qgc29ja2FkZHJfaW4gKmlwX2FkZHIsIHVu c2lnbmVkIGNoYXIgKnJvdXRlaXApCit7CisJdW5zaWduZWQgY2hhciBpcHN0b3JhZ2VbSVBT VE9SQUdFU0laRV07CisJcmV0dXJuICh1bnNpZ25lZCkgaXBfYWRkci0+c2luX2FkZHIuc19h ZGRyID09ICogKHVuc2lnbmVkICopIHJldHJpZXZlaXAocm91dGVpcCwgaXBzdG9yYWdlKTsK K30KKworCisvKiBQcm9jZXNzIGNhbGxzIGFuZCBpcCBhZGRyZXNzZXMgZm9yIHJvdXRpbmcu ICBUaGUgaWRlYSBiZWhpbmQKKyAqIHRoaXMgY29kZSB0aGF0IGZvciB0aGUgcm91dGVzIGxp c3RlZCBpbiB0aGUgYXgyNWlwZC5jb25mIGZpbGUsCisgKiBvbmx5IEROUyBvciB0aGUgZ2l2 ZW4gSVAncyBzaG91bGQgYmUgdXNlZC4gIEJ1dCBmb3IgY2FsbHMKKyAqIHRoYXQgYXJlIG5v dCByZWZlcmVuY2VkIGluIGF4MjVpcGQuY29uZiB0aGF0IGFycml2ZSB1c2luZworICogYSBr bm93biBnYXRld2F5IElQLCB0aGUgY29kZSBsaW5rcyB0aGVtIGJhY2sgdG8gdGhhdCBnYXRl d2F5LgorICoKKyAqIE5vIG5ldyByb3V0ZXMgYXJlIGNyZWF0ZWQuICBJZiBhIGNhbGxzaWdu IGNvbWVzIGluIGZyb20gYW4gIAorICogdW5rbm93biBnYXRld2F5LCBpdCB3aWxsIG5vdCBj cmVhdGUgYW4gZW50cnkuCisgKgorICogaWYgdGhlIENhbGxzaWduIGZvciBhIGtub3duIHJv dXRlIGlzIHJlY2VpdmVkLCBhbmQgaXQgZG9lcworICogbm90IG1hdGNoIHRoZSBjdXJyZW50 IGlwIGZvciB0aGF0IHJvdXRlLCB0aGUgdXBkYXRlX2RucyBjb2RlCisgKiBpcyB0cmlnZ2Vy ZWQsIHdoaWNoIHNob3VsZCBmaXggdGhlIElQIGJhc2VkIG9uIEROUy4gIAorICoKKyAqICov Cit2b2lkIHJvdXRlX3Byb2Nlc3Moc3RydWN0IHNvY2thZGRyX2luICppcF9hZGRyLCB1bnNp Z25lZCBjaGFyICpjYWxsKQoreworCXN0cnVjdCByb3V0ZV90YWJsZV9lbnRyeSAqcnA7CisJ dW5zaWduZWQgY2hhciBteWNhbGxbN107CisJaW50IGk7CisJaW50IGlzcm91dGU7CisKKwlp ZiAoY2FsbCA9PSBOVUxMKQorCQlyZXR1cm47CisKKwlmb3IgKGkgPSAwOyBpIDwgNjsgaSsr KQorCQlteWNhbGxbaV0gPSBjYWxsW2ldICYgMHhmZTsKKworCW15Y2FsbFs2XSA9IChjYWxs WzZdICYgMHgxZSkgfCAweDYwOworCisJcnAgPSByb3V0ZV90Ymw7CisJaXNyb3V0ZSA9IDA7 CisJd2hpbGUgKHJwKSB7CisJCWlmIChhZGRybWF0Y2gobXljYWxsLCBycC0+Y2FsbHNpZ24p KSB7CisJCQlpZiAoIXJvdXRlX2lwbWF0Y2goaXBfYWRkciwgcnAtPmlwX2FkZHIpKSB7CisJ CQkJcm91dGVfdXBkYXRlZHluZG5zKGlwX2FkZHIsIHJwKTsKKwkJCQl9CisJCQlpc3JvdXRl ID0gMTsKKwkJfQorCQlycCA9IHJwLT5uZXh0OworCX0JCQkJCisKKwkvLyBEb24ndCB1c2Ug YW55IG9mIHRoZSBpcCBsb29rdXAgY29kZSBmb3IgdGhlIHJvdXRlcy4KKwkvLyBBbHNvLCBk byBub3Qgc2V0IHJldHVybiBwYXRocyBmb3IgYnJvYWRjYXN0IGNhbGxzaWducy4gCisJLy8g Tm90IHN1cmUgaWYgdGhpcyBldmVyIGhhcHBlbnMuICBCdXQgaXQncyBubyBnb29kIGlmIGl0 IGRvZXMuCisJaWYgKCFpc3JvdXRlICYmICFpc19jYWxsX2JjYXN0KGNhbGwpKXsKKwkJcnAg PSByb3V0ZV90Ymw7CisJCXdoaWxlIChycCkgeworCQkJLy8gT25seSBkbyB0aGlzIG9uY2Uu IAorCQkJaWYgKHJvdXRlX2lwbWF0Y2goaXBfYWRkciwgcnAtPmlwX2FkZHIpKSB7CisJCQkJ cm91dGVfdXBkYXRlcmV0dXJucGF0aChteWNhbGwsIHJwKTsKKwkJCQlicmVhazsKKwkJCX0K KwkJCXJwID0gcnAtPm5leHQ7CisJCX0KKwl9CisKK30KKworCiAvKiBBZGQgYSBuZXcgYnJv YWRjYXN0IGFkZHJlc3MgZW50cnkgKi8KIHZvaWQgYmNhc3RfYWRkKHVuc2lnbmVkIGNoYXIg KmNhbGwpCiB7CkBAIC0xMzYsMTcgKzI3OSwzNSBAQAogfQogCiAvKgorICogSXQncyBwb3Nz aWJsZSB0aGF0IHRoZSB0aHJlYWQgd2lsbCB1cGRhdGUgdGhlIElQIGluIG1pZAorICogbWVt Y3B5IG9mIGFuIGlwIGFkZHJlc3MsIHNvIEkgY2hhbmdlZCBhbGwgdGhlIHJlZmVyZW5jZXMg dG8KKyAqIHJvdXRlX3RhYmxlX2VudHJ5LT5pcF9hZGRyIHRvIHVzZSB0aGlzIHJvdXRpbmUK KyAKKyAqIE5vdGUgdGhhdCB0aGUgcHJpbnRmcyBkb24ndCBjaGVjayB0aGlzCisgKi8KKwor dW5zaWduZWQgY2hhciAqcmV0cmlldmVpcCh1bnNpZ25lZCBjaGFyICppcCwgdW5zaWduZWQg Y2hhciAqaXBzdG9yYWdlKQoreworCWlmICghaXBzdG9yYWdlKXJldHVybiBpcDsKKwlwdGhy ZWFkX211dGV4X2xvY2soJmRuc211dGV4KTsKKwltZW1jcHkoKHZvaWQgKikgaXBzdG9yYWdl LCAodm9pZCAqKSBpcCwgSVBTVE9SQUdFU0laRSk7CisJcHRocmVhZF9tdXRleF91bmxvY2so JmRuc211dGV4KTsKKwlyZXR1cm4gaXBzdG9yYWdlOworfQorCisvKgogICogUmV0dXJuIGFu IElQIGFkZHJlc3MgYW5kIHBvcnQgbnVtYmVyIGdpdmVuIGEgY2FsbHNpZ24uCiAgKiBXZSBy ZXR1cm4gYSBwb2ludGVyIHRvIHRoZSBhZGRyZXNzOyB0aGUgcG9ydCBudW1iZXIgY2FuIGJl IGZvdW5kCiAgKiBpbW1lZGlhdGVseSBmb2xsb3dpbmcgdGhlIElQIGFkZHJlc3MuIChVR0xZ IGNvZGluZzsgdG8gYmUgZml4ZWQgbGF0ZXIhKQogICovCi0KLXVuc2lnbmVkIGNoYXIgKmNh bGxfdG9faXAodW5zaWduZWQgY2hhciAqY2FsbCkKKyAKK3Vuc2lnbmVkIGNoYXIgKmNhbGxf dG9faXAodW5zaWduZWQgY2hhciAqY2FsbCwgdW5zaWduZWQgY2hhciAqaXBzdG9yYWdlKQog ewogCXN0cnVjdCByb3V0ZV90YWJsZV9lbnRyeSAqcnA7CiAJdW5zaWduZWQgY2hhciBteWNh bGxbN107CiAJaW50IGk7Ci0KKwlzdHJ1Y3QgY2FsbHNpZ25fbG9va3VwX2VudHJ5ICpjbG9v a3VwOworCQogCWlmIChjYWxsID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwogCkBAIC0xNjMs MTEgKzMyNCwzNSBAQAogCQkJTE9HTDQoImZvdW5kIGlwIGFkZHIgJXNcbiIsCiAJCQkgICAg ICAoY2hhciAqKSBpbmV0X250b2EoKihzdHJ1Y3QgaW5fYWRkciAqKQogCQkJCQkJIHJwLT5p cF9hZGRyKSk7Ci0JCQlyZXR1cm4gcnAtPmlwX2FkZHI7CisJCQlyZXR1cm4gcmV0cmlldmVp cChycC0+aXBfYWRkciwgaXBzdG9yYWdlKTsKIAkJfQogCQlycCA9IHJwLT5uZXh0OwogCX0K IAorCS8qIENoZWNrIGZvciBjYWxsc2lnbnMgdGhhdCBoYXZlIGJlZW4gaGVhcmQgb24ga25v d24gcm91dGVzICovCisJY2xvb2t1cCA9IGNhbGxzaWduX2xvb2t1cDsKKwlmb3IgKDs7KXsK KwkJaW50IGNoazsKKwkJaWYgKCFjbG9va3VwKXsKKwkJCWJyZWFrOworCQl9CisJCWNoayA9 IGFkZHJjb21wYXJlKG15Y2FsbCwgY2xvb2t1cC0+Y2FsbHNpZ24pOworCQlpZiAoY2hrID4g MCl7CisJCQljbG9va3VwID0gY2xvb2t1cC0+bmV4dDsKKwkJfQorCQllbHNlIGlmIChjaGsg PCAwKXsKKwkJCWNsb29rdXAgPSBjbG9va3VwLT5wcmV2OworCQl9CisJCWVsc2V7CisJCQlM T0dMNCgiZm91bmQgY2FjaGVkIGlwIGFkZHIgJXNcbiIsCisJCQkgICAgICAoY2hhciAqKSBp bmV0X250b2EoKihzdHJ1Y3QgaW5fYWRkciAqKQorCQkJCQkJIGNsb29rdXAtPnJvdXRlLT5p cF9hZGRyKSk7CisJCisJCQlyZXR1cm4gcmV0cmlldmVpcChjbG9va3VwLT5yb3V0ZS0+aXBf YWRkciwgaXBzdG9yYWdlKTsKKwkJfQkKKwl9CisKKwogCS8qCiAJICogTm8gbWF0Y2ggZm91 bmQgaW4gdGhlIHJvdXRpbmcgdGFibGUsIHVzZSB0aGUgZGVmYXVsdCByb3V0ZSBpZgogCSAq IHdlIGhhdmUgb25lIGRlZmluZWQuCkBAIC0xNzYsNyArMzYxLDcgQEAKIAkJTE9HTDQoImZh aWxlZCwgdXNpbmcgZGVmYXVsdCBpcCBhZGRyICVzXG4iLAogCQkgICAgICAoY2hhciAqKSBp bmV0X250b2EoKihzdHJ1Y3QgaW5fYWRkciAqKQogCQkJCQkgZGVmYXVsdF9yb3V0ZS0+aXBf YWRkcikpOwotCQlyZXR1cm4gZGVmYXVsdF9yb3V0ZS0+aXBfYWRkcjsKKwkJcmV0dXJuIHJl dHJpZXZlaXAoZGVmYXVsdF9yb3V0ZS0+aXBfYWRkciwgaXBzdG9yYWdlKTsKIAl9CiAKIAlM T0dMNCgiZmFpbGVkLlxuIik7CkBAIC0yMjMsNyArNDA4LDkgQEAKIAlycCA9IHJvdXRlX3Ri bDsKIAl3aGlsZSAocnApIHsKIAkJaWYgKHJwLT5mbGFncyAmIEFYUlRfQkNBU1QpIHsKLQkJ CXNlbmRfaXAoYnVmLCBsLCBycC0+aXBfYWRkcik7CisJCQl1bnNpZ25lZCBjaGFyIGlwc3Rv cmFnZVtJUFNUT1JBR0VTSVpFXTsKKworCQkJc2VuZF9pcChidWYsIGwsIHJldHJpZXZlaXAo cnAtPmlwX2FkZHIsIGlwc3RvcmFnZSkpOwogCQl9CiAJCXJwID0gcnAtPm5leHQ7CiAJfQpA QCAtMjUxLDMgKzQzOCw2MCBAQAogCX0KIAlmZmx1c2goc3Rkb3V0KTsKIH0KKworLyogVXBk YXRlIHRoZSBJUHMgb2YgRE5TIGVudHJpZXMgZm9yIGFsbCByb3V0ZXMgKi8KK3ZvaWQgKnVw ZGF0ZV9kbnN0aHJlYWQodm9pZCAqYXJnKQoreworCXN0cnVjdCBob3N0ZW50ICpoZTsKKwlz dHJ1Y3Qgcm91dGVfdGFibGVfZW50cnkgKnJwOworCisJcnAgPSByb3V0ZV90Ymw7CisJd2hp bGUgKHJwKSB7CisJCS8vIElmIElQIGlzIDAsICBETlMgbG9va3VwIGZhaWxlZCBhdCBzdGFy dHVwLgorCQkvLyBTbyBjaGVjayBETlMgZXZlbiB0aG91Z2ggaXQncyBwZXJtYW5lbnQuCisJ CS8vIEkgdGhpbmsgY2hlY2tpbmcgdGhlIGxvY2sgb24gdGhpcyBpcF9hZGRyIHJlZmVyZW5j ZQorCQkvLyBpc24ndCBuZWVkZWQgc2luY2UgdGhlIG1haW4gY29kZSBkb2Vzbid0IGNoYW5n ZQorCQkvLyBpcF9hZGRyIGFmdGVyIHN0YXJ0dXAsIGFuZCB3b3JzdCBjYXNlIGlzIHRoYXQg aXQKKwkJLy8gZG9lcyBvbmUgZXh0cmEgZG5zIGNoZWNrCisJCWlmICgocnAtPmhvc3RubVsw XSkgICYmIAorCQkJICAoIShycC0+ZmxhZ3MgJiBBWFJUX1BFUk1BTkVOVCkgfHwgKCAqICh1 bnNpZ25lZCAqKSBycC0+aXBfYWRkciA9PSAwKSApKXsKKwkJCUxPR0w0KCJDaGVja2luZyBE TlMgZm9yICVzXG4iLCBycC0+aG9zdG5tKTsKKwkJCWhlID0gZ2V0aG9zdGJ5bmFtZShycC0+ aG9zdG5tKTsKKwkJCWlmIChoZSAhPSBOVUxMKSB7CisJCQkJcHRocmVhZF9tdXRleF9sb2Nr KCZkbnNtdXRleCk7CisJCQkJKiAodW5zaWduZWQgKikgcnAtPmlwX2FkZHIgPSAqICh1bnNp Z25lZCAqKSBoZS0+aF9hZGRyX2xpc3RbMF07ICAKKwkJCQlwdGhyZWFkX211dGV4X3VubG9j aygmZG5zbXV0ZXgpOworCQkJCUxPR0w0KCJETlMgcmV0dXJuZWQgSVA9JXNcbiIsIChjaGFy ICopIGluZXRfbnRvYSgqKHN0cnVjdCBpbl9hZGRyICopIHJwLT5pcF9hZGRyKSk7IAorCQkJ fQorCQl9CisJCXJwID0gcnAtPm5leHQ7CisJfQorCXRocmVhZHJ1bm5pbmcgPSAwOworCXB0 aHJlYWRfZXhpdCgwKTsKKwlyZXR1cm4gMDsKK30KKworLyogY2hlY2sgRE5TIGZvciByb3V0 ZSBJUHMuICBQYWNrZXRzIGZyb20gc3lzdGVtIHdob3NlIGlwIAorICogaGFzIGNoYW5nZWQg IHRyaWdnZXIgYSBETlMgbG9va3VwLiBUaGUgCisgKiB0aGUgdGltZXIgaXMgbmVlZGVkIHdo ZW4gYm90aCBzeXN0ZW1zIGFyZSBvbiBkeW5hbWljCisgKiBJUHMgYW5kIHRoZXkgYm90aCBy ZXNldCBhdCBhYm91dCB0aGUgc2FtZSB0aW1lLiAgQWxzbworICogd2hlbiB0aGUgSVAgY2hh bmdlcyBpbW1lZGlhdGVseSwgYnV0IEROUyBsYWdzLiAgCisgKi8KK3ZvaWQgdXBkYXRlX2Ru cyh1bnNpZ25lZCB3YWl0KQoreworCXB0aHJlYWRfdCBkbnNwdGhyZWFkOworCWludCByYzsK KworCWlmICh0aHJlYWRydW5uaW5nKXJldHVybjsvLyBEb24ndCBzdGFydCBhIHRocmVhZCB3 aGVuIG9uZSBpcyBnb2luZyBhbHJlYWR5LgorCWlmICh3YWl0ICYmICh0aW1lKE5VTEwpIDwg bGFzdF9kbnNfdGltZSArIHdhaXQpKXJldHVybjsKKwl0aHJlYWRydW5uaW5nID0gMTsKKwlM T0dMNCgiU3RhcnRpbmcgRE5TIHRocmVhZFxuIik7CisJbGFzdF9kbnNfdGltZSA9IHRpbWUo TlVMTCk7CisJcmMgPSBwdGhyZWFkX2NyZWF0ZSgmZG5zcHRocmVhZCwgTlVMTCwgdXBkYXRl X2Ruc3RocmVhZCwgICh2b2lkICopIDApOworCWlmIChyYyl7CisJCUxPR0wxKCIgICAgVGhy ZWFkIGVyciVkXG4iLCByYyk7IC8vIFNob3VsZCB3ZSBleGl0IGhlcmU/CisJCXRocmVhZHJ1 bm5pbmcgPSAwOworCX0JCisJCQorfQorCkJpbmFyeSBmaWxlcyBheDI1aXBkL3JvdXRpbmcu byBhbmQgYXgyNWlwZGR5bi9yb3V0aW5nLm8gZGlmZmVyCmRpZmYgLXJ1TiBheDI1aXBkL3J1 bi5iYXQgYXgyNWlwZGR5bi9ydW4uYmF0Ci0tLSBheDI1aXBkL3J1bi5iYXQJMTk2OS0xMi0z MSAxNjowMDowMC4wMDAwMDAwMDAgLTA4MDAKKysrIGF4MjVpcGRkeW4vcnVuLmJhdAkyMDA5 LTEyLTA4IDExOjM1OjUzLjE2MDM3ODY1MSAtMDgwMApAQCAtMCwwICsxLDIgQEAKK2tpbGxh bGwgYXgyNWlwZAorLi9heDI1aXBkIC1jIC9ldGMvYXgyNS9heDI1aXBkLmNvbmYK --------------010607070308040005070701--