9256 2006-03-16 22:59:06 +0300 replacedefaultroute option 2008-03-24 12:46:00 +0300 1 1 4 Development Sisyphus ppp unstable all Linux CLOSED FIXED P2 normal --- 12100 13811 14167 1 anubix mike alex_sinister hiddenman mike shaba sr zerg qa-sisyphus oldest_to_newest 36805 0 anubix 2006-03-16 22:59:06 +0300 Я уже не в одной программе наблюдаю использование опции pppd replacedefaultroute. IMHO проще в одном месте пропатчить. В SuSE точно есть. 46351 1 mike 2007-03-08 23:27:30 +0300 reassign попробую 46394 2 zerg 2007-03-09 16:08:43 +0300 Это из-за того, что в новом ppp появилась эта опция. Я раньше не знал. Теперь патч нужен скорее для того, чтоб нашу опцию cleardefaultroute заменять на стандартную replacedefaultroute. 47171 3 mithraen 2007-03-25 22:46:45 +0400 В 2.4.4 это сделано корректно? 51910 4 mike 2007-06-25 10:55:08 +0400 reassign по факту 51944 5 zerg 2007-06-25 18:59:03 +0400 (In reply to comment #2) > на стандартную replacedefaultroute. Это не стандартная, оказывается, а из SuSE 51945 6 2046 zerg 2007-06-25 19:00:17 +0400 Created attachment 2046 ppp-2.4.2-cifdefroute.diff Взято из SuSE ppp-2.4.4-51 51946 7 zerg 2007-06-25 19:01:26 +0400 Кстати, у них роутинг восстанавливается обратно, судя по патчу 55816 8 zerg 2007-09-25 18:45:50 +0400 только, если это зависимость на 12100, именно опцию replacedefaultroute уже лучше не делать, а то вылезет где попало 55819 9 mike 2007-09-25 19:16:22 +0400 Так в приложенном тобой сузешном патчике именно она (и no*) и фигурирует? PS: reassign 55821 10 zerg 2007-09-25 19:42:26 +0400 (In reply to comment #9) Да, в SuSE replacedefaultroute и noreplacedefaultroute 55920 11 anubix 2007-09-27 00:09:30 +0400 Хотя, наверное можно просто переименовать в нужные слова и приложить. Предварительно проконсультировавшись с автором creardefaultroute и проверив SuSE на более свежую версию 59191 12 mike 2007-12-08 15:19:40 +0300 Проверил, в ppp-2.4.4-79 то же самое (судя по diff). Вот %changelog за год: * Thu Aug 23 2007 - hvogel/suse.de - Work around pppoatm MTU problems. [#301678] * Thu Jul 26 2007 - prusnak/suse.cz - changed libpcap to libpcap-devel in BuildRequires * Tue Dec 19 2006 - meissner/suse.de - fixed strncat usage in radius plugin. * Wed Sep 13 2006 - hvogel/suse.de - Argh, really re-enable the patch. * Thu Sep 07 2006 - hvogel/suse.de - fix and reenable "replace default route" patch 59193 13 mike 2007-12-08 17:09:50 +0300 Заменил в 2.4.4-alt8.3 патч про cleardefaultroute на приложенный тобой (поскольку он и не менялся) -- результат в пакетах здесь: http://paq.osdn.org.ua/~mike/ppp/replacedefaultroute.patch/ * Sat Dec 08 2007 Michael Shigorin <mike@altlinux> 2.4.4-alt8.3 - replaced patch9 (cleardefaultroute option implementation) with patch0 ([no]replacedefaultroute from SuSE) (#9256) - fixed ppp-2.4.2-alt-opts.patch for this change В гит пока мусорить не буду, вдруг оно неживое :) cdmaua на стенде лежит, gsm только через irda (и через что к нему при отсутствующем /dev/ircomm0 цепляться -- пока не сообразил). К учебному pptpd попробовал прицепиться -- замечено такое: default route _дублируется_ (бишь маршрут через eth0 не удаляется, рядом появляется ещё один), зато при опускании линка остаёмся вообще без маршрута по умолчанию. С 2.4.4-alt8.2 (aka alt8) маршрут по умолчанию _заменяется_, но опять же при опускании сидим без defroute. Для людей я такое решал, передёргивая в ip-down интерфейс, через который до поднятия PPP идёт маршрут по умолчанию, но это явный костыль. Что делать будем? 59194 14 mike 2007-12-08 17:14:08 +0300 http://git.altlinux.org/people/mike/packages/?p=ppp-defroute.git (does NOT work for me as expected) 59200 15 2322 mike 2007-12-08 18:59:02 +0300 Created attachment 2322 fixed patch from ppp_2.4.4rel-9 Урра!!! openSUSE суксь, Debian рулез :) Помимо вагона переформатирования пробелов и подобной ерунды, они таки добавили несколько строчек в по существу тот же патч -- итог работает. 2 mithraen: добавь меня в ACL или сейчас сделаю начисто это всё и забирай alt9.x 59205 16 mike 2007-12-08 20:06:20 +0300 Итак, результат доступен как 2.4.4-alt9.8 тут: http://git.altlinux.org/people/mike/packages/?p=ppp.git http://paq.osdn.org.ua/~mike/ppp/ ppp-defroute.git с экспериментами прям по master и подбором рабочего патча -- грохнул. 2046 2007-06-25 19:00:17 +0400 2007-12-08 18:59:02 +0300 ppp-2.4.2-cifdefroute.diff ppp-2.4.2-cifdefroute.diff text/plain 10479 zerg LS0tIHBwcGQvaXBjcC5jCisrKyBwcHBkL2lwY3AuYwpAQCAtMTk3LDYgKzE5NywxNiBAQAogICAg ICAgImRpc2FibGUgZGVmYXVsdHJvdXRlIG9wdGlvbiIsIE9QVF9BTElBUyB8IE9QVF9BMkNMUiwK ICAgICAgICZpcGNwX3dhbnRvcHRpb25zWzBdLmRlZmF1bHRfcm91dGUgfSwKIAorI2lmZGVmIF9f bGludXhfXworICAgIHsgInJlcGxhY2VkZWZhdWx0cm91dGUiLCBvX2Jvb2wsCisJCQkJJmlwY3Bf d2FudG9wdGlvbnNbMF0ucmVwbGFjZV9kZWZhdWx0X3JvdXRlLAorICAgICAgIlJlcGxhY2UgZGVm YXVsdCByb3V0ZSIsIDEKKyAgICB9LAorICAgIHsgIm5vcmVwbGFjZWRlZmF1bHRyb3V0ZSIsIG9f Ym9vbCwKKwkJCQkmaXBjcF9hbGxvd29wdGlvbnNbMF0ucmVwbGFjZV9kZWZhdWx0X3JvdXRlLAor ICAgICAgIk5ldmVyIHJlcGxhY2UgZGVmYXVsdCByb3V0ZSIsIE9QVF9BMkNPUFksCisJCQkJJmlw Y3Bfd2FudG9wdGlvbnNbMF0ucmVwbGFjZV9kZWZhdWx0X3JvdXRlIH0sCisjZW5kaWYKICAgICB7 ICJwcm94eWFycCIsIG9fYm9vbCwgJmlwY3Bfd2FudG9wdGlvbnNbMF0ucHJveHlfYXJwLAogICAg ICAgIkFkZCBwcm94eSBBUlAgZW50cnkiLCBPUFRfRU5BQkxFfDEsICZpcGNwX2FsbG93b3B0aW9u c1swXS5wcm94eV9hcnAgfSwKICAgICB7ICJub3Byb3h5YXJwIiwgb19ib29sLCAmaXBjcF9hbGxv d29wdGlvbnNbMF0ucHJveHlfYXJwLApAQCAtMjYzLDcgKzI3Myw3IEBACiAgICAgaXBfYWN0aXZl X3BrdAogfTsKIAotc3RhdGljIHZvaWQgaXBjcF9jbGVhcl9hZGRycyBfX1AoKGludCwgdV9pbnQz Ml90LCB1X2ludDMyX3QpKTsKK3N0YXRpYyB2b2lkIGlwY3BfY2xlYXJfYWRkcnMgX19QKChpbnQs IHVfaW50MzJfdCwgdV9pbnQzMl90LCBib29sKSk7CiBzdGF0aWMgdm9pZCBpcGNwX3NjcmlwdCBf X1AoKGNoYXIgKiwgaW50KSk7CS8qIFJ1biBhbiB1cC9kb3duIHNjcmlwdCAqLwogc3RhdGljIHZv aWQgaXBjcF9zY3JpcHRfZG9uZSBfX1AoKHZvaWQgKikpOwogCkBAIC0xNjYwLDcgKzE2NzAsMTIg QEAKICAgICBpZiAoIXNpZm5wbW9kZSh1LCBQUFBfSVAsIE5QTU9ERV9RVUVVRSkpCiAJcmV0dXJu IDA7CiAgICAgaWYgKHdvLT5kZWZhdWx0X3JvdXRlKQorI2lmbmRlZiBfX2xpbnV4X18KIAlpZiAo c2lmZGVmYXVsdHJvdXRlKHUsIHdvLT5vdXJhZGRyLCB3by0+aGlzYWRkcikpCisjZWxzZQorCWlm IChzaWZkZWZhdWx0cm91dGUodSwgd28tPm91cmFkZHIsIHdvLT5oaXNhZGRyLAorCQkJCQkgICAg d28tPnJlcGxhY2VfZGVmYXVsdF9yb3V0ZSkpCisjZW5kaWYKIAkgICAgZGVmYXVsdF9yb3V0ZV9z ZXRbdV0gPSAxOwogICAgIGlmICh3by0+cHJveHlfYXJwKQogCWlmIChzaWZwcm94eWFycCh1LCB3 by0+aGlzYWRkcikpCkBAIC0xNzQyLDcgKzE3NTcsOCBAQAogICAgICAqLwogICAgIGlmIChkZW1h bmQpIHsKIAlpZiAoZ28tPm91cmFkZHIgIT0gd28tPm91cmFkZHIgfHwgaG8tPmhpc2FkZHIgIT0g d28tPmhpc2FkZHIpIHsKLQkgICAgaXBjcF9jbGVhcl9hZGRycyhmLT51bml0LCB3by0+b3VyYWRk ciwgd28tPmhpc2FkZHIpOworCSAgICBpcGNwX2NsZWFyX2FkZHJzKGYtPnVuaXQsIHdvLT5vdXJh ZGRyLCB3by0+aGlzYWRkciwKKwkJCQkgICAgICB3by0+cmVwbGFjZV9kZWZhdWx0X3JvdXRlKTsK IAkgICAgaWYgKGdvLT5vdXJhZGRyICE9IHdvLT5vdXJhZGRyKSB7CiAJCXdhcm4oIkxvY2FsIElQ IGFkZHJlc3MgY2hhbmdlZCB0byAlSSIsIGdvLT5vdXJhZGRyKTsKIAkJc2NyaXB0X3NldGVudigi T0xESVBMT0NBTCIsIGlwX250b2Eod28tPm91cmFkZHIpLCAwKTsKQEAgLTE3NjcsNyArMTc4Mywx MiBAQAogCiAJICAgIC8qIGFzc2lnbiBhIGRlZmF1bHQgcm91dGUgdGhyb3VnaCB0aGUgaW50ZXJm YWNlIGlmIHJlcXVpcmVkICovCiAJICAgIGlmIChpcGNwX3dhbnRvcHRpb25zW2YtPnVuaXRdLmRl ZmF1bHRfcm91dGUpIAorI2lmbmRlZiBfX2xpbnV4X18KIAkJaWYgKHNpZmRlZmF1bHRyb3V0ZShm LT51bml0LCBnby0+b3VyYWRkciwgaG8tPmhpc2FkZHIpKQorI2Vsc2UKKwkJaWYgKHNpZmRlZmF1 bHRyb3V0ZShmLT51bml0LCBnby0+b3VyYWRkciwgaG8tPmhpc2FkZHIsCisJCQkJCSAgICAgd28t PnJlcGxhY2VfZGVmYXVsdF9yb3V0ZSkpCisjZW5kaWYKIAkJICAgIGRlZmF1bHRfcm91dGVfc2V0 W2YtPnVuaXRdID0gMTsKIAogCSAgICAvKiBNYWtlIGEgcHJveHkgQVJQIGVudHJ5IGlmIHJlcXVl c3RlZC4gKi8KQEAgLTE4MTcsNyArMTgzOCwxMiBAQAogCiAJLyogYXNzaWduIGEgZGVmYXVsdCBy b3V0ZSB0aHJvdWdoIHRoZSBpbnRlcmZhY2UgaWYgcmVxdWlyZWQgKi8KIAlpZiAoaXBjcF93YW50 b3B0aW9uc1tmLT51bml0XS5kZWZhdWx0X3JvdXRlKSAKKyNpZm5kZWYgX19saW51eF9fCiAJICAg IGlmIChzaWZkZWZhdWx0cm91dGUoZi0+dW5pdCwgZ28tPm91cmFkZHIsIGhvLT5oaXNhZGRyKSkK KyNlbHNlCisJICAgIGlmIChzaWZkZWZhdWx0cm91dGUoZi0+dW5pdCwgZ28tPm91cmFkZHIsIGhv LT5oaXNhZGRyLAorCQkJCQkgd28tPnJlcGxhY2VfZGVmYXVsdF9yb3V0ZSkpCisjZW5kaWYKIAkJ ZGVmYXVsdF9yb3V0ZV9zZXRbZi0+dW5pdF0gPSAxOwogCiAJLyogTWFrZSBhIHByb3h5IEFSUCBl bnRyeSBpZiByZXF1ZXN0ZWQuICovCkBAIC0xODk0LDcgKzE5MjAsNyBAQAogCXNpZm5wbW9kZShm LT51bml0LCBQUFBfSVAsIE5QTU9ERV9EUk9QKTsKIAlzaWZkb3duKGYtPnVuaXQpOwogCWlwY3Bf Y2xlYXJfYWRkcnMoZi0+dW5pdCwgaXBjcF9nb3RvcHRpb25zW2YtPnVuaXRdLm91cmFkZHIsCi0J CQkgaXBjcF9oaXNvcHRpb25zW2YtPnVuaXRdLmhpc2FkZHIpOworCQkJIGlwY3BfaGlzb3B0aW9u c1tmLT51bml0XS5oaXNhZGRyLCAwKTsKICAgICB9CiAKICAgICAvKiBFeGVjdXRlIHRoZSBpcC1k b3duIHNjcmlwdCAqLwpAQCAtMTkxMCwxNiArMTkzNiwyNSBAQAogICogcHJveHkgYXJwIGVudHJp ZXMsIGV0Yy4KICAqLwogc3RhdGljIHZvaWQKLWlwY3BfY2xlYXJfYWRkcnModW5pdCwgb3VyYWRk ciwgaGlzYWRkcikKK2lwY3BfY2xlYXJfYWRkcnModW5pdCwgb3VyYWRkciwgaGlzYWRkciwgcmVw bGFjZWRlZmF1bHRyb3V0ZSkKICAgICBpbnQgdW5pdDsKICAgICB1X2ludDMyX3Qgb3VyYWRkcjsg IC8qIGxvY2FsIGFkZHJlc3MgKi8KICAgICB1X2ludDMyX3QgaGlzYWRkcjsgIC8qIHJlbW90ZSBh ZGRyZXNzICovCisgICAgYm9vbCByZXBsYWNlZGVmYXVsdHJvdXRlOwogewogICAgIGlmIChwcm94 eV9hcnBfc2V0W3VuaXRdKSB7CiAJY2lmcHJveHlhcnAodW5pdCwgaGlzYWRkcik7CiAJcHJveHlf YXJwX3NldFt1bml0XSA9IDA7CiAgICAgfQotICAgIGlmIChkZWZhdWx0X3JvdXRlX3NldFt1bml0 XSkgeworICAgIC8qIElmIHJlcGxhY2VkZWZhdWx0cm91dGUsIHNpZmRlZmF1bHRyb3V0ZSB3aWxs IGJlIGNhbGxlZCBzb29uCisgICAgICogd2l0aCByZXBsYWNlZGVmYXVsdHJvdXRlIHNldCBhbmQg dGhhdCB3aWxsIG92ZXJ3cml0ZSB0aGUgY3VycmVudAorICAgICAqIGRlZmF1bHQgcm91dGUuIFRo aXMgaXMgdGhlIGNhc2Ugb25seSB3aGVuIGRvaW5nIGRlbWFuZCwgb3RoZXJ3aXNlCisgICAgICog ZHVyaW5nIGRlbWFuZCwgdGhpcyBjaWZkZWZhdWx0cm91dGUgd291bGQgcmVzdG9yZSB0aGUgb2xk IGRlZmF1bHQKKyAgICAgKiByb3V0ZSB3aGljaCBpcyBub3Qgd2hhdCB3ZSB3YW50IGluIHRoaXMg Y2FzZS4gSW4gdGhlIG5vbi1kZW1hbmQKKyAgICAgKiBjYXNlLCB3ZSdsbCBkZWxldGUgdGhlIGRl ZmF1bHQgcm91dGUgYW5kIHJlc3RvcmUgdGhlIG9sZCBpZiB0aGVyZQorICAgICAqIGlzIG9uZSBz YXZlZCBieSBhbiBzaWZkZWZhdWx0cm91dGUgd2l0aCByZXBsYWNlZGVmYXVsdHJvdXRlLgorICAg ICAqLworICAgIGlmICghcmVwbGFjZWRlZmF1bHRyb3V0ZSAmJiBkZWZhdWx0X3JvdXRlX3NldFt1 bml0XSkgewogCWNpZmRlZmF1bHRyb3V0ZSh1bml0LCBvdXJhZGRyLCBoaXNhZGRyKTsKIAlkZWZh dWx0X3JvdXRlX3NldFt1bml0XSA9IDA7CiAgICAgfQotLS0gcHBwZC9pcGNwLmgKKysrIHBwcGQv aXBjcC5oCkBAIC03MCw2ICs3MCw3IEBACiAgICAgYm9vbCBvbGRfYWRkcnM7CQkvKiBVc2Ugb2xk IChJUC1BZGRyZXNzZXMpIG9wdGlvbj8gKi8KICAgICBib29sIHJlcV9hZGRyOwkJLyogQXNrIHBl ZXIgdG8gc2VuZCBJUCBhZGRyZXNzPyAqLwogICAgIGJvb2wgZGVmYXVsdF9yb3V0ZTsJCS8qIEFz c2lnbiBkZWZhdWx0IHJvdXRlIHRocm91Z2ggaW50ZXJmYWNlPyAqLworICAgIGJvb2wgcmVwbGFj ZV9kZWZhdWx0X3JvdXRlOwkvKiBSZXBsYWNlIGRlZmF1bHQgcm91dGUgdGhyb3VnaCBpbnRlcmZh Y2U/ICovCiAgICAgYm9vbCBwcm94eV9hcnA7CQkvKiBNYWtlIHByb3h5IEFSUCBlbnRyeSBmb3Ig cGVlcj8gKi8KICAgICBib29sIG5lZ192ajsJCS8qIFZhbiBKYWNvYnNvbiBDb21wcmVzc2lvbj8g Ki8KICAgICBib29sIG9sZF92ajsJCS8qIHVzZSBvbGQgKHNob3J0KSBmb3JtIG9mIFZKIG9wdGlv bj8gKi8KLS0tIHBwcGQvcHBwZC44CisrKyBwcHBkL3BwcGQuOApAQCAtMTIxLDYgKzEyMSwxMyBA QAogVGhpcyBlbnRyeSBpcyByZW1vdmVkIHdoZW4gdGhlIFBQUCBjb25uZWN0aW9uIGlzIGJyb2tl bi4gIFRoaXMgb3B0aW9uCiBpcyBwcml2aWxlZ2VkIGlmIHRoZSBcZklub2RlZmF1bHRyb3V0ZVxm UiBvcHRpb24gaGFzIGJlZW4gc3BlY2lmaWVkLgogLlRQCisuQiByZXBsYWNlZGVmYXVsdHJvdXRl CitUaGlzIG9wdGlvbiBpcyBhIGZsYWcgdG8gdGhlIGRlZmF1bHRyb3V0ZSBvcHRpb24uIElmIGRl ZmF1bHRyb3V0ZSBpcworc2V0IGFuZCB0aGlzIGZsYWcgaXMgYWxzbyBzZXQsIHBwcGQgcmVwbGFj ZXMgYW4gZXhpc3RpbmcgZGVmYXVsdCByb3V0ZQord2l0aCB0aGUgbmV3IGRlZmF1bHQgcm91dGUu CisKKworLlRQCiAuQiBkaXNjb25uZWN0IFxmSXNjcmlwdAogRXhlY3V0ZSB0aGUgY29tbWFuZCBz cGVjaWZpZWQgYnkgXGZJc2NyaXB0XGZSLCBieSBwYXNzaW5nIGl0IHRvIGEKIHNoZWxsLCBhZnRl cgpAQCAtNzA2LDcgKzcxMywxMiBAQAogLlRQCiAuQiBub2RlZmF1bHRyb3V0ZQogRGlzYWJsZSB0 aGUgXGZJZGVmYXVsdHJvdXRlXGZSIG9wdGlvbi4gIFRoZSBzeXN0ZW0gYWRtaW5pc3RyYXRvciB3 aG8KLXdpc2hlcyB0byBwcmV2ZW50IHVzZXJzIGZyb20gY3JlYXRpbmcgZGVmYXVsdCByb3V0ZXMg d2l0aCBwcHBkCit3aXNoZXMgdG8gcHJldmVudCB1c2VycyBmcm9tIGFkZGluZyBhIGRlZmF1bHQg cm91dGUgd2l0aCBwcHBkCitjYW4gZG8gc28gYnkgcGxhY2luZyB0aGlzIG9wdGlvbiBpbiB0aGUg L2V0Yy9wcHAvb3B0aW9ucyBmaWxlLgorLlRQCisuQiBub3JlcGxhY2VkZWZhdWx0cm91dGUKK0Rp c2FibGUgdGhlIFxmSXJlcGxhY2VkZWZhdWx0cm91dGVcZlIgb3B0aW9uLiBUaGUgc3lzdGVtIGFk bWluaXN0cmF0b3Igd2hvCit3aXNoZXMgdG8gcHJldmVudCB1c2VycyBmcm9tIHJlcGxhY2luZyBh IGRlZmF1bHQgcm91dGUgd2l0aCBwcHBkCiBjYW4gZG8gc28gYnkgcGxhY2luZyB0aGlzIG9wdGlv biBpbiB0aGUgL2V0Yy9wcHAvb3B0aW9ucyBmaWxlLgogLlRQCiAuQiBub2RlZmxhdGUKLS0tIHBw cGQvcHBwZC5oCisrKyBwcHBkL3BwcGQuaApAQCAtNjQyLDcgKzY0MiwxMSBAQAogaW50ICBjaWY2 YWRkciBfX1AoKGludCwgZXVpNjRfdCwgZXVpNjRfdCkpOwogCQkJCS8qIFJlbW92ZSBhbiBJUHY2 IGFkZHJlc3MgZnJvbSBpL2YgKi8KICNlbmRpZgorI2lmbmRlZiBfX2xpbnV4X18KIGludCAgc2lm ZGVmYXVsdHJvdXRlIF9fUCgoaW50LCB1X2ludDMyX3QsIHVfaW50MzJfdCkpOworI2Vsc2UKK2lu dCAgc2lmZGVmYXVsdHJvdXRlIF9fUCgoaW50LCB1X2ludDMyX3QsIHVfaW50MzJfdCwgYm9vbCBy ZXBsYWNlX2RlZmF1bHRfcnQpKTsKKyNlbmRpZgogCQkJCS8qIENyZWF0ZSBkZWZhdWx0IHJvdXRl IHRocm91Z2ggaS9mICovCiBpbnQgIGNpZmRlZmF1bHRyb3V0ZSBfX1AoKGludCwgdV9pbnQzMl90 LCB1X2ludDMyX3QpKTsKIAkJCQkvKiBEZWxldGUgZGVmYXVsdCByb3V0ZSB0aHJvdWdoIGkvZiAq LwotLS0gcHBwZC9zeXMtbGludXguYworKysgcHBwZC9zeXMtbGludXguYwpAQCAtMjA2LDYgKzIw Niw4IEBACiAKIHN0YXRpYyBpbnQJaWZfaXNfdXA7CS8qIEludGVyZmFjZSBoYXMgYmVlbiBtYXJr ZWQgdXAgKi8KIHN0YXRpYyBpbnQJaGF2ZV9kZWZhdWx0X3JvdXRlOwkvKiBHYXRld2F5IGZvciBk ZWZhdWx0IHJvdXRlIGFkZGVkICovCitzdGF0aWMgc3RydWN0IHJ0ZW50cnkgb2xkX2RlZl9ydDsg ICAgICAgLyogT2xkIGRlZmF1bHQgcm91dGUgKi8KK3N0YXRpYyBpbnQgICAgICAgZGVmYXVsdF9y dF9yZXBsX3Jlc3Q7ICAvKiByZXBsYWNlIGFuZCByZXN0b3JlIG9sZCBkZWZhdWx0IHJ0ICovCiBz dGF0aWMgdV9pbnQzMl90IHByb3h5X2FycF9hZGRyOwkvKiBBZGRyIGZvciBwcm94eSBhcnAgZW50 cnkgYWRkZWQgKi8KIHN0YXRpYyBjaGFyIHByb3h5X2FycF9kZXZbMTZdOwkJLyogRGV2aWNlIGZv ciBwcm94eSBhcnAgZW50cnkgKi8KIHN0YXRpYyB1X2ludDMyX3Qgb3VyX29sZF9hZGRyOwkJLyog Zm9yIGRldGVjdGluZyBhZGRyZXNzIGNoYW5nZXMgKi8KQEAgLTE1MTMsNiArMTUxNSw5IEBACiAJ cCA9IE5VTEw7CiAgICAgfQogCisgICAgU0VUX1NBX0ZBTUlMWSAocnQtPnJ0X2RzdCwgICAgIEFG X0lORVQpOworICAgIFNFVF9TQV9GQU1JTFkgKHJ0LT5ydF9nYXRld2F5LCBBRl9JTkVUKTsKKwog ICAgIFNJTl9BRERSKHJ0LT5ydF9kc3QpID0gc3RydG91bChjb2xzW3JvdXRlX2Rlc3RfY29sXSwg TlVMTCwgMTYpOwogICAgIFNJTl9BRERSKHJ0LT5ydF9nYXRld2F5KSA9IHN0cnRvdWwoY29sc1ty b3V0ZV9nd19jb2xdLCBOVUxMLCAxNik7CiAgICAgU0lOX0FERFIocnQtPnJ0X2dlbm1hc2spID0g c3RydG91bChjb2xzW3JvdXRlX21hc2tfY29sXSwgTlVMTCwgMTYpOwpAQCAtMTU4MiwyMiArMTU4 Nyw1MyBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqCiAgKgogICogc2lmZGVmYXVsdHJvdXRlIC0gYXNzaWduIGEg ZGVmYXVsdCByb3V0ZSB0aHJvdWdoIHRoZSBhZGRyZXNzIGdpdmVuLgotICovCi0KLWludCBzaWZk ZWZhdWx0cm91dGUgKGludCB1bml0LCB1X2ludDMyX3Qgb3VyYWRkciwgdV9pbnQzMl90IGdhdGV3 YXkpCi17Ci0gICAgc3RydWN0IHJ0ZW50cnkgcnQ7Ci0KLSAgICBpZiAoZGVmYXVsdHJvdXRlX2V4 aXN0cygmcnQpICYmIHN0cmNtcChydC5ydF9kZXYsIGlmbmFtZSkgIT0gMCkgewotCWlmIChydC5y dF9mbGFncyAmIFJURl9HQVRFV0FZKQotCSAgICBlcnJvcigibm90IHJlcGxhY2luZyBleGlzdGlu ZyBkZWZhdWx0IHJvdXRlIHZpYSAlSSIsCi0JCSAgU0lOX0FERFIocnQucnRfZ2F0ZXdheSkpOwot CWVsc2UKLQkgICAgZXJyb3IoIm5vdCByZXBsYWNpbmcgZXhpc3RpbmcgZGVmYXVsdCByb3V0ZSB0 aHJvdWdoICVzIiwKLQkJICBydC5ydF9kZXYpOwotCXJldHVybiAwOworICoKKyAqIElmIHRoZSBn bG9iYWwgZGVmYXVsdF9ydF9yZXBsX3Jlc3QgZmxhZyBpcyBzZXQsIHRoZW4gdGhpcyBmdW5jdGlv bgorICogYWxyZWFkeSByZXBsYWNlZCB0aGUgb3JpZ2luYWwgc3lzdGVtIGRlZmF1bHRyb3V0ZSB3 aXRoIHNvbWUgb3RoZXIKKyAqIHJvdXRlIGFuZCBpdCBzaG91bGQganVzdCByZXBsYWNlIHRoZSBj dXJyZW50IGRlZmF1bHRyb3V0ZSB3aXRoCisgKiBhbm90aGVyIG9uZSwgd2l0aG91dCBzYXZpbmcg dGhlIGN1cnJlbnQgcm91dGUuIFVzZTogZGVtYW5kIG1vZGUsCisgKiB3aGVuIHBwcGQgc2V0cyBm aXJzdCBhIGRlZmF1bHRyb3V0ZSBpdCBpdCdzIHRlbXBvcmFyeSBwcHAwIGFkZHJlc3NlcworICog YW5kIHRoZW4gY2hhbmdlcyB0aGUgdGVtcG9yYXJ5IGFkZHJlc3NlcyB0byB0aGUgYWRkcmVzc2Vz IGZvciB0aGUgcmVhbAorICogcHBwIGNvbm5lY3Rpb24gd2hlbiBpdCBoYXMgY29tZSB1cC4KKyAq LworCitpbnQgc2lmZGVmYXVsdHJvdXRlIChpbnQgdW5pdCwgdV9pbnQzMl90IG91cmFkZHIsIHVf aW50MzJfdCBnYXRld2F5LCBib29sIHJlcGxhY2UpCit7CisgICAgc3RydWN0IHJ0ZW50cnkgcnQs IHRtcF9ydDsKKyAgICBzdHJ1Y3QgcnRlbnRyeSAqZGVsX3J0ID0gTlVMTDsKKworICAgIGlmIChk ZWZhdWx0X3J0X3JlcGxfcmVzdCkgeworICAgICAgIC8qIFdlIGhhdmUgYWxyZWFkeSByZWNsYWNl ZCB0aGUgb3JpZ2luYWwgZGVmYXVsdHJvdXRlLCBpZiB3ZQorICAgICAgICAgKiBhcmUgY2FsbGVk IGFnYWluLCB3ZSB3aWxsIGRlbGV0ZSB0aGUgY3VycmVudCBkZWZhdWx0IHJvdXRlCisgICAgICAg ICAqIGFuZCBzZXQgdGhlIG5ldyBkZWZhdWx0IHJvdXRlIGluIHRoaXMgZnVuY3Rpb24uCisgICAg ICAgICAqIC0gdGhpcyBpcyBub3JtYWxseSBvbmx5IHRoZSBjYXNlIHRoZSBkb2luZyBkZW1hbmQ6 ICovCisgICAgICAgaWYgKGRlZmF1bHRyb3V0ZV9leGlzdHMoICZ0bXBfcnQgKSkKKyAgICAgICAg ICAgICAgIGRlbF9ydCA9ICZ0bXBfcnQ7CisgICAgfSBlbHNlIGlmICggZGVmYXVsdHJvdXRlX2V4 aXN0cyggJm9sZF9kZWZfcnQgICAgICAgICAgICAgICAgKSAmJgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cmNtcCggIG9sZF9kZWZfcnQucnRfZGV2LCBpZm5hbWUgKSAhPSAwKSB7Cisg ICAgICAgLyogV2UgZGlkIG5vdCB5ZXQgcmVwbGFjZSBhbiBleGlzdGluZyBkZWZhdWx0IHJvdXRl LCBsZXQncworICAgICAgICAqIGNoZWNrIGlmIHdlIHNob3VsZCBzYXZlIGFuZCByZXBsYWNlIGEg ZGVmYXVsdCByb3V0ZToKKyAgICAgICAgICovCisgICAgICAgdV9pbnQzMl90IG9sZF9nYXRld2F5 ID0gU0lOX0FERFIob2xkX2RlZl9ydC5ydF9nYXRld2F5KTsKKworICAgICAgIGlmIChvbGRfZ2F0 ZXdheSAhPSBnYXRld2F5KSB7CisgICAgICAgICAgIGlmICghcmVwbGFjZSkgeworICAgICAgICAg ICAgICAgZXJyb3IoIm5vdCByZXBsYWNpbmcgZGVmYXVsdCByb3V0ZSB0byAlcyBbJUldIiwKKyAg ICAgICAgICAgICAgICAgICAgICAgb2xkX2RlZl9ydC5ydF9kZXYsIG9sZF9nYXRld2F5KTsKKyAg ICAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgLy8gd2UgbmVlZCB0byBjb3B5IHJ0X2RldiBiZWNhdXNlIHdlIG5lZWQgaXQgcGVybWFuZW50 IHRvbzoKKyAgICAgICAgICAgICAgIGNoYXIgKiB0bXBfZGV2ID0gbWFsbG9jKHN0cmxlbihvbGRf ZGVmX3J0LnJ0X2RldikrMSk7CisgICAgICAgICAgICAgICBzdHJjcHkodG1wX2Rldiwgb2xkX2Rl Zl9ydC5ydF9kZXYpOworICAgICAgICAgICAgICAgb2xkX2RlZl9ydC5ydF9kZXYgPSB0bXBfZGV2 OworCisgICAgICAgICAgICAgICBub3RpY2UoInJlcGxhY2luZyBvbGQgZGVmYXVsdCByb3V0ZSB0 byAlcyBbJUldIiwKKyAgICAgICAgICAgICAgICAgICAgICAgb2xkX2RlZl9ydC5ydF9kZXYsIG9s ZF9nYXRld2F5KTsKKyAgICAgICAgICAgICAgIGRlZmF1bHRfcnRfcmVwbF9yZXN0ID0gMTsKKyAg ICAgICAgICAgICAgIGRlbF9ydCA9ICZvbGRfZGVmX3J0OworICAgICAgICAgICB9CisgICAgICAg fQogICAgIH0KLQogICAgIG1lbXNldCAoJnJ0LCAwLCBzaXplb2YgKHJ0KSk7CiAgICAgU0VUX1NB X0ZBTUlMWSAocnQucnRfZHN0LCBBRl9JTkVUKTsKIApAQCAtMTYxNCw2ICsxNjUwLDEyIEBACiAJ ICAgIGVycm9yKCJkZWZhdWx0IHJvdXRlIGlvY3RsKFNJT0NBRERSVCk6ICVtIik7CiAJcmV0dXJu IDA7CiAgICAgfQorICAgIGlmIChkZWZhdWx0X3J0X3JlcGxfcmVzdCAmJiBkZWxfcnQpCisgICAg ICAgIGlmIChpb2N0bChzb2NrX2ZkLCBTSU9DREVMUlQsIGRlbF9ydCkgPCAwKSB7CisJICAgIGlm ICggISBva19lcnJvciAoIGVycm5vICkpCisJICAgICAgICBlcnJvcigiZGVsIG9sZCBkZWZhdWx0 IHJvdXRlIGlvY3RsKFNJT0NERUxSVCk6ICVtKCVkKSIsIGVycm5vKTsKKwkgICAgcmV0dXJuIDA7 CisgICAgICAgIH0KIAogICAgIGhhdmVfZGVmYXVsdF9yb3V0ZSA9IDE7CiAgICAgcmV0dXJuIDE7 CkBAIC0xNjQ3LDYgKzE2ODksMTYgQEAKIAkgICAgcmV0dXJuIDA7CiAJfQogICAgIH0KKyAgICBp ZiAoZGVmYXVsdF9ydF9yZXBsX3Jlc3QpIHsKKwlub3RpY2UoInJlc3RvcmluZyBvbGQgZGVmYXVs dCByb3V0ZSB0byAlcyBbJUldIiwKKwkJCW9sZF9kZWZfcnQucnRfZGV2LCBTSU5fQUREUihvbGRf ZGVmX3J0LnJ0X2dhdGV3YXkpKTsKKyAgICAgICAgaWYgKGlvY3RsKHNvY2tfZmQsIFNJT0NBRERS VCwgJm9sZF9kZWZfcnQpIDwgMCkgeworCSAgICBpZiAoICEgb2tfZXJyb3IgKCBlcnJubyApKQor CSAgICAgICAgZXJyb3IoInJlc3RvcmUgZGVmYXVsdCByb3V0ZSBpb2N0bChTSU9DQUREUlQpOiAl bSglZCkiLCBlcnJubyk7CisJICAgIHJldHVybiAwOworICAgICAgICB9CisgICAgICAgIGRlZmF1 bHRfcnRfcmVwbF9yZXN0ID0gMDsKKyAgICB9CiAKICAgICByZXR1cm4gMTsKIH0K 2322 2007-12-08 18:59:02 +0300 2007-12-08 18:59:02 +0300 fixed patch from ppp_2.4.4rel-9 ppp-2.4.4-deb-cifdefroute.diff text/plain 11685 mike ZGlmZiAtTmF1ciBwcHAtMi40LjQtb3JpZy9wcHBkL2lwY3AuYyBwcHAtMi40LjQtZGViaWFuL3Bw cGQvaXBjcC5jCi0tLSBwcHAtMi40LjQtb3JpZy9wcHBkL2lwY3AuYwkyMDA3LTEyLTA4IDE2OjI5 OjE2ICswMjAwCisrKyBwcHAtMi40LjQtZGViaWFuL3BwcGQvaXBjcC5jCTIwMDctMTItMDggMTc6 MzM6NDggKzAyMDAKQEAgLTE5Nyw2ICsxOTcsMTQgQEAKICAgICAgICJkaXNhYmxlIGRlZmF1bHRy b3V0ZSBvcHRpb24iLCBPUFRfQUxJQVMgfCBPUFRfQTJDTFIsCiAgICAgICAmaXBjcF93YW50b3B0 aW9uc1swXS5kZWZhdWx0X3JvdXRlIH0sCiAKKyAgICB7ICJyZXBsYWNlZGVmYXVsdHJvdXRlIiwg b19ib29sLAorCQkJCSZpcGNwX3dhbnRvcHRpb25zWzBdLnJlcGxhY2VfZGVmYXVsdF9yb3V0ZSwK KyAgICAgICJSZXBsYWNlIGRlZmF1bHQgcm91dGUiLCAxCisgICAgfSwKKyAgICB7ICJub3JlcGxh Y2VkZWZhdWx0cm91dGUiLCBvX2Jvb2wsCisJCQkJJmlwY3BfYWxsb3dvcHRpb25zWzBdLnJlcGxh Y2VfZGVmYXVsdF9yb3V0ZSwKKyAgICAgICJOZXZlciByZXBsYWNlIGRlZmF1bHQgcm91dGUiLCBP UFRfQTJDT1BZLAorCQkJCSZpcGNwX3dhbnRvcHRpb25zWzBdLnJlcGxhY2VfZGVmYXVsdF9yb3V0 ZSB9LAogICAgIHsgInByb3h5YXJwIiwgb19ib29sLCAmaXBjcF93YW50b3B0aW9uc1swXS5wcm94 eV9hcnAsCiAgICAgICAiQWRkIHByb3h5IEFSUCBlbnRyeSIsIE9QVF9FTkFCTEV8MSwgJmlwY3Bf YWxsb3dvcHRpb25zWzBdLnByb3h5X2FycCB9LAogICAgIHsgIm5vcHJveHlhcnAiLCBvX2Jvb2ws ICZpcGNwX2FsbG93b3B0aW9uc1swXS5wcm94eV9hcnAsCkBAIC0yNjMsNyArMjcxLDcgQEAKICAg ICBpcF9hY3RpdmVfcGt0CiB9OwogCi1zdGF0aWMgdm9pZCBpcGNwX2NsZWFyX2FkZHJzIF9fUCgo aW50LCB1X2ludDMyX3QsIHVfaW50MzJfdCkpOworc3RhdGljIHZvaWQgaXBjcF9jbGVhcl9hZGRy cyBfX1AoKGludCwgdV9pbnQzMl90LCB1X2ludDMyX3QsIGJvb2wpKTsKIHN0YXRpYyB2b2lkIGlw Y3Bfc2NyaXB0IF9fUCgoY2hhciAqLCBpbnQpKTsJLyogUnVuIGFuIHVwL2Rvd24gc2NyaXB0ICov CiBzdGF0aWMgdm9pZCBpcGNwX3NjcmlwdF9kb25lIF9fUCgodm9pZCAqKSk7CiAKQEAgLTE2NjAs NyArMTY2OCw4IEBACiAgICAgaWYgKCFzaWZucG1vZGUodSwgUFBQX0lQLCBOUE1PREVfUVVFVUUp KQogCXJldHVybiAwOwogICAgIGlmICh3by0+ZGVmYXVsdF9yb3V0ZSkKLQlpZiAoc2lmZGVmYXVs dHJvdXRlKHUsIHdvLT5vdXJhZGRyLCB3by0+aGlzYWRkcikpCisJaWYgKHNpZmRlZmF1bHRyb3V0 ZSh1LCB3by0+b3VyYWRkciwgd28tPmhpc2FkZHIsCisJCXdvLT5yZXBsYWNlX2RlZmF1bHRfcm91 dGUpKQogCSAgICBkZWZhdWx0X3JvdXRlX3NldFt1XSA9IDE7CiAgICAgaWYgKHdvLT5wcm94eV9h cnApCiAJaWYgKHNpZnByb3h5YXJwKHUsIHdvLT5oaXNhZGRyKSkKQEAgLTE3NDIsNyArMTc1MSw4 IEBACiAgICAgICovCiAgICAgaWYgKGRlbWFuZCkgewogCWlmIChnby0+b3VyYWRkciAhPSB3by0+ b3VyYWRkciB8fCBoby0+aGlzYWRkciAhPSB3by0+aGlzYWRkcikgewotCSAgICBpcGNwX2NsZWFy X2FkZHJzKGYtPnVuaXQsIHdvLT5vdXJhZGRyLCB3by0+aGlzYWRkcik7CisJICAgIGlwY3BfY2xl YXJfYWRkcnMoZi0+dW5pdCwgd28tPm91cmFkZHIsIHdvLT5oaXNhZGRyLAorCQkJCSAgICAgIHdv LT5yZXBsYWNlX2RlZmF1bHRfcm91dGUpOwogCSAgICBpZiAoZ28tPm91cmFkZHIgIT0gd28tPm91 cmFkZHIpIHsKIAkJd2FybigiTG9jYWwgSVAgYWRkcmVzcyBjaGFuZ2VkIHRvICVJIiwgZ28tPm91 cmFkZHIpOwogCQlzY3JpcHRfc2V0ZW52KCJPTERJUExPQ0FMIiwgaXBfbnRvYSh3by0+b3VyYWRk ciksIDApOwpAQCAtMTc2Nyw3ICsxNzc3LDggQEAKIAogCSAgICAvKiBhc3NpZ24gYSBkZWZhdWx0 IHJvdXRlIHRocm91Z2ggdGhlIGludGVyZmFjZSBpZiByZXF1aXJlZCAqLwogCSAgICBpZiAoaXBj cF93YW50b3B0aW9uc1tmLT51bml0XS5kZWZhdWx0X3JvdXRlKSAKLQkJaWYgKHNpZmRlZmF1bHRy b3V0ZShmLT51bml0LCBnby0+b3VyYWRkciwgaG8tPmhpc2FkZHIpKQorCQlpZiAoc2lmZGVmYXVs dHJvdXRlKGYtPnVuaXQsIGdvLT5vdXJhZGRyLCBoby0+aGlzYWRkciwKKwkJCXdvLT5yZXBsYWNl X2RlZmF1bHRfcm91dGUpKQogCQkgICAgZGVmYXVsdF9yb3V0ZV9zZXRbZi0+dW5pdF0gPSAxOwog CiAJICAgIC8qIE1ha2UgYSBwcm94eSBBUlAgZW50cnkgaWYgcmVxdWVzdGVkLiAqLwpAQCAtMTgx Nyw3ICsxODI4LDggQEAKIAogCS8qIGFzc2lnbiBhIGRlZmF1bHQgcm91dGUgdGhyb3VnaCB0aGUg aW50ZXJmYWNlIGlmIHJlcXVpcmVkICovCiAJaWYgKGlwY3Bfd2FudG9wdGlvbnNbZi0+dW5pdF0u ZGVmYXVsdF9yb3V0ZSkgCi0JICAgIGlmIChzaWZkZWZhdWx0cm91dGUoZi0+dW5pdCwgZ28tPm91 cmFkZHIsIGhvLT5oaXNhZGRyKSkKKwkgICAgaWYgKHNpZmRlZmF1bHRyb3V0ZShmLT51bml0LCBn by0+b3VyYWRkciwgaG8tPmhpc2FkZHIsCisJCSAgICB3by0+cmVwbGFjZV9kZWZhdWx0X3JvdXRl KSkKIAkJZGVmYXVsdF9yb3V0ZV9zZXRbZi0+dW5pdF0gPSAxOwogCiAJLyogTWFrZSBhIHByb3h5 IEFSUCBlbnRyeSBpZiByZXF1ZXN0ZWQuICovCkBAIC0xODk0LDcgKzE5MDYsNyBAQAogCXNpZm5w bW9kZShmLT51bml0LCBQUFBfSVAsIE5QTU9ERV9EUk9QKTsKIAlzaWZkb3duKGYtPnVuaXQpOwog CWlwY3BfY2xlYXJfYWRkcnMoZi0+dW5pdCwgaXBjcF9nb3RvcHRpb25zW2YtPnVuaXRdLm91cmFk ZHIsCi0JCQkgaXBjcF9oaXNvcHRpb25zW2YtPnVuaXRdLmhpc2FkZHIpOworCQkJIGlwY3BfaGlz b3B0aW9uc1tmLT51bml0XS5oaXNhZGRyLCAwKTsKICAgICB9CiAKICAgICAvKiBFeGVjdXRlIHRo ZSBpcC1kb3duIHNjcmlwdCAqLwpAQCAtMTkxMCwxNiArMTkyMiwyNSBAQAogICogcHJveHkgYXJw IGVudHJpZXMsIGV0Yy4KICAqLwogc3RhdGljIHZvaWQKLWlwY3BfY2xlYXJfYWRkcnModW5pdCwg b3VyYWRkciwgaGlzYWRkcikKK2lwY3BfY2xlYXJfYWRkcnModW5pdCwgb3VyYWRkciwgaGlzYWRk ciwgcmVwbGFjZWRlZmF1bHRyb3V0ZSkKICAgICBpbnQgdW5pdDsKICAgICB1X2ludDMyX3Qgb3Vy YWRkcjsgIC8qIGxvY2FsIGFkZHJlc3MgKi8KICAgICB1X2ludDMyX3QgaGlzYWRkcjsgIC8qIHJl bW90ZSBhZGRyZXNzICovCisgICAgYm9vbCByZXBsYWNlZGVmYXVsdHJvdXRlOwogewogICAgIGlm IChwcm94eV9hcnBfc2V0W3VuaXRdKSB7CiAJY2lmcHJveHlhcnAodW5pdCwgaGlzYWRkcik7CiAJ cHJveHlfYXJwX3NldFt1bml0XSA9IDA7CiAgICAgfQotICAgIGlmIChkZWZhdWx0X3JvdXRlX3Nl dFt1bml0XSkgeworICAgIC8qIElmIHJlcGxhY2VkZWZhdWx0cm91dGUsIHNpZmRlZmF1bHRyb3V0 ZSB3aWxsIGJlIGNhbGxlZCBzb29uCisgICAgICogd2l0aCByZXBsYWNlZGVmYXVsdHJvdXRlIHNl dCBhbmQgdGhhdCB3aWxsIG92ZXJ3cml0ZSB0aGUgY3VycmVudAorICAgICAqIGRlZmF1bHQgcm91 dGUuIFRoaXMgaXMgdGhlIGNhc2Ugb25seSB3aGVuIGRvaW5nIGRlbWFuZCwgb3RoZXJ3aXNlCisg ICAgICogZHVyaW5nIGRlbWFuZCwgdGhpcyBjaWZkZWZhdWx0cm91dGUgd291bGQgcmVzdG9yZSB0 aGUgb2xkIGRlZmF1bHQKKyAgICAgKiByb3V0ZSB3aGljaCBpcyBub3Qgd2hhdCB3ZSB3YW50IGlu IHRoaXMgY2FzZS4gSW4gdGhlIG5vbi1kZW1hbmQKKyAgICAgKiBjYXNlLCB3ZSdsbCBkZWxldGUg dGhlIGRlZmF1bHQgcm91dGUgYW5kIHJlc3RvcmUgdGhlIG9sZCBpZiB0aGVyZQorICAgICAqIGlz IG9uZSBzYXZlZCBieSBhbiBzaWZkZWZhdWx0cm91dGUgd2l0aCByZXBsYWNlZGVmYXVsdHJvdXRl LgorICAgICAqLworICAgIGlmICghcmVwbGFjZWRlZmF1bHRyb3V0ZSAmJiBkZWZhdWx0X3JvdXRl X3NldFt1bml0XSkgewogCWNpZmRlZmF1bHRyb3V0ZSh1bml0LCBvdXJhZGRyLCBoaXNhZGRyKTsK IAlkZWZhdWx0X3JvdXRlX3NldFt1bml0XSA9IDA7CiAgICAgfQpkaWZmIC1OYXVyIHBwcC0yLjQu NC1vcmlnL3BwcGQvaXBjcC5oIHBwcC0yLjQuNC1kZWJpYW4vcHBwZC9pcGNwLmgKLS0tIHBwcC0y LjQuNC1vcmlnL3BwcGQvaXBjcC5oCTIwMDctMTItMDggMTY6Mjk6MTYgKzAyMDAKKysrIHBwcC0y LjQuNC1kZWJpYW4vcHBwZC9pcGNwLmgJMjAwNy0xMi0wOCAxNzozMzo0OCArMDIwMApAQCAtNzAs NiArNzAsNyBAQAogICAgIGJvb2wgb2xkX2FkZHJzOwkJLyogVXNlIG9sZCAoSVAtQWRkcmVzc2Vz KSBvcHRpb24/ICovCiAgICAgYm9vbCByZXFfYWRkcjsJCS8qIEFzayBwZWVyIHRvIHNlbmQgSVAg YWRkcmVzcz8gKi8KICAgICBib29sIGRlZmF1bHRfcm91dGU7CQkvKiBBc3NpZ24gZGVmYXVsdCBy b3V0ZSB0aHJvdWdoIGludGVyZmFjZT8gKi8KKyAgICBib29sIHJlcGxhY2VfZGVmYXVsdF9yb3V0 ZTsJLyogUmVwbGFjZSBkZWZhdWx0IHJvdXRlIHRocm91Z2ggaW50ZXJmYWNlPyAqLwogICAgIGJv b2wgcHJveHlfYXJwOwkJLyogTWFrZSBwcm94eSBBUlAgZW50cnkgZm9yIHBlZXI/ICovCiAgICAg Ym9vbCBuZWdfdmo7CQkvKiBWYW4gSmFjb2Jzb24gQ29tcHJlc3Npb24/ICovCiAgICAgYm9vbCBv bGRfdmo7CQkvKiB1c2Ugb2xkIChzaG9ydCkgZm9ybSBvZiBWSiBvcHRpb24/ICovCmRpZmYgLU5h dXIgcHBwLTIuNC40LW9yaWcvcHBwZC9wcHBkLjggcHBwLTIuNC40LWRlYmlhbi9wcHBkL3BwcGQu OAotLS0gcHBwLTIuNC40LW9yaWcvcHBwZC9wcHBkLjgJMjAwNy0xMi0wOCAxNjoyOToxNiArMDIw MAorKysgcHBwLTIuNC40LWRlYmlhbi9wcHBkL3BwcGQuOAkyMDA3LTEyLTA4IDE3OjMzOjQ4ICsw MjAwCkBAIC0xMjEsNiArMTIxLDExIEBACiBUaGlzIGVudHJ5IGlzIHJlbW92ZWQgd2hlbiB0aGUg UFBQIGNvbm5lY3Rpb24gaXMgYnJva2VuLiAgVGhpcyBvcHRpb24KIGlzIHByaXZpbGVnZWQgaWYg dGhlIFxmSW5vZGVmYXVsdHJvdXRlXGZSIG9wdGlvbiBoYXMgYmVlbiBzcGVjaWZpZWQuCiAuVFAK Ky5CIHJlcGxhY2VkZWZhdWx0cm91dGUKK1RoaXMgb3B0aW9uIGlzIGEgZmxhZyB0byB0aGUgZGVm YXVsdHJvdXRlIG9wdGlvbi4gSWYgZGVmYXVsdHJvdXRlIGlzCitzZXQgYW5kIHRoaXMgZmxhZyBp cyBhbHNvIHNldCwgcHBwZCByZXBsYWNlcyBhbiBleGlzdGluZyBkZWZhdWx0IHJvdXRlCit3aXRo IHRoZSBuZXcgZGVmYXVsdCByb3V0ZS4KKy5UUAogLkIgZGlzY29ubmVjdCBcZklzY3JpcHQKIEV4 ZWN1dGUgdGhlIGNvbW1hbmQgc3BlY2lmaWVkIGJ5IFxmSXNjcmlwdFxmUiwgYnkgcGFzc2luZyBp dCB0byBhCiBzaGVsbCwgYWZ0ZXIKQEAgLTcwNiw3ICs3MTEsMTIgQEAKIC5UUAogLkIgbm9kZWZh dWx0cm91dGUKIERpc2FibGUgdGhlIFxmSWRlZmF1bHRyb3V0ZVxmUiBvcHRpb24uICBUaGUgc3lz dGVtIGFkbWluaXN0cmF0b3Igd2hvCi13aXNoZXMgdG8gcHJldmVudCB1c2VycyBmcm9tIGNyZWF0 aW5nIGRlZmF1bHQgcm91dGVzIHdpdGggcHBwZAord2lzaGVzIHRvIHByZXZlbnQgdXNlcnMgZnJv bSBhZGRpbmcgYSBkZWZhdWx0IHJvdXRlIHdpdGggcHBwZAorY2FuIGRvIHNvIGJ5IHBsYWNpbmcg dGhpcyBvcHRpb24gaW4gdGhlIC9ldGMvcHBwL29wdGlvbnMgZmlsZS4KKy5UUAorLkIgbm9yZXBs YWNlZGVmYXVsdHJvdXRlCitEaXNhYmxlIHRoZSBcZklyZXBsYWNlZGVmYXVsdHJvdXRlXGZSIG9w dGlvbi4gVGhlIHN5c3RlbSBhZG1pbmlzdHJhdG9yIHdobword2lzaGVzIHRvIHByZXZlbnQgdXNl cnMgZnJvbSByZXBsYWNpbmcgYSBkZWZhdWx0IHJvdXRlIHdpdGggcHBwZAogY2FuIGRvIHNvIGJ5 IHBsYWNpbmcgdGhpcyBvcHRpb24gaW4gdGhlIC9ldGMvcHBwL29wdGlvbnMgZmlsZS4KIC5UUAog LkIgbm9kZWZsYXRlCmRpZmYgLU5hdXIgcHBwLTIuNC40LW9yaWcvcHBwZC9wcHBkLmggcHBwLTIu NC40LWRlYmlhbi9wcHBkL3BwcGQuaAotLS0gcHBwLTIuNC40LW9yaWcvcHBwZC9wcHBkLmgJMjAw Ny0xMi0wOCAxNjoyOToxNiArMDIwMAorKysgcHBwLTIuNC40LWRlYmlhbi9wcHBkL3BwcGQuaAky MDA3LTEyLTA4IDE3OjMzOjQ4ICswMjAwCkBAIC02NDIsNyArNjQyLDcgQEAKIGludCAgY2lmNmFk ZHIgX19QKChpbnQsIGV1aTY0X3QsIGV1aTY0X3QpKTsKIAkJCQkvKiBSZW1vdmUgYW4gSVB2NiBh ZGRyZXNzIGZyb20gaS9mICovCiAjZW5kaWYKLWludCAgc2lmZGVmYXVsdHJvdXRlIF9fUCgoaW50 LCB1X2ludDMyX3QsIHVfaW50MzJfdCkpOworaW50ICBzaWZkZWZhdWx0cm91dGUgX19QKChpbnQs IHVfaW50MzJfdCwgdV9pbnQzMl90LCBib29sIHJlcGxhY2VfZGVmYXVsdF9ydCkpOwogCQkJCS8q IENyZWF0ZSBkZWZhdWx0IHJvdXRlIHRocm91Z2ggaS9mICovCiBpbnQgIGNpZmRlZmF1bHRyb3V0 ZSBfX1AoKGludCwgdV9pbnQzMl90LCB1X2ludDMyX3QpKTsKIAkJCQkvKiBEZWxldGUgZGVmYXVs dCByb3V0ZSB0aHJvdWdoIGkvZiAqLwpkaWZmIC1OYXVyIHBwcC0yLjQuNC1vcmlnL3BwcGQvc3lz LWxpbnV4LmMgcHBwLTIuNC40LWRlYmlhbi9wcHBkL3N5cy1saW51eC5jCi0tLSBwcHAtMi40LjQt b3JpZy9wcHBkL3N5cy1saW51eC5jCTIwMDctMTItMDggMTY6Mjk6MTYgKzAyMDAKKysrIHBwcC0y LjQuNC1kZWJpYW4vcHBwZC9zeXMtbGludXguYwkyMDA3LTEyLTA4IDE3OjMzOjQ4ICswMjAwCkBA IC0yMDYsNiArMjA2LDggQEAKIAogc3RhdGljIGludAlpZl9pc191cDsJLyogSW50ZXJmYWNlIGhh cyBiZWVuIG1hcmtlZCB1cCAqLwogc3RhdGljIGludAloYXZlX2RlZmF1bHRfcm91dGU7CS8qIEdh dGV3YXkgZm9yIGRlZmF1bHQgcm91dGUgYWRkZWQgKi8KK3N0YXRpYyBzdHJ1Y3QJcnRlbnRyeSBv bGRfZGVmX3J0OwkvKiBPbGQgZGVmYXVsdCByb3V0ZSAqLworc3RhdGljIGludAlkZWZhdWx0X3J0 X3JlcGxfcmVzdDsJLyogcmVwbGFjZSBhbmQgcmVzdG9yZSBvbGQgZGVmYXVsdCBydCAqLwogc3Rh dGljIHVfaW50MzJfdCBwcm94eV9hcnBfYWRkcjsJLyogQWRkciBmb3IgcHJveHkgYXJwIGVudHJ5 IGFkZGVkICovCiBzdGF0aWMgY2hhciBwcm94eV9hcnBfZGV2WzE2XTsJCS8qIERldmljZSBmb3Ig cHJveHkgYXJwIGVudHJ5ICovCiBzdGF0aWMgdV9pbnQzMl90IG91cl9vbGRfYWRkcjsJCS8qIGZv ciBkZXRlY3RpbmcgYWRkcmVzcyBjaGFuZ2VzICovCkBAIC0xNTEzLDYgKzE1MTUsOSBAQAogCXAg PSBOVUxMOwogICAgIH0KIAorICAgIFNFVF9TQV9GQU1JTFkgKHJ0LT5ydF9kc3QsICAgICBBRl9J TkVUKTsKKyAgICBTRVRfU0FfRkFNSUxZIChydC0+cnRfZ2F0ZXdheSwgQUZfSU5FVCk7CisKICAg ICBTSU5fQUREUihydC0+cnRfZHN0KSA9IHN0cnRvdWwoY29sc1tyb3V0ZV9kZXN0X2NvbF0sIE5V TEwsIDE2KTsKICAgICBTSU5fQUREUihydC0+cnRfZ2F0ZXdheSkgPSBzdHJ0b3VsKGNvbHNbcm91 dGVfZ3dfY29sXSwgTlVMTCwgMTYpOwogICAgIFNJTl9BRERSKHJ0LT5ydF9nZW5tYXNrKSA9IHN0 cnRvdWwoY29sc1tyb3V0ZV9tYXNrX2NvbF0sIE5VTEwsIDE2KTsKQEAgLTE1ODIsMjAgKzE1ODcs NTEgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKgogICoKICAqIHNpZmRlZmF1bHRyb3V0ZSAtIGFzc2lnbiBhIGRl ZmF1bHQgcm91dGUgdGhyb3VnaCB0aGUgYWRkcmVzcyBnaXZlbi4KLSAqLwotCi1pbnQgc2lmZGVm YXVsdHJvdXRlIChpbnQgdW5pdCwgdV9pbnQzMl90IG91cmFkZHIsIHVfaW50MzJfdCBnYXRld2F5 KQotewotICAgIHN0cnVjdCBydGVudHJ5IHJ0OwotCi0gICAgaWYgKGRlZmF1bHRyb3V0ZV9leGlz dHMoJnJ0KSAmJiBzdHJjbXAocnQucnRfZGV2LCBpZm5hbWUpICE9IDApIHsKLQlpZiAocnQucnRf ZmxhZ3MgJiBSVEZfR0FURVdBWSkKLQkgICAgZXJyb3IoIm5vdCByZXBsYWNpbmcgZXhpc3Rpbmcg ZGVmYXVsdCByb3V0ZSB2aWEgJUkiLAotCQkgIFNJTl9BRERSKHJ0LnJ0X2dhdGV3YXkpKTsKLQll bHNlCisgKgorICogSWYgdGhlIGdsb2JhbCBkZWZhdWx0X3J0X3JlcGxfcmVzdCBmbGFnIGlzIHNl dCwgdGhlbiB0aGlzIGZ1bmN0aW9uCisgKiBhbHJlYWR5IHJlcGxhY2VkIHRoZSBvcmlnaW5hbCBz eXN0ZW0gZGVmYXVsdHJvdXRlIHdpdGggc29tZSBvdGhlcgorICogcm91dGUgYW5kIGl0IHNob3Vs ZCBqdXN0IHJlcGxhY2UgdGhlIGN1cnJlbnQgZGVmYXVsdHJvdXRlIHdpdGgKKyAqIGFub3RoZXIg b25lLCB3aXRob3V0IHNhdmluZyB0aGUgY3VycmVudCByb3V0ZS4gVXNlOiBkZW1hbmQgbW9kZSwK KyAqIHdoZW4gcHBwZCBzZXRzIGZpcnN0IGEgZGVmYXVsdHJvdXRlIGl0IGl0J3MgdGVtcG9yYXJ5 IHBwcDAgYWRkcmVzc2VzCisgKiBhbmQgdGhlbiBjaGFuZ2VzIHRoZSB0ZW1wb3JhcnkgYWRkcmVz c2VzIHRvIHRoZSBhZGRyZXNzZXMgZm9yIHRoZSByZWFsCisgKiBwcHAgY29ubmVjdGlvbiB3aGVu IGl0IGhhcyBjb21lIHVwLgorICovCisKK2ludCBzaWZkZWZhdWx0cm91dGUgKGludCB1bml0LCB1 X2ludDMyX3Qgb3VyYWRkciwgdV9pbnQzMl90IGdhdGV3YXksIGJvb2wgcmVwbGFjZSkKK3sKKyAg ICBzdHJ1Y3QgcnRlbnRyeSBydCwgdG1wX3J0OworICAgIHN0cnVjdCBydGVudHJ5ICpkZWxfcnQg PSBOVUxMOworCisgICAgaWYgKGRlZmF1bHRfcnRfcmVwbF9yZXN0KSB7CisJLyogV2UgaGF2ZSBh bHJlYWR5IHJlcGxhY2VkIHRoZSBvcmlnaW5hbCBkZWZhdWx0cm91dGUsIGlmIHdlCisJICAgYXJl IGNhbGxlZCBhZ2Fpbiwgd2Ugd2lsbCBkZWxldGUgdGhlIGN1cnJlbnQgZGVmYXVsdCByb3V0ZQor CSAgIGFuZCBzZXQgdGhlIG5ldyBkZWZhdWx0IHJvdXRlIGluIHRoaXMgZnVuY3Rpb24uCisJICAg LSB0aGlzIGlzIG5vcm1hbGx5IG9ubHkgdGhlIGNhc2UgdGhlIGRvaW5nIGRlbWFuZDogKi8KKwlp ZiAoZGVmYXVsdHJvdXRlX2V4aXN0cygmdG1wX3J0KSkKKwkgICAgZGVsX3J0ID0gJnRtcF9ydDsK KyAgICB9IGVsc2UgaWYgKGRlZmF1bHRyb3V0ZV9leGlzdHMoJm9sZF9kZWZfcnQpICYmCisJICAg ICAgIHN0cmNtcChvbGRfZGVmX3J0LnJ0X2RldiwgaWZuYW1lKSAhPSAwKSB7CisJLyogV2UgZGlk IG5vdCB5ZXQgcmVwbGFjZSBhbiBleGlzdGluZyBkZWZhdWx0IHJvdXRlLCBsZXQncworCSAgIGNo ZWNrIGlmIHdlIHNob3VsZCBzYXZlIGFuZCByZXBsYWNlIGEgZGVmYXVsdCByb3V0ZTogKi8KKwlp ZiAob2xkX2RlZl9ydC5ydF9mbGFncyAmIFJURl9HQVRFV0FZKSB7CisJICAgIGlmICghcmVwbGFj ZSkgeworCQllcnJvcigibm90IHJlcGxhY2luZyBleGlzdGluZyBkZWZhdWx0IHJvdXRlIHZpYSAl SSIsCisJCSAgICAgIFNJTl9BRERSKG9sZF9kZWZfcnQucnRfZ2F0ZXdheSkpOworCQlyZXR1cm4g MDsKKwkgICAgfSBlbHNlIHsKKwkJLyogd2UgbmVlZCB0byBjb3B5IHJ0X2RldiBiZWNhdXNlIHdl IG5lZWQgaXQgcGVybWFuZW50IHRvbzogKi8KKwkJY2hhciAqdG1wX2RldiA9IG1hbGxvYyhzdHJs ZW4ob2xkX2RlZl9ydC5ydF9kZXYpICsgMSk7CisJCXN0cmNweSh0bXBfZGV2LCBvbGRfZGVmX3J0 LnJ0X2Rldik7CisJCW9sZF9kZWZfcnQucnRfZGV2ID0gdG1wX2RldjsKKworCQlub3RpY2UoInJl cGxhY2luZyBvbGQgZGVmYXVsdCByb3V0ZSB0byAlcyBbJUldIiwKKwkJCW9sZF9kZWZfcnQucnRf ZGV2LCBTSU5fQUREUihvbGRfZGVmX3J0LnJ0X2dhdGV3YXkpKTsKKwkJZGVmYXVsdF9ydF9yZXBs X3Jlc3QgPSAxOworCQlkZWxfcnQgPSAmb2xkX2RlZl9ydDsKKwkgICAgfQorCX0gZWxzZQogCSAg ICBlcnJvcigibm90IHJlcGxhY2luZyBleGlzdGluZyBkZWZhdWx0IHJvdXRlIHRocm91Z2ggJXMi LAotCQkgIHJ0LnJ0X2Rldik7Ci0JcmV0dXJuIDA7CisJCSAgb2xkX2RlZl9ydC5ydF9kZXYpOwog ICAgIH0KIAogICAgIG1lbXNldCAoJnJ0LCAwLCBzaXplb2YgKHJ0KSk7CkBAIC0xNjEwLDEwICsx NjQ2LDE2IEBACiAKICAgICBydC5ydF9mbGFncyA9IFJURl9VUDsKICAgICBpZiAoaW9jdGwoc29j a19mZCwgU0lPQ0FERFJULCAmcnQpIDwgMCkgewotCWlmICggISBva19lcnJvciAoIGVycm5vICkp CisJaWYgKCFva19lcnJvcihlcnJubykpCiAJICAgIGVycm9yKCJkZWZhdWx0IHJvdXRlIGlvY3Rs KFNJT0NBRERSVCk6ICVtIik7CiAJcmV0dXJuIDA7CiAgICAgfQorICAgIGlmIChkZWZhdWx0X3J0 X3JlcGxfcmVzdCAmJiBkZWxfcnQpCisgICAgICAgIGlmIChpb2N0bChzb2NrX2ZkLCBTSU9DREVM UlQsIGRlbF9ydCkgPCAwKSB7CisJICAgIGlmICghb2tfZXJyb3IoZXJybm8pKQorCSAgICAgICAg ZXJyb3IoImRlbCBvbGQgZGVmYXVsdCByb3V0ZSBpb2N0bChTSU9DREVMUlQpOiAlbSIpOworCSAg ICByZXR1cm4gMDsKKyAgICAgICAgfQogCiAgICAgaGF2ZV9kZWZhdWx0X3JvdXRlID0gMTsKICAg ICByZXR1cm4gMTsKQEAgLTE2NDIsMTEgKzE2ODQsMjEgQEAKICAgICBydC5ydF9mbGFncyA9IFJU Rl9VUDsKICAgICBpZiAoaW9jdGwoc29ja19mZCwgU0lPQ0RFTFJULCAmcnQpIDwgMCAmJiBlcnJu byAhPSBFU1JDSCkgewogCWlmIChzdGlsbF9wcHAoKSkgewotCSAgICBpZiAoICEgb2tfZXJyb3Ig KCBlcnJubyApKQorCSAgICBpZiAoIW9rX2Vycm9yKGVycm5vKSkKIAkJZXJyb3IoImRlZmF1bHQg cm91dGUgaW9jdGwoU0lPQ0RFTFJUKTogJW0iKTsKIAkgICAgcmV0dXJuIDA7CiAJfQogICAgIH0K KyAgICBpZiAoZGVmYXVsdF9ydF9yZXBsX3Jlc3QpIHsKKwlub3RpY2UoInJlc3RvcmluZyBvbGQg ZGVmYXVsdCByb3V0ZSB0byAlcyBbJUldIiwKKwkJb2xkX2RlZl9ydC5ydF9kZXYsIFNJTl9BRERS KG9sZF9kZWZfcnQucnRfZ2F0ZXdheSkpOworICAgICAgICBpZiAoaW9jdGwoc29ja19mZCwgU0lP Q0FERFJULCAmb2xkX2RlZl9ydCkgPCAwKSB7CisJICAgIGlmICghb2tfZXJyb3IoZXJybm8pKQor CSAgICAgICAgZXJyb3IoInJlc3RvcmUgZGVmYXVsdCByb3V0ZSBpb2N0bChTSU9DQUREUlQpOiAl bSIpOworCSAgICByZXR1cm4gMDsKKyAgICAgICAgfQorICAgICAgICBkZWZhdWx0X3J0X3JlcGxf cmVzdCA9IDA7CisgICAgfQogCiAgICAgcmV0dXJuIDE7CiB9CmRpZmYgLU5hdXIgcHBwLTIuNC40 LW9yaWcvcHBwZC9zeXMtc29sYXJpcy5jIHBwcC0yLjQuNC1kZWJpYW4vcHBwZC9zeXMtc29sYXJp cy5jCi0tLSBwcHAtMi40LjQtb3JpZy9wcHBkL3N5cy1zb2xhcmlzLmMJMjAwNy0xMi0wOCAxNjoy OToxNiArMDIwMAorKysgcHBwLTIuNC40LWRlYmlhbi9wcHBkL3N5cy1zb2xhcmlzLmMJMjAwNy0x Mi0wOCAxNzozMzo0OCArMDIwMApAQCAtMjAzNiwxMiArMjAzNiwxOCBAQAogICogc2lmZGVmYXVs dHJvdXRlIC0gYXNzaWduIGEgZGVmYXVsdCByb3V0ZSB0aHJvdWdoIHRoZSBhZGRyZXNzIGdpdmVu LgogICovCiBpbnQKLXNpZmRlZmF1bHRyb3V0ZSh1LCBsLCBnKQorc2lmZGVmYXVsdHJvdXRlKHUs IGwsIGcsIHJlcGxhY2UpCiAgICAgaW50IHU7CiAgICAgdV9pbnQzMl90IGwsIGc7CisgICAgYm9v bCByZXBsYWNlOwogewogICAgIHN0cnVjdCBydGVudHJ5IHJ0OwogCisgICAgaWYgKHJlcGxhY2Up IHsKKwllcnJvcigicmVwbGFjZWRlZmF1bHRyb3V0ZSBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxh dGZvcm0iKTsKKwlyZXR1cm4gMDsKKyAgICB9CisKICNpZiBkZWZpbmVkKF9fVVNMQ19fKQogICAg IGcgPSBsOwkJCS8qIHVzZSB0aGUgbG9jYWwgYWRkcmVzcyBhcyBnYXRld2F5ICovCiAjZW5kaWYK