Mercurial > pidgin

comparison src/protocols/oscar/family_oservice.c @ 13253:87a7c3077c19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15619] More cleaning up of oscar. Renamed some functions to be more clear. Got rid of some stuff that wasn't used. Inlined some small things in conn.c that were only used once. The goals of all this are 1. Non-blocking I/O for all connections 2. p2p stuff won't use the same struct as oscar connections, because that's stupid 3. The oscar PRPL should be less scary committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 12 Feb 2006 21:27:04 +0000
parents f260d319bbbc
children 6519aeb66b31
comparison
equal deleted inserted replaced
13252:2871c385c45a 13253:87a7c3077c19
36 aim_snacid_t snacid; 36 aim_snacid_t snacid;
37 37
38 if (!ins) 38 if (!ins)
39 return -EINVAL; 39 return -EINVAL;
40 40
41 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152))) 41 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152)))
42 return -ENOMEM; 42 return -ENOMEM;
43 43
44 snacid = aim_cachesnac(sess, 0x0001, 0x0002, 0x0000, NULL, 0); 44 snacid = aim_cachesnac(sess, 0x0001, 0x0002, 0x0000, NULL, 0);
45 aim_putsnac(&fr->data, 0x0001, 0x0002, 0x0000, snacid); 45 aim_putsnac(&fr->data, 0x0001, 0x0002, 0x0000, snacid);
46 46
129 struct chatsnacinfo csi; 129 struct chatsnacinfo csi;
130 130
131 if (!sess || !conn || !roomname || !strlen(roomname)) 131 if (!sess || !conn || !roomname || !strlen(roomname))
132 return -EINVAL; 132 return -EINVAL;
133 133
134 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512))) 134 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
135 return -ENOMEM; 135 return -ENOMEM;
136 136
137 memset(&csi, 0, sizeof(csi)); 137 memset(&csi, 0, sizeof(csi));
138 csi.exchange = exchange; 138 csi.exchange = exchange;
139 strncpy(csi.name, roomname, sizeof(csi.name)); 139 strncpy(csi.name, roomname, sizeof(csi.name));
410 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside; 410 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
411 FlapFrame *fr; 411 FlapFrame *fr;
412 aim_snacid_t snacid; 412 aim_snacid_t snacid;
413 struct rateclass *rc; 413 struct rateclass *rc;
414 414
415 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512))) 415 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
416 return -ENOMEM; 416 return -ENOMEM;
417 417
418 snacid = aim_cachesnac(sess, 0x0001, 0x0008, 0x0000, NULL, 0); 418 snacid = aim_cachesnac(sess, 0x0001, 0x0008, 0x0000, NULL, 0);
419 aim_putsnac(&fr->data, 0x0001, 0x0008, 0x0000, snacid); 419 aim_putsnac(&fr->data, 0x0001, 0x0008, 0x0000, snacid);
420 420
432 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside; 432 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
433 FlapFrame *fr; 433 FlapFrame *fr;
434 aim_snacid_t snacid; 434 aim_snacid_t snacid;
435 struct rateclass *rc; 435 struct rateclass *rc;
436 436
437 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512))) 437 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 512)))
438 return -ENOMEM; 438 return -ENOMEM;
439 439
440 snacid = aim_cachesnac(sess, 0x0001, 0x0009, 0x0000, NULL, 0); 440 snacid = aim_cachesnac(sess, 0x0001, 0x0009, 0x0000, NULL, 0);
441 aim_putsnac(&fr->data, 0x0001, 0x0009, 0x0000, snacid); 441 aim_putsnac(&fr->data, 0x0001, 0x0009, 0x0000, snacid);
442 442
514 FlapFrame *fr; 514 FlapFrame *fr;
515 aim_snacid_t snacid; 515 aim_snacid_t snacid;
516 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside; 516 aim_conn_inside_t *ins = (aim_conn_inside_t *)conn->inside;
517 struct snacgroup *sg; 517 struct snacgroup *sg;
518 518
519 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1024))) 519 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1024)))
520 return -ENOMEM; 520 return -ENOMEM;
521 521
522 snacid = aim_cachesnac(sess, 0x0001, 0x000c, 0x0000, NULL, 0); 522 snacid = aim_cachesnac(sess, 0x0001, 0x000c, 0x0000, NULL, 0);
523 aim_putsnac(&fr->data, 0x0001, 0x000c, 0x0000, snacid); 523 aim_putsnac(&fr->data, 0x0001, 0x000c, 0x0000, snacid);
524 524
753 aim_snacid_t snacid; 753 aim_snacid_t snacid;
754 754
755 if (!ins) 755 if (!ins)
756 return -EINVAL; 756 return -EINVAL;
757 757
758 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152))) 758 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152)))
759 return -ENOMEM; 759 return -ENOMEM;
760 760
761 snacid = aim_cachesnac(sess, 0x0001, 0x0017, 0x0000, NULL, 0); 761 snacid = aim_cachesnac(sess, 0x0001, 0x0017, 0x0000, NULL, 0);
762 aim_putsnac(&fr->data, 0x0001, 0x0017, 0x0000, snacid); 762 aim_putsnac(&fr->data, 0x0001, 0x0017, 0x0000, snacid);
763 763
825 if (!sess || !(conn = aim_conn_findbygroup(sess, OSCAR_FAMILY_ICBM))) 825 if (!sess || !(conn = aim_conn_findbygroup(sess, OSCAR_FAMILY_ICBM)))
826 return -EINVAL; 826 return -EINVAL;
827 827
828 data = AIM_ICQ_STATE_HIDEIP | AIM_ICQ_STATE_DIRECTREQUIREAUTH | status; 828 data = AIM_ICQ_STATE_HIDEIP | AIM_ICQ_STATE_DIRECTREQUIREAUTH | status;
829 829
830 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8))) 830 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))
831 return -ENOMEM; 831 return -ENOMEM;
832 832
833 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0); 833 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0);
834 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid); 834 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid);
835 835
864 864
865 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0004))) 865 if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0004)))
866 return -EINVAL; 866 return -EINVAL;
867 867
868 if ((msg != NULL) && *msg != '\0') { 868 if ((msg != NULL) && *msg != '\0') {
869 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + strlen(msg) + 8))) 869 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + strlen(msg) + 8)))
870 return -ENOMEM; 870 return -ENOMEM;
871 871
872 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0); 872 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0);
873 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid); 873 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid);
874 874
879 aimbs_put8(&fr->data, strlen(msg)+4); 879 aimbs_put8(&fr->data, strlen(msg)+4);
880 aimbs_put16(&fr->data, strlen(msg)); 880 aimbs_put16(&fr->data, strlen(msg));
881 aimbs_putstr(&fr->data, msg); 881 aimbs_putstr(&fr->data, msg);
882 aimbs_put16(&fr->data, 0x0000); 882 aimbs_put16(&fr->data, 0x0000);
883 } else { 883 } else {
884 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + 8))) 884 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + 8)))
885 return -ENOMEM; 885 return -ENOMEM;
886 886
887 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0); 887 snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0);
888 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid); 888 aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid);
889 889
970 aim_snacid_t snacid; 970 aim_snacid_t snacid;
971 971
972 if (!sess || !conn) 972 if (!sess || !conn)
973 return -EINVAL; 973 return -EINVAL;
974 974
975 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+16))) 975 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+16)))
976 return -ENOMEM; 976 return -ENOMEM;
977 977
978 snacid = aim_cachesnac(sess, 0x0001, 0x0020, 0x0000, NULL, 0); 978 snacid = aim_cachesnac(sess, 0x0001, 0x0020, 0x0000, NULL, 0);
979 979
980 aim_putsnac(&fr->data, 0x0001, 0x0020, 0x0000, snacid); 980 aim_putsnac(&fr->data, 0x0001, 0x0020, 0x0000, snacid);