[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.124 by root, Tue Apr 15 14:21:04 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		137
137	pl->ns->force_newmap = false;	138	pl->ns->force_newmap = false;
138		139
139	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
…		…
191	socket.current_y = ob->y;	192	socket.current_y = ob->y;
192		193
193	region *reg = ob->region ();	194	region *reg = ob->region ();
194	if (socket.current_region != reg)	195	if (socket.current_region != reg)
195	{	196	{
		197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196	socket.current_region = reg;	198	socket.current_region = reg;
197	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198	}	199	}
199	}	200	}
200		201
201	/**	202	/**
202	* RequestInfo is sort of a meta command. There is some specific	203	* RequestInfo is sort of a meta command. There is some specific
203	* request of information, but we call other functions to provide	204	* request of information, but we call other functions to provide
204	* that information.	205	* that information.
205	*/	206	*/
206	void	207	void
207	RequestInfo (char buf, int len, client ns)	208	RequestInfo (char buf, int len, client ns)
208	{	209	{
209	char params = NULL, cp;	210	char *params;
210
211	/* No match */
212	char bigbuf[MAX_BUF];
213	int slen;
214
215	/* Set up replyinfo before we modify any of the buffers - this is used
216	* if we don't find a match.
217	*/
218	strcpy (bigbuf, "replyinfo ");
219	slen = strlen (bigbuf);
220	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221		211
222	/* find the first space, make it null, and update the	212	/* find the first space, make it null, and update the
223	* params pointer.	213	* params pointer.
224	*/	214	*/
225	for (cp = buf; *cp != '\0'; cp++)	215	for (params = buf; *params; params++)
226	if (*cp == ' ')	216	if (*params == ' ')
227	{	217	{
228	*cp = '\0';
229	params = cp + 1;	218	*params++ = 0;
230	break;	219	break;
231	}	220	}
232		221
233	if (!strcmp (buf, "image_info"))	222	if (!strcmp (buf, "image_info"))
234	send_image_info (ns, params);	223	send_image_info (ns, params);
…		…
237	else if (!strcmp (buf, "skill_info"))	226	else if (!strcmp (buf, "skill_info"))
238	send_skill_info (ns, params);	227	send_skill_info (ns, params);
239	else if (!strcmp (buf, "spell_paths"))	228	else if (!strcmp (buf, "spell_paths"))
240	send_spell_paths (ns, params);	229	send_spell_paths (ns, params);
241	else	230	else
242	ns->send_packet (bigbuf, len);	231	{
		232	// undo tokenisation above and send replyinfo with the request unchanged
		233	if (*params)
		234	*--params = ' ';
		235
		236	ns->send_packet_printf ("replyinfo %s", buf);
		237	}
243	}	238	}
244		239
245	void	240	void
246	ExtCmd (char buf, int len, player pl)	241	ExtCmd (char buf, int len, player pl)
247	{	242	{
…		…
250		245
251	void	246	void
252	ExtiCmd (char buf, int len, client ns)	247	ExtiCmd (char buf, int len, client ns)
253	{	248	{
254	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		250	}
		251
		252	void
		253	client::mapinfo_queue_clear ()
		254	{
		255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		256	free (*i);
		257
		258	mapinfo_queue.clear ();
		259	}
		260
		261	bool
		262	client::mapinfo_try (char *buf)
		263	{
		264	char *token = buf;
		265	buf += strlen (buf) + 9;
		266
		267	// initial map and its origin
		268	maptile *map = pl->observe->map;
		269	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		270	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		271	int max_distance = 8; // limit maximum path length to something generous
		272
		273	while (*buf && map && max_distance)
		274	{
		275	int dir = *buf++ - '1';
		276
		277	if (dir >= 0 && dir <= 3)
		278	{
		279	if (!map->tile_path [dir])
		280	map = 0;
		281	else if (map->tile_available (dir, false))
		282	{
		283	maptile *neigh = map->tile_map [dir];
		284
		285	switch (dir)
		286	{
		287	case 0: mapy -= neigh->height; break;
		288	case 2: mapy += map ->height; break;
		289	case 3: mapx -= neigh->width ; break;
		290	case 1: mapx += map ->width ; break;
		291	}
		292
		293	map = neigh;
		294	--max_distance;
		295	}
		296	else
		297	return 0;
		298	}
		299	else
		300	max_distance = 0;
		301	}
		302
		303	if (!max_distance)
		304	send_packet_printf ("mapinfo %s error", token);
		305	else if (!map \|\| !map->path)
		306	send_packet_printf ("mapinfo %s nomap", token);
		307	else
		308	{
		309	int flags = 0;
		310
		311	if (map->tile_path[0]) flags \|= 1;
		312	if (map->tile_path[1]) flags \|= 2;
		313	if (map->tile_path[2]) flags \|= 4;
		314	if (map->tile_path[3]) flags \|= 8;
		315
		316	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		317	}
		318
		319	return 1;
		320	}
		321
		322	void
		323	client::mapinfo_queue_run ()
		324	{
		325	if (mapinfo_queue.empty () \|\| !pl)
		326	return;
		327
		328	for (int i = 0; i < mapinfo_queue.size (); ++i)
		329	if (mapinfo_try (mapinfo_queue [i]))
		330	{
		331	free (mapinfo_queue [i]);
		332	mapinfo_queue.erase (i);
		333	}
		334	else
		335	++i;
255	}	336	}
256		337
257	void	338	void
258	MapInfoCmd (char buf, int len, player pl)	339	MapInfoCmd (char buf, int len, player pl)
259	{	340	{
260	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
261	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
262		343
263	char bigbuf[MAX_BUF], *token;
264
265	token = buf;	344	char *token = buf;
266	// copy token	345
267	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
268	return;	347	return;
269		348
270	*buf++ = 0;
271
272	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
273	{	350	{
274	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
275		353
276	// initial map and its origin	354	#if 0
277	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
278	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
279	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	free (copy);
280	int mapy = pl->ns->mapy / 2 - pl->ob->y;
281	int max_distance = 8; // limit maximum path length to something generous
282
283	while (*buf && map && max_distance)
284	{
285	int dir = *buf++;
286
287	switch (dir)
288	{
289	case '1':
290	dx = 0;
291	dy = -1;
292	map = map->xy_find (dx, dy);
293	map && (mapy -= map->height);
294	break;
295	case '2':
296	mapx += map->width;
297	dx = map->width;
298	dy = 0;
299	map = map->xy_find (dx, dy);
300	break;
301	case '3':
302	mapy += map->height;
303	dx = 0;
304	dy = map->height;
305	map = map->xy_find (dx, dy);
306	break;
307	case '4':
308	dx = -1;
309	dy = 0;
310	map = map->xy_find (dx, dy);
311	map && (mapx -= map->width);
312	break;
313	}
314
315	--max_distance;
316	}
317
318	if (!max_distance)
319	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320	else if (map && map->path[0])
321	{
322	int flags = 0;
323
324	if (map->tile_path[0]) flags \|= 1;
325	if (map->tile_path[1]) flags \|= 2;
326	if (map->tile_path[2]) flags \|= 4;
327	if (map->tile_path[3]) flags \|= 8;
328
329	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330	}
331	else	358	else
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
333	}	361	}
334	else	362	else
335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337	pl->ns->send_packet (bigbuf);
338	}	364	}
339		365
340	/** This is the Setup cmd */	366	/** This is the Setup cmd */
341	void	367	void
342	SetUp (char buf, int len, client ns)	368	SetUp (char buf, int len, client ns)
…		…
471		497
472	ns->send_packet (cmdback);	498	ns->send_packet (cmdback);
473	}	499	}
474		500
475	/**	501	/**
476	* client requested an image. send it rate-limited
477	* before flushing.
478	*/
479	void
480	AskFaceCmd (char buf, int len, client ns)
481	{
482	ns->askface.push_back (atoi (buf));
483	}
484
485	/**
486	* Tells client the picture it has to use
487	* to smooth a picture number given as argument.
488	*/
489	void
490	AskSmooth (char buf, int len, client ns)
491	{
492	ns->send_face (atoi (buf));
493	ns->flush_fx ();
494	}
495
496	/**
497	* This handles the general commands from the client (ie, north, fire, cast,	502	* This handles the general commands from the client (ie, north, fire, cast,
498	* etc.)	503	* etc.)
499	*/	504	*/
500	void	505	void
501	PlayerCmd (char buf, int len, player pl)	506	PlayerCmd (char buf, int len, player pl)
…		…
533	void	538	void
534	NewPlayerCmd (char buf, int len, player pl)	539	NewPlayerCmd (char buf, int len, player pl)
535	{	540	{
536	if (len <= 6)	541	if (len <= 6)
537	{	542	{
538	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	543	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539	return;	544	return;
540	}	545	}
541		546
542	uint16 cmdid = net_uint16 ((uint8 *)buf);	547	uint16 cmdid = net_uint16 ((uint8 *)buf);
543	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	548	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
747		752
748	//TODO: maybe golem should become the current_weapon, quite simply?	753	//TODO: maybe golem should become the current_weapon, quite simply?
749	if (pl->golem)	754	if (pl->golem)
750	buf << " Golem*: " << pl->golem->name;	755	buf << " Golem*: " << pl->golem->name;
751		756
		757	buf << '\0';
752	buf.linearise (obuf);	758	buf.linearise (obuf);
753	obuf [buf.size ()] = 0;
754	}	759	}
755		760
756	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
757	Old = New; \	762	Old = New; \
758	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
795	return;	800	return;
796		801
797	object *ob = pl->observe;	802	object *ob = pl->observe;
798	if (!ob)	803	if (!ob)
799	return;	804	return;
		805
		806	player opl = ob->contr ? static_cast<player >(ob->contr) : pl;
