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.7 by root, Fri Aug 18 02:06:57 2006 UTC vs.
Revision 1.26 by root, Fri Dec 15 00:14:12 2006 UTC

1
1/* 2/*
2 * static char *rcsid_newserver_h =
3 * "$Id: newserver.h,v 1.7 2006/08/18 02:06:57 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 */
50 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 unsigned char flags;
51}; 49};
52 50
53/* This basically defines the largest size an 51/* This basically defines the largest size an
54 * archetype may be - it is used for allocation of 52 * archetype may be - it is used for allocation of
55 * some structures, as well as determining how far 53 * some structures, as well as determining how far
… …
58#define MAX_HEAD_OFFSET 8 56#define MAX_HEAD_OFFSET 8
59 57
60#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 58#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET)
61#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 59#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET)
62 60
63struct Map { 61struct Map
62{
64 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
65}; 64};
66 65
67/* True max is 16383 given current map compaction method */ 66/* True max is 16383 given current map compaction method */
68#define MAXANIMNUM 2000 67# define MAXANIMNUM 2000
69 68
70struct statsinfo { 69struct statsinfo
70{
71 char *range, *title; 71 char *range, *title;
72}; 72};
73
74 73
75/* This contains basic information on the socket structure. status is its 74/* This contains basic information on the socket structure. status is its
76 * 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
77 * 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
78 * are using. 77 * are using.
79 */ 78 */
80 79
81enum Sock_Status {Ns_Avail, Ns_Add, Ns_Dead, Ns_Old}; 80enum Sock_Status { Ns_Add, Ns_Dead };
82
83/* Reserver 0 for neither of these being set */
84enum Old_Mode {Old_Listen=1, Old_Player=2};
85 81
86/* 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
87 * instead of having a bunch of different fields that needed to 83 * instead of having a bunch of different fields that needed to
88 * get toggled. 84 * get toggled.
89 */ 85 */
90enum MapMode {Map0Cmd = 0, Map1Cmd = 1, Map1aCmd=2 }; 86enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
91 87
92/* 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
93 * data that the OS can't handle right away. 89 * data that the OS can't handle right away.
94 */ 90 */
95 91
96typedef struct Buffer { 92struct Buffer
93{
97 char data[SOCKETBUFSIZE]; 94 char data[SOCKETBUFSIZE];
98 int start; 95 int start;
99 int len; 96 int len;
100} Buffer; 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
105typedef struct NewSocket { 102ACC_CLASS (client_socket) // should become player when newsocket is a baseclass of player
103struct client_socket : zero_initialised, attachable_base
104{
106 enum Sock_Status status; 105 enum Sock_Status status;
107 int fd; 106 int ACC (RW, fd);
107 unsigned int inbuf_len; // number of bytes valid in inbuf
108 struct Map lastmap; 108 struct Map lastmap;
109 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[] */
110 uint8 *faces_sent; /* This is a bitmap on sent face status */ 110 uint8 *faces_sent; /* This is a bitmap on sent face status */
111 uint8 anims_sent[MAXANIMNUM]; 111 uint8 anims_sent[MAXANIMNUM];
112 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
113 /* 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. */
114 SockList inbuf; 152 uint8 inbuf[MAXSOCKBUF];
115 char *host; /* Which host it is connected from (ip address)*/ 153 player *ACC (RO, pl);//TODO should not be here, preferably
116 uint8 password_fails; /* how many times the player has failed to give the right password */
117 Buffer outputbuffer; /* For undeliverable data */
118 uint32 facecache:1; /* If true, client is caching images */
119 uint32 sent_scroll:1;
120 uint32 sound:1; /* does the client want sound */
121 uint32 exp64:1; /* Client wants 64 bit exp data, as well as skill data */
122 uint32 newmapcmd:1; /* Send newmap command when entering new map SMACFIGGEN*/
123 uint32 plugincmd:1; /* CF+ extend the protocol through a plug-in */
124 uint32 mapinfocmd:1; /* CF+ return map info and send map change info */
125 uint32 extcmd:1; /* CF+ call into extensions/plugins */
126 uint32 extmap:1; /* CF+ extend map comamnd with extra data */
127 uint32 darkness:1; /* True if client wants darkness information */
128 uint32 image2:1; /* Client wants image2/face2 commands */
129 uint32 update_look:1; /* If true, we need to send the look window */
130 uint32 can_write:1; /* Can we write to this socket? */
131 uint32 has_readable_type:1; /* If true client accept additional text information
132 used to arrange text in books, scrolls, or scripted dialogs */
133 uint32 monitor_spells:1; /* Client wishes to be informed when their spell list changes */
134 uint32 supported_readables; /* each bit is a readable supported by client */
135 uint32 cs_version, sc_version; /* versions of the client */
136 enum MapMode mapmode; /* Type of map commands the client wants. */
137 uint16 look_position; /* start of drawing of look window */
138 uint8 mapx, mapy; /* How large a map the client wants */
139 uint8 itemcmd; /* What version of the 'item' protocol command to use */
140 uint8 faceset; /* Set the client is using, default 0 */
141 uint32 ext_mapinfos:1; /* If true client accept additionnal info on maps*/
142 /* Below are flags for extedend infos to pass to client
143 * with S->C mapextended command */
144 uint32 EMI_smooth:1; /* Send smooth in extendmapinfos*/
145 154
146 struct mapstruct *current_map; // CF+ last/current player map 155 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
147 int current_x, current_y; // CF+ last/current map position
148 156
149 /* Below here is information only relevant for old sockets */ 157 iow socket_ev; void socket_cb (iow &w, int got);
150 char *comment; /* name or listen comment */
151 enum Old_Mode old_mode;
152} NewSocket;
153 158
159 client_socket (int fd, const char *from_ip);
160 ~client_socket ();
161
162 int read_packet (); // returns length of packet or 0
163 void skip_packet (int len); // we have processed the packet, skip it
164
165 void flush ();
166 void write_outputbuffer ();
167 void send (void *buf_, int len);
168
169 void send_packet (const char *buf);
170 void send_packet (const char *buf, int len);
171 void send_packet (packet &sl);
172};
154 173
155#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 174#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
156 ( ((__type)>0) &&\ 175 ( ((__type)>0) &&\
157 ((__sockPtr)->has_readable_type) && \ 176 ((__sockPtr)->has_readable_type) && \
158 ((__sockPtr)->supported_readables & (1<<(__type))) ) 177 ((__sockPtr)->supported_readables & (1<<(__type))) )
159
160 178
161/* Bitmask for the faces_sent[] array - what 179/* Bitmask for the faces_sent[] array - what
162 * portion of the face have we sent? 180 * portion of the face have we sent?
163 */ 181 */
164#define NS_FACESENT_FACE 0x1 182#define NS_FACESENT_FACE 0x1
… …
172 * a visible object and another info related to a 4 square 190 * a visible object and another info related to a 4 square
173 * width and height area). At the begin of an extended info packet 191 * width and height area). At the begin of an extended info packet
174 * is a bit field. A bit is activated for each extended info 192 * is a bit field. A bit is activated for each extended info
175 * present in the data 193 * present in the data
176 */ 194 */
195
177/* Meanings: 196/* Meanings:
178 * EMI_NOREDRAW Take extended infos into account but don't redraw, 197 * EMI_NOREDRAW Take extended infos into account but don't redraw,
179 * some additionnal datas will follow in a new packet 198 * some additionnal datas will follow in a new packet
180 * EMI_SMOOTH Datas about smoothing 199 * EMI_SMOOTH Datas about smoothing
181 */ 200 */
182#define EMI_NOREDRAW 0x01 201#define EMI_NOREDRAW 0x01
183#define EMI_SMOOTH 0x02 202#define EMI_SMOOTH 0x02
184 203
185/* this last one says the bitfield continue un next byte 204/* this last one says the bitfield continue un next byte
186 * There may be several on contiguous bytes. So there is 7 205 * There may be several on contiguous bytes. So there is 7
187 * actual bits used per byte, and the number of bytes 206 * actual bits used per byte, and the number of bytes
… …
190#define EMI_HASMOREBITS 0x80 209#define EMI_HASMOREBITS 0x80
191 210
192#define FACE_TYPES 1 211#define FACE_TYPES 1
193#define PNG_FACE_INDEX 0 212#define PNG_FACE_INDEX 0
194 213
195typedef struct Socket_Info {
196 struct timeval timeout; /* Timeout for select */
197 int max_filedescriptor; /* max filedescriptor on the system */
198 int nconns; /* Number of connections */
199 int allocated_sockets; /* number of allocated in init_sockets */
200} Socket_Info;
201
202extern Socket_Info socket_info;
203
204#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 214#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
205#define VERSION_SC 1027 215#define VERSION_SC 1027
206#define VERSION_INFO "Crossfire+ Server" 216#define VERSION_INFO "Crossfire+ Server"
207 217
218typedef unordered_vector<client_socket *> sockvec;
219
220extern sockvec client_sockets;
221extern int nrofpixmaps; //TODO: hrmpf, should go
222
208#endif 223#endif
224

Diff Legend

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