271277 2011-04-19 09:32:19 +0000 Skype plugin duplicates messages in conferences 2013-06-22 06:39:19 +0000 1 1 10 Unmaintained kopete Skype Plugin 1.0.80 Arch Linux Linux RESOLVED FIXED NOR normal --- 1 dreamwalker pali.rohar a.j.ball btsai Chain gurnaikv ignatius juan.baptiste j_kanev mail pali.rohar vo.zaeb http://commits.kde.org/kopete/0a53d7868b057e1b4d5a3f10a6115ce82e3bbfa2 4.11 61 oldest_to_newest 1109356 0 dreamwalker 2011-04-19 09:32:19 +0000 Version: 1.0.80 (using KDE 4.6.2) OS: Linux In a conference with skype contacts every message I write is displayed two times. Messages sent by other users are not duplicated. Reproducible: Always Steps to Reproduce: Open a chat window with several skype users (in one to one chat it's all ok) and type a message. Actual Results: Message is displayed in chat window two times. Expected Results: Message is displayed only once. 1123417 1 vo.zaeb 2011-05-26 18:45:42 +0000 I suffer from this, too. KDE 4.6.80 but in 4.6 I've had the same. The strange thing is that it happens not for all my skype contacts. And also for me it happens and in one to one chats. 1125931 2 vo.zaeb 2011-05-31 23:54:45 +0000 even if I'll open native skype chat window and send message from it, kopete still display duplicates. 1127469 3 juan.baptiste 2011-06-04 21:00:40 +0000 Also happens with kopete version from KDE 4.5.5, but I don't remember having this problem with skype 2.1.0.81, just since I upgraded to 2.2.0.25. 1134217 4 gurnaikv 2011-06-23 12:43:50 +0000 This is happening for me in KDE 4.6.4 (64bit): duplicate messages even in one-to-one Skype (2.2.0.35) chats. 1139452 5 ignatius 2011-07-08 02:05:20 +0000 Same issue, intermittently double posts same chat message, when using kopete chat window for Skype chat. openSUSE 11.4, Kopete 1.0.80 (KDE 4.6.0), Skype 2.2.0.35 dynamically linked version. 1153471 6 pali.rohar 2011-08-13 12:17:49 +0000 I think that problem appeared in this commit: http://websvn.kde.org/?view=revision&revision=1133818 Can somebody compile and try Kopete before this commit? 1154595 7 Chain 2011-08-17 11:02:55 +0000 Okay, will try to :) 1185342 8 pali.rohar 2011-11-14 20:00:45 +0000 @Richard Homonnai: Did you tried it? 1185398 9 Chain 2011-11-14 22:20:47 +0000 Didn't have any luck. I kind of destroyed my Qt and stopped than, after that I forgot about it. So let's try again. :) 1185455 10 Chain 2011-11-15 01:10:43 +0000 could someone please tell me the command to check out the right revision? Due to the Git migration I cannot find any information it seems... 1185502 11 pali.rohar 2011-11-15 07:19:10 +0000 kopete is still on svn. command to checkout revision before 1133818: $ svn co -r 1133817 svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork/kopete 1191209 12 pali.rohar 2011-11-27 20:23:37 +0000 CCing Benson Tsai, author of patch in commit 1133818. @Benson Tsai: Can you test if you have this problem too? @Richard Homonnai: Did you tested kopete version before 1133818? 1191641 13 Chain 2011-11-28 22:56:00 +0000 (In reply to comment #12) > @Richard Homonnai: > Did you tested kopete version before 1133818? Hi, I tried. a lot. But I just cannot compile it, using KDE 4.7.3. I am getting compile errors over and over. I seem to have fixed these now (it was about visibility) but now I have problems about videodev.h, which seems to be named otherwise on my system. In short, I am working on it :) 1233165 14 pali.rohar 2012-03-06 06:53:13 +0000 @Richard Homonnai: Any news? 1233796 15 Chain 2012-03-08 10:05:10 +0000 (In reply to comment #14) > @Richard Homonnai: > Any news? Hi, Sorry, I tried it multiple times, it's not easy to build unfortunately. Yesterday I started again from scratch. I have almost built it. But now I get headaches about videodev.h in libkopete - is there a way to exclude video devices also? 1234032 16 pali.rohar 2012-03-08 21:39:08 +0000 For disabling video use cmake param DISABLE_VIDEOSUPPORT cmake -DDISABLE_VIDEOSUPPORT=ON 1235578 17 Chain 2012-03-12 11:50:28 +0000 Thank you that worked. I have Kopete built now. So far, no duplicate messages. Trying for a few days... (using it instead of the new Kopete in 1.1.3, this is 1.0.80) 1235619 18 69536 pali.rohar 2012-03-12 13:37:15 +0000 Created attachment 69536 Patch for reverting revision 1133818 Ok, so if you are using kopete rev. 1133817 and there is no problem with duplicate messages, can you also try to last kopete from svn without patch introduced in revision 1133818? I attached patch against kopete trunk which revert revision 1133818. Apply it with patch -p2 -i <file> 1236263 19 Chain 2012-03-14 00:36:53 +0000 Unfortunately, no. I was chatting with the 1133817 revision the whole day, didn't get a single duplicated line, so I tried trunk + patch - it did work for a long while. And then it happened again. However, in the last updates the duplicate messages were getting less it seems. I looked through my logs. When I posted my first reply, almost every message I sent was duplicated. By now, only single ones - maybe some race condition. I will now revert to 1133817 - and tell you if it is still happening. As it seems, this commit is not the bad boy itself. 1236671 20 Chain 2012-03-15 02:27:35 +0000 No, the old version seems to have the same effect. It just happens from time to time. It's hard to track because at most times it seems to work now. Also, there is nothing visible, even with all debug output turned on. It's just... strange. It worked for like 6 hours, nothing happened. And then, out of nowhere, it started again. and it also stopped, just like it started. I really have no clue what it is. But it does not seem to make any difference whether the patch is there or not (maybe the probability of getting duplicates is different, though). Tomorrow I'll try it with the 4.7.4 version again and see if there are more occurences. 1348220 21 j_kanev 2013-03-06 10:21:48 +0000 Additional information (on debian sid): Message duplicating happens in 80% of cases, with no apparent cause. Message duplicating is independent of number of participants (happens in one-one chats as well). In Kopete window only my messages are duplicated, not those of the other participant(s). Kopete history plugin shows my messages duplicated as well. Skype history (opened in skype directly) shows messages from the same chant non-duplicated. 1374911 22 pali.rohar 2013-06-07 23:48:45 +0000 Git commit 0a53d7868b057e1b4d5a3f10a6115ce82e3bbfa2 by Pali Rohár. Committed on 07/06/2013 at 23:05. Pushed by pali into branch 'master'. Fix skype protocol code which was incorrectly ported to KDE4 * Fix some missing calls to trimmed() string function * Fix incorrect handling of duplicate skype messages * This is propably root problem of bug 271277 M +7 -7 protocols/skype/libskype/skype.cpp M +1 -1 protocols/skype/skypeaccount.cpp http://commits.kde.org/kopete/0a53d7868b057e1b4d5a3f10a6115ce82e3bbfa2 1374913 23 pali.rohar 2013-06-07 23:53:13 +0000 @j_kanev, @Richard: Can you test if this bug still occured? 1374916 24 Chain 2013-06-08 00:30:03 +0000 It is still very real, and very annoying, and hard to pinpoint. I will try your patch against 4.10.3 the next days :) 1378490 25 Chain 2013-06-21 11:24:23 +0000 The patch applied cleanly with Kopete 4.10.3 (using gentoo with userpatches) testing it now for a few days. It might take a while because this just happens (or happened) sometimes... 1378591 26 Chain 2013-06-21 20:36:07 +0000 Actually... this patch seems to fix quite some more of my skype problems, in particular, that some messages are never displayed in Kopete, when I receive them in Skype. Sending takes longer instead of being instantly shown - I guess this is because Skype does not acknowledge the receipt of it. This is quite fine for me however. I think I never reported that bug, but I will search for it. No groupchat so far, so I will have to wait for the other issue though. 1378593 27 pali.rohar 2013-06-21 20:43:11 +0000 Ok, so is git commit 0a53d7868b057e1b4d5a3f10a6115ce82e3bbfa2 fixing this bug? Also note that kopete skype plugin supports only skype client 2.x versions (old and new could not work correctly). 1378611 28 Chain 2013-06-21 22:48:50 +0000 It seems to be fixed. The sending delay vanished a reboot later, but not important for this bug. I am using Skype 4.2.0.11 by the way, it does not give me any real problems. Just sometimes it needs to long for startup, and the plugin times out. But a reconnect fixes that. Sometimes I get no contacts, sometimes not all of them, but again a reconnect fixes that. Just for a short notice. Oh, and DON'T use the button to set the preferences of Skype. It won't start until you delete your XML file. I will watch for the duplication for some time and report it, if it happens. So far, all is good. 1378655 29 pali.rohar 2013-06-22 06:39:19 +0000 Ok, if this duplicate messages bug returns back, reopen it. Now I close it as fixed. That button for setting preferences is for Skype 2.x, so it is normal that for new 4.x not working... 69536 2012-03-12 13:37:15 +0000 2013-06-21 20:43:24 +0000 Patch for reverting revision 1133818 skype-revert.patch text/plain 12546 pali.rohar SW5kZXg6IGtkZS9rb3BldGUvcHJvdG9jb2xzL3NreXBlL3NreXBlY2hhdHNlc3Npb24uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGtkZS9rb3BldGUvcHJvdG9jb2xzL3NreXBlL3NreXBlY2hhdHNlc3Npb24u Y3BwCShyZXZpc2lvbiAxMjg1MjI3KQorKysga2RlL2tvcGV0ZS9wcm90b2NvbHMvc2t5cGUvc2t5 cGVjaGF0c2Vzc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDcgKzYwLDcgQEAKIAkJICog QHBhcmFtIF9wcm90b2NvbCBSZWZlcmVuY2UgdG8gdGhlIFNreXBlIHByb3RvY29sCiAJCSAqIEBw YXJhbSBfYWNjb3VudCBSZWZlcmVuY2UgdG8gdGhlIGFjY291bnQgdGhpcyBjaGF0IGJlbG9uZ3Mg dG8KIAkJICovCi0JCVNreXBlQ2hhdFNlc3Npb25Qcml2YXRlKFNreXBlUHJvdG9jb2wgKl9wcm90 b2NvbCwgU2t5cGVBY2NvdW50ICpfYWNjb3VudCkgOiBtZXNzYWdlc1NlbnRRdWV1ZSgpeworCQlT a3lwZUNoYXRTZXNzaW9uUHJpdmF0ZShTa3lwZVByb3RvY29sICpfcHJvdG9jb2wsIFNreXBlQWNj b3VudCAqX2FjY291bnQpIHsKIAkJCWtEZWJ1ZyhTS1lQRV9ERUJVR19HTE9CQUwpOwogCQkJLy9z YXZlIGdpdmVuIHZhbHVlcwogCQkJYWNjb3VudCA9IF9hY2NvdW50OwpAQCAtODYsOCArODYsNiBA QAogCQlLQWN0aW9uTWVudSAqaW52aXRlQWN0aW9uOwogCQkvLy9UaGUgY29udGFjdCBpZiBhbnkg KGFuZCBvbmUpCiAJCVNreXBlQ29udGFjdCAqY29udGFjdDsKLQkJLy8vTWVzc2FnZSBxdWV1ZQot CQlRTWFwIDwgUVN0cmluZywgS29wZXRlOjpNZXNzYWdlID4gbWVzc2FnZXNTZW50UXVldWU7CiB9 OwogCiBzdGF0aWMgS29wZXRlOjpDb250YWN0UHRyTGlzdCBjb25zdHJ1Y3RMaXN0KFNreXBlQ29u dGFjdCAqY29udGFjdCkgewpAQCAtMjI2LDQzICsyMjQsMjQgQEAKIAl9CiB9CiAKLXZvaWQgU2t5 cGVDaGF0U2Vzc2lvbjo6c2VudE1lc3NhZ2UoY29uc3QgUUxpc3Q8S29wZXRlOjpDb250YWN0Kj4g KnJlY3YsIGNvbnN0IFFTdHJpbmcgJmJvZHksIGNvbnN0IFFTdHJpbmcgJmlkKSB7Ci0JS29wZXRl OjpNZXNzYWdlIG1lczsKLQlpZiAocmVjdi0+Y291bnQoKSA9PSAxKQotCQltZXMgPSBLb3BldGU6 Ok1lc3NhZ2UoZC0+YWNjb3VudC0+bXlzZWxmKCksICpyZWN2LT5iZWdpbigpKTsKLQllbHNlCi0J CW1lcyA9IEtvcGV0ZTo6TWVzc2FnZShkLT5hY2NvdW50LT5teXNlbGYoKSwgZC0+YWNjb3VudC0+ bXlzZWxmKCkpOwotCi0JbWVzLnNldERpcmVjdGlvbihLb3BldGU6Ok1lc3NhZ2U6Ok91dGJvdW5k KTsKLQltZXMuc2V0UGxhaW5Cb2R5KGJvZHkpOwotCi0Jc2VudE1lc3NhZ2UobWVzLCBpZCk7Ci19 Ci0KLXZvaWQgU2t5cGVDaGF0U2Vzc2lvbjo6c2VudE1lc3NhZ2UoS29wZXRlOjpNZXNzYWdlIG1l c3NhZ2UsIGNvbnN0IFFTdHJpbmcgJmlkKSB7Ci0JbWVzc2FnZS5zZXRTdGF0ZShpZC5pc0VtcHR5 KCk/S29wZXRlOjpNZXNzYWdlOjpTdGF0ZVNlbnQ6S29wZXRlOjpNZXNzYWdlOjpTdGF0ZVNlbmRp bmcpOwotCi0JYXBwZW5kTWVzc2FnZShtZXNzYWdlKTsKLQotCWlmKCFpZC5pc0VtcHR5KCkpewot CQlkLT5tZXNzYWdlc1NlbnRRdWV1ZVtpZF0gPSBtZXNzYWdlOwordm9pZCBTa3lwZUNoYXRTZXNz aW9uOjpzZW50TWVzc2FnZShjb25zdCBRTGlzdDxLb3BldGU6OkNvbnRhY3QqPiAqcmVjdiwgY29u c3QgUVN0cmluZyAmYm9keSkgeworCUtvcGV0ZTo6TWVzc2FnZSAqbWVzOworCWlmIChyZWN2LT5j b3VudCgpID09IDEpIHsKKwkJbWVzID0gbmV3IEtvcGV0ZTo6TWVzc2FnZShkLT5hY2NvdW50LT5t eXNlbGYoKSwgKnJlY3YtPmJlZ2luKCkpOworCQltZXMtPnNldERpcmVjdGlvbihLb3BldGU6Ok1l c3NhZ2U6Ok91dGJvdW5kKTsKKwkJbWVzLT5zZXRQbGFpbkJvZHkoYm9keSk7CisJfSBlbHNlIHsK KwkJbWVzID0gbmV3IEtvcGV0ZTo6TWVzc2FnZShkLT5hY2NvdW50LT5teXNlbGYoKSwgZC0+YWNj b3VudC0+bXlzZWxmKCkpOworCQltZXMtPnNldERpcmVjdGlvbihLb3BldGU6Ok1lc3NhZ2U6Ok91 dGJvdW5kKTsKKwkJbWVzLT5zZXRQbGFpbkJvZHkoYm9keSk7CiAJfQorCW1lcyA9IG5ldyBLb3Bl dGU6Ok1lc3NhZ2UoZC0+YWNjb3VudC0+bXlzZWxmKCksICpyZWN2KTsKKwltZXMtPnNldERpcmVj dGlvbihLb3BldGU6Ok1lc3NhZ2U6Ok91dGJvdW5kKTsKKwltZXMtPnNldFBsYWluQm9keShib2R5 KTsKKwlhcHBlbmRNZXNzYWdlKCptZXMpOworCWRlbGV0ZSBtZXM7CiB9CiAKLWJvb2wgU2t5cGVD aGF0U2Vzc2lvbjo6YWNrTWVzc2FnZShjb25zdCBRU3RyaW5nICZpZCwgYm9vbCBlcnJvcikgewot CWlmKCFkLT5tZXNzYWdlc1NlbnRRdWV1ZS5jb250YWlucyhpZCkpCi0JCXJldHVybiBmYWxzZTsK LQotCWlmKGVycm9yKQotCQlyZWNlaXZlZE1lc3NhZ2VTdGF0ZShkLT5tZXNzYWdlc1NlbnRRdWV1 ZVtpZF0uaWQoKSwgS29wZXRlOjpNZXNzYWdlOjpTdGF0ZUVycm9yICk7Ci0JZWxzZQotCQlyZWNl aXZlZE1lc3NhZ2VTdGF0ZShkLT5tZXNzYWdlc1NlbnRRdWV1ZVtpZF0uaWQoKSwgS29wZXRlOjpN ZXNzYWdlOjpTdGF0ZVNlbnQgKTsKLQotCWQtPm1lc3NhZ2VzU2VudFF1ZXVlLnJlbW92ZSAoaWQp OwotCi0JcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgU2t5cGVDaGF0U2Vzc2lvbjo6ZGlzYWxsb3dD YWxsKCkgewogCWQtPmNhbGxBY3Rpb24tPnNldEVuYWJsZWQoZmFsc2UpOwogCkluZGV4OiBrZGUv a29wZXRlL3Byb3RvY29scy9za3lwZS9saWJza3lwZS9za3lwZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtk ZS9rb3BldGUvcHJvdG9jb2xzL3NreXBlL2xpYnNreXBlL3NreXBlLmgJKHJldmlzaW9uIDEyODUy MjcpCisrKyBrZGUva29wZXRlL3Byb3RvY29scy9za3lwZS9saWJza3lwZS9za3lwZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yOTcsMTEgKzI5NywxMSBAQAogCQkgKi8KIAkJdm9pZCBnZXRDb250YWN0 QnVkZHkoY29uc3QgUVN0cmluZyAmY29udGFjdCk7CiAJCS8qKgotCQkgKiBTZW5kcyBhIG1lc3Nh Z2UgdHJvdWdoIHNreXBlLCByZXR1cm5zIHRoZSBtZXNzYWdlIGlkCisJCSAqIFNlbmRzIGEgbWVz c2FnZSB0cm91Z2ggc2t5cGUKIAkJICogQHBhcmFtIHVzZXIgVG8gd2hvIGl0IHNob3VsZCBiZSBz ZW50CiAJCSAqIEBwYXJhbSBib2R5IFdoYXQgdG8gc2VuZAogCQkgKi8KLQkJUVN0cmluZyBzZW5k KGNvbnN0IFFTdHJpbmcgJnVzZXIsIGNvbnN0IFFTdHJpbmcgJmJvZHkpOworCQl2b2lkIHNlbmQo Y29uc3QgUVN0cmluZyAmdXNlciwgY29uc3QgUVN0cmluZyAmYm9keSk7CiAJCS8qKgogCQkgKiBF ZGl0IHNlbnQgbWVzc2FnZQogCQkgKiBAcGFyYW0gbWVzc2FnZUlkIElkIG9mIHNlbnQgbWVzc2Fn ZQpAQCAtMzEzLDcgKzMxMyw3IEBACiAJCSAqIEBwYXJhbSBjaGF0IFdoYXQgY2hhdCB0byBzZW5k IGl0IGluCiAJCSAqIEBwYXJhbSBib2R5IFRleHQgb2YgdGhhdCBtZXNzYWdlCiAJCSAqLwotCQlR U3RyaW5nIHNlbmRUb0NoYXQoY29uc3QgUVN0cmluZyAmY2hhdCwgY29uc3QgUVN0cmluZyAmYm9k eSk7CisJCXZvaWQgc2VuZFRvQ2hhdChjb25zdCBRU3RyaW5nICZjaGF0LCBjb25zdCBRU3RyaW5n ICZib2R5KTsKIAkJLyoqCiAJCSAqIEJlZ2lucyBuZXcgY2FsbC4KIAkJICogQHBhcmFtIHVzZXJJ ZCBJRCBvZiB1c2VyIHRvIGNhbGwgKG9yIG11bHRpcGxlIHVzZXJzIHNlcGFyYXRlZCBieSBjb21h cykKQEAgLTU2MSw3ICs1NjEsNyBAQAogCQkgKiBAcGFyYW0gYm9keSBUZXh0IG9mIHRoZSBtZXNz YWdlCiAJCSAqIEBwYXJhbSBjaGF0IElkIG9mIHRoZSBjaGF0IGl0IGhhcyBiZWVuIHNlbnQgdG8K IAkJICovCi0JCXZvaWQgb3V0Z29pbmdNZXNzYWdlKGNvbnN0IFFTdHJpbmcgJmlkLCBjb25zdCBR U3RyaW5nICZib2R5LCBjb25zdCBRU3RyaW5nICZjaGF0KTsKKwkJdm9pZCBvdXRnb2luZ01lc3Nh Z2UoY29uc3QgUVN0cmluZyAmYm9keSwgY29uc3QgUVN0cmluZyAmY2hhdCk7CiAJCS8qKgogCQkg KiBQdXQgdGhpcyBjYWxsIGludG8gYSBncm91cCwgd2hlcmUgb3RoZXIgY2FsbHMgYXJlICh3aWxs IGJlKSwgdXNlZCB3aXRoIGNvbmZlcmVuY2UgY2FsbHMKIAkJICogQHBhcmFtIGNhbGxJZCBJZCBv ZiB0aGUgY2FsbApJbmRleDoga2RlL2tvcGV0ZS9wcm90b2NvbHMvc2t5cGUvbGlic2t5cGUvc2t5 cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIGtkZS9rb3BldGUvcHJvdG9jb2xzL3NreXBlL2xpYnNreXBl L3NreXBlLmNwcAkocmV2aXNpb24gMTI4NTIyNykKKysrIGtkZS9rb3BldGUvcHJvdG9jb2xzL3Nr eXBlL2xpYnNreXBlL3NreXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMxLDEzICs0MzEsMTMg QEAKIAkJCX0gZWxzZSBpZiAodmFsdWUgPT0gIlNFTlQiKSB7Ly9TZW5kaW5nIG91dCBzb21lIG1l c3NhZ2UsIHRoYXQgbWVhbnMgaXQgaXMgYSBuZXcgb25lCiAJCQkJaWYgKChkLT5jb25uZWN0aW9u ICUgUVN0cmluZygiR0VUIENIQVRNRVNTQUdFICUxIFRZUEUiKS5hcmcobWVzc2FnZUlkKSkuc2Vj dGlvbignICcsIDMsIDMpLnRyaW1tZWQoKS50b1VwcGVyKCkgPT0gIlNBSUQiKS8vaXQgaXMgc29t ZSBtZXNzYWdlIEknbSBpbnRlcmVzdGVkIGluCiAJCQkJCWVtaXQgZ290TWVzc2FnZUlkKG1lc3Nh Z2VJZCk7Ly9Tb21lb25lIG1heSBiZSBpbnRlcmVzdGVkIGluIGl0cyBJRAotCQkJCWlmIChkLT5y ZWN2TWVzc2FnZXMuaW5kZXhPZihtZXNzYWdlSWQpICE9IGQtPnJlY3ZNZXNzYWdlcy5sYXN0SW5k ZXhPZihRUmVnRXhwKG1lc3NhZ2VJZCkpKQotCQkJCQlyZXR1cm47Ly93ZSBhbHJlYWR5IGdvdCB0 aGlzIG9uZQotCQkJCWQtPnJlY3ZNZXNzYWdlcyA8PCBtZXNzYWdlSWQ7Ci0JCQkJY29uc3QgUVN0 cmluZyAmY2hhdCA9IChkLT5jb25uZWN0aW9uICUgUVN0cmluZygiR0VUIENIQVRNRVNTQUdFICUx IENIQVROQU1FIikuYXJnKG1lc3NhZ2VJZCkpLnNlY3Rpb24oJyAnLCAzLCAzKS50cmltbWVkKCk7 Ci0JCQkJY29uc3QgUVN0cmluZyAmYm9keSA9IChkLT5jb25uZWN0aW9uICUgUVN0cmluZygiR0VU IENIQVRNRVNTQUdFICUxIEJPRFkiKS5hcmcobWVzc2FnZUlkKSkuc2VjdGlvbignICcsIDMpOwot CQkJCWlmICghYm9keS5pc0VtcHR5KCkpLy9zb21ldGltZXMgc2t5cGUgc2hvd3MgZW1wdHkgbWVz c2FnZXMsIGp1c3QgaWdub3JlIHRoZW0KLQkJCQkJZW1pdCBvdXRnb2luZ01lc3NhZ2UobWVzc2Fn ZUlkLCBib2R5LCBjaGF0KTsKKwkJCQkJaWYgKGQtPnJlY3ZNZXNzYWdlcy5pbmRleE9mKG1lc3Nh Z2VJZCkgIT0gZC0+cmVjdk1lc3NhZ2VzLmxhc3RJbmRleE9mKFFSZWdFeHAobWVzc2FnZUlkKSkp CisJCQkJCQlyZXR1cm47Ly93ZSBhbHJlYWR5IGdvdCB0aGlzIG9uZQorCQkJCQlkLT5yZWN2TWVz c2FnZXMgPDwgbWVzc2FnZUlkOworCQkJCQljb25zdCBRU3RyaW5nICZjaGF0ID0gKGQtPmNvbm5l Y3Rpb24gJSBRU3RyaW5nKCJHRVQgQ0hBVE1FU1NBR0UgJTEgQ0hBVE5BTUUiKS5hcmcobWVzc2Fn ZUlkKSkuc2VjdGlvbignICcsIDMsIDMpLnRyaW1tZWQoKTsKKwkJCQkJY29uc3QgUVN0cmluZyAm Ym9keSA9IChkLT5jb25uZWN0aW9uICUgUVN0cmluZygiR0VUIENIQVRNRVNTQUdFICUxIEJPRFki KS5hcmcobWVzc2FnZUlkKSkuc2VjdGlvbignICcsIDMpOworCQkJCQlpZiAoIWJvZHkuaXNFbXB0 eSgpKS8vc29tZXRpbWVzIHNreXBlIHNob3dzIGVtcHR5IG1lc3NhZ2VzLCBqdXN0IGlnbm9yZSB0 aGVtCisJCQkJCQllbWl0IG91dGdvaW5nTWVzc2FnZShib2R5LCBjaGF0KTsKIAkJCX0KIAkJfSBl bHNlIGlmICggdHlwZSA9PSAiRURJVEVEX1RJTUVTVEFNUCIgKSB7Ly90aW1lc3RhbXAgb2YgbWVz c2FnZSB3YXMgZWRpdGVkCiAJCQkvLy9UT0RPOiBJbXBsZW1lbnQgdGhpcwpAQCAtNTQ2LDEwICs1 NDYsOCBAQAogCQlpZiAobmFtZS5pc0VtcHR5KCkpCiAJCQluYW1lID0gdXNlcjsKIAkJZW1pdCBz ZXRNeXNlbGZOYW1lKG5hbWUpOwotCX0gZWxzZSBpZiAobWVzc2FnZVR5cGUgPT0gIlBPTkciKSB7 Ci0JCS8vIERvIG5vdGhpbmcKIAl9IGVsc2UgewotCQlrRGVidWcoU0tZUEVfREVCVUdfR0xPQkFM KSA8PCAiVW5rbm93biBtZXNzYWdlIiA8PCBtZXNzYWdlIDw8ICJvZiB0eXBlIiA8PCBtZXNzYWdl VHlwZTsKKwkJa0RlYnVnKFNLWVBFX0RFQlVHX0dMT0JBTCkgPDwgIlVua25vdyBtZXNzYWdlIiA8 PCBtZXNzYWdlOwogCX0KIH0KIApAQCAtNjcwLDE3ICs2NjgsMTAgQEAKIAl9CiB9CiAKLVFTdHJp bmcgU2t5cGU6OnNlbmQoY29uc3QgUVN0cmluZyAmdXNlciwgY29uc3QgUVN0cmluZyAmbWVzc2Fn ZSkgewordm9pZCBTa3lwZTo6c2VuZChjb25zdCBRU3RyaW5nICZ1c2VyLCBjb25zdCBRU3RyaW5n ICZtZXNzYWdlKSB7CiAJa0RlYnVnKFNLWVBFX0RFQlVHX0dMT0JBTCk7CiAKLQlRU3RyaW5nIHJl c3AgPSBkLT5jb25uZWN0aW9uICUgKFFTdHJpbmcoIk1FU1NBR0UgJTEgJTIiKS5hcmcodXNlciku YXJnKG1lc3NhZ2UpKTsvL2p1c3QgYXNrIHNreXBlIHRvIHNlbmQgaXQKLQotCVFTdHJpbmcgbWVz c2FnZVR5cGUgPSByZXNwLnNlY3Rpb24oJyAnLCAwLCAwKS50cmltbWVkKCkudG9VcHBlcigpOwot CWlmIChtZXNzYWdlVHlwZSA9PSAiQ0hBVE1FU1NBR0UiKSB7Ci0JCVFTdHJpbmcgbWVzc2FnZUlk ID0gcmVzcC5zZWN0aW9uKCcgJywgMSwgMSkudHJpbW1lZCgpOwotCQlyZXR1cm4gbWVzc2FnZUlk OwotCX0KLQlyZXR1cm4gUVN0cmluZygpOworCWQtPmNvbm5lY3Rpb24gPDwgUVN0cmluZygiTUVT U0FHRSAlMSAlMiIpLmFyZyh1c2VyKS5hcmcobWVzc2FnZSk7Ly9qdXN0IGFzayBza3lwZSB0byBz ZW5kIGl0CiB9CiAKIHZvaWQgU2t5cGU6OmVkaXRNZXNzYWdlKGludCBtZXNzYWdlSWQsIGNvbnN0 IFFTdHJpbmcgJm5ld01lc3NhZ2UpIHsKQEAgLTc2OSwxOCArNzYwLDE1IEBACiAJZC0+d2FpdEJl Zm9yZUNvbm5lY3QgPSB2YWx1ZTsKIH0KIAotUVN0cmluZyBTa3lwZTo6c2VuZFRvQ2hhdChjb25z dCBRU3RyaW5nICZjaGF0LCBjb25zdCBRU3RyaW5nICZtZXNzYWdlKSB7Cit2b2lkIFNreXBlOjpz ZW5kVG9DaGF0KGNvbnN0IFFTdHJpbmcgJmNoYXQsIGNvbnN0IFFTdHJpbmcgJm1lc3NhZ2UpIHsK IAlrRGVidWcoU0tZUEVfREVCVUdfR0xPQkFMKTsKIAotCVFTdHJpbmcgcmVzcCA9IGQtPmNvbm5l Y3Rpb24gJSAoUVN0cmluZygiQ0hBVE1FU1NBR0UgJTEgJTIiKS5hcmcoY2hhdCkuYXJnKG1lc3Nh Z2UpKTsKLQotCi0JUVN0cmluZyBtZXNzYWdlVHlwZSA9IHJlc3Auc2VjdGlvbignICcsIDAsIDAp LnRyaW1tZWQoKS50b1VwcGVyKCk7Ci0JaWYgKG1lc3NhZ2VUeXBlID09ICJDSEFUTUVTU0FHRSIp IHsKLQkJUVN0cmluZyBtZXNzYWdlSWQgPSByZXNwLnNlY3Rpb24oJyAnLCAxLCAxKS50cmltbWVk KCk7Ci0JCXJldHVybiBtZXNzYWdlSWQ7CisJaWYgKGQtPmNvbm5lY3Rpb24ucHJvdG9jb2xWZXIo KSA8PSA0KSB7Ly9Ob3QgYWJsZSB0byBoYW5kbGUgaXQgYnkgdGhlIEFQSSwgbGV0IFNreXBlIGRv IGl0IGZvciBtZQorCQlkLT5jb25uZWN0aW9uIDw8IFFTdHJpbmcoIk9QRU4gQ0hBVCAlMSAlMiIp LmFyZyhjaGF0KS5hcmcobWVzc2FnZSk7CisJCWVtaXQgZ290TWVzc2FnZUlkKCIiKTsKKwl9IGVs c2UgeworCQlkLT5jb25uZWN0aW9uIDw8IFFTdHJpbmcoIkNIQVRNRVNTQUdFICUxICUyIikuYXJn KGNoYXQpLmFyZyhtZXNzYWdlKTsKIAl9Ci0JcmV0dXJuIFFTdHJpbmcoKTsKIH0KIAogdm9pZCBT a3lwZTo6Z2V0VG9waWMoY29uc3QgUVN0cmluZyAmY2hhdCkgewpJbmRleDoga2RlL2tvcGV0ZS9w cm90b2NvbHMvc2t5cGUvc2t5cGVhY2NvdW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2RlL2tvcGV0ZS9w cm90b2NvbHMvc2t5cGUvc2t5cGVhY2NvdW50LmgJKHJldmlzaW9uIDEyODUyMjcpCisrKyBrZGUv a29wZXRlL3Byb3RvY29scy9za3lwZS9za3lwZWFjY291bnQuaAkod29ya2luZyBjb3B5KQpAQCAt MTI0LDcgKzEyNCw3IEBACiAJCSAqIEBwYXJhbSBib2R5IFRleHQgb2YgdGhlIG1lc3NhZ2UKIAkJ ICogQHBhcmFtIGNoYXQgSWQgb2YgdGhlIGNoYXQgaXQgd2FzIHNlbnQgdG8KIAkJICovCi0JCXZv aWQgc2VudE1lc3NhZ2UoY29uc3QgUVN0cmluZyAmaWQsIGNvbnN0IFFTdHJpbmcgJmJvZHksIGNv bnN0IFFTdHJpbmcgJmNoYXQpOworCQl2b2lkIHNlbnRNZXNzYWdlKGNvbnN0IFFTdHJpbmcgJmJv ZHksIGNvbnN0IFFTdHJpbmcgJmNoYXQpOwogCQkvKioKIAkJICogQW4gSWQgb2Ygc29tZSBtZXNz YWdlIGlzIGtub3duLCB1c2UgaXQKIAkJICogQHBhcmFtIG1lc3NhZ2VJZCBOZXcgaWQgb2YgdGhh dCBtZXNzYWdlCkluZGV4OiBrZGUva29wZXRlL3Byb3RvY29scy9za3lwZS9za3lwZWNoYXRzZXNz aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0ga2RlL2tvcGV0ZS9wcm90b2NvbHMvc2t5cGUvc2t5cGVjaGF0 c2Vzc2lvbi5oCShyZXZpc2lvbiAxMjg1MjI3KQorKysga2RlL2tvcGV0ZS9wcm90b2NvbHMvc2t5 cGUvc2t5cGVjaGF0c2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC05NSwyMiArOTUsOSBAQAog CQkgKiBUaGlzIHdpbGwgYWRkIG1lc3NhZ2UgdGhhdCBoYXMgYmVlbiBzZW50IG91dCBieSB0aGlz IHVzZXIKIAkJICogQHBhcmFtIHJlY3YgTGlzdCBvZiByZWNlaXZlcnMuIElmIHRoZXJlIGFyZSBt b3JlIHRoYW4gb25lLCByZXBsYWNlZCBieSBhbiBkdW1teSBjb250YWN0IG9mIHRoYXQgY2hhdCwg YmVjYXVzZSBpdCBkb2VzIGNyYXNoIGtvcGV0ZSBvdGhlcndpc2UKIAkJICogQHBhcmFtIGJvZHkg VGV4dCB0byBzaG93Ci0JCSAqIEBwYXJhbSBpZCBJZCBvZiB0aGUgbWVzc2FnZSwgbm90IGVtcHR5 IGlmIGFuIGFja25vd2xlZGdlbWVudCBpcyBleHBlY3RlZAogCQkgKi8KLQkJdm9pZCBzZW50TWVz c2FnZShjb25zdCBRTGlzdDxLb3BldGU6OkNvbnRhY3QqPiAqcmVjdiwgY29uc3QgUVN0cmluZyAm Ym9keSwgY29uc3QgUVN0cmluZyAmaWQgPSBRU3RyaW5nKCkpOworCQl2b2lkIHNlbnRNZXNzYWdl KGNvbnN0IFFMaXN0PEtvcGV0ZTo6Q29udGFjdCo+ICpyZWN2LCBjb25zdCBRU3RyaW5nICZib2R5 KTsKIAkJLyoqCi0JCSAqIFRoaXMgd2lsbCBhZGQgbWVzc2FnZSB0aGF0IGhhcyBiZWVuIHNlbnQg b3V0IGJ5IHRoaXMgdXNlcgotCQkgKiBAcGFyYW0gbWVzc2FnZSBNZXNzYWdlIHRvIHNob3cKLQkJ ICogQHBhcmFtIGlkIElkIG9mIHRoZSBtZXNzYWdlLCBub3QgZW1wdHkgaWYgYW4gYWNrbm93bGVk Z2VtZW50IGlzIGV4cGVjdGVkCi0JCSAqLwotCQl2b2lkIHNlbnRNZXNzYWdlKEtvcGV0ZTo6TWVz c2FnZSBtZXNzYWdlLCBjb25zdCBRU3RyaW5nICZpZD0iIik7Ci0JCS8qKgotCQkgKiBUaGlzIHdp bGwgbWFyayBhIG1lc3NhZ2UgYXMgYWNrbm93bGVnZWQgYW5kIHJldHVybiB0cnVlIGlmIHN1Y2Nl c3NmdWwKLQkJICogQHBhcmFtIGlkIFRoZSBpZCBvZiB0aGUgbWVzc2FnZQotCQkgKiBAcGFyYW0g ZXJyb3IgV2hldGhlciBvciBub3QgYW4gZXJyb3IgaGFwcGVuZWQKLQkJICovCi0JCWJvb2wgYWNr TWVzc2FnZShjb25zdCBRU3RyaW5nICZpZCwgYm9vbCBlcnJvcj1mYWxzZSk7Ci0JCS8qKgogCQkq IEludml0ZXMgYSBjb250YWN0IHRvIHRoZSBjaGF0CiAJCSogQHBhcmFtIGNvbnRhY3RJZCBXaGF0 IGNvbnRhY3QKIAkJKi8KSW5kZXg6IGtkZS9rb3BldGUvcHJvdG9jb2xzL3NreXBlL3NreXBlYWNj b3VudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0ga2RlL2tvcGV0ZS9wcm90b2NvbHMvc2t5cGUvc2t5cGVh Y2NvdW50LmNwcAkocmV2aXNpb24gMTI4NTIyNykKKysrIGtkZS9rb3BldGUvcHJvdG9jb2xzL3Nr eXBlL3NreXBlYWNjb3VudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw3ICsxNTUsNyBAQAog CVFPYmplY3Q6OmNvbm5lY3QoJmQtPnNreXBlLCBTSUdOQUwobmV3Q2FsbChRU3RyaW5nLFFTdHJp bmcpKSwgdGhpcywgU0xPVChuZXdDYWxsKFFTdHJpbmcsUVN0cmluZykpKTsKIAlRT2JqZWN0Ojpj b25uZWN0KCZkLT5za3lwZSwgU0lHTkFMKHNldE15c2VsZk5hbWUoUVN0cmluZykpLCB0aGlzLCBT TE9UKHNldE15c2VsZk5hbWUoUVN0cmluZykpKTsKIAlRT2JqZWN0Ojpjb25uZWN0KCZkLT5za3lw ZSwgU0lHTkFMKHJlY2VpdmVkTXVsdGlJTShRU3RyaW5nLFFTdHJpbmcsUVN0cmluZyxRU3RyaW5n LFFEYXRlVGltZSkpLCB0aGlzLCBTTE9UKHJlY2VpdmVNdWx0aUltKFFTdHJpbmcsUVN0cmluZyxR U3RyaW5nLFFTdHJpbmcsUURhdGVUaW1lKSkpOwotCVFPYmplY3Q6OmNvbm5lY3QoJmQtPnNreXBl LCBTSUdOQUwob3V0Z29pbmdNZXNzYWdlKFFTdHJpbmcsUVN0cmluZyxRU3RyaW5nKSksIHRoaXMs IFNMT1Qoc2VudE1lc3NhZ2UoUVN0cmluZyxRU3RyaW5nLFFTdHJpbmcpKSk7CisJUU9iamVjdDo6 Y29ubmVjdCgmZC0+c2t5cGUsIFNJR05BTChvdXRnb2luZ01lc3NhZ2UoUVN0cmluZyxRU3RyaW5n KSksIHRoaXMsIFNMT1Qoc2VudE1lc3NhZ2UoUVN0cmluZyxRU3RyaW5nKSkpOwogCVFPYmplY3Q6 OmNvbm5lY3QoJmQtPnNreXBlLCBTSUdOQUwoZ3JvdXBDYWxsKFFTdHJpbmcsUVN0cmluZykpLCB0 aGlzLCBTTE9UKGdyb3VwQ2FsbChRU3RyaW5nLFFTdHJpbmcpKSk7CiAJUU9iamVjdDo6Y29ubmVj dCgmZC0+c2t5cGUsIFNJR05BTChyZWNlaXZlZEF1dGgoUVN0cmluZyxRU3RyaW5nKSksIHRoaXMs IFNMT1QocmVjZWl2ZWRBdXRoKFFTdHJpbmcsUVN0cmluZykpKTsKIAlRT2JqZWN0Ojpjb25uZWN0 KEtvcGV0ZTo6Q29udGFjdExpc3Q6OnNlbGYoKSwgU0lHTkFMKGdyb3VwUmVtb3ZlZChLb3BldGU6 Okdyb3VwKikpLCB0aGlzLCBTTE9UKGRlbGV0ZUdyb3VwKEtvcGV0ZTo6R3JvdXAqKSkgKTsKQEAg LTQ0MSwyNSArNDQxLDE2IEBACiB2b2lkIFNreXBlQWNjb3VudDo6c2VuZE1lc3NhZ2UoS29wZXRl OjpNZXNzYWdlICZtZXNzYWdlLCBjb25zdCBRU3RyaW5nICZjaGF0KSB7CiAJa0RlYnVnKFNLWVBF X0RFQlVHX0dMT0JBTCk7CiAKLQlRU3RyaW5nIGlkOwogCWlmIChjaGF0LmlzRW1wdHkoKSkgewog CQljb25zdCBRU3RyaW5nICZ1c2VyID0gbWVzc2FnZS50bygpLmF0KDApLT5jb250YWN0SWQoKTsv L2dldCBpZCBvZiB0aGUgZmlyc3QgY29udGFjdCwgbWVzc2FnZXMgdG8gbXVsdGlwbGUgcGVvcGxl IGFyZSBub3QgeWV0IHBvc3NpYmxlCiAJCWNvbnN0IFFTdHJpbmcgJmJvZHkgPSBtZXNzYWdlLnBs YWluQm9keSgpLnRyaW1tZWQoKTsvL2dldCB0aGUgdGV4dCBvZiB0aGUgbWVzc2FnZQogCi0JCWlk ID0gZC0+c2t5cGUuc2VuZCh1c2VyLCBib2R5KTsvL3NlbmQgaXQgYnkgc2t5cGUKKwkJZC0+c2t5 cGUuc2VuZCh1c2VyLCBib2R5KTsvL3NlbmQgaXQgYnkgc2t5cGUKIAl9IGVsc2UgewogCQljb25z dCBRU3RyaW5nICZib2R5ID0gbWVzc2FnZS5wbGFpbkJvZHkoKS50cmltbWVkKCk7Ci0JCWlkID0g ZC0+c2t5cGUuc2VuZFRvQ2hhdChjaGF0LCBib2R5KTsKLQl9CiAKLQkvLyBBcHBlbmQgbWVzc2Fn ZSB0byBjaGF0IHNlc3Npb24KLQlRU3RyaW5nIGNoYXRJZCA9IGQtPnNreXBlLmdldE1lc3NhZ2VD aGF0KGlkKTsKLQotCS8vIFVzZSBsYXN0IHNlc3Npb24gaWYgYXZhaWxhYmxlIChjb3VsZCBiZSBz ZXQgYnkgc2t5cGVjaGF0c2Vzc2lvbikKLQlTa3lwZUNoYXRTZXNzaW9uICpzZXNzaW9uID0gZC0+ bGFzdFNlc3Npb24/ZC0+bGFzdFNlc3Npb246ZC0+c2Vzc2lvbnMudmFsdWUoY2hhdElkKTsKLQot CWlmKHNlc3Npb24pCi0JCXNlc3Npb24tPnNlbnRNZXNzYWdlKG1lc3NhZ2UsIGlkKTsKKwkJZC0+ c2t5cGUuc2VuZFRvQ2hhdChjaGF0LCBib2R5KTsKKwl9CiB9CiAKIGJvb2wgU2t5cGVBY2NvdW50 OjpnZXRIaXRjaEhpa2UoKSBjb25zdCB7CkBAIC03MTMsMTQgKzcwNCwxMSBAQAogCWQtPmxhc3RT ZXNzaW9uID0gMEw7CiB9CiAKLXZvaWQgU2t5cGVBY2NvdW50OjpzZW50TWVzc2FnZShjb25zdCBR U3RyaW5nICZpZCwgY29uc3QgUVN0cmluZyAmYm9keSwgY29uc3QgUVN0cmluZyAmY2hhdCkgewor dm9pZCBTa3lwZUFjY291bnQ6OnNlbnRNZXNzYWdlKGNvbnN0IFFTdHJpbmcgJmJvZHksIGNvbnN0 IFFTdHJpbmcgJmNoYXQpIHsKIAlrRGVidWcoU0tZUEVfREVCVUdfR0xPQkFMKSA8PCAiY2hhdDog IiA8PCBjaGF0OwogCiAJU2t5cGVDaGF0U2Vzc2lvbiAqc2Vzc2lvbiA9IGQtPnNlc3Npb25zLnZh bHVlKGNoYXQpOwogCi0JaWYgKCAhIHNlc3Npb24gfHwgc2Vzc2lvbi0+YWNrTWVzc2FnZShpZCwg ZmFsc2UpICkKLQkJcmV0dXJuOwotCiAJY29uc3QgUVN0cmluZ0xpc3QgJnVzZXJzID0gZC0+c2t5 cGUuZ2V0Q2hhdFVzZXJzKGNoYXQpOwogCVFMaXN0PEtvcGV0ZTo6Q29udGFjdCo+ICpyZWN2ID0g MEw7CiAK