ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/newserver.h
(Generate patch)

Comparing deliantra/server/include/newserver.h (file contents):
Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs.
Revision 1.23 by root, Thu Dec 14 05:09:32 2006 UTC

1
1/* 2/*
2 * static char *rcsid_newserver_h =
3 * "$Id: newserver.h,v 1.1 2006/02/03 07:12:49 root Exp $";
4 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for the X Window System
8 4
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
11 7
12 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
… …
31 new client server communication method. Values defined here are only 27 new client server communication method. Values defined here are only
32 used on the server side code. For shared client/server values, see 28 used on the server side code. For shared client/server values, see
33 newclient.h 29 newclient.h
34*/ 30*/
35 31
36
37#ifndef NEWSERVER_H 32#ifndef NEWSERVER_H
38#define NEWSERVER_H 33#define NEWSERVER_H
39 34
40/* Reduce this from 50 to 5 - as it is now, there will never be more 35/* Reduce this from 50 to 5 - as it is now, there will never be more
41 * than 3 anyways. 36 * than 3 anyways.
42 */ 37 */
43 38
44#define NUM_LOOK_OBJECTS 50 39#define NUM_LOOK_OBJECTS 50
45 40
46struct MapCell { 41struct MapCell
42{
43 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
44 int count; /* This is really darkness in the map1 command */
47 short faces[MAP_LAYERS]; 45 uint16 faces[MAP_LAYERS];
48 uint16 smooth[MAP_LAYERS]; 46 uint16 smooth[MAP_LAYERS];
49 int count; /* This is really darkness in the map1 command */ 47 unsigned char stat_hp; // health of something in this space, or 0
48 unsigned char flags;
50}; 49};
51 50
52/* This basically defines the largest size an 51/* This basically defines the largest size an
53 * archetype may be - it is used for allocation of 52 * archetype may be - it is used for allocation of
54 * some structures, as well as determining how far 53 * some structures, as well as determining how far
… …
57#define MAX_HEAD_OFFSET 8 56#define MAX_HEAD_OFFSET 8
58 57
59#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 58#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET)
60#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 59#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET)
61 60
62struct Map { 61struct Map
62{
63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
64}; 64};
65 65
66/* True max is 16383 given current map compaction method */ 66/* True max is 16383 given current map compaction method */
67#define MAXANIMNUM 2000 67# define MAXANIMNUM 2000
68 68
69struct statsinfo { 69struct statsinfo
70{
70 char *range, *title; 71 char *range, *title;
71}; 72};
72
73 73
74/* This contains basic information on the socket structure. status is its 74/* This contains basic information on the socket structure. status is its
75 * current state. we set up our on buffers for sending/receiving, so we can 75 * current state. we set up our on buffers for sending/receiving, so we can
76 * handle some higher level functions. fd is the actual file descriptor we 76 * handle some higher level functions. fd is the actual file descriptor we
77 * are using. 77 * are using.
78 */ 78 */
79 79
80enum Sock_Status {Ns_Avail, Ns_Add, Ns_Dead, Ns_Old}; 80enum Sock_Status { Ns_Add, Ns_Dead };
81
82/* Reserver 0 for neither of these being set */
83enum Old_Mode {Old_Listen=1, Old_Player=2};
84 81
85/* Only one map mode can actually be used, so lets make it a switch 82/* Only one map mode can actually be used, so lets make it a switch
86 * instead of having a bunch of different fields that needed to 83 * instead of having a bunch of different fields that needed to
87 * get toggled. 84 * get toggled.
88 */ 85 */
89enum MapMode {Map0Cmd = 0, Map1Cmd = 1, Map1aCmd=2 }; 86enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
90 87
91/* The following is the setup for a ring buffer for storing outbut 88/* The following is the setup for a ring buffer for storing outbut
92 * data that the OS can't handle right away. 89 * data that the OS can't handle right away.
93 */ 90 */
94 91
95typedef struct Buffer { 92struct Buffer
93{
96 char data[SOCKETBUFSIZE]; 94 char data[SOCKETBUFSIZE];
97 int start; 95 int start;
98 int len; 96 int len;
99} Buffer; 97};
100 98
101/* how many times we are allowed to give the wrong password before being kicked. */ 99/* how many times we are allowed to give the wrong password before being kicked. */
102#define MAX_PASSWORD_FAILURES 5 100#define MAX_PASSWORD_FAILURES 5
103 101
104typedef struct NewSocket { 102ACC_CLASS (client_socket) // should become player when newsocket is a baseclass of player
103struct client_socket : zero_initialised, attachable_base
104{
105 enum Sock_Status status; 105 enum Sock_Status status;
106 int fd; 106 int ACC (RW, fd);
107 unsigned int inbuf_len; // number of bytes valid in inbuf
107 struct Map lastmap; 108 struct Map lastmap;
108 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */ 109 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */
109 uint8 *faces_sent; /* This is a bitmap on sent face status */ 110 uint8 *faces_sent; /* This is a bitmap on sent face status */
110 uint8 anims_sent[MAXANIMNUM]; 111 uint8 anims_sent[MAXANIMNUM];
111 struct statsinfo stats; 112 struct statsinfo stats;
112 /* If we get an incomplete packet, this is used to hold the data. */ 113
113 SockList inbuf;
114 char *host; /* Which host it is connected from (ip address)*/ 114 char *ACC (RW, host); /* Which host it is connected from (ip address) */
115 uint8 password_fails; /* how many times the player has failed to give the right password */ 115 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
116 Buffer outputbuffer; /* For undeliverable data */ 116 Buffer outputbuffer; /* For undeliverable data */
117 uint32 facecache:1; /* If true, client is caching images */ 117 uint32 ACC (RO, facecache):1; /* If true, client is caching images */
118 uint32 sent_scroll:1; 118 uint32 ACC (RO, sent_scroll):1;
119 uint32 sound:1; /* does the client want sound */ 119 uint32 ACC (RO, sound):1; /* does the client want sound */
120 uint32 exp64:1; /* Client wants 64 bit exp data, as well as skill data */ 120 uint32 ACC (RO, exp64):1; /* Client wants 64 bit exp data, as well as skill data */
121 uint32 newmapcmd:1; /* Send newmap command when entering new map SMACFIGGEN*/ 121 uint32 ACC (RO, newmapcmd):1; /* Send newmap command when entering new map SMACFIGGEN */
122 uint32 ACC (RO, plugincmd):1; /* CF+ extend the protocol through a plug-in */
123 uint32 ACC (RO, mapinfocmd):1; /* CF+ return map info and send map change info */
124 uint32 ACC (RO, extcmd):1; /* CF+ call into extensions/plugins */
125 uint32 ACC (RO, extmap):1; /* CF+ extend map comamnd with extra data */
126 uint32 ACC (RO, buggy_mapscroll):1; /* CF+ client crashes on large mapscrolls */
122 uint32 darkness:1; /* True if client wants darkness information */ 127 uint32 ACC (RO, darkness):1; /* True if client wants darkness information */
123 uint32 image2:1; /* Client wants image2/face2 commands */ 128 uint32 ACC (RO, image2):1; /* Client wants image2/face2 commands */
124 uint32 update_look:1; /* If true, we need to send the look window */ 129 uint32 ACC (RO, update_look):1; /* If true, we need to send the look window */
125 uint32 can_write:1; /* Can we write to this socket? */ 130 uint32 ACC (RO, can_write):1; /* Can we write to this socket? */
126 uint32 has_readable_type:1; /* If true client accept additional text information 131 uint32 ACC (RO, has_readable_type):1; /* If true client accept additional text information
127 used to arrange text in books, scrolls, or scripted dialogs */ 132 used to arrange text in books, scrolls, or scripted dialogs */
128 uint32 monitor_spells:1; /* Client wishes to be informed when their spell list changes */ 133 uint32 ACC (RO, monitor_spells):1; /* Client wishes to be informed when their spell list changes */
129 uint32 supported_readables; /* each bit is a readable supported by client */
130 uint32 cs_version, sc_version; /* versions of the client */
131 enum MapMode mapmode; /* Type of map commands the client wants. */
132 uint16 look_position; /* start of drawing of look window */
133 uint8 mapx, mapy; /* How large a map the client wants */
134 uint8 itemcmd; /* What version of the 'item' protocol command to use */
135 uint8 faceset; /* Set the client is using, default 0 */
136 uint32 ext_mapinfos:1; /* If true client accept additionnal info on maps*/ 134 uint32 ACC (RO, ext_mapinfos):1; /* If true client accept additionnal info on maps */
137 /* Below are flags for extedend infos to pass to client 135 /* Below are flags for extedend infos to pass to client
138 * with S->C mapextended command */ 136 * with S->C mapextended command */
139 uint32 EMI_smooth:1; /* Send smooth in extendmapinfos*/ 137 uint32 ACC (RO, EMI_smooth):1; /* Send smooth in extendmapinfos */
138 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
139 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
140 enum MapMode mapmode; /* Type of map commands the client wants. */
141 uint16 ACC (RW, look_position); /* start of drawing of look window */
142 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
143 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
144 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
140 145
141 /* Below here is information only relevant for old sockets */ 146 maptile *ACC (RW, current_map); // CF+ last/current player map
142 char *comment; /* name or listen comment */ 147 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
143 enum Old_Mode old_mode; 148 char ACC (RW, client)[64]; // CF+ client name/version
144} NewSocket;
145 149
150 /* If we get an incomplete packet, this is used to hold the data. */
151 uint8 inbuf[MAXSOCKBUF];
152 player *pl;//TODO should not be here, preferably
153
154 client_socket (int fd, const char *from_ip);
155 ~client_socket ();
156
157 int read_packet (); // returns length of packet or 0
158 void skip_packet (int len); // we have processed the packet, skip it
159
160 void send (void *buf_, int len);
161
162 void send_packet (const char *buf);
163 void send_packet (const char *buf, int len);
164 void send_packet (packet &sl);
165};
146 166
147#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 167#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
148 ( ((__type)>0) &&\ 168 ( ((__type)>0) &&\
149 ((__sockPtr)->has_readable_type) && \ 169 ((__sockPtr)->has_readable_type) && \
150 ((__sockPtr)->supported_readables & (1<<(__type))) ) 170 ((__sockPtr)->supported_readables & (1<<(__type))) )
151
152 171
153/* Bitmask for the faces_sent[] array - what 172/* Bitmask for the faces_sent[] array - what
154 * portion of the face have we sent? 173 * portion of the face have we sent?
155 */ 174 */
156#define NS_FACESENT_FACE 0x1 175#define NS_FACESENT_FACE 0x1
… …
164 * a visible object and another info related to a 4 square 183 * a visible object and another info related to a 4 square
165 * width and height area). At the begin of an extended info packet 184 * width and height area). At the begin of an extended info packet
166 * is a bit field. A bit is activated for each extended info 185 * is a bit field. A bit is activated for each extended info
167 * present in the data 186 * present in the data
168 */ 187 */
188
169/* Meanings: 189/* Meanings:
170 * EMI_NOREDRAW Take extended infos into account but don't redraw, 190 * EMI_NOREDRAW Take extended infos into account but don't redraw,
171 * some additionnal datas will follow in a new packet 191 * some additionnal datas will follow in a new packet
172 * EMI_SMOOTH Datas about smoothing 192 * EMI_SMOOTH Datas about smoothing
173 */ 193 */
174#define EMI_NOREDRAW 0x01 194#define EMI_NOREDRAW 0x01
175#define EMI_SMOOTH 0x02 195#define EMI_SMOOTH 0x02
176 196
177/* this last one says the bitfield continue un next byte 197/* this last one says the bitfield continue un next byte
178 * There may be several on contiguous bytes. So there is 7 198 * There may be several on contiguous bytes. So there is 7
179 * actual bits used per byte, and the number of bytes 199 * actual bits used per byte, and the number of bytes
… …
182#define EMI_HASMOREBITS 0x80 202#define EMI_HASMOREBITS 0x80
183 203
184#define FACE_TYPES 1 204#define FACE_TYPES 1
185#define PNG_FACE_INDEX 0 205#define PNG_FACE_INDEX 0
186 206
187typedef struct Socket_Info {
188 struct timeval timeout; /* Timeout for select */
189 int max_filedescriptor; /* max filedescriptor on the system */
190 int nconns; /* Number of connections */
191 int allocated_sockets; /* number of allocated in init_sockets */
192} Socket_Info;
193
194extern Socket_Info socket_info;
195
196#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 207#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
197#define VERSION_SC 1027 208#define VERSION_SC 1027
198#define VERSION_INFO "Crossfire Server" 209#define VERSION_INFO "Crossfire+ Server"
199 210
211typedef unordered_vector<client_socket *> sockvec;
200 212
213extern sockvec client_sockets;
214extern int nrofpixmaps; //TODO: hrmpf, should go
201 215
202#endif 216#endif
217

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines