comparison src/protocols/oscar/ft.c @ 11162:ccb38cf22483

[gaim-migrate @ 13263] Get rid of the last of the errors in oscar. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 29 Jul 2005 01:14:23 +0000
parents bd8ac1d4b2f2
children 751de30689ef
comparison
equal deleted inserted replaced
11161:2e71eddc828b 11162:ccb38cf22483
508 strncpy(priv->sn, sn, sizeof(priv->sn)); 508 strncpy(priv->sn, sn, sizeof(priv->sn));
509 cookie->data = priv; 509 cookie->data = priv;
510 aim_cachecookie(sess, cookie); 510 aim_cachecookie(sess, cookie);
511 511
512 /* XXX - switch to aim_cloneconn()? */ 512 /* XXX - switch to aim_cloneconn()? */
513 if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_LISTENER, NULL))) { 513 if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_LISTENER))) {
514 close(listenfd); 514 close(listenfd);
515 return NULL; 515 return NULL;
516 } 516 }
517 517
518 /* this one is for the conn */ 518 /* this one is for the conn */
556 strncpy(intdata->sn, sn, sizeof(intdata->sn)); 556 strncpy(intdata->sn, sn, sizeof(intdata->sn));
557 if (addr) 557 if (addr)
558 strncpy(intdata->ip, addr, sizeof(intdata->ip)); 558 strncpy(intdata->ip, addr, sizeof(intdata->ip));
559 559
560 /* XXX - verify that non-blocking connects actually work */ 560 /* XXX - verify that non-blocking connects actually work */
561 if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS, addr))) { 561 if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS))) {
562 free(intdata); 562 free(intdata);
563 return NULL; 563 return NULL;
564 } 564 }
565 565
566 newconn->internal = intdata; 566 newconn->internal = intdata;
744 faim_export int aim_sendfile_listen(aim_session_t *sess, struct aim_oft_info *oft_info, int listenfd) 744 faim_export int aim_sendfile_listen(aim_session_t *sess, struct aim_oft_info *oft_info, int listenfd)
745 { 745 {
746 if (!oft_info) 746 if (!oft_info)
747 return -EINVAL; 747 return -EINVAL;
748 748
749 if (!(oft_info->conn = aim_newconn(sess, AIM_CONN_TYPE_LISTENER, NULL))) { 749 if (!(oft_info->conn = aim_newconn(sess, AIM_CONN_TYPE_LISTENER))) {
750 close(listenfd); 750 close(listenfd);
751 return -ENOMEM; 751 return -ENOMEM;
752 } 752 }
753 753
754 oft_info->conn->fd = listenfd; 754 oft_info->conn->fd = listenfd;