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.15 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.19 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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