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.12 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.25 by root, Thu Dec 14 21:46:34 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{
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 */
44 short faces[MAP_LAYERS]; 45 uint16 faces[MAP_LAYERS];
45 uint16 smooth[MAP_LAYERS]; 46 uint16 smooth[MAP_LAYERS];
46 int count; /* This is really darkness in the map1 command */
47 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
48 tag_t player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 48 unsigned char flags;
49}; 49};
50 50
51/* This basically defines the largest size an 51/* This basically defines the largest size an
52 * archetype may be - it is used for allocation of 52 * archetype may be - it is used for allocation of
53 * some structures, as well as determining how far 53 * some structures, as well as determining how far
54 * we should look for the heads of big images. 54 * we should look for the heads of big images.
55 */ 55 */
56#define MAX_HEAD_OFFSET 8 56#define MAX_HEAD_OFFSET 8
57 57
58# define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 58#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET)
59#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 59#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET)
60 60
61struct Map 61struct Map
62{ 62{
63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
… …
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 */
… …
98 int start; 95 int start;
99 int len; 96 int len;
100}; 97};
101 98
102/* 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. */
103# define MAX_PASSWORD_FAILURES 5 100#define MAX_PASSWORD_FAILURES 5
104 101
105struct NewSocket 102ACC_CLASS (client_socket) // should become player when newsocket is a baseclass of player
103struct client_socket : zero_initialised, attachable_base
106{ 104{
107 enum Sock_Status status; 105 enum Sock_Status status;
108 int fd; 106 int ACC (RW, fd);
107 unsigned int inbuf_len; // number of bytes valid in inbuf
109 struct Map lastmap; 108 struct Map lastmap;
110 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[] */
111 uint8 *faces_sent; /* This is a bitmap on sent face status */ 110 uint8 *faces_sent; /* This is a bitmap on sent face status */
112 uint8 anims_sent[MAXANIMNUM]; 111 uint8 anims_sent[MAXANIMNUM];
113 struct statsinfo stats; 112 struct statsinfo stats;
113
114 char *ACC (RW, host); /* Which host it is connected from (ip address) */
115 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
116 Buffer outputbuffer; /* For undeliverable data */
117
118 bool ACC (RW, facecache); /* If true, client is caching images */
119 bool ACC (RW, sent_scroll);
120 bool ACC (RW, sound); /* does the client want sound */
121 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
122 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
123 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
124 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
125 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
126 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
127 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
128 bool ACC (RW, darkness); /* True if client wants darkness information */
129 bool ACC (RW, image2); /* Client wants image2/face2 commands */
130 bool ACC (RW, update_look); /* If true, we need to send the look window */
131 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
132 /* used to arrange text in books, scrolls, or scripted dialogs */
133 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
134 bool ACC (RW, ext_mapinfos); /* If true client accept additionnal info on maps */
135 /* Below are flags for extedend infos to pass to client
136 * with S->C mapextended command */
137 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
138
139 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
140 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
141 enum MapMode mapmode; /* Type of map commands the client wants. */
142 uint16 ACC (RW, look_position); /* start of drawing of look window */
143 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
144 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
145 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
146
147 maptile *ACC (RW, current_map); // CF+ last/current player map
148 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
149 char ACC (RW, client)[64]; // CF+ client name/version
150
114 /* If we get an incomplete packet, this is used to hold the data. */ 151 /* If we get an incomplete packet, this is used to hold the data. */
115 SockList inbuf; 152 uint8 inbuf[MAXSOCKBUF];
116 char *host; /* Which host it is connected from (ip address) */ 153 player *pl;//TODO should not be here, preferably
117 uint8 password_fails; /* how many times the player has failed to give the right password */
118 Buffer outputbuffer; /* For undeliverable data */
119 uint32 facecache:1; /* If true, client is caching images */
120 uint32 sent_scroll:1;
121 uint32 sound:1; /* does the client want sound */
122 uint32 exp64:1; /* Client wants 64 bit exp data, as well as skill data */
123 uint32 newmapcmd:1; /* Send newmap command when entering new map SMACFIGGEN */
124 uint32 plugincmd:1; /* CF+ extend the protocol through a plug-in */
125 uint32 mapinfocmd:1; /* CF+ return map info and send map change info */
126 uint32 extcmd:1; /* CF+ call into extensions/plugins */
127 uint32 extmap:1; /* CF+ extend map comamnd with extra data */
128 uint32 buggy_mapscroll:1; /* CF+ client crashes on large mapscrolls */
129 uint32 darkness:1; /* True if client wants darkness information */
130 uint32 image2:1; /* Client wants image2/face2 commands */
131 uint32 update_look:1; /* If true, we need to send the look window */
132 uint32 can_write:1; /* Can we write to this socket? */
133 uint32 has_readable_type:1; /* If true client accept additional text information
134 used to arrange text in books, scrolls, or scripted dialogs */
135 uint32 monitor_spells:1; /* Client wishes to be informed when their spell list changes */
136 uint32 supported_readables; /* each bit is a readable supported by client */
137 uint32 cs_version, sc_version; /* versions of the client */
138 enum MapMode mapmode; /* Type of map commands the client wants. */
139 uint16 look_position; /* start of drawing of look window */
140 uint8 mapx, mapy; /* How large a map the client wants */
141 uint8 itemcmd; /* What version of the 'item' protocol command to use */
142 uint8 faceset; /* Set the client is using, default 0 */
143 uint32 ext_mapinfos:1; /* If true client accept additionnal info on maps */
144 /* Below are flags for extedend infos to pass to client
145 * with S->C mapextended command */
146 uint32 EMI_smooth:1; /* Send smooth in extendmapinfos */
147 154
148 maptile *current_map; // CF+ last/current player map 155 iow socket_ev; void socket_cb (iow &w, int got);
149 int current_x, current_y; // CF+ last/current map position
150 char client[64]; // CF+ client name/version
151 156
152 /* Below here is information only relevant for old sockets */ 157 client_socket (int fd, const char *from_ip);
153 char *comment; /* name or listen comment */ 158 ~client_socket ();
154 enum Old_Mode old_mode; 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 flush ();
164 void write_outputbuffer ();
165 void send (void *buf_, int len);
166
167 void send_packet (const char *buf);
168 void send_packet (const char *buf, int len);
169 void send_packet (packet &sl);
155}; 170};
156 171
157#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 172#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
158 ( ((__type)>0) &&\ 173 ( ((__type)>0) &&\
159 ((__sockPtr)->has_readable_type) && \ 174 ((__sockPtr)->has_readable_type) && \
… …
192#define EMI_HASMOREBITS 0x80 207#define EMI_HASMOREBITS 0x80
193 208
194#define FACE_TYPES 1 209#define FACE_TYPES 1
195#define PNG_FACE_INDEX 0 210#define PNG_FACE_INDEX 0
196 211
197struct Socket_Info
198{
199 struct timeval timeout; /* Timeout for select */
200 int max_filedescriptor; /* max filedescriptor on the system */
201 int nconns; /* Number of connections */
202 int allocated_sockets; /* number of allocated in init_sockets */
203};
204
205extern Socket_Info socket_info;
206
207#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 212#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
208#define VERSION_SC 1027 213#define VERSION_SC 1027
209#define VERSION_INFO "Crossfire+ Server" 214#define VERSION_INFO "Crossfire+ Server"
210 215
216typedef unordered_vector<client_socket *> sockvec;
217
218extern sockvec client_sockets;
219extern int nrofpixmaps; //TODO: hrmpf, should go
220
211#endif 221#endif
212 222

Diff Legend

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