moved bin 8 out and removed clientctx

moved crypto bin8 out of entrance server

removed unused clientctx

missed import

fix accidental commit and rename ack_helpers

server/channelserver/ack_helpers.go

@@ -0,0 +1,54 @@
+package channelserver
+
+import (
+	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+)
+
+func doAckEarthSucceed(s *Session, ackHandle uint32, data []*byteframe.ByteFrame) {
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(uint32(s.server.erupeConfig.EarthID))
+	bf.WriteUint32(0)
+	bf.WriteUint32(0)
+	bf.WriteUint32(uint32(len(data)))
+	for i := range data {
+		bf.WriteBytes(data[i].Data())
+	}
+	doAckBufSucceed(s, ackHandle, bf.Data())
+}
+
+func doAckBufSucceed(s *Session, ackHandle uint32, data []byte) {
+	s.QueueSendMHF(&mhfpacket.MsgSysAck{
+		AckHandle:        ackHandle,
+		IsBufferResponse: true,
+		ErrorCode:        0,
+		AckData:          data,
+	})
+}
+
+func doAckBufFail(s *Session, ackHandle uint32, data []byte) {
+	s.QueueSendMHF(&mhfpacket.MsgSysAck{
+		AckHandle:        ackHandle,
+		IsBufferResponse: true,
+		ErrorCode:        1,
+		AckData:          data,
+	})
+}
+
+func doAckSimpleSucceed(s *Session, ackHandle uint32, data []byte) {
+	s.QueueSendMHF(&mhfpacket.MsgSysAck{
+		AckHandle:        ackHandle,
+		IsBufferResponse: false,
+		ErrorCode:        0,
+		AckData:          data,
+	})
+}
+
+func doAckSimpleFail(s *Session, ackHandle uint32, data []byte) {
+	s.QueueSendMHF(&mhfpacket.MsgSysAck{
+		AckHandle:        ackHandle,
+		IsBufferResponse: false,
+		ErrorCode:        1,
+		AckData:          data,
+	})
+}

server/channelserver/handlers.go

@@ -31,54 +31,6 @@ func stubEnumerateNoResults(s *Session, ackHandle uint32) {
 	doAckBufSucceed(s, ackHandle, enumBf.Data())
 }
 
