Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/odc.c @ 27947:13c774d59ac8
propagate from branch 'im.pidgin.pidgin' (head 33cc2185e6e6d5b19764d50e8b02900f782843b2)
to branch 'im.pidgin.pidgin.yaz' (head efe9e22205297cc61d8f064393190b934fb3142f)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Fri, 15 May 2009 01:19:26 +0000 |
| parents | d8e6a2d592a4 |
| children | 85fa979b08c2 |
comparison
equal
deleted
inserted
replaced
| 26959:ab298d237562 | 27947:13c774d59ac8 |
|---|---|
| 99 | 99 |
| 100 length = 76; | 100 length = 76; |
| 101 byte_stream_new(&bs, length + frame->payload.len); | 101 byte_stream_new(&bs, length + frame->payload.len); |
| 102 byte_stream_putraw(&bs, conn->magic, 4); | 102 byte_stream_putraw(&bs, conn->magic, 4); |
| 103 byte_stream_put16(&bs, length); | 103 byte_stream_put16(&bs, length); |
| 104 | |
| 104 byte_stream_put16(&bs, frame->type); | 105 byte_stream_put16(&bs, frame->type); |
| 105 byte_stream_put16(&bs, frame->subtype); | 106 byte_stream_put16(&bs, frame->subtype); |
| 106 byte_stream_put16(&bs, 0x0000); | 107 byte_stream_put16(&bs, 0x0000); |
| 108 | |
| 107 byte_stream_putraw(&bs, frame->cookie, 8); | 109 byte_stream_putraw(&bs, frame->cookie, 8); |
| 108 byte_stream_put16(&bs, 0x0000); | 110 byte_stream_put16(&bs, 0x0000); |
| 109 byte_stream_put16(&bs, 0x0000); | 111 byte_stream_put16(&bs, 0x0000); |
| 110 byte_stream_put16(&bs, 0x0000); | 112 byte_stream_put16(&bs, 0x0000); |
| 111 byte_stream_put16(&bs, 0x0000); | 113 byte_stream_put16(&bs, 0x0000); |
| 114 | |
| 112 byte_stream_put32(&bs, frame->payload.len); | 115 byte_stream_put32(&bs, frame->payload.len); |
| 113 byte_stream_put16(&bs, 0x0000); | |
| 114 byte_stream_put16(&bs, frame->encoding); | 116 byte_stream_put16(&bs, frame->encoding); |
| 115 byte_stream_put16(&bs, 0x0000); | 117 byte_stream_put16(&bs, 0x0000); |
| 118 byte_stream_put16(&bs, 0x0000); | |
| 119 | |
| 116 byte_stream_put16(&bs, frame->flags); | 120 byte_stream_put16(&bs, frame->flags); |
| 117 byte_stream_put16(&bs, 0x0000); | 121 byte_stream_put16(&bs, 0x0000); |
| 118 byte_stream_put16(&bs, 0x0000); | 122 byte_stream_put16(&bs, 0x0000); |
| 119 byte_stream_putraw(&bs, frame->bn, 32); | 123 byte_stream_putraw(&bs, frame->bn, 32); |
| 120 byte_stream_putraw(&bs, frame->payload.data, frame->payload.len); | 124 byte_stream_putraw(&bs, frame->payload.data, frame->payload.len); |
| 494 | 498 |
| 495 frame = g_new0(OdcFrame, 1); | 499 frame = g_new0(OdcFrame, 1); |
| 496 frame->type = byte_stream_get16(bs); | 500 frame->type = byte_stream_get16(bs); |
| 497 frame->subtype = byte_stream_get16(bs); | 501 frame->subtype = byte_stream_get16(bs); |
| 498 byte_stream_advance(bs, 2); | 502 byte_stream_advance(bs, 2); |
| 503 | |
| 499 byte_stream_getrawbuf(bs, frame->cookie, 8); | 504 byte_stream_getrawbuf(bs, frame->cookie, 8); |
| 500 byte_stream_advance(bs, 8); | 505 byte_stream_advance(bs, 8); |
| 506 | |
| 501 frame->payload.len = byte_stream_get32(bs); | 507 frame->payload.len = byte_stream_get32(bs); |
| 502 frame->encoding = byte_stream_get16(bs); | 508 frame->encoding = byte_stream_get16(bs); |
| 503 byte_stream_advance(bs, 4); | 509 byte_stream_advance(bs, 4); |
| 510 | |
| 504 frame->flags = byte_stream_get16(bs); | 511 frame->flags = byte_stream_get16(bs); |
| 505 byte_stream_advance(bs, 4); | 512 byte_stream_advance(bs, 4); |
| 506 byte_stream_getrawbuf(bs, frame->bn, 32); | 513 byte_stream_getrawbuf(bs, frame->bn, 32); |
| 507 | 514 |
| 508 purple_debug_info("oscar", "Incoming ODC frame from %s with " | 515 purple_debug_info("oscar", "Incoming ODC frame from %s with " |