From alex323@gmail.com Sun Nov 6 04:14:08 2005 From: alex323@gmail.com (Alex) Date: Sat, 05 Nov 2005 23:14:08 -0500 Subject: [OTR-dev] Possible infinate loop flaw in CVS Message-ID: <436D8310.6090705@gmail.com> This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1EF2419C81D2F5E6F58A0B95 Content-Type: multipart/alternative; boundary="------------040603080505080303010308" This is a multi-part message in MIME format. --------------040603080505080303010308 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Alex and Bob are talking on a secure channel. Alex has OTR version 2. Bob is using version 1. Both Alex and Bob have OPPORTUNISTIC set. The following message is sent to Bob from Alex: (23:05:21) *Alex:* Anyway, OTRv2 has been released to CVS. The following messages are flooded back and fourth, causing an infinate loop (notice timestamps): (23:05:21) *OTR Error: You transmitted a malformed data message* (23:05:22) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:22) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:22) *The last message to Bob was resent.* (23:05:22) *OTR Error: You transmitted a malformed data message* (23:05:22) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:22) *The last message to Bob was resent.* (23:05:22) *OTR Error: You transmitted a malformed data message* (23:05:22) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *The last message to Bob was resent.* (23:05:23) *OTR Error: You transmitted a malformed data message* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *OTR Error: You transmitted a malformed data message* (23:05:23) *OTR Error: You transmitted a malformed data message* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *The last message to Bob was resent.* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.* (23:05:23) *Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1. *At this point, I am throttled by the AIM servers (rate limiting error). Just thought you'd like to know. - Alex --------------040603080505080303010308 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Alex and Bob are talking on a secure channel. Alex has OTR version 2. Bob is using version 1. Both Alex and Bob have OPPORTUNISTIC set. The following message is sent to Bob from Alex:

(23:05:21) Alex: Anyway, OTRv2 has been released to CVS.

The following messages are flooded back and fourth, causing an infinate loop (notice timestamps):

(23:05:21) OTR Error: You transmitted a malformed data message
(23:05:22) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:22) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:22) The last message to Bob was resent.
(23:05:22) OTR Error: You transmitted a malformed data message
(23:05:22) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:22) The last message to Bob was resent.
(23:05:22) OTR Error: You transmitted a malformed data message
(23:05:22) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) The last message to Bob was resent.
(23:05:23) OTR Error: You transmitted a malformed data message
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) OTR Error: You transmitted a malformed data message
(23:05:23) OTR Error: You transmitted a malformed data message
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) The last message to Bob was resent.
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.
(23:05:23) Successfully refreshed the private conversation with Bob. Warning: using old protocol version 1.

At this point, I am throttled by the AIM servers (rate limiting error).

Just thought you'd like to know.

 - Alex
