Commit Graph

35 Commits

Author SHA1 Message Date
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
Pontus Fransson 3a752f6b95 Network - Merge with gamelogic 2013-12-16 09:09:48 +01:00
Pontus Fransson 7acb3a3613 Network - 2013-12-16 08:59:38 +01:00
dean11 8b1c2b91e8 Fixed some craches and stuff 2013-12-13 23:47:16 +01:00
Pontus Fransson 5a3188d5f6 Network - NetworkServer, NetworkClient, Translator
First version of the NetworkAPI. It should work.
2013-12-11 21:45:43 +01:00
Pontus Fransson e06ee31754 Network - First basic API. 2013-12-10 08:32:08 +01:00
Pontus Fransson df1594a43b Network - Fixed small errors 2013-12-04 14:58:15 +01:00
Pontus Fransson e81062b875 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-04 12:41:37 +01:00
Pontus Fransson f0dff0b728 Network - Starting to implement correct shutdown connection. 2013-12-04 12:41:25 +01:00
Sam Mario Svensson 79cf9df111 Network - changed from & to smartpoints 2013-12-04 12:40:49 +01:00
Pontus Fransson df1470eb2c Network - Send/Recv both ways.
Impl: SetBlockingMode() : Connection.
Impl: Resize() : OysterByte.
Remade Clear() : OysterByte.
Added bool return if FetchMessage() succeded or failed : PostBox.
Fixed a few errors with mutex on ThreadedClient.
Added missing mutex unlock in ThreadSafeQueue.
2013-12-03 23:12:48 +01:00
Pontus Fransson 6e24acea2b Listener's Accept() is now threaded.
Added function private to Connection SetBlockingMode(bool blocking); But
it doesn't do anything yet.
Listener is now accepting clients in a thread.
GetNewClient() returns the socket that has connected. -1 if there is no
new client connected. (Can only connect 1 client at a time.)
The simple chat program is not working anymore because of changes in the
server.
2013-11-27 14:33:08 +01:00
Pontus Fransson 43b111f0d3 Pull MiscBranch 2013-11-27 11:28:11 +01:00
Pontus Fransson aeddc032d9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/NetworkDependencies/IConnection.h
	Code/Network/OysterNetworkClient/Client.cpp
	Code/Network/OysterNetworkClient/Client.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/Client.cpp
	Code/Network/OysterNetworkServer/Client.h
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-27 11:06:03 +01:00
Pontus Fransson 214e29e906 OysterByte
Added Byte class instead of handling byte messages manually.
Converted all functions to use OysterByte.
2013-11-27 11:01:22 +01:00
Sam Mario Svensson f6ade9e4fd ErrorMessages everywhere! 2013-11-26 13:45:03 +01:00
Pontus Fransson 45c145439a Fixade crash och flyttade initsockets, shutdownsockets.
Moved initsocket and shutdownsockets to WinsockFunctions.
2013-11-25 20:27:23 +01:00
Pontus Fransson 6b57815bb8 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
2013-11-25 19:05:28 +01:00
Pontus Fransson caabb6702e Fixed code standard, Added packing functions 2013-11-25 19:00:33 +01:00
Sam Mario Svensson ca5e578af5 reconstruction in connection. 2013-11-25 14:03:32 +01:00
Sam Mario Svensson 82b8ef7b05 Fixed connection split up connect function and added initiateClient() 2013-11-25 12:14:01 +01:00
Sam Mario Svensson 640ac2172a checked the coding standard and changed it accordinly 2013-11-25 11:39:54 +01:00
Pontus Fransson d33220f8ca Fixed memory leaks
Fixed memory leaks.
2013-11-22 14:23:08 +01:00
Pontus Fransson c5e432b566 Fixed size 2013-11-22 09:43:24 +01:00
Pontus Fransson bacb83b084 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-22 09:24:44 +01:00
Pontus Fransson 5265fd1af1 Fixed merge errors 2013-11-22 09:17:07 +01:00
Pontus Fransson 954a1ac669 Fixed error
Fixed translation
2013-11-22 08:56:00 +01:00
Sam Mario Svensson 4142688f6c unsigned char instead of char and chat program with protocols 2013-11-22 08:54:26 +01:00
Sam Mario Svensson f77efb107d Implemented Translator
also fixed some coding standards with namespaces in client, connection,
listener, server.
added protocols with enums for packagetype.
2013-11-21 13:40:52 +01:00
Pontus Fransson 816dced937 Chat test server 2013-11-19 14:24:38 +01:00
Sam Mario Svensson 1df11becf7 chat test with server
created simple chat program for the client to be able to chat between
client through a server
2013-11-19 14:18:34 +01:00
Pontus Fransson ac75e178ce Sending a message from server to client (done and done) 2013-11-19 13:42:50 +01:00
Sam Mario Svensson adcef51227 third time is the charm
fixed send and recieve functions in IConnection
2013-11-19 12:55:54 +01:00
Sam Mario Svensson 89ce3dd0d1 Fixed IConnection and Connection 2013-11-19 12:41:58 +01:00
Sam Mario Svensson 56c32fcbc3 Iconnection interface 2013-11-19 12:38:13 +01:00