-func doAckEarthSucceed(s *Session, ackHandle uint32, data []*byteframe.ByteFrame) {
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint32(uint32(s.server.erupeConfig.EarthID))
-	bf.WriteUint32(0)
-	bf.WriteUint32(0)
-	bf.WriteUint32(uint32(len(data)))
-	for i := range data {
-		bf.WriteBytes(data[i].Data())
-	}
-	doAckBufSucceed(s, ackHandle, bf.Data())
-}
-
-func doAckBufSucceed(s *Session, ackHandle uint32, data []byte) {
-	s.QueueSendMHF(&mhfpacket.MsgSysAck{
-		AckHandle:        ackHandle,
-		IsBufferResponse: true,
-		ErrorCode:        0,
-		AckData:          data,
-	})
-}
-
-func doAckBufFail(s *Session, ackHandle uint32, data []byte) {
-	s.QueueSendMHF(&mhfpacket.MsgSysAck{
-		AckHandle:        ackHandle,
-		IsBufferResponse: true,
-		ErrorCode:        1,
-		AckData:          data,
-	})
-}
-
-func doAckSimpleSucceed(s *Session, ackHandle uint32, data []byte) {
-	s.QueueSendMHF(&mhfpacket.MsgSysAck{
-		AckHandle:        ackHandle,
-		IsBufferResponse: false,
-		ErrorCode:        0,
-		AckData:          data,
-	})
-}
-
-func doAckSimpleFail(s *Session, ackHandle uint32, data []byte) {
-	s.QueueSendMHF(&mhfpacket.MsgSysAck{
-		AckHandle:        ackHandle,
-		IsBufferResponse: false,
-		ErrorCode:        1,
-		AckData:          data,
-	})
-}
-
 func updateRights(s *Session) {
 	rightsInt := uint32(2)
 	s.server.db.QueryRow("SELECT rights FROM users u INNER JOIN characters c ON u.id = c.user_id WHERE c.id = $1", s.charID).Scan(&rightsInt)

server/channelserver/handlers_cast_binary.go

@@ -188,7 +188,7 @@ func parseChatCommand(s *Session, command string) {
 				}
 				temp = &mhfpacket.MsgSysDeleteObject{ObjID: object.id}
 				deleteNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(deleteNotif, s.clientContext)
+				temp.Build(deleteNotif)
 			}
 			for _, session := range s.server.sessions {
 				if s == session {
@@ -196,7 +196,7 @@ func parseChatCommand(s *Session, command string) {
 				}
 				temp = &mhfpacket.MsgSysDeleteUser{CharID: session.charID}
 				deleteNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(deleteNotif, s.clientContext)
+				temp.Build(deleteNotif)
 			}
 			deleteNotif.WriteUint16(uint16(network.MSG_SYS_END))
 			s.QueueSend(deleteNotif.Data())
@@ -208,14 +208,14 @@ func parseChatCommand(s *Session, command string) {
 				}
 				temp = &mhfpacket.MsgSysInsertUser{CharID: session.charID}
 				reloadNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(reloadNotif, s.clientContext)
+				temp.Build(reloadNotif)
 				for i := 0; i < 3; i++ {
 					temp = &mhfpacket.MsgSysNotifyUserBinary{
 						CharID:     session.charID,
 						BinaryType: uint8(i + 1),
 					}
 					reloadNotif.WriteUint16(uint16(temp.Opcode()))
-					temp.Build(reloadNotif, s.clientContext)
+					temp.Build(reloadNotif)
 				}
 			}
 			for _, obj := range s.stage.objects {
@@ -231,7 +231,7 @@ func parseChatCommand(s *Session, command string) {
 					OwnerCharID: obj.ownerCharID,
 				}
 				reloadNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(reloadNotif, s.clientContext)
+				temp.Build(reloadNotif)
 			}
 			reloadNotif.WriteUint16(uint16(network.MSG_SYS_END))
 			s.QueueSend(reloadNotif.Data())

server/channelserver/handlers_mail.go

@@ -184,7 +184,7 @@ func SendMailNotification(s *Session, m *Mail, recipient *Session) {
 		RawDataPayload: bf.Data(),
 	}
 
-	castedBinary.Build(bf, s.clientContext)
+	castedBinary.Build(bf)
 
 	recipient.QueueSendMHF(castedBinary)
 }

server/channelserver/handlers_register.go

@@ -119,13 +119,13 @@ func (s *Session) notifyRavi() {
 	raviNotif := byteframe.NewByteFrame()
 	temp = &mhfpacket.MsgSysNotifyRegister{RegisterID: 0x40000}
 	raviNotif.WriteUint16(uint16(temp.Opcode()))
-	temp.Build(raviNotif, s.clientContext)
+	temp.Build(raviNotif)
 	temp = &mhfpacket.MsgSysNotifyRegister{RegisterID: 0x50000}
 	raviNotif.WriteUint16(uint16(temp.Opcode()))
-	temp.Build(raviNotif, s.clientContext)
+	temp.Build(raviNotif)
 	temp = &mhfpacket.MsgSysNotifyRegister{RegisterID: 0x60000}
 	raviNotif.WriteUint16(uint16(temp.Opcode()))
-	temp.Build(raviNotif, s.clientContext)
+	temp.Build(raviNotif)
 	raviNotif.WriteUint16(0x0010) // End it.
 	if s.server.erupeConfig.GameplayOptions.LowLatencyRaviente {
 		for session := range sema.clients {

server/channelserver/handlers_stage.go

@@ -78,14 +78,14 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 			}
 			temp = &mhfpacket.MsgSysInsertUser{CharID: session.charID}
 			newNotif.WriteUint16(uint16(temp.Opcode()))
-			temp.Build(newNotif, s.clientContext)
+			temp.Build(newNotif)
 			for i := 0; i < 3; i++ {
 				temp = &mhfpacket.MsgSysNotifyUserBinary{
 					CharID:     session.charID,
 					BinaryType: uint8(i + 1),
 				}
 				newNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(newNotif, s.clientContext)
+				temp.Build(newNotif)
 			}
 		}
 	}
