Menu
▾
▴
[Bitcollider-commits] CVS: bitcollider/lib main.c,1.46,1.47
|
From: Gordon M. <go...@us...> - 2004-01-18 11:02:35
|
Update of /cvsroot/bitcollider/bitcollider/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv1729/lib
Modified Files:
main.c
Log Message:
* main.c
Calculate Kazaa tree value alongside other hashes. Replace uuhash with kzhash.
Index: main.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/lib/main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** main.c 3 Jan 2004 21:30:36 -0000 1.46
--- main.c 18 Jan 2004 11:02:32 -0000 1.47
***************
*** 18,21 ****
--- 18,22 ----
#include "ed2k_md4.h"
#include "ftuuhash.h"
+ #include "kztree.h"
#include "mp3.h"
#include "id3.h"
***************
*** 84,88 ****
char *md5sum,
char *ed2kmd4sum,
! char *ftuusum,
unsigned char *firstHex,
mp3_info *mp3Info,
--- 85,89 ----
char *md5sum,
char *ed2kmd4sum,
! char *kzhashhex,
unsigned char *firstHex,
mp3_info *mp3Info,
***************
*** 242,246 ****
char md5[64];
char ed2kmd4[64];
! char ftuu[64];
const char *baseFileName;
mp3_info *mp3Info = NULL;
--- 243,247 ----
char md5[64];
char ed2kmd4[64];
! char kzhashhex[128];
const char *baseFileName;
mp3_info *mp3Info = NULL;
***************
*** 350,354 ****
mp3Info = malloc(sizeof(mp3_info));
! if (!get_bitprint_data(submission, fileName, bitprint, crc32, md5, ed2kmd4, ftuu, firstNHex,
mp3Info, methods, &attrList))
{
--- 351,355 ----
mp3Info = malloc(sizeof(mp3_info));
! if (!get_bitprint_data(submission, fileName, bitprint, crc32, md5, ed2kmd4, kzhashhex, firstNHex,
mp3Info, methods, &attrList))
{
***************
*** 381,385 ****
add_attribute(submission, "tag.filename.filename", baseFileName);
! if (submission->bc->calculateCRC32)
{
add_attribute(submission, "tag.crc32.crc32", crc32);
--- 382,386 ----
add_attribute(submission, "tag.filename.filename", baseFileName);
! if (submission->bc->calculateCRC32)
{
add_attribute(submission, "tag.crc32.crc32", crc32);
***************
*** 391,395 ****
add_attribute(submission, "tag.ed2k.ed2khash", ed2kmd4);
! add_attribute(submission, "tag.uuhash.uuhash", ftuu);
/* Check to make sure that we carried out the mp3 check, and
--- 392,396 ----
add_attribute(submission, "tag.ed2k.ed2khash", ed2kmd4);
! add_attribute(submission, "tag.kzhash.kzhash", kzhashhex);
/* Check to make sure that we carried out the mp3 check, and
***************
*** 715,719 ****
char *md5sum,
char *ed2kmd4,
! char *ftuu,
unsigned char *firstHex,
mp3_info *mp3Info,
--- 716,720 ----
char *md5sum,
char *ed2kmd4,
! char *kzhashhex,
unsigned char *firstHex,
mp3_info *mp3Info,
***************
*** 735,739 ****
fseek(source, 0, SEEK_SET);
! ret = calculate_hashes(submission, source, bitprint, crc32hex, md5sum, ed2kmd4, ftuu,
mp3Info, methods, attrList);
if (ret)
--- 736,740 ----
fseek(source, 0, SEEK_SET);
! ret = calculate_hashes(submission, source, bitprint, crc32hex, md5sum, ed2kmd4, kzhashhex,
mp3Info, methods, attrList);
if (ret)
***************
*** 750,754 ****
char *md5sum,
char *ed2kmd4sum,
! char *ftuusum,
mp3_info *mcontext,
PluginMethods *methods,
--- 751,755 ----
char *md5sum,
char *ed2kmd4sum,
! char *kzhashsum,
mp3_info *mcontext,
PluginMethods *methods,
***************
*** 760,764 ****
ED2K_CTX ed2kmd4context;
FTUU_CTX ftuucontext;
! unsigned char *buffer, bitprintRaw[BITPRINT_RAW_LEN], md5Digest[16], ed2kDigest[16], ftuuDigest[20];
int bytes;
b_bool ret = true;
--- 761,766 ----
ED2K_CTX ed2kmd4context;
FTUU_CTX ftuucontext;
! KZTREE_CONTEXT kztreecontext;
! unsigned char *buffer, bitprintRaw[BITPRINT_RAW_LEN], md5Digest[16], ed2kDigest[16], kzhash[36];
int bytes;
b_bool ret = true;
***************
*** 775,784 ****
if (methods && methods->mem_analyze_init)
context = methods->mem_analyze_init();
! if (submission->bc->calculateCRC32)
! crc32 = 0xffffffff; //init
if (submission->bc->calculateMD5)
MD5Init(&md5context);
ED2KInit(&ed2kmd4context);
FTUUInit(&ftuucontext);
buffer = (unsigned char*)malloc(BUFFER_LEN);
--- 777,787 ----
if (methods && methods->mem_analyze_init)
context = methods->mem_analyze_init();
! if (submission->bc->calculateCRC32)
! crc32 = 0xffffffff; //init
if (submission->bc->calculateMD5)
MD5Init(&md5context);
ED2KInit(&ed2kmd4context);
FTUUInit(&ftuucontext);
+ kztree_init(&kztreecontext);
buffer = (unsigned char*)malloc(BUFFER_LEN);
***************
*** 818,822 ****
ED2KUpdate(&ed2kmd4context, buffer, bytes);
FTUUUpdate(&ftuucontext, buffer, bytes);
!
if (submission->bc->progressCallback && !submission->bc->preview)
--- 821,825 ----
ED2KUpdate(&ed2kmd4context, buffer, bytes);
FTUUUpdate(&ftuucontext, buffer, bytes);
! kztree_update(&kztreecontext, buffer, bytes);
if (submission->bc->progressCallback && !submission->bc->preview)
***************
*** 854,862 ****
{
MD5Final(md5Digest, &md5context);
! bitziEncodeBase32(md5Digest, 16, md5sum);
}
ED2KFinal(ed2kDigest, &ed2kmd4context);
! FTUUFinal(ftuuDigest, &ftuucontext);
sprintf(ed2kmd4sum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
--- 857,871 ----
{
MD5Final(md5Digest, &md5context);
! //bitziEncodeBase32(md5Digest, 16, md5sum);
! sprintf(md5sum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
! md5Digest[0],md5Digest[1],md5Digest[2],md5Digest[3],
! md5Digest[4],md5Digest[5],md5Digest[6],md5Digest[7],
! md5Digest[8],md5Digest[9],md5Digest[10],md5Digest[11],
! md5Digest[12],md5Digest[13],md5Digest[14],md5Digest[15]);
}
ED2KFinal(ed2kDigest, &ed2kmd4context);
! FTUUFinal(kzhash, &ftuucontext);
! kztree_digest(&kztreecontext,kzhash+20);
sprintf(ed2kmd4sum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
***************
*** 865,870 ****
ed2kDigest[8],ed2kDigest[9],ed2kDigest[10],ed2kDigest[11],
ed2kDigest[12],ed2kDigest[13],ed2kDigest[14],ed2kDigest[15]);
!
! bitziEncodeBase64(ftuuDigest,20,ftuusum);
return ret;
--- 874,889 ----
ed2kDigest[8],ed2kDigest[9],ed2kDigest[10],ed2kDigest[11],
ed2kDigest[12],ed2kDigest[13],ed2kDigest[14],ed2kDigest[15]);
!
! //bitziEncodeBase64(ftuuDigest,20,ftuusum);
! sprintf(kzhashsum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
! kzhash[0],kzhash[1],kzhash[2],kzhash[3],
! kzhash[4],kzhash[5],kzhash[6],kzhash[7],
! kzhash[8],kzhash[9],kzhash[10],kzhash[11],
! kzhash[12],kzhash[13],kzhash[14],kzhash[15],
! kzhash[16],kzhash[17],kzhash[18],kzhash[19],
! kzhash[20],kzhash[21],kzhash[22],kzhash[23],
! kzhash[24],kzhash[25],kzhash[26],kzhash[27],
! kzhash[28],kzhash[29],kzhash[30],kzhash[31],
! kzhash[32],kzhash[33],kzhash[34],kzhash[35]);
return ret;
|
