Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27902/include Modified Files: data.h parsemeta.h Log Message: This patch merges the COW metaserver code. It adds a UDP metaserver option, which can be refreshed, that merges data from all known metaservers. The UPD metaserver can also solicit other servers as if they were a metaserver, and supports the server option to display a comment rather than server name. There is also support for multicast server packets. data.h, data.c: Changes default metaserver format from array to comma delimited list parsemeta.h: Fixes description of parsemeta function console.c (LineToConsole): Increases buffer size (large error messages like displaying the metaserver packet was causing a buffer overflow) cowmain.c: Adds support for metatype sysdef option main.c: Renames old -m option to -M, and adds -m option for UDP metaserver newwin.c: Changes how metaserver window dimensions are set (slightly wider, height variable) parsemeta.c: Extensively rewritten. Highlights include new server fields, bug fixes related to the size/initialization of the comment field, and new metaserver headers based on what optional fields (age, ping) are displayed. Totally new functions, such as ReadMetasSend, grow, server_find, version_s, version_r, ReadMetasRecv, SaveMetasCache, and LoadMetasCache, have also been added. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- data.h 20 Sep 2006 13:04:52 -0000 1.37 +++ data.h 27 Nov 2006 07:08:40 -0000 1.38 @@ -110,7 +110,7 @@ #endif #ifdef META -extern char *metaServer[]; +extern char *metaServer; extern int metaPort; extern char *metaCache; #ifdef METAPING Index: parsemeta.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/parsemeta.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- parsemeta.h 7 May 2006 16:59:26 -0000 1.3 +++ parsemeta.h 27 Nov 2006 07:08:40 -0000 1.4 @@ -16,11 +16,11 @@ void parsemeta (int metaType); /* - * Read and Parse the meta-server information, either from the meta- - * server (if metaType = 1) or from the cache (if metaType = 2). + * Read and Parse the metaserver information, either from the metaservers + * by UDP (1), from a single metaserver by TCP (3), or from the cache (2). * * NOTE: This function sets the variable "num_servers" which is - * later used to decide the hight of the meta-server window. + * used in newwin() to set the height of the meta-server window. */