--------------040603080505080303010308-- --------------enig1EF2419C81D2F5E6F58A0B95 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iQIVAwUBQ22DFINsvbPFJtOPAQPapw//af4rwzzN1Wvmidq1tnDzWPNa6GoEn95v 5rkv94S1RJEKKe86/Ijrf+QzukZwWA6c3UXKXS2bud7b/xnQbtBwQxCjQh7KVk0+ 8LisCaOufSJey7azQN56r1+Mvn2fmMMa6UOnsaBBfN2sIrX0MJ0mfjeB9nQC9mHi tzz5Ml+CigKZWIMvO3dSdK41ffSBhLdBv4t2yNpdbPYnTHbbjF3U0LCQFKgRjHoC SzF0Ep85HqjrcaQC80oJ4jHwCvmc3ODnZPU90KsDi8+4LTtKwE+6SRKTedb5ugTF IxPrXRGYNGyGmZS1c9KXv7tp6M2jHjVhY9cm7pUbL0EMEKffELS2t9uqYe4Y3m1X 0Auz3P++RolnaTEyh3v5eMsj8ALoa+j85sHYVxE+hVL6jKhgJCntujEmPnF2pUpd 3vodqpKjllxA3/262IVw4YsMRb9i6iXzexhYyfe1r3PXiTz7YHiLNAonkJUpfrva 2QRIDhp8V2bei9VtHOXX22/zH1Rfld36EBblEDD4lhPCK/IPwATr1Q0X33R5xBcf mfSQuGAXGdU6Xp3QFpQh4nuUglDcK3o1KRv4qkiGHZvKYjiNsBr63g/BXK3q+LGd XAo+4scXLhmrYMqLfLOBFXMyjSkYbKTu2l/LNygfY4aeUFnoyFTPcg4gLhxOX2O+ fy7Ilv/xY2Y= =mXyT -----END PGP SIGNATURE----- --------------enig1EF2419C81D2F5E6F58A0B95-- From kat@paip.net Sun Nov 6 22:24:53 2005 From: kat@paip.net (Kat Hanna) Date: Sun, 6 Nov 2005 17:24:53 -0500 (EST) Subject: [OTR-dev] Possible infinate loop flaw in CVS In-Reply-To: <436D8310.6090705@gmail.com> References: <436D8310.6090705@gmail.com> Message-ID: This is almost certainly because one or both of you are logged in more than once. One of your logins can't read the encrypted messages, and complains. We certainly want to fix this, but it's not trivial, and no one has the time right now. It's certainly in the plan for the future. -Kat On Sat, 5 Nov 2005, Alex wrote: > Alex and Bob are talking on a secure channel. Alex has OTR version 2. > Bob is using version 1. Both Alex and Bob have OPPORTUNISTIC set. The > following message is sent to Bob from Alex: > > (23:05:21) *Alex:* Anyway, OTRv2 has been released to CVS. > > The following messages are flooded back and fourth, causing an infinate > loop (notice timestamps): > > (23:05:21) *OTR Error: You transmitted a malformed data message* > (23:05:22) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:22) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:22) *The last message to Bob was resent.* > (23:05:22) *OTR Error: You transmitted a malformed data message* > (23:05:22) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:22) *The last message to Bob was resent.* > (23:05:22) *OTR Error: You transmitted a malformed data message* > (23:05:22) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *The last message to Bob was resent.* > (23:05:23) *OTR Error: You transmitted a malformed data message* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *OTR Error: You transmitted a malformed data message* > (23:05:23) *OTR Error: You transmitted a malformed data message* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *The last message to Bob was resent.* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1.* > (23:05:23) *Successfully refreshed the private conversation with Bob. > Warning: using old protocol version 1. > > *At this point, I am throttled by the AIM servers (rate limiting error). > > Just thought you'd like to know. > > - Alex > From alex323@gmail.com Mon Nov 7 00:10:33 2005 From: alex323@gmail.com (Alex) Date: Sun, 06 Nov 2005 19:10:33 -0500 Subject: [OTR-dev] Possible infinate loop flaw in CVS In-Reply-To: References: <436D8310.6090705@gmail.com> Message-ID: <436E9B79.9020500@gmail.com> This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig87C77787C081B3A304688A67 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Kat Hanna wrote: >This is almost certainly because one or both of you are logged in more >than once. One of your logins can't read the encrypted messages, and >complains. > > I beg to differ. We are not signed in more than once. What intrigues me is the fact that all other messages work, but the only message that causes the problem is the message with "OTRv2" in it. This leads me to believe that it is an easily fixable bug in the software. - Alex --------------enig87C77787C081B3A304688A67 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iQIVAwUBQ26bfYNsvbPFJtOPAQPxIg//XSJSa7VZ17z9oZwON183K9WukjHkZ7TA mMFkjnnSVvIqL6kS7+LrJ36W1CSa/y3rRrMT+/82STHYICaxPXDJz6+OffNaXoZj oM8E4WStBCTqnq3SraF6L6jsnKVq+/PB6QRRTe4s9PgJhkwQTvz2aRvCvDcnJEHT i5/hGn0DZqsZGEgB0eNdnAys/zYh8aNI8wBT9Iy2P/NAB0fYfD+NfLIyYRV//4UN fgauBvCWR9DODWOBJNyZEJ6ZOM356yRpp8iIJHt3MS7tlTYfG7taNHoVqvTC9I9O 7uHcnDMVlV2GrDumnRs3TYck2o/1HxDN5V2/Yl04nNuSuGbmVS03rTtuDAAiRUGZ U5ipC1thMpYY2XRIhBv75+IjmN6Q9ElqoiAfP5hDq+6IJ+GW2jYUdtq5FsS1DmxF AlwugFckCkyrlJmZNhF7oE2VWc8XFwwOPkjyYiX3+vT74ni5e/cN1Z9MlP3haPhG LqHIU67ktZFtPK8QS/cyuEVyJSXy8sQavyrYjp6GkQr9rejR20QO7o9p9PKOjztz Yb2tjGlceyN/iVw8j+hjEiiVzJizXgW19xoN4FMPe/935GuFBH5nec5lD9k9XViE 2auvr0oVNMnDElbd7PeaxWhSkVL4r75ro9G4TRw2Gwix2wOpmQuXTG2wNOIULszY bsEed6k1js4= =KNPU -----END PGP SIGNATURE----- --------------enig87C77787C081B3A304688A67-- From alex323@gmail.com Mon Nov 7 00:26:27 2005 From: alex323@gmail.com (Alex) Date: Sun, 06 Nov 2005 19:26:27 -0500 Subject: [OTR-dev] Problem with Systray plugin and OTR Message-ID: <436E9F33.70002@gmail.com> This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigF4A3791CF5DEE79B49233027 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit I use the System Tray plugin for Gaim 1.5.0. I have it configured so that when a new message is sent to me, it will be suppressed until I click on the blinking tray icon. If Bob and I have a conversation in OTRv2, I close the message window, and Bob sends me a message, the message will pop right up instead of being suppressed. In addition, when I click on the blinking icon (keeping in mind that Bob's message window is still open), the Buddy List appears while the icon continues to blink. Any way around this? - Alex --------------enigF4A3791CF5DEE79B49233027 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iQIVAwUBQ26fN4NsvbPFJtOPAQOBShAAnjhbfbGHDX/ZBjXJO2uOG8awfJA5vzgQ M5cVE5btESooNQYidDytujqdF7me8jlll6MrF7mVH0HVU/yh3LfUQ5XAEX+rfRGx DI4aHWd0y++atIKj+O6KkpIEJanl2ovJVTpD2fqt9P5o0lcWTXpF3ziqZ9YjRbwL y9OqlLHAhpOFbfQItrhT753L3pPvG90gOp1kfnj/MzenaMzpuX66QnNHD9YbW5P2 zD5HjRJYVmiHVIEg3Y4VSfY5AxkwtUwyLRbJ7EWWq3x+OKJxvV/Dxps97zcu4C/n RO0uHQyfOsFmTQnoaFavOuO8Es4uFTCrbxRhuxbm3OqRt3TnTGWq1X+Anm/5eIhZ 3MWKYPWaHWPuK0xX9xXLe2IV94WstJoJrl9dX37JjvNFdRcof1tV0tAkGajMLQKq WteZEX4/Jze+Yiav2XV+Kt9o2DQ+8HT/KTJ8squTZyOPQxgtiHxaJMA589ZaYRGP CESrZ0EJEBpsoEv/7PgxSaR6Z2BR4puku7S7Qq/QSdyCkgzZ6XT429QepaPu2zI+ ABk4cPQeMkIPa1yktykn8huI+jT88ligE6o/dxFlp9z/6k3Qpq1pk/lNj1BiunZz RiStkE42SoEPdvHa81ge+bkBsanwr1m7P14p0ul1OFMIy/HZmfJxozdSnYo/qsad Wm24MvsMCVE= =Vncz -----END PGP SIGNATURE----- --------------enigF4A3791CF5DEE79B49233027-- From ian@cypherpunks.ca Mon Nov 7 01:15:40 2005 From: ian@cypherpunks.ca (Ian Goldberg) Date: Sun, 6 Nov 2005 20:15:40 -0500 Subject: [OTR-dev] Possible infinate loop flaw in CVS In-Reply-To: <436E9B79.9020500@gmail.com> References: <436D8310.6090705@gmail.com> <436E9B79.9020500@gmail.com> Message-ID: <20051107011540.GD847@smtp.paip.net> On Sun, Nov 06, 2005 at 07:10:33PM -0500, Alex wrote: > Kat Hanna wrote: > > >This is almost certainly because one or both of you are logged in more > >than once. One of your logins can't read the encrypted messages, and > >complains. > > > > > I beg to differ. We are not signed in more than once. What intrigues me > is the fact that all other messages work, but the only message that > causes the problem is the message with "OTRv2" in it. This leads me to > believe that it is an easily fixable bug in the software. Can you replicate the problem? It doesn't happen here, even when I type a message containing the string "OTRv2". Thanks, - Ian From alex323@gmail.com Mon Nov 7 01:29:33 2005 From: alex323@gmail.com (Alex) Date: Sun, 06 Nov 2005 20:29:33 -0500 Subject: [OTR-dev] Possible infinate loop flaw in CVS In-Reply-To: <20051107011540.GD847@smtp.paip.net> References: <436D8310.6090705@gmail.com> <436E9B79.9020500@gmail.com> <20051107011540.GD847@smtp.paip.net> Message-ID: <436EADFD.3060606@gmail.com> This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA09D5DA034B5031A6DE144C6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Ian Goldberg wrote: >Can you replicate the problem? It doesn't happen here, even when I type >a message containing the string "OTRv2". > The problem is replicable. - Alex --------------enigA09D5DA034B5031A6DE144C6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iQIVAwUBQ26uAINsvbPFJtOPAQMTAQ//T8uLGlmlrFY1skamChH6/Awby1jMQrTj RC6N7Z+3y99gu1xHOlhape6qx0FQfVabQBIEe7gFvBAnV0QGqpWUAHibe1VQ8azV Gp58Go1I5BspawKe/pyelc9AimcZnKxapc0SCZkP2Bb6wj77J5CVk8xc7b+hKA49 cxu52dS64CnFri6D0YXrZ3/MzfuUxsrbFcNFhE1rlmU9oWamXPt4Mkc1Wn8eWoxb s+3ToX20XCijerUIPTyhpd1dt0+OTLxk2VPB3S2EqJpG1/v5Y7beCf+0QqULYMf+ w70KjAHCWXZ26VxyzxDFULlvWXDowtCxrvozVQVg45v62PUSSZebu+pdW6Cl58Yc wUAeKgBdQIo0G9IAx3zx1guDFC/VCbkoGUW0lsAyOeUp3Y+jq+NYEPkBW/f7D3vG VvXAVq5X686uvbRHpzMUCX94xqlMxf/+zJvycaQaSw07ek/Rs2yjprAkym2L6lkI xVtMOyib2QZT+YRZzP0wAsTn0PEC2GAUcfjfgiX7Z42DGl0OqP1Pm5MPscXh1vKF +G5AEOHUsxOvfFbRqKXVsgTsI3kBo1fLWmgTH/Cl9mg7RvoajwG9e1YS6lB9hO9w viYJt+ZdzZmVZm28Ba/t7z8SzEo6TdzOlzqwaELAShjyCzb2N3cm+NUPM1ouRJTP Jw67HioGs8w= =4hfo -----END PGP SIGNATURE----- --------------enigA09D5DA034B5031A6DE144C6-- From ian@cypherpunks.ca Mon Nov 7 01:31:19 2005 From: ian@cypherpunks.ca (Ian Goldberg) Date: Sun, 6 Nov 2005 20:31:19 -0500 Subject: [OTR-dev] Possible infinate loop flaw in CVS In-Reply-To: <436EADFD.3060606@gmail.com> References: <436D8310.6090705@gmail.com> <436E9B79.9020500@gmail.com> <20051107011540.GD847@smtp.paip.net> <436EADFD.3060606@gmail.com> Message-ID: <20051107013119.GE847@smtp.paip.net> On Sun, Nov 06, 2005 at 08:29:33PM -0500, Alex wrote: > Ian Goldberg wrote: > > >Can you replicate the problem? It doesn't happen here, even when I type > >a message containing the string "OTRv2". > > > The problem is replicable. You're saying every time you (using gaim-otr 3.0.0) are in an OTR conversation with someone (using gaim-otr 2.0.2), and you type "OTRv2" as part of a message, you see this behaviour? That certainly doesn't happen here. - Ian From arodland@entermail.net Thu Nov 17 08:38:09 2005 From: arodland@entermail.net (Andrew Rodland) Date: Thu, 17 Nov 2005 03:38:09 -0500 Subject: [OTR-dev] otr against gaim-cvs Message-ID: <200511170338.09666.arodland@entermail.net> Is there a tree anywhere that's tracking the changes going into gaim (pre-2.0) CVS, or are the devs waiting for things to settle down first? I'm tracking gaim-cvs, so if there's an otr-cvs, I'm willing to keep on it and find out when and how it breaks :) hobbs From ian@cypherpunks.ca Thu Nov 17 13:46:28 2005 From: ian@cypherpunks.ca (Ian Goldberg) Date: Thu, 17 Nov 2005 08:46:28 -0500 Subject: [OTR-dev] otr against gaim-cvs In-Reply-To: <200511170338.09666.arodland@entermail.net> References: <200511170338.09666.arodland@entermail.net> Message-ID: <20051117134628.GN847@smtp.paip.net> --G4iJoqBmSsgzjUCe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Nov 17, 2005 at 03:38:09AM -0500, Andrew Rodland wrote: > Is there a tree anywhere that's tracking the changes going into gaim (pre-2.0) > CVS, or are the devs waiting for things to settle down first? I'm tracking > gaim-cvs, so if there's an otr-cvs, I'm willing to keep on it and find out > when and how it breaks :) Someone's sent in a patch, which we'll look at when we get a chance (at the end of the month). We'll probably stick it in CVS if it looks plausible, and then you'll be able to let us know what breaks. ;-) Ah, whatever. Here's the patch that was sent in (only briefly looked at by me). Have at it, and let us know... ;-) - Ian --G4iJoqBmSsgzjUCe Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="gaim-otr-3.0.0-gaim2.diff" diff -Naur gaim-otr-3.0.0/gtk-dialog.c gaim-otr-3.0.0-gaim2/gtk-dialog.c --- gaim-otr-3.0.0/gtk-dialog.c 2005-10-27 23:38:21.000000000 -0400 +++ gaim-otr-3.0.0-gaim2/gtk-dialog.c 2005-11-16 20:23:59.000000000 -0500 @@ -33,6 +33,7 @@ #include "gtkutils.h" #include "gtkimhtml.h" #include "util.h" +#include "version.h" /* libotr headers */ #include @@ -779,7 +780,11 @@ account = gaim_accounts_find(accountname, protocol); if (!account) return -1; +#if GAIM_MAJOR_VERSION < 2 conv = gaim_find_conversation_with_account(username, account); +#else + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); +#endif if (!conv) return -1; gaim_conversation_write(conv, NULL, msg, GAIM_MESSAGE_SYSTEM, time(NULL)); @@ -968,7 +973,11 @@ account = gaim_accounts_find(context->accountname, context->protocol); if (!account) return; +#if GAIM_MAJOR_VERSION < 2 conv = gaim_find_conversation_with_account(context->username, account); +#else + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account); +#endif if (!conv) return; dialog_update_label_conv(conv, level); } @@ -1252,7 +1261,11 @@ account = gaim_accounts_find(accountname, protocol); if (!account) return; +#if GAIM_MAJOR_VERSION < 2 conv = gaim_find_conversation_with_account(username, account); +#else + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); +#endif if (!conv) return; buf = g_strdup_printf("%s has ended his private conversation with you; " @@ -1406,9 +1419,13 @@ GtkWidget *whatsthis; /* Do nothing if this isn't an IM conversation */ +#if GAIM_MAJOR_VERSION < 2 if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; - bbox = gtkconv->bbox; +#else + if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; + bbox = gtkconv->lower_hbox; +#endif context = otrg_plugin_conv_to_context(conv); @@ -1515,7 +1532,11 @@ GtkWidget *button; /* Do nothing if this isn't an IM conversation */ +#if GAIM_MAJOR_VERSION < 2 if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; +#else + if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; +#endif button = gaim_conversation_get_data(conv, "otr-button"); if (button) gtk_object_destroy(GTK_OBJECT(button)); @@ -1531,7 +1552,11 @@ OtrlPolicy policy; /* Do nothing if this isn't an IM conversation */ +#if GAIM_MAJOR_VERSION < 2 if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; +#else + if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; +#endif account = gaim_conversation_get_account(conv); name = gaim_conversation_get_name(conv); diff -Naur gaim-otr-3.0.0/otr-plugin.c gaim-otr-3.0.0-gaim2/otr-plugin.c --- gaim-otr-3.0.0/otr-plugin.c 2005-10-27 12:01:59.000000000 -0400 +++ gaim-otr-3.0.0-gaim2/otr-plugin.c 2005-11-15 21:08:51.000000000 -0500 @@ -32,11 +32,11 @@ /* gaim headers */ #include "gaim.h" -#include "core.h" #include "notify.h" #include "version.h" #include "util.h" #include "debug.h" +#include "core.h" #ifdef USING_GTK /* gaim GTK headers */ @@ -156,7 +156,11 @@ buddy = gaim_find_buddy(account, recipient); if (!buddy) return -1; +#if GAIM_MAJOR_VERSION < 2 return (buddy->present == GAIM_BUDDY_ONLINE); +#else + return (GAIM_BUDDY_IS_ONLINE(buddy)); +#endif } static void inject_message_cb(void *opdata, const char *accountname, @@ -430,7 +434,11 @@ proto = gaim_account_get_protocol_id(acct); if (!otrg_plugin_proto_supports_otr(proto)) return; +#if GAIM_MAJOR_VERSION < 2 act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL); +#else + act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL, NULL); +#endif *menu = g_list_append(*menu, act); } @@ -482,9 +490,17 @@ account = gaim_accounts_find(context->accountname, context->protocol); if (account == NULL) return NULL; +#if GAIM_MAJOR_VERSION < 2 conv = gaim_find_conversation_with_account(context->username, account); +#else + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account); +#endif if (conv == NULL && force_create) { +#if GAIM_MAJOR_VERSION < 2 conv = gaim_conversation_new(GAIM_CONV_IM, account, context->username); +#else + conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, context->username); +#endif } return conv; @@ -567,9 +583,15 @@ GAIM_CALLBACK(process_connection_change), NULL); gaim_signal_connect(blist_handle, "blist-node-extended-menu", otrg_plugin_handle, GAIM_CALLBACK(supply_extended_menu), NULL); +#if GAIM_MAJOR_VERSION < 2 button_type_cbid = gaim_prefs_connect_callback( "/gaim/gtk/conversations/button_type", process_button_type_change, NULL); +#else + button_type_cbid = gaim_prefs_connect_callback(NULL, + "/gaim/gtk/conversations/button_type", + process_button_type_change, NULL); +#endif gaim_conversation_foreach(otrg_dialog_new_conv); @@ -642,7 +664,12 @@ /* We stick with the functions in the gaim 1.0.x API for * compatibility. */ - 1, /* major version */ +#if GAIM_MAJOR_VERSION < 2 + 1, /* major version */ +#else + /* The 2.0.x API is causing no trouble - Dustin */ + 2, /* major version */ +#endif 0, /* minor version */ GAIM_PLUGIN_STANDARD, /* type */ --G4iJoqBmSsgzjUCe-- From arodland@entermail.net Sat Nov 19 08:25:47 2005 From: arodland@entermail.net (Andrew Rodland) Date: Sat, 19 Nov 2005 03:25:47 -0500 Subject: [OTR-dev] otr against gaim-cvs In-Reply-To: <20051117134628.GN847@smtp.paip.net> References: <200511170338.09666.arodland@entermail.net> <20051117134628.GN847@smtp.paip.net> Message-ID: <200511190325.47920.arodland@entermail.net> On Thursday 17 November 2005 08:46 am, Ian Goldberg wrote: > On Thu, Nov 17, 2005 at 03:38:09AM -0500, Andrew Rodland wrote: > > Is there a tree anywhere that's tracking the changes going into gaim > > (pre-2.0) CVS, or are the devs waiting for things to settle down first? > > I'm tracking gaim-cvs, so if there's an otr-cvs, I'm willing to keep on > > it and find out when and how it breaks :) > > Someone's sent in a patch, which we'll look at when we get a chance (at > the end of the month). We'll probably stick it in CVS if it looks > plausible, and then you'll be able to let us know what breaks. ;-) > > Ah, whatever. Here's the patch that was sent in (only briefly looked > at by me). Have at it, and let us know... ;-) > I've been using this for a few days, and it looks pretty good. I've had one segfault that appeared to be OTR-related, but it disappeared before I could get a backtrace on it, so I don't have any idea whether it's related to gaim-cvs or not. Everything else seems to be pretty good, though; no protocol problems (not that I expected any), and the UI and gaim integration are just fine. Andrew From evan.s@dreskin.net Sun Nov 20 19:06:36 2005 From: evan.s@dreskin.net (Evan Schoenberg) Date: Sun, 20 Nov 2005 13:06:36 -0600 Subject: [OTR-dev] Bug (with fix) in proto.h, lilbotr 3.0.0 Message-ID: <1D7CDCD9-5E39-4665-9B30-DFBED79A283A@dreskin.net> --Apple-Mail-2--412425769 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed At proto.h:43 we have #define OTRL_POLICY_ALLOW_V1 0x01 #define OTRL_POLICY_ALLOW_V2 0x02 #define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04 #define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08 #define OTRL_POLICY_WHITESPACE_START_AKE 0x08 #define OTRL_POLICY_ERROR_START_AKE 0x10 Note that SEND_WHITESPACE_TAG and WHITESPACE_START_AKE have the same value. This is incorrect; the correct definition should be: #define OTRL_POLICY_ALLOW_V1 0x01 #define OTRL_POLICY_ALLOW_V2 0x02 #define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04 #define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08 #define OTRL_POLICY_WHITESPACE_START_AKE 0x10 #define OTRL_POLICY_ERROR_START_AKE 0x12 Thanks, Evan www.adiumx.com --Apple-Mail-2--412425769 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=ISO-8859-1 At=A0proto.h:43 we have

