… | |
… | |
60 | * before player joins, and those happen after the player has joined. |
60 | * before player joins, and those happen after the player has joined. |
61 | * As such, we have function types that might be called, so |
61 | * As such, we have function types that might be called, so |
62 | * we end up having 2 tables. |
62 | * we end up having 2 tables. |
63 | */ |
63 | */ |
64 | |
64 | |
65 | typedef void (*func_uint8_int_ns) (char *, int, client_socket *); |
65 | enum { |
66 | |
66 | PF_PLAYER = 0x01, // must have valid player |
67 | struct NsCmdMapping |
67 | PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately |
68 | { |
68 | PF_PLAYING = 0x04, // must be in playing state |
69 | const char *cmdname; |
|
|
70 | func_uint8_int_ns cmdproc; |
|
|
71 | uint8 flag; |
|
|
72 | }; |
69 | }; |
73 | |
70 | |
74 | typedef void (*func_uint8_int_pl) (char *, int, player *); |
71 | struct pkt_type |
75 | struct PlCmdMapping |
|
|
76 | { |
72 | { |
77 | const char *cmdname; |
73 | const char *name; |
78 | func_uint8_int_pl cmdproc; |
74 | void *cb; |
79 | uint8 flag; |
75 | int flags; |
|
|
76 | |
|
|
77 | bool may_execute (client_socket *ns) |
|
|
78 | { |
|
|
79 | return (!(flags & PF_PLAYER) || ns->pl) |
|
|
80 | && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING)); |
|
|
81 | } |
|
|
82 | |
|
|
83 | void execute (client_socket *ns, char *data, int datalen) |
|
|
84 | { |
|
|
85 | //TODO: only one format |
|
|
86 | if (flags & PF_PLAYER) |
|
|
87 | ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl); |
|
|
88 | else |
|
|
89 | ((void (*)(char *, int, client_socket *))cb)((char *)data, datalen, ns); |
|
|
90 | } |
80 | }; |
91 | }; |
81 | |
92 | |
|
|
93 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
|
|
94 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb), |
|
|
95 | #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | |
|
|
96 | |
82 | /** |
97 | /** |
83 | * Dispatch table for the server. |
98 | * Dispatch table for the server. |
84 | * |
99 | */ |
85 | * CmdMapping is the dispatch table for the server, used in HandleClient, |
100 | static struct pkt_type packets[] = { |
86 | * which gets called when the client has input. All commands called here |
101 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
87 | * use the same parameter form (char* data, int len, int clientnum. |
102 | {"command", PC(PlayerCmd) PF_PLAYING }, |
88 | * We do implicit casts, because the data that is being passed is |
103 | |
89 | * unsigned (pretty much needs to be for binary data), however, most |
104 | {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE }, |
90 | * of these treat it only as strings, so it makes things easier |
105 | {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE }, |
91 | * to cast it here instead of a bunch of times in the function itself. |
106 | {"reply", PC(ReplyCmd) PF_IMMEDIATE }, |
92 | * flag is 1 if the player must be in the playing state to issue the |
107 | {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE }, |
93 | * command, 0 if they can issue it at any time. |
108 | {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE }, |
94 | */ |
109 | {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE }, |
95 | static struct PlCmdMapping plcommands[] = { |
110 | {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE }, |
96 | {"examine", ExamineCmd, 1}, |
111 | {"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 */ |
112 | {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ |
106 | {"mapinfo", MapInfoCmd, 2}, /* CF+ */ |
113 | {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */ |
107 | {"ext", ExtCmd, 2}, /* CF+ */ |
|
|
108 | { 0 } /* terminator */ |
|
|
109 | }; |
|
|
110 | |
114 | |
111 | /** Face-related commands */ |
115 | {"addme", SC(AddMeCmd) PF_IMMEDIATE }, |
112 | static struct NsCmdMapping nscommands[] = { |
|
|
113 | {"addme", AddMeCmd, 2}, |
|
|
114 | {"askface", SendFaceCmd}, /* Added: phil */ |
116 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
115 | {"requestinfo", RequestInfo}, |
117 | {"requestinfo", SC(RequestInfo) 0 }, |
116 | {"setfacemode", SetFaceMode, 2}, |
118 | {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE }, |
117 | {"setsound", SetSound, 2}, |
119 | {"setsound", SC(SetSound) PF_IMMEDIATE }, |
118 | {"setup", SetUp, 2}, |
120 | {"setup", SC(SetUp) PF_IMMEDIATE }, |
119 | {"version", VersionCmd, 2}, |
121 | {"version", SC(VersionCmd) PF_IMMEDIATE }, |
120 | {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */ |
122 | {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */ |
121 | {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */ |
123 | {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */ |
122 | {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ |
124 | {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */ |
123 | { 0 } /* terminator (I, II & III) */ |
|
|
124 | }; |
125 | }; |
125 | |
126 | |
126 | /** |
127 | /** |
127 | * RequestInfo is sort of a meta command. There is some specific |
128 | * RequestInfo is sort of a meta command. There is some specific |
128 | * request of information, but we call other functions to provide |
129 | * request of information, but we call other functions to provide |
… | |
… | |
222 | datalen = 0; |
223 | datalen = 0; |
223 | } |
224 | } |
224 | |
225 | |
225 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
226 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
226 | |
227 | |
227 | for (int i = 0; nscommands[i].cmdname; i++) |
228 | for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
228 | { |
|
|
229 | if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) |
229 | 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 | { |
230 | { |
250 | if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) |
231 | if (pkt->may_execute (ns)) |
251 | { |
232 | { |
252 | if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) |
233 | pkt->execute (ns, data, datalen); |
253 | plcommands[i].cmdproc ((char *) data, datalen, pl); |
|
|
254 | |
|
|
255 | ns->skip_packet (pkt_len); |
234 | ns->skip_packet (pkt_len); |
256 | //D// not doing this causes random memory corruption |
235 | //D//TODO not doing this causes random memory corruption |
257 | if (plcommands[i].flag & 2) |
236 | if (pkt->flags & PF_IMMEDIATE) |
258 | goto next_packet; |
237 | goto next_packet; |
259 | |
|
|
260 | return; |
238 | return; |
261 | } |
239 | } |
262 | } |
240 | } |
263 | |
241 | |
264 | /* If we get here, we didn't find a valid command. Logging |
242 | /* If we get here, we didn't find a valid command. Logging |