TFS 1.X+ market system

[johnsamir]

hello i use nekiro tfs 8.6 1.5
have added market system, the market box appears i depot i can open it but some buttons of the market box crash the server, this is what i've have found out

>    theforgottenserver-x64.exe!Game::playerBrowseMarket(unsigned int playerId, unsigned short spriteId) Line 5255    C++

>    theforgottenserver-x64.exe!ProtocolGame::parseMarketBrowse::__l11::<lambda>() Line 1267    C++

first code

void Game::playerBrowseMarket(uint32_t playerId, uint16_t spriteId)
{
    Player* player = getPlayerByID(playerId);
    if (!player) {
        return;
    }

    if (!player->isInMarket()) {
        player->sendMarketEnter();
    }

    const ItemType& it = Item::items.getItemIdByClientId(spriteId);
    if (it.id == 0) {
        return;
    }

    if (it.wareId == 0) {
        return;
    }

    const MarketOfferList& buyOffers = IOMarket::getActiveOffers(MARKETACTION_BUY, it.id);
    const MarketOfferList& sellOffers = IOMarket::getActiveOffers(MARKETACTION_SELL, it.id);
    player->sendMarketBrowseItem(it.id, buyOffers, sellOffers);
    g_events->eventPlayerOnLookInMarket(player, &it);
}

second code:

void ProtocolGame::parseMarketBrowse(NetworkMessage& msg)
{
    uint8_t browseId = msg.get<uint8_t>();
    if (browseId == MARKETREQUEST_OWN_OFFERS) {
        g_dispatcher.addTask([playerID = player->getID()]() { g_game.playerBrowseMarketOwnOffers(playerID); });
    }
    else if (browseId == MARKETREQUEST_OWN_HISTORY) {
        g_dispatcher.addTask([playerID = player->getID()]() { g_game.playerBrowseMarketOwnHistory(playerID); });
    }
    else {
        uint16_t spriteId = msg.get<uint16_t>();
        g_dispatcher.addTask([=, playerID = player->getID()]() { g_game.playerBrowseMarket(playerID, spriteId); });
    }
}

 

[johnsamir]

as you can see the code is up to date with tfs 1.5

//void ProtocolGame::parseMarketBrowse(NetworkMessage& msg)
void ProtocolGame::parseMarketBrowse(NetworkMessage& msg)
{
    uint8_t browseId = msg.get<uint8_t>();
    if (browseId == MARKETREQUEST_OWN_OFFERS) {
        g_dispatcher.addTask([playerID = player->getID()]() { g_game.playerBrowseMarketOwnOffers(playerID); });
    }
    else if (browseId == MARKETREQUEST_OWN_HISTORY) {
        g_dispatcher.addTask([playerID = player->getID()]() { g_game.playerBrowseMarketOwnHistory(playerID); });
    }
    else {
        uint16_t spriteID = msg.get<uint16_t>();
        g_dispatcher.addTask([=, playerID = player->getID()]() { g_game.playerBrowseMarket(playerID, spriteID); });
    }
}

