Mercurial > pidgin.yaz

changeset 31202:d4869cd86680

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Chang member name so it is compatible with MsnSlpHeader struct names.
author masca@cpw.pidgin.im
date Thu, 03 Jun 2010 21:18:53 +0000
parents 83eb90d18a96
children 4a8ebd7ed879
files libpurple/protocols/msn/directconn.c libpurple/protocols/msn/p2p.h
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/directconn.c	Thu Jun 03 21:16:24 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Thu Jun 03 21:18:53 2010 +0000
@@ -350,13 +350,13 @@
 	context = (MsnP2PBinaryHeader *)(dc->in_buffer + 4);
 
 	h->session_id = GUINT32_FROM_LE(context->session_id);
-	h->id = GUINT32_FROM_LE(context->seq_id);
+	h->id = GUINT32_FROM_LE(context->id);
 	h->offset = GUINT64_FROM_LE(context->offset);
 	h->total_size = GUINT64_FROM_LE(context->total_size);
 	h->length = GUINT32_FROM_LE(context->length);
 	h->flags = GUINT32_FROM_LE(context->flags);
 	h->ack_id = GUINT32_FROM_LE(context->ack_id);
-	h->ack_sub_id = GUINT32_FROM_LE(context->ack_uid);
+	h->ack_sub_id = GUINT32_FROM_LE(context->ack_sub_id);
 	h->ack_size = GUINT64_FROM_LE(context->ack_size);
 }
 
@@ -370,13 +370,13 @@
 	h = &dc->header;
 
 	bin_header.session_id = GUINT32_TO_LE(h->session_id);
-	bin_header.seq_id = GUINT32_TO_LE(h->id);
+	bin_header.id = GUINT32_TO_LE(h->id);
 	bin_header.offset = GUINT64_TO_LE(h->offset);
 	bin_header.total_size = GUINT64_TO_LE(h->total_size);
 	bin_header.length = GUINT32_TO_LE(h->length);
 	bin_header.flags = GUINT32_TO_LE(h->flags);
 	bin_header.ack_id = GUINT32_TO_LE(h->ack_id);
-	bin_header.ack_uid = GUINT32_TO_LE(h->ack_sub_id);
+	bin_header.ack_sub_id = GUINT32_TO_LE(h->ack_sub_id);
 	bin_header.ack_size = GUINT64_TO_LE(h->ack_size);
 
 	return (const gchar *)&bin_header;
--- a/libpurple/protocols/msn/p2p.h	Thu Jun 03 21:16:24 2010 +0000
+++ b/libpurple/protocols/msn/p2p.h	Thu Jun 03 21:18:53 2010 +0000
@@ -6,13 +6,13 @@
 #pragma pack(push,1)
 typedef struct {
 	guint32 session_id;
-	guint32 seq_id;
+	guint32 id;
 	guint64 offset;
 	guint64 total_size;
 	guint32 length;
 	guint32 flags;
 	guint32 ack_id;
-	guint32 ack_uid;
+	guint32 ack_sub_id;
 	guint64 ack_size;
 /*	guint8  body[1]; */
 } MsnP2PBinaryHeader;