Update of /cvsroot/netrek/server/Vanilla/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227/include
Modified Files:
config.h.in data.h defs.h struct.h
Log Message:
vote to ban
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h 10 Apr 2006 11:57:00 -0000 1.5
+++ defs.h 24 Apr 2006 12:35:17 -0000 1.6
@@ -17,6 +17,7 @@
#define FNAMESIZE 256
#define MAXHOSTNAMESIZE 64 /* maximum host name size in characters */
+#define MAXBANS 32
#define NODET (char)(-1) /* isae - chain reaction case */
@@ -65,9 +66,10 @@
#ifdef VOTING
#define PV_EXTRA 8 /* # of non-eject vote types */
-#define PV_TOTAL MAXPLAYER+PV_EXTRA /* total number of voting slots */
-#define PV_EJECT 0 /* array base for eject votes */
-#define PV_OTHER MAXPLAYER /* array base for non-eject votes */
+#define PV_TOTAL MAXPLAYER*2+PV_EXTRA /* total number of voting slots */
+#define PV_EJECT 0*MAXPLAYER /* array base for eject votes */
+#define PV_BAN 1*MAXPLAYER /* array base for eject votes */
+#define PV_OTHER 2*MAXPLAYER /* array base for non-eject votes */
/* see ntserv/ntscmds.c for array */
#endif
Index: config.h.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h.in 10 Apr 2006 04:24:51 -0000 1.4
+++ config.h.in 24 Apr 2006 12:35:17 -0000 1.5
@@ -347,20 +347,23 @@
/* ALLOW_EJECT - define to allow players to
eject others */
- /* VICIOUS_EJECT - free's the players slot
- after ejection */
+ /* ALLOW_BAN - define to allow players to
+ eject and ban others */
+
+ /* VICIOUS_EJECT - free's the players slot
+ after ejection,
+ causes some clients to
+ hang */
/* EJECT_ONLY_IF_QUEUE - refuses to eject
unless queue != 0 */
- /* EJECT_PERSISTENCY - does not let player back
- in if same character name or same ip address */
#ifdef VOTING
-#undef ALLOW_EJECT
+#define ALLOW_EJECT
#ifdef ALLOW_EJECT
-#define VICIOUS_EJECT
-#define EJECT_ONLY_IF_QUEUE
-#define EJECT_PERSISTENCY
+#define ALLOW_BAN
+#undef VICIOUS_EJECT
+#undef EJECT_ONLY_IF_QUEUE
#endif
#endif
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/data.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- data.h 27 Sep 2005 12:26:37 -0000 1.3
+++ data.h 24 Apr 2006 12:35:17 -0000 1.4
@@ -68,6 +68,7 @@
extern struct ship *shipvals;
extern struct pqueue *queues;
extern struct queuewait *waiting;
+extern struct ban *bans;
extern int oldalert;
extern int remap[];
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/include/struct.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- struct.h 24 Apr 2006 10:12:17 -0000 1.6
+++ struct.h 24 Apr 2006 12:35:17 -0000 1.7
@@ -586,6 +586,11 @@
char *name;
};
+struct ban {
+ int b_expire; /* joins to see before expiry */
+ char b_ip[NAME_LEN]; /* ip address banned */
+};
+
struct memory {
struct player players[MAXPLAYER];
struct torp torps[MAXPLAYER * (MAXTORP + MAXPLASMA)];
@@ -598,7 +603,9 @@
struct ship shipvals[NUM_TYPES];
struct pqueue queues[MAXQUEUE];
struct queuewait waiting[MAXWAITING];
+ struct ban bans[MAXBANS];
};
+/* note: adding to struct memory requires changes to openmem.c */
#ifdef RSA
struct rsa_key {
@@ -716,3 +723,10 @@
#endif
#endif /* __INCLUDED_struct_h__ */
+
+/* Hey Emacs!
+ * Local Variables:
+ * c-basic-offset:4
+ * indent-tabs-mode:"t"
+ * End:
+ */