void ProtocolGame::parsePacket(NetworkMessage& msg)
{
    if (!acceptPackets || g_game.getGameState() == GAME_STATE_SHUTDOWN || msg.getLength() == 0) {
        return;
    }

    uint8_t recvbyte = msg.getByte();

    if (!player) {
        if (recvbyte == 0x0F) {
            disconnect();
        }

        return;
    }

    //a dead player can not performs actions
    if (player->isRemoved() || player->getHealth() <= 0) {
        if (recvbyte == 0x0F) {
            disconnect();
            return;
        }

        if (recvbyte != 0x14) {
            return;
        }
    }

    switch (recvbyte) {
    case 0x14: addGameTask([thisPtr = getThis()]() { thisPtr->logout(true, false); }); break;
    case 0x1D: addGameTask([playerID = player->getID()]() { g_game.playerReceivePingBack(playerID); }); break;
    case 0x1E: addGameTask([playerID = player->getID()]() { g_game.playerReceivePing(playerID); }); break;
        //case 0x2A: break; // bestiary tracker
        //case 0x2C: break; // team finder (leader)
        //case 0x2D: break; // team finder (member)
        //case 0x28: break; // stash withdraw
    case 0x32: parseExtendedOpcode(msg); break; //otclient extended
    case 0x40: parseNewPing(msg); break;
    case 0x64: parseAutoWalk(msg); break;
    case 0x65: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_NORTH); }); break;
    case 0x66: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_EAST); }); break;
    case 0x67: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_SOUTH); }); break;
    case 0x68: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_WEST); }); break;
    case 0x69: addGameTask([playerID = player->getID()]() { g_game.playerStopAutoWalk(playerID); }); break;
    case 0x6A: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_NORTHEAST); }); break;
    case 0x6B: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_SOUTHEAST); }); break;
    case 0x6C: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_SOUTHWEST); }); break;
    case 0x6D: addGameTask([playerID = player->getID()]() { g_game.playerMove(playerID, DIRECTION_NORTHWEST); }); break;
    case 0x6F: addGameTaskTimed(DISPATCHER_TASK_EXPIRATION, [playerID = player->getID()]() { g_game.playerTurn(playerID, DIRECTION_NORTH); }); break;
    case 0x70: addGameTaskTimed(DISPATCHER_TASK_EXPIRATION, [playerID = player->getID()]() { g_game.playerTurn(playerID, DIRECTION_EAST); }); break;
    case 0x71: addGameTaskTimed(DISPATCHER_TASK_EXPIRATION, [playerID = player->getID()]() { g_game.playerTurn(playerID, DIRECTION_SOUTH); }); break;
    case 0x72: addGameTaskTimed(DISPATCHER_TASK_EXPIRATION, [playerID = player->getID()]() { g_game.playerTurn(playerID, DIRECTION_WEST); }); break;
        //case 0x73: break; // map click(?)

    case 0x77: parseEquipObject(msg); break;
    case 0x78: parseThrow(msg); break;
    case 0x79: parseLookInShop(msg); break;
    case 0x7A: parsePlayerPurchase(msg); break;
    case 0x7B: parsePlayerSale(msg); break;
    case 0x7C: addGameTask([playerID = player->getID()]() { g_game.playerCloseShop(playerID); }); break;
    case 0x7D: parseRequestTrade(msg); break;
    case 0x7E: parseLookInTrade(msg); break;
    case 0x7F: addGameTask([playerID = player->getID()]() { g_game.playerAcceptTrade(playerID); }); break;
    case 0x80: addGameTask([playerID = player->getID()]() { g_game.playerCloseTrade(playerID); }); break;
    case 0x82: parseUseItem(msg); break;
    case 0x83: parseUseItemEx(msg); break;
    case 0x84: parseUseWithCreature(msg); break;
    case 0x85: parseRotateItem(msg); break;
    case 0x87: parseCloseContainer(msg); break;
    case 0x88: parseUpArrowContainer(msg); break;
    case 0x89: parseTextWindow(msg); break;
    case 0x8A: parseHouseWindow(msg); break;
    case 0x8B: parseWrapItem(msg); break;
    case 0x8C: parseLookAt(msg); break;
    case 0x8D: parseLookInBattleList(msg); break;
    case 0x8E: /* join aggression */ break;
    case 0x96: parseSay(msg); break;
    case 0x97: addGameTask([playerID = player->getID()]() { g_game.playerRequestChannels(playerID); }); break;
    case 0x98: parseOpenChannel(msg); break;
    case 0x99: parseCloseChannel(msg); break;
    case 0x9A: parseOpenPrivateChannel(msg); break;
    case 0x9E: addGameTask([playerID = player->getID()]() { g_game.playerCloseNpcChannel(playerID); }); break;
    case 0xA0: parseFightModes(msg); break;
    case 0xA1: parseAttack(msg); break;
    case 0xA2: parseFollow(msg); break;
    case 0xA3: parseInviteToParty(msg); break;
    case 0xA4: parseJoinParty(msg); break;
    case 0xA5: parseRevokePartyInvite(msg); break;
    case 0xA6: parsePassPartyLeadership(msg); break;
    case 0xA7: addGameTask([playerID = player->getID()]() { g_game.playerLeaveParty(playerID); }); break;
    case 0xA8: parseEnableSharedPartyExperience(msg); break;
    case 0xAA: addGameTask([playerID = player->getID()]() { g_game.playerCreatePrivateChannel(playerID); }); break;
    case 0xAB: parseChannelInvite(msg); break;
    case 0xAC: parseChannelExclude(msg); break;

        //case 0xB1: break; // request highscores
    case 0xBE: addGameTask([playerID = player->getID()]() { g_game.playerCancelAttackAndFollow(playerID); }); break;
        //case 0xC7: break; // request tournament leaderboard

    case 0xC9: /* update tile */ break;
    case 0xCA: parseUpdateContainer(msg); break;
        //case 0xCB: parseBrowseField(msg); break;
    case 0xCC: parseSeekInContainer(msg); break;

        //case 0xCD: break; // request inspect window

    case 0xD2: addGameTask([playerID = player->getID()]() { g_game.playerRequestOutfit(playerID); }); break;


    case 0xD3: parseSetOutfit(msg); break;
    case 0xD4: parseToggleMount(msg); break;
    case 0xDC: parseAddVip(msg); break;
    case 0xDD: parseRemoveVip(msg); break;
    //case 0xDE: parseEditVip(msg); break;
    case 0xE6: parseBugReport(msg); break;
    case 0xE7: /* thank you */ break;
    case 0xE8: parseDebugAssert(msg); break;
    case 0xEE: addGameTask([playerID = player->getID()]() { g_game.playerSay(playerID, 0, TALKTYPE_SAY, "", "hi"); }); break;
        //case 0xEF: break; // request store coins transfer
    case 0xF0: addGameTaskTimed(DISPATCHER_TASK_EXPIRATION, [playerID = player->getID()]() { g_game.playerShowQuestLog(playerID); }); break;
    case 0xF1: parseQuestLine(msg); break;
    case 0xF2: parseRuleViolationReport(msg); break;
    case 0xF3: /* get object info */ break;
        case 0xF4: parseMarketLeave(); break;
        case 0xF5: parseMarketBrowse(msg); break;
        case 0xF6: parseMarketCreateOffer(msg); break;
        case 0xF7: parseMarketCancelOffer(msg); break;
        case 0xF8: parseMarketAcceptOffer(msg); break;
        case 0xF9: parseModalWindowAnswer(msg); break;

    default:
            g_dispatcher.addTask([=, playerID = player->getID(), msg = new NetworkMessage(msg)]() {
                g_game.parsePlayerNetworkMessage(playerID, recvbyte, msg);
            });
            break;
    }

    if (msg.isOverrun()) {
        disconnect();
    }
}

