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.14 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.22 by root, Thu Dec 14 04:30:32 2006 UTC

… …
27 new client server communication method. Values defined here are only 27 new client server communication method. Values defined here are only
28 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
29 newclient.h 29 newclient.h
30*/ 30*/
31 31
32
33#ifndef NEWSERVER_H 32#ifndef NEWSERVER_H
34#define NEWSERVER_H 33#define NEWSERVER_H
35 34
36/* 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
37 * than 3 anyways. 36 * than 3 anyways.
… …
39 38
40#define NUM_LOOK_OBJECTS 50 39#define NUM_LOOK_OBJECTS 50
41 40
42struct MapCell 41struct MapCell
43{ 42{
44 tag_t player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 43 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
45 int count; /* This is really darkness in the map1 command */ 44 int count; /* This is really darkness in the map1 command */
46 short faces[MAP_LAYERS]; 45 uint16 faces[MAP_LAYERS];
47 uint16 smooth[MAP_LAYERS]; 46 uint16 smooth[MAP_LAYERS];
48 unsigned char stat_hp; // health of something in this space, or 0 47 unsigned char stat_hp; // health of something in this space, or 0
49 unsigned char flags; 48 unsigned char flags;
50}; 49};
51 50
… …
101}; 100};
102 101
103/* how many times we are allowed to give the wrong password before being kicked. */ 102/* how many times we are allowed to give the wrong password before being kicked. */
104# define MAX_PASSWORD_FAILURES 5 103# define MAX_PASSWORD_FAILURES 5
105 104
106ACC_CLASS (player_TODO) // should become player when newsocket is a baseclass of player 105ACC_CLASS (client_socket) // should become player when newsocket is a baseclass of player
107struct NewSocket 106struct client_socket : zero_initialised
108{ 107{
109 enum Sock_Status status; 108 enum Sock_Status status;
110 int ACC (RW, fd); 109 int ACC (RW, fd);
110 unsigned int inbuf_len; // number of bytes valid in inbuf
111 struct Map lastmap; 111 struct Map lastmap;
112 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */ 112 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */
113 uint8 *faces_sent; /* This is a bitmap on sent face status */ 113 uint8 *faces_sent; /* This is a bitmap on sent face status */
114 uint8 anims_sent[MAXANIMNUM]; 114 uint8 anims_sent[MAXANIMNUM];
115 struct statsinfo stats; 115 struct statsinfo stats;
116 /* If we get an incomplete packet, this is used to hold the data. */ 116
117 SockList inbuf;
118 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 117 char *ACC (RW, host); /* Which host it is connected from (ip address) */
119 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 118 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
120 Buffer outputbuffer; /* For undeliverable data */ 119 Buffer outputbuffer; /* For undeliverable data */
121 uint32 ACC (RO, facecache):1; /* If true, client is caching images */ 120 uint32 ACC (RO, facecache):1; /* If true, client is caching images */
122 uint32 ACC (RO, sent_scroll):1; 121 uint32 ACC (RO, sent_scroll):1;
… …
145 uint16 ACC (RW, look_position); /* start of drawing of look window */ 144 uint16 ACC (RW, look_position); /* start of drawing of look window */
146 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 145 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
147 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 146 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
148 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ 147 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
149 148
150 maptile *ACC (RW, current_map); // CF+ last/current player map 149 maptile *ACC (RW, current_map); // CF+ last/current player map
151 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 150 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
152 char ACC (RW, client)[64]; // CF+ client name/version 151 char ACC (RW, client)[64]; // CF+ client name/version
152
153 /* If we get an incomplete packet, this is used to hold the data. */
154 uint8 inbuf[MAXSOCKBUF];
155 player *pl;//TODO should not be here, preferably
156
157 client_socket (int fd, const char *from_ip);
158 ~client_socket ();
159
160 int read_packet (); // returns length of packet or 0
161 void skip_packet (int len); // we have processed the packet, skip it
162
163 void send (void *buf_, int len);
164
165 void send_packet (const char *buf);
166 void send_packet (const char *buf, int len);
167 void send_packet (packet &sl);
153}; 168};
154 169
155#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 170#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
156 ( ((__type)>0) &&\ 171 ( ((__type)>0) &&\
157 ((__sockPtr)->has_readable_type) && \ 172 ((__sockPtr)->has_readable_type) && \
… …
190#define EMI_HASMOREBITS 0x80 205#define EMI_HASMOREBITS 0x80
191 206
192#define FACE_TYPES 1 207#define FACE_TYPES 1
193#define PNG_FACE_INDEX 0 208#define PNG_FACE_INDEX 0
194 209
195struct Socket_Info
196{
197 struct timeval timeout; /* Timeout for select */
198 int max_filedescriptor; /* max filedescriptor on the system */
199 int nconns; /* Number of connections */
200 int allocated_sockets; /* number of allocated in init_sockets */
201};
202
203extern Socket_Info socket_info;
204
205#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 210#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
206#define VERSION_SC 1027 211#define VERSION_SC 1027
207#define VERSION_INFO "Crossfire+ Server" 212#define VERSION_INFO "Crossfire+ Server"
208 213
214typedef unordered_vector<client_socket *> sockvec;
215
216extern sockvec client_sockets;
217extern int nrofpixmaps; //TODO: hrmpf, should go
218
209#endif 219#endif
210 220

Diff Legend

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