From e2ba37babe9dc8c43b86f5deadda3741f4fb185b Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Thu, 22 Jan 2009 21:43:07 -0500 Subject: [PATCH] Cleaned up socket handling and comments in packet.cc --- ChangeLog | 1 + src/packet.cc | 29 ++++++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8392412..2bc0d957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Release: version 0.15 - 2009/01/?? - refactored Calendar and Task record classes, creating new RecurBase to handle recurrence data - removed FIXME in Socket::Packet(), since socket is set in Send() + - cleaned up socket handling and comments in packet.cc 2009/01/20 - applied Nicolas Vivien's javaloader patch, fixing constant defines and other small fixes diff --git a/src/packet.cc b/src/packet.cc index 16f12ee5..67100405 100644 --- a/src/packet.cc +++ b/src/packet.cc @@ -81,7 +81,7 @@ void ZeroPacket::GetAttribute(unsigned int object, unsigned int attribute) MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(size)); Protocol::Packet &packet = *cpack; - packet.socket = 0; + // socket class sets socket for us packet.size = htobs(size); packet.command = SB_COMMAND_FETCH_ATTRIBUTE; packet.u.socket.socket = htobs(0x00ff); // default non-socket request @@ -164,8 +164,7 @@ void DBPacket::ClearDatabase(unsigned int dbId) MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(9)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(9); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -188,8 +187,7 @@ void DBPacket::GetDBDB() MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(7)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(7); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -212,8 +210,7 @@ void DBPacket::GetRecordStateTable(unsigned int dbId) MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(9)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(9); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -242,8 +239,7 @@ void DBPacket::SetRecordFlags(unsigned int dbId, unsigned int stateTableIndex, MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(size)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(size); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -270,8 +266,7 @@ void DBPacket::DeleteRecordByIndex(unsigned int dbId, unsigned int stateTableInd MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(size)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(size); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -295,8 +290,7 @@ void DBPacket::GetRecordByIndex(unsigned int dbId, unsigned int stateTableIndex) MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(11)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(11); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -335,8 +329,7 @@ bool DBPacket::SetRecordByIndex(unsigned int dbId, unsigned int stateTableIndex, MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(total_size)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(total_size); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -362,8 +355,7 @@ void DBPacket::GetRecords(unsigned int dbId) MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(9)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(9); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); @@ -401,8 +393,7 @@ bool DBPacket::SetRecord(unsigned int dbId, Builder &build, const IConverter *ic MAKE_PACKETPTR_BUF(cpack, m_send.GetBuffer(total_size)); Protocol::Packet &packet = *cpack; - // socket class should override this for us -// packet.socket = htobs(m_con.m_socket->GetSocket()); + // socket class sets socket for us packet.size = htobs(total_size); packet.command = SB_COMMAND_DB_DATA; packet.u.db.tableCmd = m_con.GetDBCommand(Mode::Desktop::DatabaseAccess); -- 2.11.4.GIT