--- sbbs/src/sbbs3/chksmb.c	2018/04/24 16:41:23	1.1
+++ sbbs/src/sbbs3/chksmb.c	2018/04/24 16:42:47	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet message base (SMB) validity checker */
 
-/* $Id: chksmb.c,v 1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: chksmb.c,v 1.1.1.2 2018/04/24 16:42:47 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2005 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -118,18 +118,20 @@ char *usage="\nusage: chksmb [-opts] <fi
 int main(int argc, char **argv)
 {
 	char		str[128],*p,*s,*beep="";
+	char		from[26];
 	char*		body;
 	char*		tail;
 	int 		h,i,j,x,y,lzh,errors,errlast;
 	BOOL		stop_on_error=FALSE,pause_on_error=FALSE,chkxlat=TRUE,chkalloc=TRUE,chkhash=TRUE
 				,lzhmsg,extinfo=FALSE,msgerr;
-	ushort		xlat;
-	ulong		l,m,n,length,size,total=0,orphan,deleted,headers
+	uint16_t	xlat;
+	uint32_t	m;
+	ulong		l,n,length,size,total=0,orphan,deleted,headers
 				,*offset,*number,xlaterr
 				,delidx
 				,delhdrblocks,deldatblocks,hdrerr,lockerr,hdrnumerr,hdrlenerr
 				,getbodyerr,gettailerr
-				,hasherr
+				,hasherr,badhash
 				,acthdrblocks,actdatblocks
 				,dfieldlength,dfieldoffset
 				,dupenum,dupenumhdr,dupeoff,attr,actalloc
@@ -144,10 +146,11 @@ int main(int argc, char **argv)
 	smbmsg_t	msg;
 	hash_t**	hashes;
 	char		revision[16];
+	time_t		now=time(NULL);
 
-	sscanf("$Revision: 1.1 $", "%*s %s", revision);
+	sscanf("$Revision: 1.1.1.2 $", "%*s %s", revision);
 
-	fprintf(stderr,"\nCHKSMB v2.20-%s (rev %s) SMBLIB %s - Check Synchronet Message Base\n"
+	fprintf(stderr,"\nCHKSMB v2.30-%s (rev %s) SMBLIB %s - Check Synchronet Message Base\n"
 		,PLATFORM_DESC,revision,smb_lib_ver());
 
 	if(argc<2) {
@@ -267,7 +270,7 @@ int main(int argc, char **argv)
 	actalloc=datactalloc=deldatblocks=delhdrblocks=xlaterr=0;
 	lzhblocks=lzhsaved=acthdrblocks=actdatblocks=0;
 	getbodyerr=gettailerr=0;
-	hasherr=0;
+	hasherr=badhash=0;
 	unvalidated=0;
 	intransit=0;
 	acthdrblocks=actdatblocks=0;
@@ -276,6 +279,7 @@ int main(int argc, char **argv)
 	for(l=smb.status.header_offset;l<length;l+=size) {
 		size=SHD_BLOCK_LEN;
 		fprintf(stderr,"\r%2lu%%  ",(long)(100.0/((float)length/l)));
+		fflush(stderr);
 		memset(&msg,0,sizeof(msg));
 		msg.idx.offset=l;
 		msgerr=FALSE;
@@ -307,9 +311,10 @@ int main(int argc, char **argv)
 		smb_unlockmsghdr(&smb,&msg);
 		size=smb_hdrblocks(smb_getmsghdrlen(&msg))*SHD_BLOCK_LEN;
 
-		truncsp(msg.from);
-		strip_ctrl(msg.from);
-		fprintf(stderr,"#%-5lu (%06lX) %-25.25s ",msg.hdr.number,l,msg.from);
+		SAFECOPY(from,msg.from);
+		truncsp(from);
+		strip_ctrl(from);
+		fprintf(stderr,"#%-5lu (%06lX) %-25.25s ",msg.hdr.number,l,from);
 
 		if(msg.hdr.length!=smb_getmsghdrlen(&msg)) {
 			fprintf(stderr,"%sHeader length mismatch\n",beep);
@@ -342,10 +347,10 @@ int main(int argc, char **argv)
 
 		if(!(smb.status.attr&SMB_EMAIL) && chkhash) {
 			/* Look-up the message hashes */