@@ -108,7 +108,7 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 				OwnerCharID: obj.ownerCharID,
 			}
 			newNotif.WriteUint16(uint16(temp.Opcode()))
-			temp.Build(newNotif, s.clientContext)
+			temp.Build(newNotif)
 		}
 		s.stage.RUnlock()
 	}

server/channelserver/sys_channel_server.go

@@ -294,7 +294,7 @@ func (s *Server) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session)
 		bf.WriteUint16(uint16(pkt.Opcode()))
 
 		// Build the packet onto the byteframe.
-		pkt.Build(bf, session.clientContext)
+		pkt.Build(bf)
 
 		// Enqueue in a non-blocking way that drops the packet if the connections send buffer channel is full.
 		session.QueueSendNonBlocking(bf.Data())

server/channelserver/sys_semaphore.go

@@ -51,7 +51,7 @@ func (s *Semaphore) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Sessio
 		bf.WriteUint16(uint16(pkt.Opcode()))
 
 		// Build the packet onto the byteframe.
-		pkt.Build(bf, session.clientContext)
+		pkt.Build(bf)
 
 		// Enqueue in a non-blocking way that drops the packet if the connections send buffer channel is full.
 		session.QueueSendNonBlocking(bf.Data())

server/channelserver/sys_session.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"erupe-ce/network"
-	"erupe-ce/network/clientctx"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
 	"erupe-ce/utils/stringstack"
@@ -29,13 +28,12 @@ type packet struct {
 // Session holds state for the channel server connection.
 type Session struct {
 	sync.Mutex
-	logger        *zap.Logger
-	server        *Server
-	rawConn       net.Conn
-	cryptConn     *network.CryptConn
-	sendPackets   chan packet
-	clientContext *clientctx.ClientContext
-	lastPacket    time.Time
+	logger      *zap.Logger
+	server      *Server
+	rawConn     net.Conn
+	cryptConn   *network.CryptConn
+	sendPackets chan packet
+	lastPacket  time.Time
 
 	objectIndex      uint16
 	userEnteredStage bool // If the user has entered a stage before
@@ -79,7 +77,6 @@ func NewSession(server *Server, conn net.Conn) *Session {
 		rawConn:        conn,
 		cryptConn:      network.NewCryptConn(conn),
 		sendPackets:    make(chan packet, 20),
-		clientContext:  &clientctx.ClientContext{}, // Unused
 		lastPacket:     time.Now(),
 		sessionStart:   gametime.TimeAdjusted().Unix(),
 		stageMoveStack: stringstack.New(),
@@ -138,7 +135,7 @@ func (s *Session) QueueSendMHF(pkt mhfpacket.MHFPacket) {
 	bf.WriteUint16(uint16(pkt.Opcode()))
 
 	// Build the packet onto the byteframe.
-	pkt.Build(bf, s.clientContext)
+	pkt.Build(bf)
 
 	// Queue it.
 	s.QueueSend(bf.Data())
@@ -231,7 +228,7 @@ func (s *Session) handlePacketGroup(pktGroup []byte) {
 		return
 	}
 	// Parse the packet.
-	err := mhfPkt.Parse(bf, s.clientContext)
+	err := mhfPkt.Parse(bf)
 	if err != nil {
 		fmt.Printf("\n!!! [%s] %s NOT IMPLEMENTED !!! \n\n\n", s.Name, opcode)
 		return

server/channelserver/sys_stage.go

@@ -78,7 +78,7 @@ func (s *Stage) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session) {
 		bf.WriteUint16(uint16(pkt.Opcode()))
 
 		// Build the packet onto the byteframe.
-		pkt.Build(bf, session.clientContext)
+		pkt.Build(bf)
 
 		// Enqueue in a non-blocking way that drops the packet if the connections send buffer channel is full.
 		session.QueueSendNonBlocking(bf.Data())