From vanilla-devel at us.netrek.org Wed Jan 7 20:08:29 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:50 2005 Subject: [Vanilla Devel] CVS update: Vanilla/robots Message-ID: <200401080208.i0828TG14219@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:08 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/robots In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14213 Modified Files: Makefile.in Log Message: Grr.... Somebody wasn't careful with Puck objects and Pre-T objects variable names. P_OJBS was used for both and pre-T won out, being second. I was wondering why puck didn't make a rink and kept throwing in robots. --Carlos V. **************************************** Index: Vanilla/robots/Makefile.in diff -u Vanilla/robots/Makefile.in:1.5 Vanilla/robots/Makefile.in:1.6 --- Vanilla/robots/Makefile.in:1.5 Sat Aug 23 01:14:20 2003 +++ Vanilla/robots/Makefile.in Wed Jan 7 20:08:29 2004 @@ -34,7 +34,7 @@ # Puck Objects -P_OBJS = puck.o puckmove.o commands_puck.o $(C_OBJS) +PUCK_OBJS = puck.o puckmove.o commands_puck.o $(C_OBJS) # Mars (dogfighter) Objects @@ -79,8 +79,8 @@ all: $(PMAKE) $(EXECS) -puck: $(PMAKE) $(P_OBJS) - $(CC) $(CFLAGS) ${LDFLAGS} -o puck $(P_OBJS) $(EXTRALIBS) +puck: $(PMAKE) $(PUCK_OBJS) + $(CC) $(CFLAGS) ${LDFLAGS} -o puck $(PUCK_OBJS) $(EXTRALIBS) mars: $(PMAKE) $(M_OBJS) $(CC) $(CFLAGS) ${LDFLAGS} -o mars $(M_OBJS) $(EXTRALIBS) _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Wed Jan 7 20:12:31 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:50 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200401080212.i082CVv14232@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:12 Author: unbelver Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14229 Modified Files: ChangeLog Log Message: **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.144 Vanilla/ChangeLog:1.145 --- Vanilla/ChangeLog:1.144 Thu Oct 30 17:04:37 2003 +++ Vanilla/ChangeLog Wed Jan 7 20:12:31 2004 @@ -1,3 +1,8 @@ +Wed Jan 7 18:09:04 2004 Carlos Y. Villalpando + + * robots/Makefile.in (PUCK_OBJS): variable name collision for + puck objects and pre-t objects. + Fri Oct 31 09:15:42 2003 James Cameron * robotd/util.c, robots/inlcomm.c, sequencer/roboshar.c: use @@ -1484,4 +1489,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.144 2003/10/30 23:04:37 cameron Exp $ + $Id: ChangeLog,v 1.145 2004/01/08 02:12:31 unbelver Exp $ _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Wed Jan 7 20:42:20 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:50 2005 Subject: [Vanilla Devel] CVS update: Vanilla Message-ID: <200401080242.i082gK114261@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:42 Author: unbelver Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14253 Modified Files: ChangeLog Log Message: Added in Psychosis' hockey code running on puck.psychosis.net. Disabled by default, but useful to keep in the main tree. 3 differences. PUCK_FIRST: Puck process runs first on each update. Mainly for shots on edge of shot range. Puck isn't pressored out before puck notices that it is shot. FO_BIAS: non-scoring team, or team that's more than 5 goals behind get faceoff advantage. Advantage settable with FACEOFF_HELP. SITOUT_HURTS: Normally a sitout puts you within 5 points of exploding to avoid cheating. Undefine this and sitout won't hurt. --Carlos V. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.145 Vanilla/ChangeLog:1.146 --- Vanilla/ChangeLog:1.145 Wed Jan 7 20:12:31 2004 +++ Vanilla/ChangeLog Wed Jan 7 20:42:20 2004 @@ -1,3 +1,12 @@ +Wed Jan 7 18:30:36 2004 Carlos Y. Villalpando + + * robots/puck.c (main): Added items for makeing sure puck robot + runs before player process and Faceoff Bias. Code originally came + from psychosis hockey server. + * robots/puckmove.c (rmove): wrapped this function with puck_first + capability. + * ntserv/daemonII.c (main): Added puck_first capabilities. + Wed Jan 7 18:09:04 2004 Carlos Y. Villalpando * robots/Makefile.in (PUCK_OBJS): variable name collision for @@ -1489,4 +1498,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.145 2004/01/08 02:12:31 unbelver Exp $ + $Id: ChangeLog,v 1.146 2004/01/08 02:42:20 unbelver Exp $ _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Wed Jan 7 20:42:21 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:50 2005 Subject: [Vanilla Devel] CVS update: Vanilla/robots Message-ID: <200401080242.i082gLr14276@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:42 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/robots In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14253/robots Modified Files: puck.c puckdefs.h puckmove.c Log Message: Added in Psychosis' hockey code running on puck.psychosis.net. Disabled by default, but useful to keep in the main tree. 3 differences. PUCK_FIRST: Puck process runs first on each update. Mainly for shots on edge of shot range. Puck isn't pressored out before puck notices that it is shot. FO_BIAS: non-scoring team, or team that's more than 5 goals behind get faceoff advantage. Advantage settable with FACEOFF_HELP. SITOUT_HURTS: Normally a sitout puts you within 5 points of exploding to avoid cheating. Undefine this and sitout won't hurt. --Carlos V. **************************************** Index: Vanilla/robots/puck.c diff -u Vanilla/robots/puck.c:1.4 Vanilla/robots/puck.c:1.5 --- Vanilla/robots/puck.c:1.4 Sun Jul 11 22:28:02 1999 +++ Vanilla/robots/puck.c Wed Jan 7 20:42:20 2004 @@ -20,6 +20,13 @@ #include "puckdefs.h" #include "proto.h" +#ifdef PUCK_FIRST +#include + +struct sembuf sem_puck_op[1]; +int sem_puck; +#endif /*PUCK_FIRST*/ + void config(int); extern int redrawall; @@ -104,6 +111,17 @@ myship = &me->p_ship; mystats = &me->p_stats; lastm = mctl->mc_current; + +#ifdef PUCK_FIRST + if((sem_puck = semget(PUCK_FIRST, 1, 0600)) == -1) + { + ERROR(1,("Puck unable to get semaphore.")); + } + + sem_puck_op[0].sem_num = 0; + sem_puck_op[0].sem_op = 1; + sem_puck_op[0].sem_flg = 0; +#endif /*PUCK_FIRST*/ /* At this point we have memory set up. If we aren't a fleet, we don't want to replace any other robots on this team, so we'll check the Index: Vanilla/robots/puckdefs.h diff -u Vanilla/robots/puckdefs.h:1.2 Vanilla/robots/puckdefs.h:1.3 --- Vanilla/robots/puckdefs.h:1.2 Fri Apr 30 15:19:07 1999 +++ Vanilla/robots/puckdefs.h Wed Jan 7 20:42:20 2004 @@ -45,6 +45,18 @@ #define NUMSKATERS 12 + /* With SITOUT_HURTS defined, sitout causes + ships to be severely damaged (in order to prevent + abuse of sitout to gain position). If undefined, + sitout does not damage, but also does not + change a ship's y-position (allowing ships to + return to the rink quickly if a sitout wasn't + really needed, etc, which happens far more often + than abuse). Default was defined */ +#define SITOUT_HURTS + + + /* Some "computer speed" definitions */ #define HOWOFTEN 1 /*Robot moves every HOWOFTEN cycles*/ #define PERSEC (1000000/UPDATE/HOWOFTEN) /* # of robo calls per second*/ @@ -78,6 +90,17 @@ #define KLI_E (RINK_TOP + TENTH/2) /* end of Kli goal */ #define KLI_B (RINK_TOP + (RINK_LENGTH/3)) /* Kli blue line */ + /* FO_BIAS adds in code for biasing Faceoff against + the scoring team, or a team ahead by more than 5 + points. Leaving this undefined is the default + behavior of leaving puck in the center without + FACEOFF_HELP code */ +/* #undef FO_BIAS */ + /* FACEOFF_HELP should be defined, either as 0 + to leave the default behaviour, or > 0 as the + offset to apply to the puck's droppoint at faceoff + to assist the losing team. */ +#define FACEOFF_HELP (TENTH*2/3) /* Some global puck variable definitions */ Index: Vanilla/robots/puckmove.c diff -u Vanilla/robots/puckmove.c:1.8 Vanilla/robots/puckmove.c:1.9 --- Vanilla/robots/puckmove.c:1.8 Sun Dec 3 11:52:20 2000 +++ Vanilla/robots/puckmove.c Wed Jan 7 20:42:20 2004 @@ -23,6 +23,13 @@ #include "data.h" #include "puckdefs.h" +#ifdef PUCK_FIRST +#include + +extern struct sembuf sem_puck_op[1]; +extern int sem_puck; +#endif /*PUCK_FIRST */ + #define WEAKER_STR 2 /* integer factor to divide tractstr down */ @@ -161,7 +168,19 @@ int team_offsides = 0; #endif +#ifdef PUCK_FIRST +void _rmove(void); /* original rmove we're hijacking */ + +void rmove(void) +{ + _rmove(); + semop(sem_puck, sem_puck_op, 1); /* we're done, everyone else's turn now */ +} + +void _rmove(void) +#else /*PUCK_FIRST */ void rmove(void) +#endif /*PUCK_FIRST */ { extern struct Enemy *get_nearest(); struct Enemy *enemy_buf; @@ -174,6 +193,10 @@ static int pauseticks; +#ifdef FO_BIAS + static int faceoffbias = 0; +#endif /*FO_BIAS*/ + /***** Start The Code Here *****/ HANDLE_SIG(SIGALRM,rmove); @@ -193,12 +216,18 @@ /* This is done first to allow for a good short_game */ if (roboclock >= END_OF_PERIOD) { if (period >= PERIODS_PER_GAME) { +#ifdef FO_BIAS + faceoffbias = 0; +#endif /*FO_BIAS*/ messAll(anncer->p_no,roboname,"#############################"); messAll(anncer->p_no,roboname,"#"); messAll(me->p_no, roboname,"# END OF GAME."); messAll(anncer->p_no,roboname,"#"); woomp(); } else { +#ifdef FO_BIAS + faceoffbias = 0; +#endif /*FO_BIAS*/ messAll(anncer->p_no,roboname,"#"); messAll(me->p_no, roboname,"# END OF PERIOD."); messAll(anncer->p_no,roboname,"#"); @@ -288,7 +317,13 @@ } messAll(me->p_no,roboname,""); me->p_x = 45000 + random()%10000; /* reappear */ +#ifdef FO_BIAS + if (scores[KLI] >= (scores[ORI]+5)) faceoffbias = 1; + if (scores[ORI] >= (scores[KLI]+5)) faceoffbias = -1; + me->p_y = R_MID + FACEOFF_HELP * faceoffbias; +#else /*FO_BIAS */ me->p_y = R_MID; +#endif /*FO_BIAS */ me->p_speed = 0; /* *** BAV *** */ me->p_desspeed = 0; me->p_subspeed = 0; @@ -378,6 +413,9 @@ else{ #endif do_goal(ORI); +#ifdef FO_BIAS + faceoffbias = -1; +#endif /*FO_BIAS*/ #ifdef OFFSIDE } #endif @@ -397,6 +435,10 @@ else{ #endif do_goal(KLI); +#ifdef FO_BIAS + faceoffbias = 1; +#endif /*FO_BIAS*/ + #ifdef OFFSIDE } #endif @@ -949,11 +991,15 @@ /*Place people on opposite sides of the rink*/ if (j->p_team == KLI){ j->p_x = track->t_x = SITOUT_X; +#ifdef SITOUT_HURTS j->p_y = track->t_y = KLI_B + (random() % (2*DISPLACE) - DISPLACE); +#endif /*SITOUT_HURTS */ } else if (j->p_team == ORI){ j->p_x = track->t_x = GWIDTH - SITOUT_X; +#ifdef SITOUT_HURTS j->p_y = track->t_y = ORI_B + (random() % (2*DISPLACE) - DISPLACE); +#endif /*SITOUT_HURTS*/ } else return; /*Not ORI, not KLI, so do nothing... Weird*/ @@ -987,10 +1033,11 @@ j->p_desspeed = 0; j->p_subspeed = 0; j->p_flags = PFSHIELD; +#ifdef SITOUT_HURTS j->p_fuel = 0; /*Hah, you're hosed anyway */ j->p_damage = j->p_ship.s_maxdamage - 5; j->p_shield = j->p_ship.s_maxshield; /*OK, a potential help */ - +#endif /*SITOUT_HURTS*/ } void do_offsides(void) @@ -1599,6 +1646,13 @@ messAll(me->p_no,roboname,"#"); } } + +#ifdef PUCK_FIRST + if (sem_puck > -1) + { + semop(sem_puck, sem_puck_op, 1); + } +#endif /*PUCK_FIRST*/ freeslot(me); freeslot(anncer); _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Wed Jan 7 20:42:20 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:50 2005 Subject: [Vanilla Devel] CVS update: Vanilla/include Message-ID: <200401080242.i082gKg14266@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:42 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/include In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14253/include Modified Files: defs.h Log Message: Added in Psychosis' hockey code running on puck.psychosis.net. Disabled by default, but useful to keep in the main tree. 3 differences. PUCK_FIRST: Puck process runs first on each update. Mainly for shots on edge of shot range. Puck isn't pressored out before puck notices that it is shot. FO_BIAS: non-scoring team, or team that's more than 5 goals behind get faceoff advantage. Advantage settable with FACEOFF_HELP. SITOUT_HURTS: Normally a sitout puts you within 5 points of exploding to avoid cheating. Undefine this and sitout won't hurt. --Carlos V. **************************************** Index: Vanilla/include/defs.h diff -u Vanilla/include/defs.h:1.2 Vanilla/include/defs.h:1.3 --- Vanilla/include/defs.h:1.2 Mon Jul 7 17:19:55 2003 +++ Vanilla/include/defs.h Wed Jan 7 20:42:20 2004 @@ -1,4 +1,4 @@ -/* $Id: defs.h,v 1.2 2003/07/07 22:19:55 ahn Exp $ +/* $Id: defs.h,v 1.3 2004/01/08 02:42:20 unbelver Exp $ */ #ifndef _h_defs @@ -473,5 +473,7 @@ #define SVALID 253 /* Mark server messages as valid to send over SP_S_MESSAGE */ #define SINVALID 254 /* Mark server Message as invalid to send over SP_S_MESSAGE */ #define DINVALID 255 /* Mark daemon ( GOD) Message as invalid to send over SP_S_WARNING */ + +/* #undef PUCK_FIRST 99 */ /* make sure puck runs before players do */ #endif /* _h_defs */ _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Wed Jan 7 20:42:20 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:51 2005 Subject: [Vanilla Devel] CVS update: Vanilla/ntserv Message-ID: <200401080242.i082gK414271@swashbuckler.real-time.com> Date: Wednesday January 7, 2004 @ 20:42 Author: unbelver Update of /home/netrek/cvsroot/Vanilla/ntserv In directory swashbuckler.real-time.com:/var/tmp/cvs-serv14253/ntserv Modified Files: daemonII.c Log Message: Added in Psychosis' hockey code running on puck.psychosis.net. Disabled by default, but useful to keep in the main tree. 3 differences. PUCK_FIRST: Puck process runs first on each update. Mainly for shots on edge of shot range. Puck isn't pressored out before puck notices that it is shot. FO_BIAS: non-scoring team, or team that's more than 5 goals behind get faceoff advantage. Advantage settable with FACEOFF_HELP. SITOUT_HURTS: Normally a sitout puts you within 5 points of exploding to avoid cheating. Undefine this and sitout won't hurt. --Carlos V. **************************************** Index: Vanilla/ntserv/daemonII.c diff -u Vanilla/ntserv/daemonII.c:1.39 Vanilla/ntserv/daemonII.c:1.40 --- Vanilla/ntserv/daemonII.c:1.39 Mon Jul 7 17:19:55 2003 +++ Vanilla/ntserv/daemonII.c Wed Jan 7 20:42:20 2004 @@ -36,6 +36,22 @@ #include #endif +#ifdef PUCK_FIRST +#include +/* this is from a semctl man page */ +#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) +/* union semun is defined by including */ +#else /*__GNU_LIBRARY__ && !__SEM_SEMUN_UNDEFINED */ +/* according to X/OPEN we have to define it ourselves */ +union semun { + int val; /* value for SETVAL */ + struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */ + unsigned short int *array; /* array for GETALL, SETALL */ + struct seminfo *__buf; /* buffer for IPC_INFO */ + }; +#endif /*__GNU_LIBRARY__ && !__SEM_SEMUN_UNDEFINED */ +#endif /*PUCK_FIRST*/ + #define fuse(X) ((ticks % (X)) == 0) #define TOURNEXTENSION 15 /* Tmode gone for 15 seconds 8/26/91 TC */ #define NotTmode(X) (!(status->tourn) && ((X - tourntimestamp)/10 > TOURNEXTENSION)) @@ -112,6 +128,13 @@ extern void solicit(int force); extern void pmove(void); +#ifdef PUCK_FIRST +static void signal_puck(void); +static int pucksem_id; +static union semun pucksem_arg; +static struct sembuf pucksem_op[1]; +#endif /*PUCK_FIRST*/ + static int debug = 0; static int ticks = 0; static int tourntimestamp = 0; /* ticks since last Tmode 8/2/91 TC */ @@ -245,6 +268,21 @@ if (start_robot) fork_robot(start_robot); +#ifdef PUCK_FIRST + if ((pucksem_id = semget(PUCK_FIRST, 1, 0600 | IPC_CREAT)) != -1 || + (pucksem_id = semget(PUCK_FIRST, 1, 0600)) != -1) + { + pucksem_arg.val = 0; + pucksem_op[0].sem_num = 0; + pucksem_op[0].sem_op = -1; + pucksem_op[0].sem_flg = 0; + } + else + { + ERROR(1,("Unable to get puck semaphore.")); + } +#endif /*PUCK_FIRST*/ + (void) SIGNAL(SIGALRM, move); udt.it_interval.tv_sec = 0; udt.it_interval.tv_usec = reality; @@ -590,6 +628,14 @@ oldtourn=0; status->tourn=0; } + +#ifdef PUCK_FIRST + /* The placement of signal_puck before udplayers() is key. If udplayers() + happens first the puck can be pushed out of range of a valid shot, + among other things. */ + signal_puck(); +#endif /*PUCK_FIRST */ + if (fuse(PLAYERFUSE)) { udplayers(); } @@ -822,6 +868,8 @@ ERROR(4,("%s: ship in POUTFIT too long (of=%d,wd=%d)\n", j->p_mapchars, outfitdelay, j->p_whydead)); + fflush(stdout); + /* Force the player out of the game */ saveplayer(j); if (j->p_process > 1) { @@ -3429,6 +3477,12 @@ if (!removemem()) ERROR(1,("exitDaemon: cannot removed shared memory segment")); +#ifdef PUCK_FIRST + if(pucksem_id != -1) + if (semctl(pucksem_id, 0, IPC_RMID, pucksem_arg) == -1) + ERROR(1,("exitDaemon: cannot remove puck semaphore")); +#endif /*PUCK_FIRST*/ + switch(sig){ case SIGSEGV: case SIGBUS: @@ -4358,6 +4412,52 @@ } } #endif +#ifdef PUCK_FIRST +void do_nuttin (int sig) { } + +/* This has [should have] the daemon wait until the puck has finished by + waiting on a semaphore. Error logging is not entirely useful. +*/ +static void signal_puck(void) +{ + int i; + struct player *j; + int puckwait = 0; + + for (i = 0, j = players; i < MAXPLAYER; i++, j++) + if (j->p_status != PFREE && j->w_queue == QU_ROBOT && + strcmp(j->p_name, "Puck") == 0) + { + /* Set semaphore to 0 in case there are multiple pucks. Yuck. */ + if (pucksem_id != -1 && + semctl(pucksem_id, 0, SETVAL, pucksem_arg) == -1) + { + perror("signal_puck semctl"); + pucksem_id = -1; + /* are there any errors that would 'fix themselves?' */ + } + if (kill(j->p_process, SIGALRM) < 0) + { + if (errno == ESRCH) + { + ERROR(1,("daemonII/signal_puck: slot %d missing\n", i)); + freeslot(j); + } + } + else if (pucksem_id != -1) + { + puckwait = 1; + } + } + + if (puckwait) + { + SIGNAL(SIGALRM, do_nuttin); + semop(pucksem_id, pucksem_op, 1); + SIGNAL(SIGALRM, SIG_IGN); + } +} +#endif /*PUCK_FIRST*/ /* * The minor problem here is that the only client update speeds that @@ -4378,6 +4478,14 @@ continue; if (j->p_process <= 1) continue; + +#ifdef PUCK_FIRST + if (j->p_status != PFREE && j->w_queue == QU_ROBOT && + strcmp(j->p_name, "Puck") == 0) + { + continue; + } +#endif /*PUCK_FIRST*/ t = j->p_timerdelay; if (!t) /* paranoia */ _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Mon Jan 12 16:11:53 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:51 2005 Subject: [Vanilla Devel] CVS update: metaserver Message-ID: <200401122211.i0CMBr717337@swashbuckler.real-time.com> Date: Monday January 12, 2004 @ 16:11 Author: unbelver Update of /home/netrek/cvsroot/metaserver In directory swashbuckler.real-time.com:/var/tmp/cvs-serv17334 Modified Files: rsa_keys Log Message: **************************************** Index: metaserver/rsa_keys diff -u metaserver/rsa_keys:2.34 metaserver/rsa_keys:2.35 --- metaserver/rsa_keys:2.34 Wed Jan 29 14:47:19 2003 +++ metaserver/rsa_keys Mon Jan 12 16:11:53 2004 @@ -317,6 +317,12 @@ :gk=3169aa8253108fa3ca4f9f9e9f0c28377e10827f5fe915bfb2502bf4116bde4e:\ :pk=cfee809a562563cd6d8996bf197d26af6f34394e9bbfca8badad0d948b9deb12: # +key.brmh.2.4.macosx:ct=BRMH 2.4:cr=karthik@karthik.com:\ + :cd=January 2004:ar=PowerPC/Mac OS X (Darwin 7.2):\ + :cm=ftp://ftp.netrek.org/pub/netrek/clients/brmh/:\ + :gk=1b4b811a3c5b0c38030f5ee328cbf95ae4de4db58dc23ea10a04b33bb87a3c50:\ + :pk=015a96cb3e456728072f270bc92a3bd2f11784b78ee5b4992e766242878af826: +# # # COW Clients # keep @@ -632,6 +638,12 @@ :gk=7338d1bd0587ab8f816235bc5b45e2b8d8e522a735aa7396f1c0498728fe1a07:\ :pk=ad90ac79264a4c0ba0950382dc27deabad0585fcfecc3434ebdf3b8a71ffaf00: # +key.cow3pl2.Solaris251:ct=Client Of Win v3:cr=Carlos Villalpando :\ + :cd=January 2000:ar=Solaris251 / Cow 3.0pl2:cl=inl,standard2:\ + :cm=reserved.c blessed. Located via http at cow.netrek.org:\ + :gk=971ef1ae3eba1b1ec7bc1e3cd86fcd41c19c3c421b64686fad7da38319b2960e:\ + :pk=79b55811516f491581cc8f6e945890e2374df458ed93471cb0459248e3811109: +# key.cow.gnu_win32:ct=Client Of Win v3:cr=007@netrek.org:\ :cd=June 1999:ar=gnu_win32 / Cygnus GNU Win32 key:cl=inl,standard2:\ :cm=reserved.c blessed. Located via http at cow.netrek.org:\ @@ -1190,4 +1202,12 @@ :gk=b160145c4205bba8815db0a908fcac9b99a0303ee44c204469374109e09bb782:\ :pk=8b0f3d3f1b1b8528d86545d3be9d8900f2e3130cb52248df9a5ec63ff9a15e11: # +# +# Temp development keys +# +Obstreks-RSA-Key-Java1.4.2_02:ct=obstrek:cr=msucka0xff@programmer.net:\ + :cd=December 2003:ar=Java1.4.2_02:cl=standard2:\ + :cm=Java obs development key:\ + :gk=abb27563e0cc985f45ac92c8a75878e94c4203bd8372b9a9ce77d7dffafd1b02:\ + :pk=17cc95a2f29c0c4b84cc2507b99163f78316531702923807565c32c0a37af600: # --- end of list --- _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From vanilla-devel at us.netrek.org Mon Jan 12 16:27:39 2004 From: vanilla-devel at us.netrek.org (Vanilla CVS Development) Date: Wed Jan 12 00:50:51 2005 Subject: [Vanilla Devel] CVS update: metaserver Message-ID: <200401122227.i0CMRdY17350@swashbuckler.real-time.com> Date: Monday January 12, 2004 @ 16:27 Author: unbelver Update of /home/netrek/cvsroot/metaserver In directory swashbuckler.real-time.com:/var/tmp/cvs-serv17347 Modified Files: rsa_keys Log Message: **************************************** Index: metaserver/rsa_keys diff -u metaserver/rsa_keys:2.35 metaserver/rsa_keys:2.36 --- metaserver/rsa_keys:2.35 Mon Jan 12 16:11:53 2004 +++ metaserver/rsa_keys Mon Jan 12 16:27:39 2004 @@ -318,7 +318,7 @@ :pk=cfee809a562563cd6d8996bf197d26af6f34394e9bbfca8badad0d948b9deb12: # key.brmh.2.4.macosx:ct=BRMH 2.4:cr=karthik@karthik.com:\ - :cd=January 2004:ar=PowerPC/Mac OS X (Darwin 7.2):\ + :cd=January 2004:ar=PowerPC/Mac OS X (Darwin 7.2):cl=inl,standard2:\ :cm=ftp://ftp.netrek.org/pub/netrek/clients/brmh/:\ :gk=1b4b811a3c5b0c38030f5ee328cbf95ae4de4db58dc23ea10a04b33bb87a3c50:\ :pk=015a96cb3e456728072f270bc92a3bd2f11784b78ee5b4992e766242878af826: _______________________________________________ vanilla-devel mailing list vanilla-devel@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel From ahn at orion.netrek.org Mon Jan 19 13:18:24 2004 From: ahn at orion.netrek.org (Dave Ahn) Date: Wed Jan 12 00:51:54 2005 Subject: [Vanilla List] New www.netrek.org maintainer Message-ID: <20040119191824.GA591@orion.netrek.org> I'm pleased to announce that Erik Hietbrink has graciously volunteered to help maintain the Netrek home page content. Please direct any content related questions or concerns to him. Any infrastructure related issues should still come to me, thanks. Dave _______________________________________________ vanilla-list mailing list vanilla-list@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-list From damouth at san.rr.com Sun Jan 25 00:42:23 2004 From: damouth at san.rr.com (Daniel Damouth) Date: Wed Jan 12 00:51:54 2005 Subject: [Vanilla List] compiling stat's client w/wout RSA Message-ID: <001501c3e30d$d0aa2f40$37fb4b42@alienware> Skipped content of type multipart/alternative-------------- next part -------------- _______________________________________________ vanilla-list mailing list vanilla-list@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-list From keyos at keyos.org Sun Jan 25 01:26:27 2004 From: keyos at keyos.org (Stas Pirogov) Date: Wed Jan 12 00:51:54 2005 Subject: [Vanilla List] compiling stat's client w/wout RSA In-Reply-To: <001501c3e30d$d0aa2f40$37fb4b42@alienware> References: <001501c3e30d$d0aa2f40$37fb4b42@alienware> Message-ID: You should just change RSA=1 to RSA=0 in both makefiles (src and src/cursors) and see if it will compile. Stas. On Sat, 24 Jan 2004, Daniel Damouth wrote: > Date: Sat, 24 Jan 2004 22:38:16 -0800 > From: Daniel Damouth > Reply-To: vanilla-list@us.netrek.org > To: vanilla-list@us.netrek.org > Subject: [Vanilla List] compiling stat's client w/wout RSA > > Hi everyone. Hope this is an appropriate place for my question. > > I'm trying to compile NetrekXP on XP, and I don't care if it's blessed, because I'm thinking of creating a hockey bot, and I don't think the hockey server I want to test on needs it. Got Borland. Client seems to compile ok (albeit with a hundred warnings), until I get the error messages appended below. > > If the problem is my lack of an RSA key file, can I get around it somehow in order to compile a non-blessed client, or do I need to generate a key? > > -Dan / tuber / Charity > > mkkey version [RES-RSA 2.9.2: Mar. 13, 2000][GMP] > Source basename: "rsa_box" > Number of shells: 3 > Number of steps between swaps: 2 > Number of files: 5 > Ratio of computation in files to main file: 0.8 > Reading key from keycap file "\netrek_files\rsa\NetrekXP-Mod-RSA-Key-Win32.secre > t"... > D:\NetrekXP\netrekxpsrc\tools\mkkey.exe: can't open keycap file "\netrek_files\r > sa\NetrekXP-Mod-RSA-Key-Win32.secret" > No such file or directory > > ** error 1 ** deleting rsa_box.c > Stamping netrek.exe: FileVersion=4.3.0.105 ProductVersion=4.3.0.105 > error: Couldn't open netrek.exe for writing (The handle is invalid.) > > > > _______________________________________________ vanilla-list mailing list vanilla-list@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-list From damouth at san.rr.com Sun Jan 25 04:16:41 2004 From: damouth at san.rr.com (Daniel Damouth) Date: Wed Jan 12 00:51:54 2005 Subject: [Vanilla List] compiling stat's client w/wout RSA References: <001501c3e30d$d0aa2f40$37fb4b42@alienware> Message-ID: <004801c3e32b$7e1fd4a0$37fb4b42@alienware> Thanks, I got it compiled and working. You need to comment out the RSA=1 line in the makefiles, not change it to RSA=0. (The number probably doesn't matter). I had to mess around with paths and dll locations a bit, and configure the free Borland compiler by creating a couple of files telling the compiler what directories to find includes and libs (be careful of the direction of slashes in these files). Also, I had to move the netrek.exe executable from src to the newly created netrek_files/netrek directory. -Dan ----- Original Message ----- From: "Stas Pirogov" To: Sent: Saturday, January 24, 2004 11:13 PM Subject: Re: [Vanilla List] compiling stat's client w/wout RSA > You should just change RSA=1 to RSA=0 > in both makefiles (src and src/cursors) > and see if it will compile. > > Stas. > > On Sat, 24 Jan 2004, Daniel Damouth wrote: > > > Date: Sat, 24 Jan 2004 22:38:16 -0800 > > From: Daniel Damouth > > Reply-To: vanilla-list@us.netrek.org > > To: vanilla-list@us.netrek.org > > Subject: [Vanilla List] compiling stat's client w/wout RSA > > > > Hi everyone. Hope this is an appropriate place for my question. > > > > I'm trying to compile NetrekXP on XP, and I don't care if it's blessed, because I'm thinking of creating a hockey bot, and I don't think the hockey server I want to test on needs it. Got Borland. Client seems to compile ok (albeit with a hundred warnings), until I get the error messages appended below. > > > > If the problem is my lack of an RSA key file, can I get around it somehow in order to compile a non-blessed client, or do I need to generate a key? > > > > -Dan / tuber / Charity > > > > mkkey version [RES-RSA 2.9.2: Mar. 13, 2000][GMP] > > Source basename: "rsa_box" > > Number of shells: 3 > > Number of steps between swaps: 2 > > Number of files: 5 > > Ratio of computation in files to main file: 0.8 > > Reading key from keycap file "\netrek_files\rsa\NetrekXP-Mod-RSA-Key-Win32.secre > > t"... > > D:\NetrekXP\netrekxpsrc\tools\mkkey.exe: can't open keycap file "\netrek_files\r > > sa\NetrekXP-Mod-RSA-Key-Win32.secret" > > No such file or directory > > > > ** error 1 ** deleting rsa_box.c > > Stamping netrek.exe: FileVersion=4.3.0.105 ProductVersion=4.3.0.105 > > error: Couldn't open netrek.exe for writing (The handle is invalid.) > > > > > > > > > > _______________________________________________ > vanilla-list mailing list > vanilla-list@us.netrek.org > https://mailman.real-time.com/mailman/listinfo/vanilla-list _______________________________________________ vanilla-list mailing list vanilla-list@us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-list