-			hashes=smb_msghashes(&msg,body);
+			hashes=smb_msghashes(&msg,body,SMB_HASH_SOURCE_DUPE);
 			if(hashes!=NULL 
 				&& hashes[0]!=NULL 
-				&& (i=smb_findhash(&smb,hashes,NULL,SMB_HASH_SOURCE_ALL,/* mark */TRUE ))
+				&& (i=smb_findhash(&smb,hashes,NULL,SMB_HASH_SOURCE_DUPE,/* mark */TRUE ))
 					!=SMB_SUCCESS) {
 				for(h=0;hashes[h]!=NULL;h++) {
 					if(hashes[h]->flags&SMB_HASH_MARKED)
@@ -593,6 +598,8 @@ int main(int argc, char **argv)
 						,((msg.hdr.offset+msg.dfield[n].offset)/SDT_BLOCK_LEN)*2
 						,SEEK_SET);
 					for(m=0;m<msg.dfield[n].length;m+=SDT_BLOCK_LEN) {
+						/* TODO: LE Only */
+						i=0;
 						if(!fread(&i,2,1,smb.sda_fp) || !i) {
 							fprintf(stderr
 								,"%sActive Data Block %lu.%lu marked free\n"
@@ -644,6 +651,7 @@ int main(int argc, char **argv)
 		for(l=0;l<length;l+=2) {
 			if((l%10)==0)
 				fprintf(stderr,"\r%2lu%%  ",l ? (long)(100.0/((float)length/l)) : 0);
+			/* TODO: LE Only */
 			i=0;
 			if(!fread(&i,2,1,smb.sda_fp))
 				break;
@@ -740,6 +748,35 @@ int main(int argc, char **argv)
 
 	}	/* if(total) */
 
+	if(!(smb.status.attr&SMB_EMAIL) && chkhash && smb_open_hash(&smb)==SMB_SUCCESS) {
+		hash_t hash;
+
+		fprintf(stderr,"\nChecking %s Hashes\n\n",smb.file);
+
+		length=filelength(fileno(smb.hash_fp));
+
+		fseek(smb.hash_fp,0L,SEEK_SET);
+		for(l=0;l<length;l+=sizeof(hash_t)) {
+			if(((l/sizeof(hash_t))%10)==0)
+				fprintf(stderr,"\r%2lu%%  ",l ? (long)(100.0/((float)length/l)) : 0);
+			if(!fread(&hash,sizeof(hash),1,smb.hash_fp))
+				break;
+			if(hash.number==0 || hash.number > smb.status.last_msg)
+				fprintf(stderr,"\r%sInvalid message number (%u)\n", beep, hash.number), badhash++;
+			else if(hash.time < 0x40000000 || hash.time > (ulong)now)
+				fprintf(stderr,"\r%sInvalid time (0x%08lX)\n", beep, hash.time), badhash++;
+			else if(hash.length < 1 || hash.length > 1024*1024)
+				fprintf(stderr,"\r%sInvalid length (%lu)\n", beep, hash.length), badhash++;
+			else if(hash.source >= SMB_HASH_SOURCE_TYPES)
+				fprintf(stderr,"\r%sInvalid source type (%u)\n", beep, hash.source), badhash++;
+		}
+
+		smb_close_hash(&smb);
+
+		fprintf(stderr,"\r%79s\r100%%\n",""); 
+	}
+
+
 	totalmsgs+=smb.status.total_msgs;
 	totalmsgbytes+=(acthdrblocks*SHD_BLOCK_LEN)+(actdatblocks*SDT_BLOCK_LEN);
 	totaldelmsgs+=deleted;
@@ -907,13 +944,17 @@ int main(int argc, char **argv)
 			,"Invalid Data Field Lengths"
 			,dfieldlength);
 
+	if(badhash)
+		printf("%-35.35s (!): %lu\n"
+			,"Invalid Hash Entries"
+			,badhash);
 
 	printf("\n%s Message Base ",smb.file);
 	if(/* (headers-deleted)!=smb.status.total_msgs || */
 		total!=smb.status.total_msgs
 		|| (headers-deleted)!=total-delidx
 		|| idxzeronum || zeronum
-		|| hdrlenerr || hasherr
+		|| hdrlenerr || hasherr || badhash
 		|| getbodyerr || gettailerr
 		|| orphan || dupenumhdr || dupenum || dupeoff || attr
 		|| lockerr || hdrerr || hdrnumerr || idxnumerr || idxofferr