void Protocol::onRecvMessage(NetworkMessage& msg)
{
    if (encryptionEnabled && !XTEA_decrypt(msg, key)) {
        return;
    }

    parsePacket(msg);
}

void Connection::parsePacket(const boost::system::error_code& error)
{
    std::lock_guard<std::recursive_mutex> lockClass(connectionLock);
    readTimer.cancel();

    if (error) {
        close(FORCE_CLOSE);
        return;
    }
    else if (closed) {
        return;
    }

    //Check packet checksum
    uint32_t checksum;
    int32_t len = msg.getLength() - msg.getBufferPosition() - NetworkMessage::CHECKSUM_LENGTH;
    if (len > 0) {
        checksum = adlerChecksum(msg.getBuffer() + msg.getBufferPosition() + NetworkMessage::CHECKSUM_LENGTH, len);
    }
    else {
        checksum = 0;
    }

    uint32_t recvChecksum = msg.get<uint32_t>();
    if (recvChecksum != checksum) {
        // it might not have been the checksum, step back
        msg.skipBytes(-NetworkMessage::CHECKSUM_LENGTH);
    }

    if (!receivedFirst) {
        // First message received
        receivedFirst = true;

        if (!protocol) {
            // Game protocol has already been created at this point
            protocol = service_port->make_protocol(recvChecksum == checksum, msg, shared_from_this());
            if (!protocol) {
                close(FORCE_CLOSE);
                return;
            }
        }
        else {
            msg.skipBytes(1); // Skip protocol ID
        }

        protocol->onRecvFirstMessage(msg);
    }
    else {
        protocol->onRecvMessage(msg); // Send the packet to the current protocol
    }

    try {
        readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT));
        readTimer.async_wait(std::bind(&Connection::handleTimeout, std::weak_ptr<Connection>(shared_from_this()),
            std::placeholders::_1));

        // Wait to the next packet
        boost::asio::async_read(socket,
            boost::asio::buffer(msg.getBuffer(), NetworkMessage::HEADER_LENGTH),
            std::bind(&Connection::parseHeader, shared_from_this(), std::placeholders::_1));
    }
    catch (boost::system::system_error& e) {
        std::cout << "[Network error - Connection::parsePacket] " << e.what() << std::endl;
        close(FORCE_CLOSE);
    }
}

these are the codes where the debugging break points leads me to