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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	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	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) 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,	13	* This program is distributed in the hope that it will be useful,
16	* GNU General Public License 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	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* 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>
22	*/	22	*/
23		23
24	/**	24	/**
25	* \file	25	* \file
26	* Client handling.	26	* Client handling.
…		…
129	}	129	}
130		130
131	static void	131	static void
132	clear_map (player *pl)	132	clear_map (player *pl)
133	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
134	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135		137
136	pl->ns->force_newmap = false;	138	pl->ns->force_newmap = false;
137		139
138	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
…		…
246	{	248	{
247	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248	}	250	}
249		251
250	void	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;
		336	}
		337
		338	void
251	MapInfoCmd (char buf, int len, player pl)	339	MapInfoCmd (char buf, int len, player pl)
252	{	340	{
253	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
254	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
255		343
256	char bigbuf[MAX_BUF], *token;
257
258	token = buf;	344	char *token = buf;
259	// copy token	345
260	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
261	return;	347	return;
262		348
263	*buf++ = 0;
264
265	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
266	{	350	{
267	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
268		353
269	// initial map and its origin	354	#if 0
270	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
271	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
272	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	free (copy);
273	int mapy = pl->ns->mapy / 2 - pl->ob->y;
274	int max_distance = 8; // limit maximum path length to something generous
275
276	while (*buf && map && max_distance)
277	{
278	int dir = *buf++;
279
280	switch (dir)
281	{
282	case '1':
283	dx = 0;
284	dy = -1;
285	map = map->xy_find (dx, dy);
286	map && (mapy -= map->height);
287	break;
288	case '2':
289	mapx += map->width;
290	dx = map->width;
291	dy = 0;
292	map = map->xy_find (dx, dy);
293	break;
294	case '3':
295	mapy += map->height;
296	dx = 0;
297	dy = map->height;
298	map = map->xy_find (dx, dy);
299	break;
300	case '4':
301	dx = -1;
302	dy = 0;
303	map = map->xy_find (dx, dy);
304	map && (mapx -= map->width);
305	break;
306	}
307
308	--max_distance;
309	}
310
311	if (!max_distance)
312	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313	else if (map && map->path[0])
314	{
315	int flags = 0;
316
317	if (map->tile_path[0]) flags \|= 1;
318	if (map->tile_path[1]) flags \|= 2;
319	if (map->tile_path[2]) flags \|= 4;
320	if (map->tile_path[3]) flags \|= 8;
321
322	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323	}
324	else	358	else
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
326	}	361	}
327	else	362	else
328	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330	pl->ns->send_packet (bigbuf);
331	}	364	}
332		365
333	/** This is the Setup cmd */	366	/** This is the Setup cmd */
334	void	367	void
335	SetUp (char buf, int len, client ns)	368	SetUp (char buf, int len, client ns)
…		…
931		964
932	if (!ns.faces_sent[face_num])	965	if (!ns.faces_sent[face_num])
933	if (ob)	966	if (ob)
934	ns.send_faces (ob);	967	ns.send_faces (ob);
935	else	968	else
936	ns.send_face (face_num);	969	ns.send_face (face_num, 10);
937		970
938	sl << uint16 (face_num);	971	sl << uint16 (face_num);
939	return 1;	972	return 1;
940	}	973	}
941		974
…		…
998		1031
999	/* 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
1000	* 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
1001	* be OK once they really log in.	1034	* be OK once they really log in.
1002	*/	1035	*/
1003	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	1036	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)
1004	return;	1037	return;
1005		1038
1006	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007	int estartlen, eoldlen;	1040	int estartlen, eoldlen;
1008	uint8 eentrysize;	1041	uint8 eentrysize;
…		…
1096		1129
1097	if (!m)	1130	if (!m)
1098	{	1131	{
1099	nx = x; ny = y; m = plmap;	1132	nx = x; ny = y; m = plmap;
1100		1133
1101	if (!xy_normalise (m, nx, ny))	1134	if (xy_normalise (m, nx, ny))
		1135	m->touch ();
		1136	else
1102	m = 0;	1137	m = 0;
1103	}	1138	}
1104		1139
1105	int emask, mask;	1140	int emask, mask;
1106	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1141	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
…		…
1123	}	1158	}
1124		1159
1125	continue;	1160	continue;
1126	}	1161	}
1127		1162
1128	m->touch ();
1129
1130	int d = pl->blocked_los[ax][ay];	1163	int d = pl->blocked_los[ax][ay];
1131		1164
1132	if (d > 3)	1165	if (d > 3)
1133	{	1166	{
1134		1167
…		…
1209	uint8 flags = 0;	1242	uint8 flags = 0;
1210	tag_t player = 0;	1243	tag_t player = 0;
1211		1244
1212	// send hp information, if applicable	1245	// send hp information, if applicable
1213	if (object *op = ms.faces_obj [0])	1246	if (object *op = ms.faces_obj [0])
		1247	if (op->is_head () && !op->invisible)
1214	{	1248	{
1215	if (op->head \|\| op->invisible)	1249	if (op->stats.maxhp > op->stats.hp
1216	; // do not show	1250	&& op->stats.maxhp > 0
1217	else if (op->type == PLAYER	1251	&& (op->type == PLAYER
		1252	\|\| op->type == DOOR // does not work, have maxhp 0
1218	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))	1253	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1219	{
1220	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1221	{	1254	{
1222	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge	1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224	}	1257	}
1225	}
1226		1258
1227	if (op->msg && op->msg[0] == '@')	1259	if (op->msg && op->msg[0] == '@')
1228	flags \|= 1;	1260	flags \|= 1;
1229		1261
1230	if (op->type == PLAYER && op != ob)	1262	if (op->type == PLAYER && op != ob)
1231	player = op->count;	1263	player = op->count;
1232	}	1264	}
1233		1265
1234	if (lastcell.stat_hp != stat_hp)	1266	if (lastcell.stat_hp != stat_hp)
1235	{	1267	{
1236	lastcell.stat_hp = stat_hp;	1268	lastcell.stat_hp = stat_hp;
1237		1269
…		…
1388	sl << "replyinfo skill_info\n";	1420	sl << "replyinfo skill_info\n";
1389		1421
1390	for (int i = 1; i < NUM_SKILLS; i++)	1422	for (int i = 1; i < NUM_SKILLS; i++)
1391	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1423	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392		1424
1393	if (sl.length () >= MAXSOCKBUF)	1425	if (sl.length () > MAXSOCKBUF)
1394	{	1426	{
1395	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1427	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396	fatal (0);	1428	fatal (0);
1397	}	1429	}
1398		1430
…		…
1411	sl << "replyinfo spell_paths\n";	1443	sl << "replyinfo spell_paths\n";
1412		1444
1413	for (int i = 0; i < NRSPELLPATHS; i++)	1445	for (int i = 0; i < NRSPELLPATHS; i++)
1414	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1446	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415		1447
1416	if (sl.length () >= MAXSOCKBUF)	1448	if (sl.length () > MAXSOCKBUF)
1417	{	1449	{
1418	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1450	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419	fatal (0);	1451	fatal (0);
1420	}	1452	}
1421		1453
…		…
1529	if (!spell->face)	1561	if (!spell->face)
1530	{	1562	{
1531	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1563	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532	spell->face = face_find ("burnout.x11", blank_face);	1564	spell->face = face_find ("burnout.x11", blank_face);
1533	}	1565	}
		1566
		1567	pl->ns->send_face (spell->face);
1534		1568
1535	/* send the current values */	1569	/* send the current values */
1536	sl << uint32 (spell->count)	1570	sl << uint32 (spell->count)
1537	<< uint16 (spell->level)	1571	<< uint16 (spell->level)
1538	<< uint16 (spell->casting_time)	1572	<< uint16 (spell->casting_time)
…		…
1574	* bytes and 3 strings (because that is the spec) so we need to	1608	* bytes and 3 strings (because that is the spec) so we need to
1575	* check that the length of those 3 strings, plus the 23 bytes,	1609	* check that the length of those 3 strings, plus the 23 bytes,
1576	* won't take us over the length limit for the socket, if it does,	1610	* won't take us over the length limit for the socket, if it does,
1577	* we need to send what we already have, and restart packet formation	1611	* we need to send what we already have, and restart packet formation
1578	*/	1612	*/
		1613	if (spell->type != SPELL)
		1614	continue;
		1615
1579	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1616	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580	* to show add_spell is 26 bytes + 2 strings. However, the overun	1617	* to show add_spell is 26 bytes + 2 strings. However, the overun
1581	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1618	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582	* like it will fix this	1619	* like it will fix this
1583	*/	1620	*/
1584	if (spell->type != SPELL)
1585	continue;
1586
1587	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1621	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588	{	1622	{
		1623	pl->ns->flush_fx ();
1589	pl->ns->send_packet (sl);	1624	pl->ns->send_packet (sl);
1590		1625
1591	sl.reset ();	1626	sl.reset ();
1592	sl << "addspell ";	1627	sl << "addspell ";
1593	}	1628	}
…		…
1601	return;	1636	return;
1602	}	1637	}
1603	else	1638	else
1604	append_spell (pl, sl, spell);	1639	append_spell (pl, sl, spell);
1605		1640
1606	if (sl.length () >= MAXSOCKBUF)	1641	if (sl.length () > MAXSOCKBUF)
1607	{	1642	{
1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1643	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609	fatal (0);	1644	fatal (0);
1610	}	1645	}
1611		1646
1612	/* finally, we can send the packet */	1647	/* finally, we can send the packet */
		1648	pl->ns->flush_fx ();
1613	pl->ns->send_packet (sl);	1649	pl->ns->send_packet (sl);
1614	}	1650	}
1615		1651

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs. Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC