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.9 by root, Thu Aug 24 10:58:38 2006 UTC vs.
Revision 1.24 by root, Thu Dec 14 20:39:54 2006 UTC

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

Diff Legend

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