comparison libpurple/protocols/msn/slplink.c @ 31301:16ab805406d1

Get rid of the offset field in the SlpMessage in favor of the one in the Header.
author masca@cpw.pidgin.im
date Thu, 05 Aug 2010 21:58:13 +0000
parents 5ad928319db0
children e32332ac385c
comparison
equal deleted inserted replaced
31300:5ad928319db0 31301:16ab805406d1
576 purple_xfer_prpl_ready(slpmsg->slpcall->xfer); 576 purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
577 } 577 }
578 else if (slpmsg->size && slpmsg->buffer) { 578 else if (slpmsg->size && slpmsg->buffer) {
579 if (G_MAXSIZE - part->size < part->header->offset 579 if (G_MAXSIZE - part->size < part->header->offset
580 || (part->header->offset + part->size) > slpmsg->size 580 || (part->header->offset + part->size) > slpmsg->size
581 || slpmsg->offset != part->header->offset) { 581 || slpmsg->header->offset != part->header->offset) {
582 purple_debug_error("msn", 582 purple_debug_error("msn",
583 "Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n", 583 "Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
584 slpmsg->size, part->header->offset, part->size); 584 slpmsg->size, part->header->offset, part->size);
585 g_return_if_reached(); 585 g_return_if_reached();
586 } else { 586 } else {
587 memcpy(slpmsg->buffer + part->header->offset, part->buffer, part->size); 587 memcpy(slpmsg->buffer + part->header->offset, part->buffer, part->size);
588 slpmsg->offset += part->size; 588 slpmsg->header->offset += part->size;
589 } 589 }
590 } 590 }
591 } 591 }
592 592
593 void 593 void