--- deliantra/server/socket/request.C 2006/09/19 10:35:22 1.23 +++ deliantra/server/socket/request.C 2006/12/30 10:16:11 1.55 @@ -40,40 +40,25 @@ * esrv_map_setbelow allows filling in all of the faces for the map. * if a face has not already been sent to the client, it is sent now. * - * mapcellchanged, compactlayer, compactstack, perform the map compressing - * operations - * - * esrv_map_doneredraw finishes the map update, and ships across the - * map updates. - * */ #include #include -#include -#include #include #include /* This block is basically taken from socket.c - I assume if it works there, * it should work here. */ -#ifndef WIN32 /* ---win32 exclude unix headers */ -# include -# include -# include -# include -# include -#endif /* win32 */ - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif +#include +#include +#include +#include +#include + +#include +#include #include "sounds.h" @@ -100,17 +85,12 @@ }; static void -socket_map_scroll (NewSocket * ns, int dx, int dy) +socket_map_scroll (client *ns, int dx, int dy) { struct Map newmap; int x, y, mx, my; - { - char buf[MAXSOCKBUF]; - - sprintf (buf, "map_scroll %d %d", dx, dy); - Write_String_To_Socket (ns, buf, strlen (buf)); - } + ns->send_packet_printf ("map_scroll %d %d", dx, dy); /* If we are using the Map1aCmd, we may in fact send * head information that is outside the viewable map. @@ -139,19 +119,13 @@ for (y = 0; y < my; y++) { if (x >= ns->mapx || y >= ns->mapy) - { - /* clear cells outside the viewable area */ - memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); - } + /* clear cells outside the viewable area */ + memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) - { - /* clear newly visible tiles within the viewable area */ - memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); - } + /* clear newly visible tiles within the viewable area */ + memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); else - { - memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); - } + memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); } } @@ -166,22 +140,19 @@ static void clear_map (player *pl) { - NewSocket & socket = pl->socket; - - memset (&socket.lastmap, 0, sizeof (socket.lastmap)); + memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); - if (socket.newmapcmd == 1) - Write_String_To_Socket (&socket, "newmap", 6); + if (pl->ns->newmapcmd == 1) + pl->ns->send_packet ("newmap"); - socket.update_look = 1; - socket.look_position = 0; + pl->ns->floorbox_reset (); } /** check for map change and send new map data */ static void check_map_change (player *pl) { - NewSocket & socket = pl->socket; + client &socket = *pl->ns; object *ob = pl->ob; char buf[MAX_BUF]; /* eauugggh */ @@ -207,12 +178,12 @@ flags |= 8; snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", - flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); + flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); } else snprintf (buf, MAX_BUF, "mapinfo current"); - Write_String_To_Socket (&socket, buf, strlen (buf)); + socket.send_packet (buf); } } else if (socket.current_x != ob->x || socket.current_y != ob->y) @@ -225,8 +196,7 @@ else { socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); - socket.update_look = 1; - socket.look_position = 0; + socket.floorbox_reset (); } } @@ -234,6 +204,50 @@ socket.current_y = ob->y; } +/** + * RequestInfo is sort of a meta command. There is some specific + * request of information, but we call other functions to provide + * that information. + */ +void +RequestInfo (char *buf, int len, client * ns) +{ + char *params = NULL, *cp; + + /* No match */ + char bigbuf[MAX_BUF]; + int slen; + + /* Set up replyinfo before we modify any of the buffers - this is used + * if we don't find a match. + */ + strcpy (bigbuf, "replyinfo "); + slen = strlen (bigbuf); + safe_strcat (bigbuf, buf, &slen, MAX_BUF); + + /* find the first space, make it null, and update the + * params pointer. + */ + for (cp = buf; *cp != '\0'; cp++) + if (*cp == ' ') + { + *cp = '\0'; + params = cp + 1; + break; + } + + if (!strcmp (buf, "image_info")) + send_image_info (ns, params); + else if (!strcmp (buf, "image_sums")) + send_image_sums (ns, params); + else if (!strcmp (buf, "skill_info")) + send_skill_info (ns, params); + else if (!strcmp (buf, "spell_paths")) + send_spell_paths (ns, params); + else + ns->send_packet (bigbuf, len); +} + void ExtCmd (char *buf, int len, player *pl) { @@ -241,6 +255,12 @@ } void +ExtiCmd (char *buf, int len, client *ns) +{ + INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); +} + +void MapInfoCmd (char *buf, int len, player *pl) { // ob->map; sint16 dx, dy; - int mapx = pl->socket.mapx / 2 - pl->ob->x; - int mapy = pl->socket.mapy / 2 - pl->ob->y; + int mapx = pl->ns->mapx / 2 - pl->ob->x; + int mapy = pl->ns->mapy / 2 - pl->ob->y; int max_distance = 8; // limit maximum path length to something generous while (*buf && map && max_distance) @@ -316,7 +336,7 @@ if (map->tile_path[3]) flags |= 8; - snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); + snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); } else snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); @@ -324,12 +344,12 @@ else snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); - Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); + pl->ns->send_packet (bigbuf); } /** This is the Setup cmd - easy first implementation */ void -SetUp (char *buf, int len, NewSocket * ns) +SetUp (char *buf, int len, client * ns) { int s, slen; char *cmd, *param, cmdback[HUGE_BUF]; @@ -341,16 +361,19 @@ * The client then must sort this out */ - LOG (llevInfo, "Get SetupCmd:: %s\n", buf); + //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); + strcpy (cmdback, "setup"); - for (s = 0; s < len;) + for (s = 0; s < len; ) { - cmd = &buf[s]; /* find the next space, and put a null there */ - for (; buf[s] && buf[s] != ' '; s++); + for (; buf[s] && buf[s] != ' '; s++) + ; + buf[s++] = 0; + while (buf[s] == ' ') s++; @@ -359,8 +382,11 @@ param = &buf[s]; - for (; buf[s] && buf[s] != ' '; s++); + for (; buf[s] && buf[s] != ' '; s++) + ; + buf[s++] = 0; + while (buf[s] == ' ') s++; @@ -375,10 +401,7 @@ safe_strcat (cmdback, param, &slen, HUGE_BUF); } else if (!strcmp (cmd, "exp64")) - { - ns->exp64 = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } + safe_strcat (cmdback, param, &slen, HUGE_BUF); else if (!strcmp (cmd, "spellmon")) { ns->monitor_spells = atoi (param); @@ -531,8 +554,9 @@ safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); } } /* for processing all the setup commands */ + LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); - Write_String_To_Socket (ns, cmdback, strlen (cmdback)); + ns->send_packet (cmdback); } /** @@ -542,32 +566,14 @@ * it either has to be here or init_sockets needs to be exported. */ void -AddMeCmd (char *buf, int len, NewSocket * ns) +AddMeCmd (char *buf, int len, client * ns) { - Settings oldsettings; - - oldsettings = settings; - if (ns->status != Ns_Add || add_player (ns)) - { - Write_String_To_Socket (ns, "addme_failed", 12); - } - else - { - /* Basically, the add_player copies the socket structure into - * the player structure, so this one (which is from init_sockets) - * is not needed anymore. The write below should still work, as the - * stuff in ns is still relevant. - */ - Write_String_To_Socket (ns, "addme_success", 13); - socket_info.nconns--; - ns->status = Ns_Avail; - } - settings = oldsettings; + INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); } /** Reply to ExtendedInfos command */ void -ToggleExtendedInfos (char *buf, int len, NewSocket * ns) +ToggleExtendedInfos (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char command[50]; @@ -615,7 +621,7 @@ strcat (cmdback, "smoothing"); } - Write_String_To_Socket (ns, cmdback, strlen (cmdback)); + ns->send_packet (cmdback); } /* @@ -628,7 +634,7 @@ /** Reply to ExtendedInfos command */ void -ToggleExtendedText (char *buf, int len, NewSocket * ns) +ToggleExtendedText (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char temp[10]; @@ -678,7 +684,7 @@ strcat (cmdback, temp); } - Write_String_To_Socket (ns, cmdback, strlen (cmdback)); + ns->send_packet (cmdback); } /** @@ -689,11 +695,9 @@ * client. */ static void -SendSmooth (NewSocket * ns, uint16 face) +SendSmooth (client *ns, uint16 face) { uint16 smoothface; - unsigned char reply[MAX_BUF]; - SockList sl; /* If we can't find a face, return and set it so we won't try to send this * again. @@ -711,12 +715,12 @@ ns->faces_sent[face] |= NS_FACESENT_SMOOTH; - sl.buf = reply; - strcpy ((char *) sl.buf, "smooth "); - sl.len = strlen ((char *) sl.buf); - SockList_AddShort (&sl, face); - SockList_AddShort (&sl, smoothface); - Send_With_Handling (ns, &sl); + packet sl ("smooth"); + + sl << uint16 (face) + << uint16 (smoothface); + + ns->send_packet (sl); } /** @@ -724,18 +728,11 @@ * to smooth a picture number given as argument. */ void -AskSmooth (char *buf, int len, NewSocket * ns) +AskSmooth (char *buf, int len, client *ns) { - uint16 facenbr; - - facenbr = atoi (buf); - SendSmooth (ns, facenbr); + SendSmooth (ns, atoi (buf)); } - - - - /** * This handles the general commands from the client (ie, north, fire, cast, * etc.) @@ -743,48 +740,28 @@ void PlayerCmd (char *buf, int len, player *pl) { - - /* The following should never happen with a proper or honest client. - * Therefore, the error message doesn't have to be too clear - if - * someone is playing with a hacked/non working client, this gives them - * an idea of the problem, but they deserve what they get - */ - if (pl->state != ST_PLAYING) - { - new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); - return; - } /* Check if there is a count. In theory, a zero count could also be * sent, so check for that also. */ if (atoi (buf) || buf[0] == '0') { pl->count = atoi ((char *) buf); + buf = strchr (buf, ' '); /* advance beyond the numbers */ if (!buf) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); -#endif - return; - } + return; + buf++; } - /* This should not happen anymore. */ - if (pl->ob->speed_left < -1.0) - { - LOG (llevError, "Player has negative time - shouldn't do command.\n"); - } - /* In c_new.c */ + execute_newserver_command (pl->ob, (char *) buf); + /* Perhaps something better should be done with a left over count. * Cleaning up the input should probably be done first - all actions * for the command that issued the count should be done before any other * commands. */ - pl->count = 0; - } @@ -795,50 +772,25 @@ * can throttle. */ void -NewPlayerCmd (uint8 * buf, int len, player *pl) +NewPlayerCmd (char *buf, int len, player *pl) { - int time, repeat; - short packet; - unsigned char command[MAX_BUF]; - SockList sl; - - if (len < 7) + if (len <= 6) { LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); return; } - packet = GetShort_String (buf); - repeat = GetInt_String (buf + 2); + uint16 cmdid = net_uint16 ((uint8 *)buf); + sint32 repeat = net_sint32 ((uint8 *)buf + 2); + /* -1 is special - no repeat, but don't update */ if (repeat != -1) - { - pl->count = repeat; - } - if ((len - 4) >= MAX_BUF) - len = MAX_BUF - 5; + pl->count = repeat; - strncpy ((char *) command, (char *) buf + 6, len - 4); - command[len - 4] = '\0'; + buf += 6; //len -= 6; - /* The following should never happen with a proper or honest client. - * Therefore, the error message doesn't have to be too clear - if - * someone is playing with a hacked/non working client, this gives them - * an idea of the problem, but they deserve what they get - */ - if (pl->state != ST_PLAYING) - { - new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); - return; - } + execute_newserver_command (pl->ob, buf); - /* This should not happen anymore. */ - if (pl->ob->speed_left < -1.0) - { - LOG (llevError, "Player has negative time - shouldn't do command.\n"); - } - /* In c_new.c */ - execute_newserver_command (pl->ob, (char *) command); /* Perhaps something better should be done with a left over count. * Cleaning up the input should probably be done first - all actions * for the command that issued the count should be done before any other @@ -846,26 +798,35 @@ */ pl->count = 0; + //TODO: schmorp thinks whatever this calculates, it makes no sense at all + int time = FABS (pl->ob->speed) < 0.001 + ? time = MAX_TIME * 100 + : time = (int) (MAX_TIME / FABS (pl->ob->speed)); + /* Send confirmation of command execution now */ - sl.buf = command; - strcpy ((char *) sl.buf, "comc "); - sl.len = 5; - SockList_AddShort (&sl, packet); - if (FABS (pl->ob->speed) < 0.001) - time = MAX_TIME * 100; - else - time = (int) (MAX_TIME / FABS (pl->ob->speed)); - SockList_AddInt (&sl, time); - Send_With_Handling (&pl->socket, &sl); + packet sl ("comc"); + sl << uint16 (cmdid) << uint32 (time); + pl->ns->send_packet (sl); } - /** This is a reply to a previous query. */ void -ReplyCmd (char *buf, int len, player *pl) +ReplyCmd (char *buf, int len, client *ns) { + if (ns->state == ST_CUSTOM) + { + INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); + return; + } + + if (!ns->pl) + return; //TODO: depends on the exact reply we are after + //TODO: but right now, we always have a ns->pl + + player *pl = ns->pl; + /* This is to synthesize how the data would be stored if it - * was normally entered. A bit of a hack, and should be cleaned up + * was normally entered. A bit of a hack, and should be cleaned up * once all the X11 code is removed from the server. * * We pass 13 to many of the functions because this way they @@ -876,52 +837,26 @@ /* this avoids any hacking here */ - switch (pl->state) + switch (ns->state) { - case ST_PLAYING: - LOG (llevError, "Got reply message with ST_PLAYING input state\n"); - break; - - case ST_PLAY_AGAIN: - /* We can check this for return value (2==quit). Maybe we - * should, and do something appropriate? - */ - receive_play_again (pl->ob, buf[0]); - break; + case ST_PLAYING: + LOG (llevError, "Got reply message with ST_PLAYING input state\n"); + break; + + case ST_CHANGE_CLASS: + key_change_class (pl->ob, buf[0]); + break; - case ST_ROLL_STAT: - key_roll_stat (pl->ob, buf[0]); - break; - - case ST_CHANGE_CLASS: - - key_change_class (pl->ob, buf[0]); - break; - - case ST_CONFIRM_QUIT: - key_confirm_quit (pl->ob, buf[0]); - break; - - case ST_CONFIGURE: - LOG (llevError, "In client input handling, but into configure state\n"); - pl->state = ST_PLAYING; - break; - - case ST_GET_NAME: - receive_player_name (pl->ob, 13); - break; - - case ST_GET_PASSWORD: - case ST_CONFIRM_PASSWORD: - receive_player_password (pl->ob, 13); - break; - - case ST_GET_PARTY_PASSWORD: /* Get password for party */ - receive_party_password (pl->ob, 13); - break; + case ST_CONFIRM_QUIT: + key_confirm_quit (pl->ob, buf[0]); + break; + + case ST_GET_PARTY_PASSWORD: /* Get password for party */ + receive_party_password (pl->ob, 13); + break; - default: - LOG (llevError, "Unknown input state: %d\n", pl->state); + default: + LOG (llevError, "Unknown input state: %d\n", ns->state); } } @@ -933,11 +868,8 @@ * problem. */ void -VersionCmd (char *buf, int len, NewSocket * ns) +VersionCmd (char *buf, int len, client * ns) { - char *cp; - char version_warning[256]; - if (!buf) { LOG (llevError, "CS: received corrupted version command\n"); @@ -946,52 +878,39 @@ ns->cs_version = atoi (buf); ns->sc_version = ns->cs_version; - if (VERSION_CS != ns->cs_version) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); -#endif - } - cp = strchr (buf + 1, ' '); + + LOG (llevDebug, "connection from client <%s>\n", buf); + + + //TODO: should log here just for statistics + + //if (VERSION_CS != ns->cs_version) + // unchecked; + + char *cp = strchr (buf + 1, ' '); if (!cp) return; + ns->sc_version = atoi (cp); - if (VERSION_SC != ns->sc_version) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); -#endif - } + + //if (VERSION_SC != ns->sc_version) + // unchecked; + cp = strchr (cp + 1, ' '); + if (cp) { - LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); - - snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); - - /* This is first implementation - i skip all beta DX clients with it - * Add later stuff here for other clients - */ + assign (ns->version, cp + 1); - /* these are old dxclients */ - /* Version 1024 added support for singular + plural name values - - * requiing this minimal value reduces complexity of that code, and it - * has been around for a long time. - */ - if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) - { - sprintf (version_warning, "drawinfo %d %s", NDI_RED, + if (ns->sc_version < 1026) + ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); - Write_String_To_Socket (ns, version_warning, strlen (version_warning)); - } - } } /** sound related functions. */ - void -SetSound (char *buf, int len, NewSocket * ns) +SetSound (char *buf, int len, client * ns) { ns->sound = atoi (buf); } @@ -1001,19 +920,11 @@ void MapRedrawCmd (char *buf, int len, player *pl) { - /* This function is currently disabled; just clearing the map state results in * display errors. It should clear the cache and send a newmap command. * Unfortunately this solution does not work because some client versions send * a mapredraw command after receiving a newmap command. */ -#if 0 - /* Okay, this is MAJOR UGLY. but the only way I know how to - * clear the "cache" - */ - memset (&pl->socket.lastmap, 0, sizeof (struct Map)); - draw_client_map (pl->ob); -#endif } /** @@ -1026,28 +937,29 @@ int vals[3], i; /* A little funky here. We only cycle for 2 records, because - * we obviously am not going to find a space after the third - * record. Perhaps we should just replace this with a + * we obviously are not going to find a space after the third + * record. Perhaps we should just replace this with a * sscanf? */ for (i = 0; i < 2; i++) { vals[i] = atoi (buf); + if (!(buf = strchr (buf, ' '))) { LOG (llevError, "Incomplete move command: %s\n", buf); return; } + buf++; } + vals[2] = atoi (buf); /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); } - - /****************************************************************************** * * Start of commands the server sends to the client. @@ -1059,45 +971,34 @@ * it needs to send something back (vs just printing out a message) */ void -send_query (NewSocket * ns, uint8 flags, char *text) +send_query (client *ns, uint8 flags, char *text) { - char buf[MAX_BUF]; - - sprintf (buf, "query %d %s", flags, text ? text : ""); - Write_String_To_Socket (ns, buf, strlen (buf)); + ns->send_packet_printf ("query %d %s", flags, text ? text : ""); } #define AddIfInt64(Old,New,Type) if (Old != New) {\ Old = New; \ - SockList_AddChar(&sl, Type); \ - SockList_AddInt64(&sl, New); \ + sl << uint8 (Type) << uint64 (New); \ } #define AddIfInt(Old,New,Type) if (Old != New) {\ Old = New; \ - SockList_AddChar(&sl, Type); \ - SockList_AddInt(&sl, New); \ + sl << uint8 (Type) << uint32 (New); \ } #define AddIfShort(Old,New,Type) if (Old != New) {\ Old = New; \ - SockList_AddChar(&sl, Type); \ - SockList_AddShort(&sl, New); \ + sl << uint8 (Type) << uint16 (New); \ } #define AddIfFloat(Old,New,Type) if (Old != New) {\ Old = New; \ - SockList_AddChar(&sl, Type); \ - SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ + sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ } #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ - if (Old) free(Old);\ - Old = strdup_local(New);\ - SockList_AddChar(&sl, Type); \ - SockList_AddChar(&sl, ( char )strlen(New)); \ - strcpy((char*)sl.buf + sl.len, New); \ - sl.len += strlen(New); \ + free(Old); Old = strdup (New);\ + sl << uint8 (Type) << data8 (New); \ } /** @@ -1109,15 +1010,15 @@ void esrv_update_stats (player *pl) { - SockList sl; char buf[MAX_BUF]; uint16 flags; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "stats "); - sl.len = strlen ((char *) sl.buf); + if (!pl->ns) + return; + + packet sl ("stats"); - if (pl->ob != NULL) + if (pl->ob) { AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); @@ -1126,39 +1027,28 @@ AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); - AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); - AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); - AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); + AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); + AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); + AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); } - if (pl->socket.exp64) - { - uint8 s; - - for (s = 0; s < NUM_SKILLS; s++) - { - if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) - { - - /* Always send along the level if exp changes. This is only - * 1 extra byte, but keeps processing simpler. - */ - SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); - SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); - SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); - pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; - } - } - } + for (int s = 0; s < NUM_SKILLS; s++) + if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) + { + /* Always send along the level if exp changes. This is only + * 1 extra byte, but keeps processing simpler. + */ + sl << uint8 (s + CS_STAT_SKILLINFO) + << uint8 (pl->last_skill_ob[s]->level) + << uint64 (pl->last_skill_ob[s]->stats.exp); - if (pl->socket.exp64) - { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } - else - { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } + pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; + } + AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); @@ -1177,23 +1067,19 @@ AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); - if (pl->socket.sc_version < 1025) + if (pl->ns->sc_version < 1025) { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } else - { - int i; - - for (i = 0; i < NROFATTACKS; i++) - { - /* Skip ones we won't send */ - if (atnr_cs_stat[i] == -1) - continue; + for (int i = 0; i < NROFATTACKS; i++) + { + /* Skip ones we won't send */ + if (atnr_cs_stat[i] == -1) + continue; - AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); - } - } + AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); + } - if (pl->socket.monitor_spells) + if (pl->ns->monitor_spells) { AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); @@ -1201,20 +1087,13 @@ } rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ - AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); + AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); set_title (pl->ob, buf); - AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); + AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); /* Only send it away if we have some actual data */ - if (sl.len > 6) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); -#endif - Send_With_Handling (&pl->socket, &sl); - } - - free (sl.buf); + if (sl.length () > 6) + pl->ns->send_packet (sl); } /** @@ -1223,24 +1102,16 @@ void esrv_new_player (player *pl, uint32 weight) { - SockList sl; - pl->last_weight = weight; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); + packet sl ("player"); - strcpy ((char *) sl.buf, "player "); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, pl->ob->count); - SockList_AddInt (&sl, weight); - SockList_AddInt (&sl, pl->ob->face->number); - - SockList_AddChar (&sl, (char) strlen (pl->ob->name)); - strcpy ((char *) sl.buf + sl.len, pl->ob->name); - sl.len += strlen (pl->ob->name); + sl << uint32 (pl->ob->count) + << uint32 (weight) + << uint32 (pl->ob->face->number) + << data8 (pl->ob->name); - Send_With_Handling (&pl->socket, &sl); - free (sl.buf); + pl->ns->send_packet (sl); SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } @@ -1252,11 +1123,8 @@ * when the player logs in and picks stuff up. */ void -esrv_send_animation (NewSocket * ns, short anim_num) +esrv_send_animation (client * ns, short anim_num) { - SockList sl; - int i; - /* Do some checking on the anim_num we got. Note that the animations * are added in contigous order, so if the number is in the valid * range, it must be a valid animation. @@ -1267,22 +1135,24 @@ return; } - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "anim "); - sl.len = 5; - SockList_AddShort (&sl, anim_num); - SockList_AddShort (&sl, 0); /* flags - not used right now */ + packet sl ("anim"); + + sl << uint16 (anim_num) + << uint16 (0); /* flags - not used right now */ + /* Build up the list of faces. Also, send any information (ie, the * the face itself) down to the client. */ - for (i = 0; i < animations[anim_num].num_animations; i++) + for (int i = 0; i < animations[anim_num].num_animations; i++) { if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) esrv_send_face (ns, animations[anim_num].faces[i], 0); - SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ + + sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ } - Send_With_Handling (ns, &sl); - free (sl.buf); + + ns->send_packet (sl); + ns->anims_sent[anim_num] = 1; } @@ -1298,163 +1168,23 @@ * the face yet, we will also send it. */ static void -esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) +esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) { if (newmap->cells[x][y].count >= MAP_LAYERS) { + //TODO: one or the other, can't both have abort and return, verify and act LOG (llevError, "Too many faces in map cell %d %d\n", x, y); return; abort (); } + newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; newmap->cells[x][y].count++; + if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) esrv_send_face (ns, face_num, 0); } -struct LayerCell -{ - uint16 xy; - short face; -}; - -struct MapLayer -{ - int count; - struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; -}; - -/** Checkes if map cells have changed */ -static int -mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) -{ - int k; - - if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) - return 1; - for (k = 0; k < newmap->cells[i][j].count; k++) - { - if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) - { - return 1; - } - } - return 0; -} - -/** - * Basically, what this does is pack the data into layers. - * cnum is the client number, cur is the the buffer we put all of - * this data into. we return the end of the data. layers is - * how many layers of data we should back. - */ -static uint8 * -compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) -{ - int x, y, k; - int face; - unsigned char *fcur; - struct MapLayer layers[MAP_LAYERS]; - - for (k = 0; k < MAP_LAYERS; k++) - layers[k].count = 0; - fcur = cur; - for (x = 0; x < ns->mapx; x++) - { - for (y = 0; y < ns->mapy; y++) - { - if (!mapcellchanged (ns, x, y, newmap)) - continue; - if (newmap->cells[x][y].count == 0) - { - *cur = x * ns->mapy + y; /* mark empty space */ - cur++; - continue; - } - for (k = 0; k < newmap->cells[x][y].count; k++) - { - layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; - layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; - layers[k].count++; - } - } - } - /* If no data, return now. */ - if (fcur == cur && layers[0].count == 0) - return cur; - *cur = 255; /* mark end of explicitly cleared cells */ - cur++; - /* First pack by layers. */ - for (k = 0; k < numlayers; k++) - { - if (layers[k].count == 0) - break; /* once a layer is entirely empty, no layer below it can - have anything in it either */ - /* Pack by entries in thie layer */ - for (x = 0; x < layers[k].count;) - { - fcur = cur; - *cur = layers[k].lcells[x].face >> 8; - cur++; - *cur = layers[k].lcells[x].face & 0xFF; - cur++; - face = layers[k].lcells[x].face; - /* Now, we back the redundant data into 1 byte xy pairings */ - for (y = x; y < layers[k].count; y++) - { - if (layers[k].lcells[y].face == face) - { - *cur = (uint8) layers[k].lcells[y].xy; - cur++; - layers[k].lcells[y].face = -1; - } - } - *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ - /* forward over the now redundant data */ - while (x < layers[k].count && layers[k].lcells[x].face == -1) - x++; - } - *fcur = *fcur | 128; /* mark for end of faces at this layer */ - } - return cur; -} - -static void -esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) -{ - static long frames, bytes, tbytes, tframes; - char *cur; - SockList sl; - - - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "map "); - sl.len = strlen ((char *) sl.buf); - - cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); - sl.len = cur - (char *) sl.buf; - -/* LOG(llevDebug, "Sending map command.\n");*/ - - if (sl.len > (int) strlen ("map ") || ns->sent_scroll) - { - /* All of this is just accounting stuff */ - if (tframes > 100) - tframes = tbytes = 0; - - tframes++; - frames++; - tbytes += sl.len; - bytes += sl.len; - memcpy (&ns->lastmap, newmap, sizeof (struct Map)); - Send_With_Handling (ns, &sl); - ns->sent_scroll = 0; - } - - free (sl.buf); -} - - /** Clears a map cell */ static void map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) @@ -1462,9 +1192,10 @@ cell->faces[0] = face0; cell->faces[1] = face1; cell->faces[2] = face2; - cell->count = count; - cell->stat_hp = 0; - cell->player = 0; + cell->count = count; + cell->stat_hp = 0; + cell->flags = 0; + cell->player = 0; } #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) @@ -1473,10 +1204,9 @@ /* Using a global really isn't a good approach, but saves the over head of * allocating and deallocating such a block of data each time run through, * and saves the space of allocating this in the socket object when we only - * need it for this cycle. If the serve is ever threaded, this needs to be + * need it for this cycle. If the server is ever threaded, this needs to be * re-examined. */ - static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; /** @@ -1487,10 +1217,10 @@ static inline int have_head (int ax, int ay) { - if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) return 1; + return 0; } @@ -1498,11 +1228,11 @@ * check_head is a bit simplistic version of update_space below. * basically, it only checks the that the head on space ax,ay at layer * needs to get sent - if so, it adds the data, sending the head - * if needed, and returning 1. If this no data needs to get + * if needed, and returning 1. If this no data needs to get * sent, it returns zero. */ static int -check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) +check_head (packet &sl, client &ns, int ax, int ay, int layer) { short face_num; @@ -1513,9 +1243,10 @@ if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) { - SockList_AddShort (&sl, face_num); + sl << uint16 (face_num); if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) esrv_send_face (&ns, face_num, 0); + heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; ns.lastmap.cells[ax][ay].faces[layer] = face_num; return 1; @@ -1543,9 +1274,8 @@ * the case, it seems to make more sense to have these layer values * actually match. */ - static int -update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) { object *ob, *head; uint16 face_num; @@ -1554,7 +1284,6 @@ /* If there is a multipart object stored away, treat that as more important. * If not, then do the normal processing. */ - head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; /* Check to see if this head is part of the set of objects @@ -1729,22 +1458,22 @@ * we already sent for a lower layer. In that case, don't send * this one. */ - if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) - { - face_num = 0; - } + if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) + face_num = 0; /* We've gotten what face we want to use for the object. Now see if * if it has changed since we last sent it to the client. */ - if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) + if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) { - ns->lastmap.cells[sx][sy].faces[layer] = face_num; - if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) - esrv_send_face (ns, face_num, 0); - SockList_AddShort (sl, face_num); + ns.lastmap.cells[sx][sy].faces[layer] = face_num; + if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) + esrv_send_face (&ns, face_num, 0); + + sl << uint16 (face_num); return 1; } + /* Nothing changed */ return 0; } @@ -1769,7 +1498,7 @@ */ static inline int -update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) { object *ob; int smoothlevel; /* old face_num; */ @@ -1779,13 +1508,13 @@ /* If there is no object for this space, or if the face for the object * is the blank face, set the smoothlevel to zero. */ - if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) + if (!ob || ob->face == blank_face) smoothlevel = 0; else { smoothlevel = ob->smoothlevel; - if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) - SendSmooth (ns, ob->face->number); + if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) + SendSmooth (&ns, ob->face->number); } /* else not already head object or blank face */ /* We've gotten what face we want to use for the object. Now see if @@ -1795,12 +1524,14 @@ smoothlevel = 255; else if (smoothlevel < 0) smoothlevel = 0; - if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) + + if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { - ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; - SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); + ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; + sl << uint8 (smoothlevel); return 1; } + /* Nothing changed */ return 0; } @@ -1811,7 +1542,7 @@ * available. */ int -getExtendedMapInfoSize (NewSocket * ns) +getExtendedMapInfoSize (client * ns) { int result = 0; @@ -1820,6 +1551,7 @@ if (ns->EMI_smooth) result += 1; /*One byte for smoothlevel */ } + return result; } @@ -1836,7 +1568,7 @@ * and use the other 4 bits for other informatiion. For full documentation * of what we send, see the doc/Protocol file. * I will describe internally what we do: - * the socket->lastmap shows how the map last looked when sent to the client. + * the ns->lastmap shows how the map last looked when sent to the client. * in the lastmap structure, there is a cells array, which is set to the * maximum viewable size (As set in config.h). * in the cells, there are faces and a count value. @@ -1851,41 +1583,38 @@ int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; sint16 nx, ny; int estartlen, eoldlen; - SockList sl; - SockList esl; /*For extended Map info */ uint16 mask, emask; uint8 eentrysize; uint16 ewhatstart, ewhatflag; uint8 extendedinfos; maptile *m; - NewSocket & socket = pl->contr->socket; + client &socket = *pl->contr->ns; check_map_change (pl->contr); - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - if (socket.mapmode == Map1Cmd) - strcpy ((char *) sl.buf, "map1 "); - else - strcpy ((char *) sl.buf, "map1a "); - sl.len = strlen ((char *) sl.buf); - startlen = sl.len; + packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); + packet esl; + + startlen = sl.length (); + /*Extendedmapinfo structure initialisation */ if (socket.ext_mapinfos) { - esl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) esl.buf, "mapextended "); - esl.len = strlen ((char *) esl.buf); extendedinfos = EMI_NOREDRAW; + if (socket.EMI_smooth) extendedinfos |= EMI_SMOOTH; - ewhatstart = esl.len; + + ewhatstart = esl.length (); ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit could need to be taken away */ - SockList_AddChar (&esl, extendedinfos); eentrysize = getExtendedMapInfoSize (&socket); - SockList_AddChar (&esl, eentrysize); - estartlen = esl.len; + esl << "mapextended " + << uint8 (extendedinfos) + << uint8 (eentrysize); + + estartlen = esl.length (); } else { @@ -1894,6 +1623,7 @@ ewhatflag = 0; estartlen = 0; } + /* Init data to zero */ memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); @@ -1907,6 +1637,7 @@ */ max_x = pl->x + (socket.mapx + 1) / 2; max_y = pl->y + (socket.mapy + 1) / 2; + if (socket.mapmode == Map1aCmd) { max_x += MAX_HEAD_OFFSET; @@ -1918,7 +1649,6 @@ ax = 0; for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) { - emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; /* If this space is out of the normal viewable area, we only check @@ -1931,16 +1661,13 @@ { int i, got_one; - oldlen = sl.len; + oldlen = sl.length (); - SockList_AddShort (&sl, mask); + sl << uint16 (mask); - if (check_head (sl, socket, ax, ay, 2)) - mask |= 0x4; - if (check_head (sl, socket, ax, ay, 1)) - mask |= 0x2; - if (check_head (sl, socket, ax, ay, 0)) - mask |= 0x1; + if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; + if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; + if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; /* If all we are doing is sending 0 (blank) faces, we don't * actually need to send that - just the coordinates @@ -1948,30 +1675,27 @@ * space. */ got_one = 0; - for (i = oldlen + 2; i < sl.len; i++) - { - if (sl.buf[i]) - got_one = 1; - } + for (i = oldlen + 2; i < sl.length (); i++) + if (sl[i]) + got_one = 1; if (got_one && (mask & 0xf)) - { - sl.buf[oldlen + 1] = mask & 0xff; - } + sl[oldlen + 1] = mask & 0xff; else { /*either all faces blank, either no face at all */ if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ - sl.len = oldlen + 2; + sl.reset (oldlen + 2); else - sl.len = oldlen; + sl.reset (oldlen); } + /*What concerns extendinfos, nothing to be done for now * (perhaps effects layer later) */ continue; /* don't do processing below */ } - MapCell & lastcell = socket.lastmap.cells[ax][ay]; + MapCell &lastcell = socket.lastmap.cells[ax][ay]; d = pl->contr->blocked_los[ax][ay]; @@ -1981,6 +1705,7 @@ nx = x; ny = y; m = get_map_from_coord (pl->map, &nx, &ny); + if (!m) { /* space is out of map. Update space and clear values @@ -1989,7 +1714,7 @@ */ if (lastcell.count != -1) { - SockList_AddShort (&sl, mask); + sl << uint16 (mask); map_clearcell (&lastcell, 0, 0, 0, -1); } } @@ -2001,45 +1726,39 @@ * reason. Still may need to send the head for this space. */ - oldlen = sl.len; + oldlen = sl.length (); + + sl << uint16 (mask); - SockList_AddShort (&sl, mask); if (lastcell.count != -1) need_send = 1; + count = -1; if (socket.mapmode == Map1aCmd && have_head (ax, ay)) { /* Now check to see if any heads need to be sent */ - if (check_head (sl, socket, ax, ay, 2)) - mask |= 0x4; - if (check_head (sl, socket, ax, ay, 1)) - mask |= 0x2; - if (check_head (sl, socket, ax, ay, 0)) - mask |= 0x1; + if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; + if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; + if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; lastcell.count = count; - } else { - struct MapCell *cell = &lastcell; - /* properly clear a previously sent big face */ - if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) + if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 + || lastcell.stat_hp || lastcell.flags || lastcell.player) need_send = 1; + map_clearcell (&lastcell, 0, 0, 0, count); } if ((mask & 0xf) || need_send) - { - sl.buf[oldlen + 1] = mask & 0xff; - } + sl[oldlen + 1] = mask & 0xff; else - { - sl.len = oldlen; - } + sl.reset (oldlen); } else { @@ -2051,20 +1770,20 @@ * need to send is, then form the packet after that, * we presume that we will in fact form a packet, and update * the bits by what we do actually send. If we send nothing, - * we just back out sl.len to the old value, and no harm + * we just back out sl.length () to the old value, and no harm * is done. * I think this is simpler than doing a bunch of checks to see * what if anything we need to send, setting the bits, then * doing those checks again to add the real data. */ - oldlen = sl.len; + oldlen = sl.length (); mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; - eoldlen = esl.len; + eoldlen = esl.length (); emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; - SockList_AddShort (&sl, mask); + sl << uint16 (mask); if (socket.ext_mapinfos) - SockList_AddShort (&esl, emask); + esl << uint16 (emask); unsigned char dummy; unsigned char *last_ext = &dummy; @@ -2077,11 +1796,11 @@ if (socket.extmap) { *last_ext |= 0x80; - last_ext = sl.buf + sl.len; - SockList_AddChar (&sl, d); + last_ext = &sl[sl.length ()]; + sl << uint8 (d); } else - SockList_AddChar (&sl, 255 - 64 * d); + sl << uint8 (255 - 64 * d); } lastcell.count = d; @@ -2090,7 +1809,8 @@ { uint8 stat_hp = 0; uint8 stat_width = 0; - tag_t player = 0; + uint8 flags = 0; + UUID player = 0; // send hp information, if applicable if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) @@ -2107,6 +1827,9 @@ } } + if (op->msg && op->msg[0] == '@') + flags |= 1; + if (op->type == PLAYER && op != pl) player = op->count; } @@ -2117,16 +1840,16 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.len; - SockList_AddChar (&sl, 5); - SockList_AddChar (&sl, stat_hp); + last_ext = &sl[sl.length ()]; + + sl << uint8 (5) << uint8 (stat_hp); if (stat_width > 1) { *last_ext |= 0x80; - last_ext = sl.buf + sl.len; - SockList_AddChar (&sl, 6); - SockList_AddChar (&sl, stat_width); + last_ext = &sl[sl.length ()]; + + sl << uint8 (6) << uint8 (stat_width); } } @@ -2136,27 +1859,37 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.len; - SockList_AddChar (&sl, 0x47); - SockList_AddChar (&sl, 4); - SockList_AddInt (&sl, player); + last_ext = &sl[sl.length ()]; + + sl << uint8 (0x47) << uint8 (8) << (uint64)player; + } + + if (lastcell.flags != flags) + { + lastcell.flags = flags; + + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; + + sl << uint8 (8) << uint8 (flags); } } /* Floor face */ - if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) + if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) mask |= 0x4; if (socket.EMI_smooth) - if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) + if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) emask |= 0x4; /* Middle face */ - if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) + if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) mask |= 0x2; if (socket.EMI_smooth) - if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) + if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) emask |= 0x2; if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) @@ -2165,43 +1898,38 @@ { lastcell.faces[0] = pl->face->number; mask |= 0x1; + if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) esrv_send_face (&socket, pl->face->number, 0); - SockList_AddShort (&sl, pl->face->number); + + sl << uint16 (pl->face->number); } } - /* Top face */ else { - if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) + /* Top face */ + if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) mask |= 0x1; + if (socket.EMI_smooth) - if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) - { - emask |= 0x1; - } + if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) + emask |= 0x1; } + /* Check to see if we are in fact sending anything for this * space by checking the mask. If so, update the mask. * if not, reset the len to that from before adding the mask * value, so we don't send those bits. */ if (mask & 0xf) - { - sl.buf[oldlen + 1] = mask & 0xff; - } + sl[oldlen + 1] = mask & 0xff; else - { - sl.len = oldlen; - } + sl.reset (oldlen); + if (emask & 0xf) - { - esl.buf[eoldlen + 1] = emask & 0xff; - } + esl[eoldlen + 1] = emask & 0xff; else - { - esl.len = eoldlen; - } + esl.reset (eoldlen); } /* else this is a viewable space */ } /* for x loop */ } /* for y loop */ @@ -2209,28 +1937,24 @@ /* Verify that we in fact do need to send this */ if (socket.ext_mapinfos) { - if (!(sl.len > startlen || socket.sent_scroll)) + if (!(sl.length () > startlen || socket.sent_scroll)) { /* No map data will follow, so don't say the client * it doesn't need draw! */ ewhatflag &= (~EMI_NOREDRAW); - esl.buf[ewhatstart + 1] = ewhatflag & 0xff; + esl[ewhatstart + 1] = ewhatflag & 0xff; } - if (esl.len > estartlen) - Send_With_Handling (&socket, &esl); - - free (esl.buf); + if (esl.length () > estartlen) + socket.send_packet (esl); } - if (sl.len > startlen || socket.sent_scroll) + if (sl.length () > startlen || socket.sent_scroll) { - Send_With_Handling (&socket, &sl); + socket.send_packet (sl); socket.sent_scroll = 0; } - - free (sl.buf); } /** @@ -2264,26 +1988,25 @@ memset (&newmap, 0, sizeof (struct Map)); - for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) - { - for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) - { - ax = i; - ay = j; - m = pm; - mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); - if (mflags & P_OUT_OF_MAP) - continue; - if (mflags & P_NEED_UPDATE) - update_position (m, ax, ay); - /* If a map is visible to the player, we don't want to swap it out - * just to reload it. This should really call something like - * swap_map, but this is much more efficient and 'good enough' - */ - if (mflags & P_NEW_MAP) - m->timeout = 50; - } - } + for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) + for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) + { + ax = i; + ay = j; + m = pm; + mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); + + if (mflags & P_OUT_OF_MAP) + continue; + + /* If a map is visible to the player, we don't want to swap it out + * just to reload it. This should really call something like + * swap_map, but this is much more efficient and 'good enough' + */ + if (mflags & P_NEW_MAP) + m->timeout = 50; + } + /* do LOS after calls to update_position */ if (pl->contr->do_los) { @@ -2291,72 +2014,8 @@ pl->contr->do_los = 0; } - if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) - { - /* Big maps need a different drawing mechanism to work */ - draw_client_map1 (pl); - return; - } - - if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) - { - esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); - } - - /* j and i are the y and x coordinates of the real map (which is - * basically some number of spaces around the player) - * ax and ay are values from within the viewport (ie, 0, 0 is upper - * left corner) and are thus disconnected from the map values. - * Subtract 1 from the max values so that we properly handle cases where - * player has specified an even map. Otherwise, we try to send them too - * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually - * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is - * odd, this still works fine. - */ - ay = 0; - for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) - { - ax = 0; - for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) - { - - d = pl->contr->blocked_los[ax][ay]; - /* note the out_of_map and d>3 checks are both within the same - * negation check. - */ - nx = i; - ny = j; - m = get_map_from_coord (pm, &nx, &ny); - if (m && d < 4) - { - face = GET_MAP_FACE (m, nx, ny, 0); - floor2 = GET_MAP_FACE (m, nx, ny, 1); - floor = GET_MAP_FACE (m, nx, ny, 2); - - /* If all is blank, send a blank face. */ - if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) - { - esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); - } - else - { /* actually have something interesting */ - /* send the darkness mask, if any. */ - if (d && pl->contr->socket.darkness) - esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); - - if (face && face != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); - if (floor2 && floor2 != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); - if (floor && floor != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); - } - } /* Is a valid space */ - } - } - esrv_map_doneredraw (&pl->contr->socket, &newmap); - - check_map_change (pl->contr); + /* Big maps need a different drawing mechanism to work */ + draw_client_map1 (pl); } @@ -2372,7 +2031,7 @@ void send_plugin_custom_message (object *pl, char *buf) { - cs_write_string (&pl->contr->socket, buf, strlen (buf)); + pl->contr->ns->send_packet (buf); } /** @@ -2380,25 +2039,21 @@ * the params - we always send the same info no matter what. */ void -send_skill_info (NewSocket * ns, char *params) +send_skill_info (client *ns, char *params) { - SockList sl; - int i; + packet sl; + sl << "replyinfo skill_info\n"; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "replyinfo skill_info\n"); - for (i = 1; i < NUM_SKILLS; i++) - { - sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); - } - sl.len = strlen ((char *) sl.buf); - if (sl.len >= MAXSOCKBUF) + for (int i = 1; i < NUM_SKILLS; i++) + sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); + + if (sl.length () >= MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_skill_info!\n"); fatal (0); } - Send_With_Handling (ns, &sl); - free (sl.buf); + + ns->send_packet (sl); } /** @@ -2406,23 +2061,22 @@ * the params - we always send the same info no matter what. */ void -send_spell_paths (NewSocket * ns, char *params) +send_spell_paths (client * ns, char *params) { - SockList sl; - int i; + packet sl; + + sl << "replyinfo spell_paths\n"; + + for (int i = 0; i < NRSPELLPATHS; i++) + sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); - for (i = 0; i < NRSPELLPATHS; i++) - sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); - sl.len = strlen ((char *) sl.buf); - if (sl.len >= MAXSOCKBUF) + if (sl.length () >= MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_spell_paths!\n"); fatal (0); } - Send_With_Handling (ns, &sl); - free (sl.buf); + + ns->send_packet (sl); } /** @@ -2432,48 +2086,50 @@ void esrv_update_spells (player *pl) { - SockList sl; - int flags = 0; - object *spell; + if (!pl->ns) + return; - if (!pl->socket.monitor_spells) + if (!pl->ns->monitor_spells) return; - for (spell = pl->ob->inv; spell != NULL; spell = spell->below) + + for (object *spell = pl->ob->inv; spell; spell = spell->below) { if (spell->type == SPELL) { + int flags = 0; + /* check if we need to update it */ if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) { spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); flags |= UPD_SP_MANA; } + if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) { spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); flags |= UPD_SP_GRACE; } + if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) { spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); flags |= UPD_SP_DAMAGE; } - if (flags != 0) + + if (flags) { - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "updspell "); - sl.len = strlen ((char *) sl.buf); - SockList_AddChar (&sl, flags); - SockList_AddInt (&sl, spell->count); - if (flags & UPD_SP_MANA) - SockList_AddShort (&sl, spell->last_sp); - if (flags & UPD_SP_GRACE) - SockList_AddShort (&sl, spell->last_grace); - if (flags & UPD_SP_DAMAGE) - SockList_AddShort (&sl, spell->last_eat); - flags = 0; - Send_With_Handling (&pl->socket, &sl); - free (sl.buf); + packet sl; + + sl << "updspell " + << uint8 (flags) + << uint32 (spell->count); + + if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); + if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); + if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); + + pl->ns->send_packet (sl); } } } @@ -2482,26 +2138,25 @@ void esrv_remove_spell (player *pl, object *spell) { - SockList sl; - - if (!pl->socket.monitor_spells) + if (!pl->ns->monitor_spells) return; + if (!pl || !spell || spell->env != pl->ob) { LOG (llevError, "Invalid call to esrv_remove_spell"); return; } - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "delspell "); - sl.len = strlen ((char *) sl.buf); - SockList_AddInt (&sl, spell->count); - Send_With_Handling (&pl->socket, &sl); - free (sl.buf); + + packet sl ("delspell"); + + sl << uint32 (spell->count); + + pl->ns->send_packet (sl); } /* appends the spell *spell to the Socklist we will send the data to. */ static void -append_spell (player *pl, SockList * sl, object *spell) +append_spell (player *pl, packet &sl, object *spell) { int len, i, skill = 0; @@ -2510,17 +2165,11 @@ LOG (llevError, "item number %d is a spell with no name.\n", spell->count); return; } - SockList_AddInt (sl, spell->count); - SockList_AddShort (sl, spell->level); - SockList_AddShort (sl, spell->casting_time); + /* store costs and damage in the object struct, to compare to later */ - spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); + spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); - spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); - /* send the current values */ - SockList_AddShort (sl, spell->last_sp); - SockList_AddShort (sl, spell->last_grace); - SockList_AddShort (sl, spell->last_eat); + spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); /* figure out which skill it uses, if it uses one */ if (spell->skill) @@ -2532,27 +2181,19 @@ break; } } - SockList_AddChar (sl, skill); - - SockList_AddInt (sl, spell->path_attuned); - SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); - - len = strlen (spell->name); - SockList_AddChar (sl, (char) len); - memcpy (sl->buf + sl->len, spell->name, len); - sl->len += len; - if (!spell->msg) - { - SockList_AddShort (sl, 0); - } - else - { - len = strlen (spell->msg); - SockList_AddShort (sl, len); - memcpy (sl->buf + sl->len, spell->msg, len); - sl->len += len; - } + /* send the current values */ + sl << uint32 (spell->count) + << uint16 (spell->level) + << uint16 (spell->casting_time) + << uint16 (spell->last_sp) + << uint16 (spell->last_grace) + << uint16 (spell->last_eat) + << uint8 (skill) + << uint32 (spell->path_attuned) + << uint32 (spell->face ? spell->face->number : 0) + << data8 (spell->name) + << data16 (spell->msg); } /** @@ -2562,18 +2203,17 @@ void esrv_add_spells (player *pl, object *spell) { - SockList sl; - if (!pl) { LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); return; } - if (!pl->socket.monitor_spells) + + if (!pl->ns->monitor_spells) return; - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - strcpy ((char *) sl.buf, "addspell "); - sl.len = strlen ((char *) sl.buf); + + packet sl ("addspell"); + if (!spell) { for (spell = pl->ob->inv; spell != NULL; spell = spell->below) @@ -2593,13 +2233,16 @@ */ if (spell->type != SPELL) continue; - if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) + + if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) { - Send_With_Handling (&pl->socket, &sl); - strcpy ((char *) sl.buf, "addspell "); - sl.len = strlen ((char *) sl.buf); + pl->ns->send_packet (sl); + + sl.reset (); + sl << "addspell "; } - append_spell (pl, &sl, spell); + + append_spell (pl, sl, spell); } } else if (spell->type != SPELL) @@ -2608,13 +2251,15 @@ return; } else - append_spell (pl, &sl, spell); - if (sl.len >= MAXSOCKBUF) + append_spell (pl, sl, spell); + + if (sl.length () >= MAXSOCKBUF) { LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); fatal (0); } + /* finally, we can send the packet */ - Send_With_Handling (&pl->socket, &sl); - free (sl.buf); + pl->ns->send_packet (sl); } +