ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.18 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.24 by root, Sat Dec 16 18:39:26 2006 UTC

… …
45 45
46#include <unistd.h> 46#include <unistd.h>
47#include <arpa/inet.h> 47#include <arpa/inet.h>
48 48
49#include <loader.h> 49#include <loader.h>
50#include <newserver.h>
51 50
52/***************************************************************************** 51#define MAX_QUEUE_DEPTH 500 //TODO
53 * Start of command dispatch area. 52#define MAX_QUEUE_BACKLOG 5. //TODO
54 * The commands here are protocol commands.
55 ****************************************************************************/
56 53
57/* Either keep this near the start or end of the file so it is 54void
58 * at least reasonablye easy to find. 55client::reset_state ()
59 * There are really 2 commands - those which are sent/received
60 * before player joins, and those happen after the player has joined.
61 * As such, we have function types that might be called, so
62 * we end up having 2 tables.
63 */
64
65enum {
66 PF_PLAYER = 0x01, // must have valid player
67 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
68 PF_PLAYING = 0x04, // must be in playing state
69};
70
71struct pkt_type
72{ 56{
73 const char *name; 57 if (!pl)
74 void *cb; 58 return;
75 int flags;
76 59
77 bool may_execute (client_socket *ns) 60 pl->run_on = 0;
61 pl->fire_on = 0;
62}
63
64void
65client::queue_command (packet_type *handler, char *data, int datalen)
66{
67 tstamp stamp = now ();
68
69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
78 { 70 {
79 return (!(flags & PF_PLAYER) || ns->pl) 71 //TODO: just disconnect here?
80 && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING)); 72 reset_state ();
73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
81 } 74 }
82 75 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp)
83 void execute (client_socket *ns, char *data, int datalen)
84 { 76 {
85 //TODO: only one format 77 reset_state ();
86 if (flags & PF_PLAYER) 78 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
87 ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl); 79 }
88 else 80 else
89 ((void (*)(char *, int, client_socket *))cb)((char *)data, datalen, ns); 81 {
90 } 82 cmd_queue.push_back (command ());
91}; 83 command &cmd = cmd_queue.back ();
92 84 cmd.stamp = stamp;
93// SocketCommand, PlayingCommand, should not exist with those ugly casts 85 cmd.handler = handler;
94#define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb), 86 cmd.data = (char *)salloc (datalen + 1, data);
95#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | 87 cmd.datalen = datalen;
96
97/**
98 * Dispatch table for the server.
99 */
100static struct pkt_type packets[] = {
101 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
102 {"command", PC(PlayerCmd) PF_PLAYING },
103
104 {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE },
105 {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE },
106 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
107 {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE },
108 {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE },
109 {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE },
110 {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE },
111 {"ext", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
112 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
113 {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */
114
115 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
116 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
117 {"requestinfo", SC(RequestInfo) 0 },
118 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
119 {"setsound", SC(SetSound) PF_IMMEDIATE },
120 {"setup", SC(SetUp) PF_IMMEDIATE },
121 {"version", SC(VersionCmd) PF_IMMEDIATE },
122 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */
123 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */
124 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
125};
126
127/**
128 * Handle client input.
129 *
130 * HandleClient is actually not named really well - we only get here once
131 * there is input, so we don't do exception or other stuff here.
132 * sock is the output socket information. pl is the player associated
133 * with this socket, null if no player (one of the init_sockets for just
134 * starting a connection)
135 */
136
137void
138HandleClient (client_socket *ns, player *pl)
139{
140 /* Loop through this - maybe we have several complete packets here. */
141 // limit to a few commands only, though, as to not monopolise the server
142 for (int repeat = 16; repeat--;)
143 { 88 }
144 /* If it is a player, and they don't have any speed left, we 89}
145 * return, and will read in the data when they do have time. 90
146 */ 91bool
92client::handle_command ()
93{
147 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 94 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
148 return; 95 return false;
149 96
150 int pkt_len = ns->read_packet (); 97 if (cmd_queue.empty ())
98 return false;
151 99
152 if (pkt_len < 0) 100 command &cmd = cmd_queue.front ();
153 {
154 LOG (llevError, "read error on player %s\n", &pl->ob->name);
155 /* Caller will take care of cleaning this up */
156 ns->status = Ns_Dead;
157 return;
158 }
159 else if (pkt_len == 0)
160 /* Still dont have a full packet */
161 return;
162 101
163 /* First, break out beginning word. There are at least 102 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
164 * a few commands that do not have any paremeters. If
165 * we get such a command, don't worry about trying
166 * to break it up.
167 */
168 int datalen;
169 char *data = strchr ((char *)ns->inbuf + 2, ' ');
170
171 if (data)
172 {
173 *data++ = 0;
174 datalen = pkt_len - (data - (char *)ns->inbuf);
175 }
176 else
177 {
178 data = (char *)ns->inbuf + 2; // better read garbage than segfault
179 datalen = 0;
180 }
181
182 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
183
184 for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
185 if (!strcmp ((char *)ns->inbuf + 2, pkt->name))
186 {
187 if (pkt->may_execute (ns))
188 {
189 pkt->execute (ns, data, datalen);
190 ns->skip_packet (pkt_len);
191 //D//TODO not doing this causes random memory corruption
192 if (pkt->flags & PF_IMMEDIATE)
193 goto next_packet;
194 return;
195 }
196 }
197
198 /* If we get here, we didn't find a valid command. Logging
199 * this might be questionable, because a broken client/malicious
200 * user could certainly send a whole bunch of invalid commands.
201 */
202 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
203 ns->skip_packet (pkt_len);
204 next_packet:
205 ;
206 } 103 {
104 reset_state ();
105 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
106 }
107 else
108 execute (cmd.handler, cmd.data, cmd.datalen);
109
110 cmd_queue.pop_front ();
111
112 return true;
207} 113}
208 114
209void 115void
210flush_sockets (void) 116flush_sockets (void)
211{ 117{
212 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 118 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
213 if ((*i)->status != Ns_Dead) 119 if ((*i)->status != Ns_Dead)
214 (*i)->flush (); 120 (*i)->flush ();
215} 121}
216 122
217/** 123/**
… …
222 * 128 *
223 */ 129 */
224void 130void
225doeric_server (void) 131doeric_server (void)
226{ 132{
227 int i, pollret;
228 fd_set tmp_read;
229 struct sockaddr_in addr;
230 socklen_t addrlen = sizeof (struct sockaddr);
231 player *pl, *next;
232 int maxfd = 0;
233
234#ifdef CS_LOGSTATS 133#ifdef CS_LOGSTATS
235 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 134 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
236 write_cs_stats (); 135 write_cs_stats ();
237#endif 136#endif
238 137
239 /* Go through the players. Let the loop set the next pl value, 138 /* Go through the players. Let the loop set the next pl value,
240 * since we may remove some 139 * since we may remove some
241 */ 140 */
242 //TODO: must be handled cleanly elsewhere 141 //TODO: must be handled cleanly elsewhere
243 for (pl = first_player; pl; ) 142 for (player *pl = first_player; pl; )
244 { 143 {
245 player *npl = pl->next; 144 player *npl = pl->next;
246 145
247 //TODO: must be handled cleanly elsewhere 146 //TODO: must be handled cleanly elsewhere
248 if (pl->socket->status == Ns_Dead) 147 if (!pl->socket || pl->socket->status == Ns_Dead)
249 { 148 {
250 save_player (pl->ob, 0); 149 save_player (pl->ob, 0);
251 150
252 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 151 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
253 { 152 {
… …
260 } 159 }
261 160
262 pl = npl; 161 pl = npl;
263 } 162 }
264 163
265 FD_ZERO (&tmp_read);
266
267 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 164 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
268 { 165 {
269 client_socket *s = *i; 166 client *s = *i;
270 167
271 if (s->status == Ns_Dead) 168 if (s->status == Ns_Dead)
272 { 169 {
273 client_sockets.erase (i); 170 clients.erase (i);
274 delete s; 171 delete s;
275 } 172 }
276 else 173 else
277 {
278 if (s->fd > maxfd) maxfd = s->fd;
279
280 FD_SET (s->fd, &tmp_read);
281
282 ++i; 174 ++i;
283 }
284 }
285
286 struct timeval timeout;
287
288 timeout.tv_sec = 0;
289 timeout.tv_usec = 0;
290
291 pollret = select (maxfd + 1,
292 &tmp_read, 0, 0,
293 &timeout);
294
295 if (pollret == -1)
296 {
297 LOG (llevError, "select failed: %s\n", strerror (errno));
298 return;
299 } 175 }
300 176
301 /* We need to do some of the processing below regardless */ 177 /* We need to do some of the processing below regardless */
302 178
303 /* Check for any input on the sockets */ 179 /* Check for any input on the sockets */
304 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 180 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
305 { 181 {
306 client_socket *s = *i; 182 client *s = *i;
307 player *pl = s->pl; 183 player *pl = s->pl;
308 184
309 //TODO: disassociate handleclient from socket readin 185 s->handle_packet ();
310 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read)) 186 s->handle_command ();
311 HandleClient (s, pl);
312 187
313 //TODO: should not be done here, either 188 //TODO: should not be done here, either
314 if (s->status != Ns_Dead && pl) 189 if (s->status != Ns_Dead && pl)
315 { 190 {
316 /* Update the players stats once per tick. More efficient than 191 /* Update the players stats once per tick. More efficient than
317 * sending them whenever they change, and probably just as useful 192 * sending them whenever they change, and probably just as useful
318 */ 193 */
319 esrv_update_stats (pl); 194 esrv_update_stats (pl);
195
320 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 196 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
321 { 197 {
322 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 198 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
323 if (pl->last_weight != WEIGHT (pl->ob)) 199 if (pl->last_weight != WEIGHT (pl->ob))
324 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 200 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
325 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 201 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
326 } 202 }
327 203
328 /* draw_client_map does sanity checking that map is
329 * valid, so don't do it here.
330 */
331 draw_client_map (pl->ob); 204 draw_client_map (pl->ob);
205
332 if (s->update_look) 206 if (s->update_look)
333 esrv_draw_look (pl->ob); 207 esrv_draw_look (pl->ob);
334 } 208 }
335 } 209 }
336} 210}

Diff Legend

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