Changeset 6738a67 for protocols/yahoo/libyahoo2.c
- Timestamp:
- 2008-07-16T23:22:52Z (16 years ago)
- Branches:
- master
- Children:
- 9b55485
- Parents:
- 9730d72 (diff), 6a78c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/yahoo/libyahoo2.c
r9730d72 r6738a67 69 69 #ifdef __MINGW32__ 70 70 # include <winsock2.h> 71 # define write(a,b,c) send(a,b,c,0)72 # define read(a,b,c) recv(a,b,c,0)73 71 #endif 74 72 … … 381 379 382 380 /* call repeatedly to get the next one */ 383 /*384 381 static struct yahoo_input_data * find_input_by_id(int id) 385 382 { … … 392 389 return NULL; 393 390 } 394 */395 391 396 392 static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who) … … 737 733 738 734 memcpy(data + pos, "YMSG", 4); pos += 4; 739 pos += yahoo_put16(data + pos, 0x0 a00);735 pos += yahoo_put16(data + pos, 0x000c); 740 736 pos += yahoo_put16(data + pos, 0x0000); 741 737 pos += yahoo_put16(data + pos, pktlen + extra_pad); … … 797 793 { 798 794 struct yahoo_data *yd = find_conn_by_id(id); 795 799 796 if(!yd) 800 797 return; … … 3166 3163 3167 3164 LOG(("write callback: id=%d fd=%d data=%p", id, fd, data)); 3168 if(!yid || !yid->txqueues )3165 if(!yid || !yid->txqueues || !find_conn_by_id(id)) 3169 3166 return -2; 3170 3167 … … 3351 3348 break; 3352 3349 case 5: 3353 if( cp != "\005")3350 if(strcmp(cp, "5") != 0) 3354 3351 yct->location = cp; 3355 3352 k = 0; … … 3842 3839 } 3843 3840 3844 3845 /* do { 3841 do { 3846 3842 yahoo_input_close(yid); 3847 } while((yid = find_input_by_id(id)));*/ 3848 3843 } while((yid = find_input_by_id(id))); 3849 3844 } 3850 3845
Note: See TracChangeset
for help on using the changeset viewer.