#define OTRL_POLICY_ALLOW_V1 0x01
#define OTRL_POLICY_ALLOW_V2 0x02
#define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04
#define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08
#define OTRL_POLICY_WHITESPACE_START_AKE 0x08
#define OTRL_POLICY_ERROR_START_AKE 0x10

Note that SEND_WHITESPACE_TAG and = WHITESPACE_START_AKE have the same value.=A0 This is incorrect; the = correct definition should be:
#define = OTRL_POLICY_ALLOW_V1 0x01
#define OTRL_POLICY_ALLOW_V2 0x02
#define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04
#define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08
#define OTRL_POLICY_WHITESPACE_START_AKE 0x10
#define OTRL_POLICY_ERROR_START_AKE 0x12

Evan
www.adiumx.com
= --Apple-Mail-2--412425769-- From ian@cypherpunks.ca Sun Nov 20 20:37:10 2005 From: ian@cypherpunks.ca (Ian Goldberg) Date: Sun, 20 Nov 2005 15:37:10 -0500 Subject: [OTR-dev] Bug (with fix) in proto.h, lilbotr 3.0.0 In-Reply-To: <1D7CDCD9-5E39-4665-9B30-DFBED79A283A@dreskin.net> References: <1D7CDCD9-5E39-4665-9B30-DFBED79A283A@dreskin.net> Message-ID: <20051120203710.GI847@smtp.paip.net> On Sun, Nov 20, 2005 at 01:06:36PM -0600, Evan Schoenberg wrote: > At proto.h:43 we have > > #define OTRL_POLICY_ALLOW_V1 0x01 > #define OTRL_POLICY_ALLOW_V2 0x02 > #define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04 > #define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08 > #define OTRL_POLICY_WHITESPACE_START_AKE 0x08 > #define OTRL_POLICY_ERROR_START_AKE 0x10 > > Note that SEND_WHITESPACE_TAG and WHITESPACE_START_AKE have the same > value. This is incorrect; the correct definition should be: > #define OTRL_POLICY_ALLOW_V1 0x01 > #define OTRL_POLICY_ALLOW_V2 0x02 > #define OTRL_POLICY_REQUIRE_ENCRYPTION 0x04 > #define OTRL_POLICY_SEND_WHITESPACE_TAG 0x08 > #define OTRL_POLICY_WHITESPACE_START_AKE 0x10 > #define OTRL_POLICY_ERROR_START_AKE 0x12 Good catch, but the last value should be 0x20, not 0x12. I've checked in the fix to CVS. Feel free to use the fixed version (0x10, 0x20) in Adium; it won't cause incompatibility with other clients or anything. It just so happens that that bug will never be exposed in gaim-otr or otrproxy, so I won't rush out a new release of libotr. Thanks! - Ian From paul@xelerance.com Mon Nov 21 04:53:00 2005 From: paul@xelerance.com (Paul Wouters) Date: Mon, 21 Nov 2005 05:53:00 +0100 (CET) Subject: [OTR-dev] Bug (with fix) in proto.h, lilbotr 3.0.0 In-Reply-To: <20051120203710.GI847@smtp.paip.net> References: <1D7CDCD9-5E39-4665-9B30-DFBED79A283A@dreskin.net> <20051120203710.GI847@smtp.paip.net> Message-ID: On Sun, 20 Nov 2005, Ian Goldberg wrote: > Feel free to use the fixed version (0x10, 0x20) in Adium; it won't cause > incompatibility with other clients or anything. It just so happens that > that bug will never be exposed in gaim-otr or otrproxy, so I won't rush > out a new release of libotr. Are you sure? I've seen a few bugs related to starting or restarting (or dual starting?) sessions from a v2 to a v1 client. Lots of repeated refreshes, sometimes ending up working, sometimes not, and a rare malformed message. (not only on jabber, this actually mostly happens for me on MSN, but I also use that one mostly) Paul From ian@cypherpunks.ca Mon Nov 21 16:33:40 2005 From: ian@cypherpunks.ca (Ian Goldberg) Date: Mon, 21 Nov 2005 11:33:40 -0500 Subject: [OTR-dev] Bug (with fix) in proto.h, lilbotr 3.0.0 In-Reply-To: References: <1D7CDCD9-5E39-4665-9B30-DFBED79A283A@dreskin.net> <20051120203710.GI847@smtp.paip.net> Message-ID: <20051121163340.GK847@smtp.paip.net> On Mon, Nov 21, 2005 at 05:53:00AM +0100, Paul Wouters wrote: > On Sun, 20 Nov 2005, Ian Goldberg wrote: > > > Feel free to use the fixed version (0x10, 0x20) in Adium; it won't cause > > incompatibility with other clients or anything. It just so happens that > > that bug will never be exposed in gaim-otr or otrproxy, so I won't rush > > out a new release of libotr. > > Are you sure? > I've seen a few bugs related to starting or restarting (or dual starting?) > sessions from a v2 to a v1 client. Lots of repeated refreshes, sometimes > ending up working, sometimes not, and a rare malformed message. > > (not only on jabber, this actually mostly happens for me on MSN, but I > also use that one mostly) Quite sure. There may be another bug, but it's not this one. If you can capture the incoming and outgoing messages that go by when you see this happening, I'll see if anything obvious is wrong. Thanks, - Ian