From 981d0670007e84c9d15386014069f5cf88a0c7f0 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 23 Feb 2001 18:31:48 +0000 Subject: [PATCH] merge qw's net_com.c and checksum.c (net_com.c was identitcle to nq's checksum.c) and then move the resutlting checksum.c into libs/utils ditching nq's. Due to net_com.c, qw's libqfnet.a will need to be deleted or you will get duplicate symbol link errors. Also merge crc.[ch] and move qfplits.[ch] to their final homes. Also, remove a slightly overzealous use of "static" in qfplist.[ch]. --- {qw/include => include}/checksum.h | 7 +-- {qw/include => include}/crc.h | 6 +- {qw/include => include}/qfplist.h | 2 +- libs/util/Makefile.am | 2 +- {qw/source => libs/util}/checksum.c | 73 +++++++++-------------- {qw/source => libs/util}/crc.c | 0 {qw/source => libs/util}/qfplist.c | 11 +--- nq/include/checksum.h | 34 ----------- nq/include/crc.h | 38 ------------ nq/source/Makefile.am | 4 +- nq/source/checksum.c | 54 ----------------- nq/source/crc.c | 91 ----------------------------- qw/source/Makefile.am | 8 +-- qw/source/net_com.c | 55 ----------------- 14 files changed, 41 insertions(+), 344 deletions(-) rename {qw/include => include}/checksum.h (86%) rename {qw/include => include}/crc.h (95%) rename {qw/include => include}/qfplist.h (97%) rename {qw/source => libs/util}/checksum.c (83%) rename {qw/source => libs/util}/crc.c (100%) rename {qw/source => libs/util}/qfplist.c (99%) delete mode 100644 nq/include/checksum.h delete mode 100644 nq/include/crc.h delete mode 100644 nq/source/checksum.c delete mode 100644 nq/source/crc.c delete mode 100644 qw/source/net_com.c diff --git a/qw/include/checksum.h b/include/checksum.h similarity index 86% rename from qw/include/checksum.h rename to include/checksum.h index 9af9a59d0..e55ced39d 100644 --- a/qw/include/checksum.h +++ b/include/checksum.h @@ -26,14 +26,13 @@ $Id$ */ -#ifndef _CHECKSUM_H -#define _CHECKSUM_H +#ifndef __checksum_h +#define __checksum_h #include "qtypes.h" unsigned int Com_BlockChecksum (void *buffer, int length); void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf); -byte COM_BlockSequenceCheckByte (byte *base, int length, int sequence, unsigned int mapchecksum); byte COM_BlockSequenceCRCByte (byte *base, int length, int sequence); -#endif // _CHECKSUM_H +#endif // __checksum_h diff --git a/qw/include/crc.h b/include/crc.h similarity index 95% rename from qw/include/crc.h rename to include/crc.h index eaa8d3fcc..8cc578d12 100644 --- a/qw/include/crc.h +++ b/include/crc.h @@ -26,8 +26,8 @@ $Id$ */ -#ifndef _CRC_H -#define _CRC_H +#ifndef __crc_h +#define __crc_h #include "qtypes.h" @@ -36,4 +36,4 @@ void CRC_ProcessByte(unsigned short *crcvalue, byte data); unsigned short CRC_Value(unsigned short crcvalue); unsigned short CRC_Block (byte *start, int count); -#endif // _CRC_H +#endif // __crc_h diff --git a/qw/include/qfplist.h b/include/qfplist.h similarity index 97% rename from qw/include/qfplist.h rename to include/qfplist.h index f42819b03..587f23b4e 100644 --- a/qw/include/qfplist.h +++ b/include/qfplist.h @@ -89,7 +89,7 @@ typedef struct pldata_s { // Unparsed property list string char *error; } pldata_t; -static plitem_t *PL_GetPropertyList (const char *); +plitem_t *PL_GetPropertyList (const char *); /* Internal prototypes diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index 0ad56e6e8..8fca18521 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libqfutil.a -libqfutil_a_SOURCES = cmd.c cvar.c hash.c mdfour.c sizebuf.c va.c zone.c +libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c mdfour.c qfplist.c sizebuf.c va.c zone.c all-local: ../libqfutil.a diff --git a/qw/source/checksum.c b/libs/util/checksum.c similarity index 83% rename from qw/source/checksum.c rename to libs/util/checksum.c index d5fc80a0d..58075eb69 100644 --- a/qw/source/checksum.c +++ b/libs/util/checksum.c @@ -1,7 +1,12 @@ /* checksum.c - (description) + CRC and MD4-based checksum utility functions + + Copyright (C) 2000 Jeff Teunissen + + Author: Jeff Teunissen + Date: 01 Jan 2000 Copyright (C) 1996-1997 Id Software, Inc. @@ -38,6 +43,7 @@ #include "checksum.h" #include "crc.h" +#include "mdfour.h" static byte chktbl[1024 + 4] = { 0x78, 0xd2, 0x94, 0xe3, 0x41, 0xec, 0xd6, 0xd5, 0xcb, 0xfc, 0xdb, 0x8a, @@ -109,52 +115,6 @@ static byte chktbl[1024 + 4] = { 0x00, 0x00, 0x00, 0x00 }; -#if 0 -/* - COM_BlockSequenceCheckByte - - For proxy protecting -*/ -byte -COM_BlockSequenceCheckByte (byte * base, int length, int sequence, - unsigned mapchecksum) -{ - int checksum; - byte *p; - - if (last_mapchecksum != mapchecksum) { - last_mapchecksum = mapchecksum; - chktbl[1024] = (mapchecksum & 0xff000000) >> 24; - chktbl[1025] = (mapchecksum & 0x00ff0000) >> 16; - chktbl[1026] = (mapchecksum & 0x0000ff00) >> 8; - chktbl[1027] = (mapchecksum & 0x000000ff); - - Com_BlockFullChecksum (chktbl, sizeof (chktbl), chkbuf); - } - - p = chktbl + (sequence % (sizeof (chktbl) - 8)); - - if (length > 60) - length = 60; - memcpy (chkbuf + 16, base, length); - - length += 16; - - chkbuf[length] = (sequence & 0xff) ^ p[0]; - chkbuf[length + 1] = p[1]; - chkbuf[length + 2] = ((sequence >> 8) & 0xff) ^ p[2]; - chkbuf[length + 3] = p[3]; - - length += 4; - - checksum = LittleLong (Com_BlockChecksum (chkbuf, length)); - - checksum &= 0xff; - - return checksum; -} -#endif - /* COM_BlockSequenceCRCByte @@ -186,3 +146,22 @@ COM_BlockSequenceCRCByte (byte * base, int length, int sequence) return (byte) crc; } + +unsigned int +Com_BlockChecksum (void *buffer, int length) +{ + int digest[4]; + unsigned int val; + + mdfour ((unsigned char *) digest, (unsigned char *) buffer, length); + + val = digest[0] ^ digest[1] ^ digest[2] ^ digest[3]; + + return val; +} + +void +Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf) +{ + mdfour (outbuf, (unsigned char *) buffer, len); +} diff --git a/qw/source/crc.c b/libs/util/crc.c similarity index 100% rename from qw/source/crc.c rename to libs/util/crc.c diff --git a/qw/source/qfplist.c b/libs/util/qfplist.c similarity index 99% rename from qw/source/qfplist.c rename to libs/util/qfplist.c index f7b7b5a94..f52059379 100644 --- a/qw/source/qfplist.c +++ b/libs/util/qfplist.c @@ -421,7 +421,7 @@ PL_ParsePropertyListItem (pldata_t *pl) } // switch } -static plitem_t * +plitem_t * PL_GetPropertyList (const char *string) { pldata_t *pl = calloc (1, sizeof (pldata_t)); @@ -434,12 +434,3 @@ PL_GetPropertyList (const char *string) return PL_ParsePropertyListItem (pl); } - - - - - - - - - diff --git a/nq/include/checksum.h b/nq/include/checksum.h deleted file mode 100644 index 6ea3c3644..000000000 --- a/nq/include/checksum.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - checksum.h - - @description@ - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifndef __checksum_h -#define __checksum_h - -unsigned Com_BlockChecksum (void *buffer, int length); - -#endif // __checksum_h diff --git a/nq/include/crc.h b/nq/include/crc.h deleted file mode 100644 index f462f3831..000000000 --- a/nq/include/crc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - crc.h - - @description@ - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifndef __crc_h -#define __crc_h - -#include "qtypes.h" - -void CRC_Init(unsigned short *crcvalue); -void CRC_ProcessByte(unsigned short *crcvalue, byte data); -unsigned short CRC_Value(unsigned short crcvalue); - -#endif // __crc_h diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 75bbb0213..8b8679fc0 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -49,7 +49,7 @@ sound_ASM= snd_mixa.S common_ASM= sys_ia32.S worlda.S $(math_ASM) #endif -common_SOURCES= crc.c mathlib.c wad.c world.c \ +common_SOURCES= mathlib.c wad.c world.c \ model.c model_alias.c model_brush.c model_sprite.c \ msg.c qendian.c qargs.c quakefs.c \ quakeio.c link.c com.c \ @@ -122,7 +122,7 @@ EXTRA_libqfjs_a_SOURCES= joy_linux.c joy_null.c # # ... Networking # -libqfnet_a_SOURCES= net_bsd.c checksum.c net_dgrm.c net_loop.c \ +libqfnet_a_SOURCES= net_bsd.c net_dgrm.c net_loop.c \ net_main.c net_udp.c net_vcr.c EXTRA_libqfcd_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \ diff --git a/nq/source/checksum.c b/nq/source/checksum.c deleted file mode 100644 index 6d25f3d52..000000000 --- a/nq/source/checksum.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - net_com.c - - MD4-based checksum utility functions - - Copyright (C) 2000 Jeff Teunissen - - Author: Jeff Teunissen - Date: 01 Jan 2000 - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -unsigned Com_BlockChecksum (void *buffer, int length) -{ - int digest[4]; - unsigned val; - - mdfour ( (unsigned char *) digest, (unsigned char *) buffer, length ); - - val = digest[0] ^ digest[1] ^ digest[2] ^ digest[3]; - - return val; -} - -void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf) -{ - mdfour ( outbuf, (unsigned char *) buffer, len ); -} - diff --git a/nq/source/crc.c b/nq/source/crc.c deleted file mode 100644 index b58d0762c..000000000 --- a/nq/source/crc.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - crc.c - - @description@ - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "crc.h" - -// this is a 16 bit, non-reflected CRC using the polynomial 0x1021 -// and the initial and final xor values shown below... in other words, the -// CCITT standard CRC used by XMODEM - -#define CRC_INIT_VALUE 0xffff -#define CRC_XOR_VALUE 0x0000 - -static unsigned short crctable[256] = -{ - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 -}; - -void CRC_Init(unsigned short *crcvalue) -{ - *crcvalue = CRC_INIT_VALUE; -} - -void CRC_ProcessByte(unsigned short *crcvalue, byte data) -{ - *crcvalue = (*crcvalue << 8) ^ crctable[(*crcvalue >> 8) ^ data]; -} - -unsigned short CRC_Value(unsigned short crcvalue) -{ - return crcvalue ^ CRC_XOR_VALUE; -} diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index e829b7d99..9916a6e7c 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -49,7 +49,7 @@ endif if ASM_ARCH math_ASM = math.S sys_x86.S endif -common_SOURCES= buildnum.c checksum.c com.c crc.c \ +common_SOURCES= buildnum.c com.c \ info.c link.c mathlib.c model.c model_brush.c \ msg.c pmove.c pmovetst.c qargs.c qendian.c quakefs.c quakeio.c \ $(math_ASM) $(packetlogger) @@ -58,11 +58,11 @@ common_SOURCES= buildnum.c checksum.c com.c crc.c \ # ... Network type # if NETTYPE_IPV6 -libqfnet_a_SOURCES= net_chan.c net_com.c net_udp6.c +libqfnet_a_SOURCES= net_chan.c net_udp6.c else -libqfnet_a_SOURCES= net_chan.c net_com.c net_udp.c +libqfnet_a_SOURCES= net_chan.c net_udp.c endif -EXTRA_libqfnet_a_SOURCES= net_chan.c net_com.c net_udp.c net_udp6.c +EXTRA_libqfnet_a_SOURCES= net_chan.c net_udp.c net_udp6.c # # Server builds diff --git a/qw/source/net_com.c b/qw/source/net_com.c deleted file mode 100644 index f48ef3cb9..000000000 --- a/qw/source/net_com.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - net_com.c - - MD4-based checksum utility functions - - Copyright (C) 2000 Jeff Teunissen - - Author: Jeff Teunissen - Date: 01 Jan 2000 - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "mdfour.h" - -unsigned int -Com_BlockChecksum (void *buffer, int length) -{ - int digest[4]; - unsigned int val; - - mdfour ((unsigned char *) digest, (unsigned char *) buffer, length); - - val = digest[0] ^ digest[1] ^ digest[2] ^ digest[3]; - - return val; -} - -void -Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf) -{ - mdfour (outbuf, (unsigned char *) buffer, len); -}