… | |
… | |
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> |
50 | #include <newserver.h> |
56 | |
51 | |
57 | /***************************************************************************** |
52 | /***************************************************************************** |
… | |
… | |
65 | * before player joins, and those happen after the player has joined. |
60 | * before player joins, and those happen after the player has joined. |
66 | * As such, we have function types that might be called, so |
61 | * As such, we have function types that might be called, so |
67 | * we end up having 2 tables. |
62 | * we end up having 2 tables. |
68 | */ |
63 | */ |
69 | |
64 | |
70 | typedef void (*func_uint8_int_ns) (char *, int, client_socket *); |
65 | enum { |
|
|
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 | }; |
71 | |
70 | |
72 | struct NsCmdMapping |
71 | struct pkt_type |
73 | { |
72 | { |
74 | const char *cmdname; |
73 | const char *name; |
75 | func_uint8_int_ns cmdproc; |
74 | void *cb; |
76 | 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 | } |
77 | }; |
91 | }; |
78 | |
92 | |
79 | typedef void (*func_uint8_int_pl) (char *, int, player *); |
93 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
80 | struct PlCmdMapping |
94 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb), |
81 | { |
95 | #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 | |
96 | |
87 | /** |
97 | /** |
88 | * Dispatch table for the server. |
98 | * Dispatch table for the server. |
89 | * |
99 | */ |
90 | * CmdMapping is the dispatch table for the server, used in HandleClient, |
100 | static struct pkt_type packets[] = { |
91 | * which gets called when the client has input. All commands called here |
101 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
92 | * use the same parameter form (char* data, int len, int clientnum. |
102 | {"command", PC(PlayerCmd) PF_PLAYING }, |
93 | * We do implicit casts, because the data that is being passed is |
103 | |
94 | * unsigned (pretty much needs to be for binary data), however, most |
104 | {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE }, |
95 | * of these treat it only as strings, so it makes things easier |
105 | {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE }, |
96 | * to cast it here instead of a bunch of times in the function itself. |
106 | {"reply", PC(ReplyCmd) PF_IMMEDIATE }, |
97 | * flag is 1 if the player must be in the playing state to issue the |
107 | {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE }, |
98 | * command, 0 if they can issue it at any time. |
108 | {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE }, |
99 | */ |
109 | {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE }, |
100 | static struct PlCmdMapping plcommands[] = { |
110 | {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE }, |
101 | {"examine", ExamineCmd, 1}, |
111 | {"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 */ |
112 | {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ |
111 | {"mapinfo", MapInfoCmd, 2}, /* CF+ */ |
113 | {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */ |
112 | {"ext", ExtCmd, 2}, /* CF+ */ |
114 | |
113 | { 0 } /* terminator */ |
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) */ |
114 | }; |
125 | }; |
115 | |
|
|
116 | /** Face-related commands */ |
|
|
117 | static 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 | */ |
|
|
136 | void |
|
|
137 | RequestInfo (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 | |
126 | |
175 | /** |
127 | /** |
176 | * Handle client input. |
128 | * Handle client input. |
177 | * |
129 | * |
178 | * HandleClient is actually not named really well - we only get here once |
130 | * HandleClient is actually not named really well - we only get here once |
… | |
… | |
227 | datalen = 0; |
179 | datalen = 0; |
228 | } |
180 | } |
229 | |
181 | |
230 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
182 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
231 | |
183 | |
232 | for (int i = 0; nscommands[i].cmdname; i++) |
184 | for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
233 | { |
|
|
234 | if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) |
185 | 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 | { |
186 | { |
255 | if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) |
187 | if (pkt->may_execute (ns)) |
256 | { |
188 | { |
257 | if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) |
189 | pkt->execute (ns, data, datalen); |
258 | plcommands[i].cmdproc ((char *) data, datalen, pl); |
|
|
259 | |
|
|
260 | ns->skip_packet (pkt_len); |
190 | ns->skip_packet (pkt_len); |
261 | //D// not doing this causes random memory corruption |
191 | //D//TODO not doing this causes random memory corruption |
262 | if (plcommands[i].flag & 2) |
192 | if (pkt->flags & PF_IMMEDIATE) |
263 | goto next_packet; |
193 | goto next_packet; |
264 | |
|
|
265 | return; |
194 | return; |
266 | } |
195 | } |
267 | } |
196 | } |
268 | |
197 | |
269 | /* If we get here, we didn't find a valid command. Logging |
198 | /* If we get here, we didn't find a valid command. Logging |