Mercurial > pidgin
comparison src/protocols/oscar/txqueue.c @ 4617:858979ab3867
[gaim-migrate @ 4908]
Big Changes:
-Rewrote some of the perl stuff so perl scripts can change a few of their
parameters
-Receiving a file with AIM over oscar works pretty well
Now, the "nitty gritty":
Very minor change to prefs.c: In the plugins details tab, I changed "URL"
to "Web Site." I was just going to fix the tabbing, but silvestrij
suggested changing it to "Web site," and I thought that sounded good.
I think it fits better, too. I dunno, maybe that's just me.
"Get Capabilities" has stopped working for some reason. I'm just going to
blame AOL. It's really not important anyway, and some people wanted it
taken off. It is now #ifdef 0'ed out. I'll remove it completely if it
continues to no longer function.
I took out a few plugin_event calls from oscar.c and put them in core code.
"event_error" should be, uh, "evented" when there is an error signing on.
Hopefully no one was using this. It's really pretty useless. The parameter
is now the reason for not being able to connect rather than the archaic
toc error code.
I screwed around with how perl functions are called some. There was way the
hell too much malloc'ing going on here. I think all in all it's an
improvement, though I'm still not a big fan of how changes to parameters
propagate to the actual memory.
I really think it would be nice if the perl stuff was made into a C plugin.
It's just so much cleaner. Especially if someone wanted to write, say, a
python or tcl interpreter. That's how xchat2 does it. I just think that
would be really slick. Like butter. Or ice. Very unlike Velcro.
I added a "Change Password" Protocol Action for ICQ over oscar. This was
really pretty easy. I'd like to thank my housemate Andrew for complaining
a lot that having to use Windows ICQ to change his password was a pain.
I rewrote a lot of the oscar file transfer stuff to use Christian's new
xfer interface. This involved moving a few functions from ft.c to im.c,
where they belong. I also removed all the #if 0'ed getfile functions.
I'll be rewritting them soonish. Receiving a file should work perfectly,
aside from maybe a small memleak when stuff is canceled. Sending a file is
currently disabled. No ETA on when I'll have that working.
I renamed pretty much all of the functions in im.c so they have kind of a
scheme now. They should all be aim_im_bleh, since "im" is the family
name. There comes a time when you must break the crap out of any clients
that might be using libfaim in order to make stuff cleaner. Maybe.
I got rid of the snac destructor stuff for now. I'll probably add it back
later. I wasn't entirely comfortable with how it was done.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 26 Feb 2003 05:01:37 +0000 |
parents | 07283934dedd |
children | c86f075b269a |
comparison
equal
deleted
inserted
replaced
4616:767093a2ddaf | 4617:858979ab3867 |
---|---|
34 faimdprintf(sess, 0, "aim_tx_new: ERROR: no connection specified\n"); | 34 faimdprintf(sess, 0, "aim_tx_new: ERROR: no connection specified\n"); |
35 return NULL; | 35 return NULL; |
36 } | 36 } |
37 | 37 |
38 /* For sanity... */ | 38 /* For sanity... */ |
39 if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) || | 39 if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) || (conn->type == AIM_CONN_TYPE_LISTENER)) { |
40 (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT)) { | |
41 if (framing != AIM_FRAMETYPE_OFT) { | 40 if (framing != AIM_FRAMETYPE_OFT) { |
42 faimdprintf(sess, 0, "aim_tx_new: attempted to allocate inappropriate frame type for rendezvous connection\n"); | 41 faimdprintf(sess, 0, "aim_tx_new: attempted to allocate inappropriate frame type for rendezvous connection\n"); |
43 return NULL; | 42 return NULL; |
44 } | 43 } |
45 } else { | 44 } else { |
240 if (count) { | 239 if (count) { |
241 if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) && | 240 if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) && |
242 (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) { | 241 (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) { |
243 /* I strongly suspect that this is a horrible thing to do | 242 /* I strongly suspect that this is a horrible thing to do |
244 * and I feel really guilty doing it. */ | 243 * and I feel really guilty doing it. */ |
245 const char *sn = aim_directim_getsn(conn); | 244 const char *sn = aim_odc_getsn(conn); |
246 aim_rxcallback_t userfunc; | 245 aim_rxcallback_t userfunc; |
247 while (count - wrote > 1024) { | 246 while (count - wrote > 1024) { |
248 wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024); | 247 wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024); |
249 if ((userfunc=aim_callhandler(conn->sessv, conn, | 248 if ((userfunc=aim_callhandler(conn->sessv, conn, |
250 AIM_CB_FAM_SPECIAL, | 249 AIM_CB_FAM_SPECIAL, |
251 AIM_CB_SPECIAL_IMAGETRANSFER))) | 250 AIM_CB_SPECIAL_IMAGETRANSFER))) |
252 userfunc(conn->sessv, NULL, sn, | 251 userfunc(conn->sessv, NULL, sn, |
253 count-wrote>1024 ? ((double)wrote / count) : 1); | 252 count-wrote>1024 ? ((double)wrote / count) : 1); |
254 } | 253 } |
255 } | 254 } |
256 if (count - wrote) { | 255 if (count - wrote) { |
257 wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote); | 256 wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote); |
258 } | 257 } |
259 | 258 |
260 } | 259 } |
261 | |
262 | 260 |
263 if (((aim_session_t *)conn->sessv)->debug >= 2) { | 261 if (((aim_session_t *)conn->sessv)->debug >= 2) { |
264 int i; | 262 int i; |
265 aim_session_t *sess = (aim_session_t *)conn->sessv; | 263 aim_session_t *sess = (aim_session_t *)conn->sessv; |
266 | 264 |
271 faimdprintf(sess, 2, "0x%02x ", *(bs->data + bs->offset + i)); | 269 faimdprintf(sess, 2, "0x%02x ", *(bs->data + bs->offset + i)); |
272 } | 270 } |
273 faimdprintf(sess, 2, "\n"); | 271 faimdprintf(sess, 2, "\n"); |
274 } | 272 } |
275 | 273 |
276 | |
277 bs->offset += wrote; | 274 bs->offset += wrote; |
278 | 275 |
279 return wrote; | 276 return wrote; |
280 } | 277 } |
281 | 278 |
282 static int sendframe_flap(aim_session_t *sess, aim_frame_t *fr) | 279 static int sendframe_flap(aim_session_t *sess, aim_frame_t *fr) |
283 { | 280 { |
284 aim_bstream_t obs; | 281 aim_bstream_t obs; |