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.16 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.19 by root, Fri Dec 15 19:59:20 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/*****************************************************************************
53 * Start of command dispatch area. 52 * Start of command dispatch area.
54 * The commands here are protocol commands. 53 * The commands here are protocol commands.
55 ****************************************************************************/ 54 ****************************************************************************/
… …
60 * before player joins, and those happen after the player has joined. 59 * before player joins, and those happen after the player has joined.
61 * As such, we have function types that might be called, so 60 * As such, we have function types that might be called, so
62 * we end up having 2 tables. 61 * we end up having 2 tables.
63 */ 62 */
64 63
65typedef void (*func_uint8_int_ns) (char *, int, client_socket *); 64enum {
65 PF_PLAYER = 0x01, // must have valid player
66 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
67 PF_PLAYING = 0x04, // must be in playing state
68};
66 69
67struct NsCmdMapping 70struct pkt_type
68{ 71{
69 const char *cmdname; 72 const char *name;
70 func_uint8_int_ns cmdproc; 73 void *cb;
71 uint8 flag; 74 int flags;
75
76 bool may_execute (client *ns)
77 {
78 return (!(flags & PF_PLAYER) || ns->pl)
79 && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING));
80 }
81
82 void execute (client *ns, char *data, int datalen)
83 {
84 //TODO: only one format
85 if (flags & PF_PLAYER)
86 ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl);
87 else
88 ((void (*)(char *, int, client *))cb)((char *)data, datalen, ns);
89 }
72}; 90};
73 91
74typedef void (*func_uint8_int_pl) (char *, int, player *); 92// SocketCommand, PlayingCommand, should not exist with those ugly casts
75struct PlCmdMapping 93#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
76{ 94#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
77 const char *cmdname;
78 func_uint8_int_pl cmdproc;
79 uint8 flag;
80};
81 95
82/** 96/**
83 * Dispatch table for the server. 97 * Dispatch table for the server.
84 * 98 */
85 * CmdMapping is the dispatch table for the server, used in HandleClient, 99static struct pkt_type packets[] = {
86 * which gets called when the client has input. All commands called here 100 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
87 * use the same parameter form (char* data, int len, int clientnum. 101 {"command", PC(PlayerCmd) PF_PLAYING },
88 * We do implicit casts, because the data that is being passed is 102
89 * unsigned (pretty much needs to be for binary data), however, most 103 {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE },
90 * of these treat it only as strings, so it makes things easier 104 {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE },
91 * to cast it here instead of a bunch of times in the function itself. 105 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
92 * flag is 1 if the player must be in the playing state to issue the 106 {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE },
93 * command, 0 if they can issue it at any time. 107 {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE },
94 */ 108 {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE },
95static struct PlCmdMapping plcommands[] = { 109 {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE },
96 {"examine", ExamineCmd, 1}, 110 {"ext", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
97 {"apply", ApplyCmd, 1},
98 {"move", MoveCmd, 1},
99 {"reply", ReplyCmd, 0},
100 {"command", PlayerCmd, 1},
101 {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1},
102 {"lookat", LookAt, 1},
103 {"lock", (func_uint8_int_pl) LockItem, 1},
104 {"mark", (func_uint8_int_pl) MarkItem, 1},
105 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 111 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
106 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 112 {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */
107 {"ext", ExtCmd, 2}, /* CF+ */ 113
108 { 0 } /* terminator */ 114 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
115 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
116 {"requestinfo", SC(RequestInfo) 0 },
117 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
118 {"setsound", SC(SetSound) PF_IMMEDIATE },
119 {"setup", SC(SetUp) PF_IMMEDIATE },
120 {"version", SC(VersionCmd) PF_IMMEDIATE },
121 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */
122 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */
123 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
109}; 124};
110
111/** Face-related commands */
112static struct NsCmdMapping nscommands[] = {
113 {"addme", AddMeCmd, 2},
114 {"askface", SendFaceCmd}, /* Added: phil */
115 {"requestinfo", RequestInfo},
116 {"setfacemode", SetFaceMode, 2},
117 {"setsound", SetSound, 2},
118 {"setup", SetUp, 2},
119 {"version", VersionCmd, 2},
120 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
121 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
122 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
123 { 0 } /* terminator (I, II & III) */
124};
125
126/**
127 * RequestInfo is sort of a meta command. There is some specific
128 * request of information, but we call other functions to provide
129 * that information.
130 */
131void
132RequestInfo (char *buf, int len, client_socket * ns)
133{
134 char *params = NULL, *cp;
135
136 /* No match */
137 char bigbuf[MAX_BUF];
138 int slen;
139
140 /* Set up replyinfo before we modify any of the buffers - this is used
141 * if we don't find a match.
142 */
143 strcpy (bigbuf, "replyinfo ");
144 slen = strlen (bigbuf);
145 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
146
147 /* find the first space, make it null, and update the
148 * params pointer.
149 */
150 for (cp = buf; *cp != '\0'; cp++)
151 if (*cp == ' ')
152 {
153 *cp = '\0';
154 params = cp + 1;
155 break;
156 }
157
158 if (!strcmp (buf, "image_info"))
159 send_image_info (ns, params);
160 else if (!strcmp (buf, "image_sums"))
161 send_image_sums (ns, params);
162 else if (!strcmp (buf, "skill_info"))
163 send_skill_info (ns, params);
164 else if (!strcmp (buf, "spell_paths"))
165 send_spell_paths (ns, params);
166 else
167 ns->send_packet (bigbuf, len);
168}
169 125
170/** 126/**
171 * Handle client input. 127 * Handle client input.
172 * 128 *
173 * HandleClient is actually not named really well - we only get here once 129 * HandleClient is actually not named really well - we only get here once
174 * there is input, so we don't do exception or other stuff here. 130 * there is input, so we don't do exception or other stuff here.
175 * sock is the output socket information. pl is the player associated 131 * sock is the output socket information. pl is the player associated
176 * with this socket, null if no player (one of the init_sockets for just 132 * with this socket, null if no player (one of the init_sockets for just
177 * starting a connection) 133 * starting a connection)
178 */ 134 */
179
180void 135void
181HandleClient (client_socket *ns, player *pl) 136HandleClient (client *ns, player *pl)
182{ 137{
183 /* Loop through this - maybe we have several complete packets here. */ 138 /* Loop through this - maybe we have several complete packets here. */
184 // limit to a few commands only, though, as to not monopolise the server 139 // limit to a few commands only, though, as to not monopolise the server
185 for (int repeat = 16; repeat--;) 140 for (int repeat = 16; repeat--;)
186 { 141 {
… …
222 datalen = 0; 177 datalen = 0;
223 } 178 }
224 179
225 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 180 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
226 181
227 for (int i = 0; nscommands[i].cmdname; i++) 182 for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
228 {
229 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) 183 if (!strcmp ((char *)ns->inbuf + 2, pkt->name))
230 {
231 nscommands[i].cmdproc (data, datalen, ns);
232 ns->skip_packet (pkt_len);
233 //D// not doing this causes random memory corruption
234 if (nscommands[i].flag & 2)
235 goto next_packet;
236 return;
237 }
238 }
239
240 /* Player must be in the playing state or the flag on the
241 * the command must be zero for the user to use the command -
242 * otherwise, a player cam save, be in the play_again state, and
243 * the map they were on gets swapped out, yet things that try to look
244 * at the map causes a crash. If the command is valid, but
245 * one they can't use, we still swallow it up.
246 */
247 if (pl)
248 for (int i = 0; plcommands[i].cmdname; i++)
249 { 184 {
250 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) 185 if (pkt->may_execute (ns))
251 { 186 {
252 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 187 pkt->execute (ns, data, datalen);
253 plcommands[i].cmdproc ((char *) data, datalen, pl);
254
255 ns->skip_packet (pkt_len); 188 ns->skip_packet (pkt_len);
256 //D// not doing this causes random memory corruption 189 //D//TODO not doing this causes random memory corruption
257 if (plcommands[i].flag & 2) 190 if (pkt->flags & PF_IMMEDIATE)
258 goto next_packet; 191 goto next_packet;
259
260 return; 192 return;
261 } 193 }
262 } 194 }
263 195
264 /* If we get here, we didn't find a valid command. Logging 196 /* If we get here, we didn't find a valid command. Logging
… …
273} 205}
274 206
275void 207void
276flush_sockets (void) 208flush_sockets (void)
277{ 209{
278 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 210 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
279 if ((*i)->status != Ns_Dead) 211 if ((*i)->status != Ns_Dead)
280 (*i)->flush (); 212 (*i)->flush ();
281} 213}
282 214
283/** 215/**
… …
328 pl = npl; 260 pl = npl;
329 } 261 }
330 262
331 FD_ZERO (&tmp_read); 263 FD_ZERO (&tmp_read);
332 264
333 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 265 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
334 { 266 {
335 client_socket *s = *i; 267 client *s = *i;
336 268
337 if (s->status == Ns_Dead) 269 if (s->status == Ns_Dead)
338 { 270 {
339 client_sockets.erase (i); 271 clients.erase (i);
340 delete s; 272 delete s;
341 } 273 }
342 else 274 else
343 { 275 {
344 if (s->fd > maxfd) maxfd = s->fd; 276 if (s->fd > maxfd) maxfd = s->fd;
… …
365 } 297 }
366 298
367 /* We need to do some of the processing below regardless */ 299 /* We need to do some of the processing below regardless */
368 300
369 /* Check for any input on the sockets */ 301 /* Check for any input on the sockets */
370 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 302 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
371 { 303 {
372 client_socket *s = *i; 304 client *s = *i;
373 player *pl = s->pl; 305 player *pl = s->pl;
374 306
375 //TODO: disassociate handleclient from socket readin 307 //TODO: disassociate handleclient from socket readin
376 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read)) 308 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
377 HandleClient (s, pl); 309 HandleClient (s, pl);

Diff Legend

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