Re: [VANILLA-DEV:200] CVS update: metaserver

[Bob Tanner <tanner@real-time.com>]

Does this patch fix the multi-homed problem of continuum?

Quoting Vanilla CVS Development (tanner@real-time.com):
> Date:	Wednesday March 24, 1999 @ 0:20
> Author:	unbelver
> 
> Update of /home/netrek/cvsroot/metaserver
> In directory cvs.castle.real-time.com:/var/tmp/cvs-serv2640
> 
> Modified Files:
> 	Makefile scan.c 
> Log Message:
> For the makefile, added -DSYSV, since we all seem to be on SYSVish
> machines
> 
> For scan.c, when solicit is checking to see if it knows about the
> host, changed the ip check from what's in the metarc to what's
> been nslookup'ed.
> 
> 
> 
> ****************************************
> 
> Index: metaserver/Makefile
> diff -u metaserver/Makefile:2.0 metaserver/Makefile:2.1
> --- metaserver/Makefile:2.0	Tue Oct 27 21:48:04 1998
> +++ metaserver/Makefile	Wed Mar 24 00:20:48 1999
> @@ -12,14 +12,14 @@
>  #CFLAGS	= -O -s -DDEBUG
>  #CFLAGS	= -O -s
>  #CFLAGS	= -O -s -DSYSV
> -CFLAGS	= -g
> +CFLAGS	= -g -DSYSV -s
>  #CFLAGS	= -g -DDEBUG
>  #CFLAGS	= -g -p -DPROF
>  LIBS	= 
>  
>  # Amdahl UTS stuff
>  #LIBS	= $(UTSLIBS)
> -LIBS	= #-lV3
> +LIBS	= -lnsl -lsocket
>  # hpux stuff
>  #LIBS	= -lBSD
>  
> Index: metaserver/scan.c
> diff -u metaserver/scan.c:2.0 metaserver/scan.c:2.1
> --- metaserver/scan.c:2.0	Tue Oct 27 21:48:06 1998
> +++ metaserver/scan.c	Wed Mar 24 00:20:49 1999
> @@ -4,7 +4,7 @@
>   * MetaServerII
>   * Copyright (c) 1993 by Andy McFadden
>   * 
> - * $Id: scan.c,v 2.0 1998/10/28 03:48:06 unbelver Exp $
> + * $Id: scan.c,v 2.1 1999/03/24 06:20:49 unbelver Exp $
>   * 
>   */
>  #include <stdio.h>
> @@ -1061,11 +1061,20 @@
>      }
>  
>    /* now either update an existing server entry or create a new one */
> +#ifdef SOLICITDEBUG
> +  printf("\nCHECKING A SOLICIT\n");
> +#endif
>    for (i = 0, sp = servers; i < server_count; i++, sp++) {
> +#ifdef SOLICITDEBUG
> +    printf("srvbuf.hostname      = %s\n",srvbuf.hostname);
> +    printf("sp->hostname         = %s\n",sp->hostname);
> +    printf("from.sin_addr.s_addr = %x\n",from.sin_addr.s_addr);
> +    printf("sp->addr             = %x\n",sp->addr);
> +#endif
>      if (!strcmp(srvbuf.hostname, sp->hostname) &&
> -	!strcmp(srvbuf.ip_addr, sp->ip_addr) &&
> +        (from.sin_addr.s_addr == sp->addr) &&
>  	(srvbuf.type[0] == sp->type[0]) &&
> -	srvbuf.port == sp->port) {
> +	(srvbuf.port == sp->port)) {
>        /* we know about the server already */
>  
>        /* check for flooding */
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: vanilla-devel-unsubscribe@us.netrek.org
> For additional commands, e-mail: vanilla-devel-help@us.netrek.org

-- 
Bob Tanner <tanner@real-time.com>       | Phone : (612)943-8700
http://www.real-time.com                | Fax   : (612)943-8500
Key fingerprint =  6C E9 51 4F D5 3E 4C 66 62 A9 10 E5 35 85 39 D9