commit 3e8b3ce9a2075ea53ac7d62225bae3142a3ff6d6
Author: Nikias Bassen <[email protected]>
Date: Sun Oct 3 00:48:10 2010 +0200
update MhbdHeader field names
src/db-itunes-parser.h | 19 ++++++++++++-------
src/itdb_hash58.c | 6 +++---
src/itdb_hash72.c | 4 ++--
3 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/src/db-itunes-parser.h b/src/db-itunes-parser.h
index f0494ef..cc71bcc 100644
--- a/src/db-itunes-parser.h
+++ b/src/db-itunes-parser.h
@@ -84,19 +84,24 @@ struct _MhbdHeader {
guint32 num_children;
guint64 db_id;
guint16 platform;
- guint32 unknown3;
- guint64 unknown4;
- guint16 unknown5;
+ guint16 unk_0x22;
+ guint64 id_0x24;
+ guint32 unk_0x2c;
guint16 hashing_scheme;
- guchar unknown6[20];
+ guchar unk_0x32[20];
gchar language_id[2];
guint64 db_persistent_id;
- guint32 unknown7;
- guint32 unknown8;
+ guint32 unk_0x50;
+ guint32 unk_0x54;
guchar hash58[20];
gint32 timezone_offset;
- guint16 unknown9;
+ guint16 unk_0x70;
guchar hash72[46];
+ guint16 audio_language;
+ guint16 subtitle_language;
+ guint16 unk_0xa4;
+ guint16 unk_0xa6;
+ guint16 unk_0xa8;
guchar padding[];
} __attribute__((__packed__));
diff --git a/src/itdb_hash58.c b/src/itdb_hash58.c
index e450ef7..03b6cbb 100644
--- a/src/itdb_hash58.c
+++ b/src/itdb_hash58.c
@@ -291,11 +291,11 @@ gboolean itdb_hash58_write_hash (Itdb_Device *device,
header = (MhbdHeader *)itdb_data;
g_assert (strncmp (header->header_id, "mhbd", strlen ("mhbd")) == 0);
memcpy (backup18, &header->db_id, sizeof (backup18));
- memcpy (backup32, &header->unknown6, sizeof (backup32));
+ memcpy (backup32, &header->unk_0x32, sizeof (backup32));
/* Those fields must be zero'ed out for the sha1 calculation */
memset(&header->db_id, 0, sizeof (header->db_id));
- memset(&header->unknown6, 0, sizeof (header->unknown6));
+ memset(&header->unk_0x32, 0, sizeof (header->unk_0x32));
memset(&header->hash58, 0, sizeof (header->hash58));
header->hashing_scheme = GUINT16_FROM_LE (ITDB_CHECKSUM_HASH58);
@@ -310,7 +310,7 @@ gboolean itdb_hash58_write_hash (Itdb_Device *device,
g_free (checksum);
memcpy (&header->db_id, backup18, sizeof (backup18));
- memcpy (&header->unknown6, backup32, sizeof (backup32));
+ memcpy (&header->unk_0x32, backup32, sizeof (backup32));
return TRUE;
}
diff --git a/src/itdb_hash72.c b/src/itdb_hash72.c
index 7fada49..cf4314f 100644
--- a/src/itdb_hash72.c
+++ b/src/itdb_hash72.c
@@ -246,7 +246,7 @@ static void itdb_hash72_compute_itunesdb_sha1 (unsigned
char *itdb_data,
header = (MhbdHeader *)itdb_data;
g_assert (strncmp (header->header_id, "mhbd", strlen ("mhbd")) == 0);
memcpy (backup18, &header->db_id, sizeof (backup18));
- memcpy (backup32, &header->unknown6, sizeof (backup32));
+ memcpy (backup32, &header->unk_0x32, sizeof (backup32));
memcpy (hash72, &header->hash72, sizeof (hash72));
/* Those fields must be zero'ed out for the sha1 calculation */
@@ -262,7 +262,7 @@ static void itdb_hash72_compute_itunesdb_sha1 (unsigned
char *itdb_data,
g_checksum_free (checksum);
memcpy (&header->db_id, backup18, sizeof (backup18));
- memcpy (&header->unknown6, backup32, sizeof (backup32));
+ memcpy (&header->unk_0x32, backup32, sizeof (backup32));
}
gboolean itdb_hash72_extract_hash_info (const Itdb_Device *device,
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