800		807
801	packet sl ("stats");	808	packet sl ("stats");
802		809
803	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
804	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
813	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
814	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
815	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
816		823
817	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
818	if (object *skill = pl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob[s])
819	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
820	{	827	{
821	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
822		829
823	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
838	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
839	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
840		847
841	flags = 0;	848	flags = 0;
842		849
843	if (pl->fire_on)	850	if (opl->fire_on)
844	flags \|= SF_FIREON;	851	flags \|= SF_FIREON;
845		852
846	if (pl->run_on)	853	if (opl->run_on)
847	flags \|= SF_RUNON;	854	flags \|= SF_RUNON;
848		855
849	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
850		857
851	if (ns->sc_version < 1025)	858	if (ns->sc_version < 1025)
…		…
865	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	872	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
866	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	873	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
867	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	874	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
868	}	875	}
869		876
870	rangetostring (pl, buf); /* we want use the new fire & run system in new client */	877	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
871	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
872	set_title (ob, buf);	879	set_title (ob, buf);
873	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
874		881
875	/* Only send it away if we have some actual data */	882	/* Only send it away if we have some actual data */
…		…
957		964
958	if (!ns.faces_sent[face_num])	965	if (!ns.faces_sent[face_num])
959	if (ob)	966	if (ob)
960	ns.send_faces (ob);	967	ns.send_faces (ob);
961	else	968	else
962	ns.send_face (face_num);	969	ns.send_face (face_num, 10);
963		970
964	sl << uint16 (face_num);	971	sl << uint16 (face_num);
965	return 1;	972	return 1;
966	}	973	}
967		974
…		…
1024		1031
1025	/* If player is just joining the game, he isn't here yet, so the map	1032	/* If player is just joining the game, he isn't here yet, so the map
1026	* can get swapped out. If so, don't try to send them a map. All will	1033	* can get swapped out. If so, don't try to send them a map. All will
1027	* be OK once they really log in.	1034	* be OK once they really log in.
1028	*/	1035	*/
1029	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	1036	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)
1030	return;	1037	return;
1031		1038
1032	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1033	sint16 nx, ny;
1034	int estartlen, eoldlen;	1040	int estartlen, eoldlen;
1035	uint8 eentrysize;	1041	uint8 eentrysize;
1036	uint16 ewhatstart, ewhatflag;	1042	uint16 ewhatstart, ewhatflag;
1037	uint8 extendedinfos;	1043	uint8 extendedinfos;
1038	maptile *m;
1039		1044
1040	check_map_change (pl);	1045	check_map_change (pl);
1041	prefetch_surrounding_maps (pl->ob);	1046	prefetch_surrounding_maps (pl->ob);
1042		1047
1043	/* do LOS after calls to update_position */	1048	/* do LOS after calls to update_position */
…		…
1109	max_x = ob->x + (socket.mapx + 1) / 2;	1114	max_x = ob->x + (socket.mapx + 1) / 2;
1110	max_y = ob->y + (socket.mapy + 1) / 2;	1115	max_y = ob->y + (socket.mapy + 1) / 2;
1111		1116
1112	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)	1117	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1113	{	1118	{
		1119	sint16 nx, ny;
		1120	maptile *m = 0;
		1121
1114	ax = 0;	1122	ax = 0;
1115	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1123	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1116	{	1124	{
		1125	// check to see if we can simply go one right quickly
		1126	++nx;
		1127	if (m && nx >= m->width)
		1128	m = 0;
		1129
		1130	if (!m)
		1131	{
		1132	nx = x; ny = y; m = plmap;
		1133
		1134	if (xy_normalise (m, nx, ny))
		1135	m->touch ();
		1136	else
		1137	m = 0;
		1138	}
		1139
1117	int emask, mask;	1140	int emask, mask;
1118	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1141	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1119		1142
1120	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1121		1144
1122	/* If the coordinates are not valid, or it is too dark to see,	1145	/* If the coordinates are not valid, or it is too dark to see,
1123	* we tell the client as such	1146	* we tell the client as such
1124	*/	1147	*/
1125	nx = x;
1126	ny = y;
1127	m = get_map_from_coord (plmap, &nx, &ny);
1128
1129	if (!m)	1148	if (!m)
1130	{	1149	{
1131	/* space is out of map. Update space and clear values	1150	/* space is out of map. Update space and clear values
1132	* if this hasn't already been done. If the space is out	1151	* if this hasn't already been done. If the space is out
1133	* of the map, it shouldn't have a head	1152	* of the map, it shouldn't have a head
…		…
1139	}	1158	}
1140		1159
1141	continue;	1160	continue;
1142	}	1161	}
1143		1162
1144	m->touch ();
1145
1146	int d = pl->blocked_los[ax][ay];	1163	int d = pl->blocked_los[ax][ay];
1147		1164
1148	if (d > 3)	1165	if (d > 3)
1149	{	1166	{
1150		1167
…		…
1214	}	1231	}
1215		1232
1216	lastcell.count = d;	1233	lastcell.count = d;
1217		1234
1218	mapspace &ms = m->at (nx, ny);	1235	mapspace &ms = m->at (nx, ny);
		1236	ms.update ();
1219		1237
1220	if (socket.extmap)	1238	if (socket.extmap)
1221	{	1239	{
1222	uint8 stat_hp = 0;	1240	uint8 stat_hp = 0;
1223	uint8 stat_width = 0;	1241	uint8 stat_width = 0;
…		…
1403	sl << "replyinfo skill_info\n";	1421	sl << "replyinfo skill_info\n";
1404		1422
1405	for (int i = 1; i < NUM_SKILLS; i++)	1423	for (int i = 1; i < NUM_SKILLS; i++)
1406	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1424	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1407		1425
1408	if (sl.length () >= MAXSOCKBUF)	1426	if (sl.length () > MAXSOCKBUF)
1409	{	1427	{
1410	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1428	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1411	fatal (0);	1429	fatal (0);
1412	}	1430	}
1413		1431
…		…
1426	sl << "replyinfo spell_paths\n";	1444	sl << "replyinfo spell_paths\n";
1427		1445
1428	for (int i = 0; i < NRSPELLPATHS; i++)	1446	for (int i = 0; i < NRSPELLPATHS; i++)
1429	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1447	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1430		1448
1431	if (sl.length () >= MAXSOCKBUF)	1449	if (sl.length () > MAXSOCKBUF)
1432	{	1450	{
1433	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1451	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1434	fatal (0);	1452	fatal (0);
1435	}	1453	}
1436		1454
…		…
1544	if (!spell->face)	1562	if (!spell->face)
1545	{	1563	{
1546	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1564	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1547	spell->face = face_find ("burnout.x11", blank_face);	1565	spell->face = face_find ("burnout.x11", blank_face);
1548	}	1566	}
		1567
		1568	pl->ns->send_face (spell->face);
1549		1569
1550	/* send the current values */	1570	/* send the current values */
1551	sl << uint32 (spell->count)	1571	sl << uint32 (spell->count)
1552	<< uint16 (spell->level)	1572	<< uint16 (spell->level)
1553	<< uint16 (spell->casting_time)	1573	<< uint16 (spell->casting_time)
…		…
1589	* bytes and 3 strings (because that is the spec) so we need to	1609	* bytes and 3 strings (because that is the spec) so we need to
1590	* check that the length of those 3 strings, plus the 23 bytes,	1610	* check that the length of those 3 strings, plus the 23 bytes,
1591	* won't take us over the length limit for the socket, if it does,	1611	* won't take us over the length limit for the socket, if it does,
1592	* we need to send what we already have, and restart packet formation	1612	* we need to send what we already have, and restart packet formation
1593	*/	1613	*/
		1614	if (spell->type != SPELL)
		1615	continue;
		1616
1594	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1617	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1595	* to show add_spell is 26 bytes + 2 strings. However, the overun	1618	* to show add_spell is 26 bytes + 2 strings. However, the overun
1596	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1619	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1597	* like it will fix this	1620	* like it will fix this
1598	*/	1621	*/
1599	if (spell->type != SPELL)
1600	continue;
1601
1602	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1622	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1603	{	1623	{
		1624	pl->ns->flush_fx ();
1604	pl->ns->send_packet (sl);	1625	pl->ns->send_packet (sl);
1605		1626
1606	sl.reset ();	1627	sl.reset ();
1607	sl << "addspell ";	1628	sl << "addspell ";
1608	}	1629	}
…		…
1616	return;	1637	return;
1617	}	1638	}
1618	else	1639	else
1619	append_spell (pl, sl, spell);	1640	append_spell (pl, sl, spell);
1620		1641
1621	if (sl.length () >= MAXSOCKBUF)	1642	if (sl.length () > MAXSOCKBUF)
1622	{	1643	{
1623	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1644	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1624	fatal (0);	1645	fatal (0);
1625	}	1646	}
1626		1647
1627	/* finally, we can send the packet */	1648	/* finally, we can send the packet */
		1649	pl->ns->flush_fx ();
1628	pl->ns->send_packet (sl);	1650	pl->ns->send_packet (sl);
1629	}	1651	}
1630		1652

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.104 by root, Tue Jun 5 13:05:03 2007 UTC vs. Revision 1.124 by root, Tue Apr 15 14:21:04 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.124 by root, Tue Apr 15 14:21:04 2008 UTC