Commit 294afb5b authored by Mark Frohnmayer's avatar Mark Frohnmayer
Browse files

updated test program to use new torque_socket methods

parent f6684569

tnl2/net_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ public: 
	

	bool window_full()

	{

		return _notify_queue_head && (_last_send_sequence - _notify_queue_head->sequence >= torque_packet_window_size);

		return _notify_queue_head && (_last_send_sequence - _notify_queue_head->sequence >= torque_sockets_packet_window_size);

	}

tnl2/net_interface.h

+8 −20
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public: 
	

	void set_challenge_response_data(byte_buffer_ptr data)

	{

		_socket.set_challenge_response_data(data);

		_socket.set_challenge_response(data);

		//torque_socket_set_challenge_response_data(_socket, the_data.get_next_byte_position(), the_data.get_buffer());

	}
@@ -198,15 +198,15 @@ public: 
	{

		bit_stream key_stream(event->public_key, event->public_key_size);

		bit_stream request_stream(event->data, event->data_size);

		uint8 response_buffer[torque_max_status_datagram_size];

		bit_stream response_stream(response_buffer, torque_max_status_datagram_size);

		uint8 response_buffer[torque_sockets_max_status_datagram_size];

		bit_stream response_stream(response_buffer, torque_sockets_max_status_datagram_size);

		

		uint32 type_identifier;

		core::read(request_stream, type_identifier);

		type_record *rec = find_connection_type(type_identifier);

		if(!rec)

		{

			_socket.reject_connection(event->connection, response_stream);

			_socket.disconnect(event->connection, 0, 0);

			//torque_connection_reject(event->connection, 0, response_stream.get_buffer());

		}

		net_connection *allocated = (net_connection *) operator new(rec->size);
@@ -217,11 +217,11 @@ public: 
		if(the_connection->read_connect_request(request_stream, response_stream))

		{

			_add_connection(the_connection, event->connection);

			_socket.accept_connection(event->connection, response_stream);

			_socket.accept_connection(event->connection);

			//torque_connection_accept(event->connection, response_stream.get_byte_position(), response_stream.get_buffer());

		}

		else

			_socket.reject_connection(event->connection, response_stream);

			_socket.disconnect(event->connection, response_stream.get_buffer(), response_stream.get_next_byte_position());

			//torque_connection_reject(event->connection, response_stream.get_next_byte_position(), response_stream.get_buffer());

	}
@@ -232,7 +232,6 @@ public: 


	void _process_connection_accepted(torque_socket_event *event)

	{

		bit_stream connection_accept_stream(event->data, event->data_size);

		packet_stream response_stream;



		connection_pointer p = _connection_table.find(event->connection);
@@ -241,17 +240,6 @@ public: 
		if(the_connection)

		{

			(*the_connection)->set_connection_state(net_connection::state_accepted);

			if(!(*the_connection)->read_connect_accept(connection_accept_stream, response_stream))

			{

				_socket.disconnect(event->connection, response_stream);

				//torque_connection_disconnect(event->connection, response_stream.get_next_byte_position(), response_stream.get_buffer());

				p.remove();

			}

			/*else

			{

				(*the_connection)->set_connection_state(net_connection::state_established);

				(*the_connection)->on_connection_established();

			}*/

		}

	}
@@ -330,7 +318,7 @@ public: 
	

	void connect(const address &remote_host, ref_ptr<net_connection> &the_connection)

	{

		uint8 connect_buffer[torque_max_status_datagram_size];

		uint8 connect_buffer[torque_sockets_max_status_datagram_size];

		bit_stream connect_stream(connect_buffer, sizeof(connect_buffer));

		

		uint32 type_identifier = get_type_identifier(the_connection);
@@ -339,7 +327,7 @@ public: 
		

		the_connection->write_connect_request(connect_stream);



		torque_connection_id connection_id = _socket.connect(remote_host, connect_stream);

		torque_connection_id connection_id = _socket.connect(remote_host, connect_stream.get_buffer(), connect_stream.get_next_byte_position());

		_add_connection(the_connection, connection_id);

		//torque_socket_connect(_socket, connect_address, connect_stream.get_next_byte_position(), connect_buffer);

		//the_connection->set_torque_connection(connection_id);

tnl2_test/Makefile

+2 −2
Original line number Diff line number Diff line 
#############################################################################

# Makefile for building: tnl2_test.app/Contents/MacOS/tnl2_test

# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat Mar 13 13:05:17 2010

# Generated by qmake (2.01a) (Qt 4.6.2) on: Tue Mar 16 11:11:31 2010

# Project:  tnl2_test.pro

# Template: app

# Command: /usr/bin/qmake -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile tnl2_test.pro
@@ -203,7 +203,7 @@ tnl2_test.app/Contents/Info.plist: 
	@sed -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tnl2_test,g" -e "s,@TYPEINFO@,????,g" /usr/local/Qt4.6/mkspecs/macx-g++/Info.plist.app >tnl2_test.app/Contents/Info.plist

dist: 

	@$(CHK_DIR_EXISTS) .tmp/tnl2_test1.0.0 || $(MKDIR) .tmp/tnl2_test1.0.0 

	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents tnl2_test_widget.h test_player.h test_net_interface.h test_game.h test_connection.h test_building.h ../tnl2/tnl2.h ../tnl2/net_object.h ../tnl2/net_interface.h ../tnl2/net_connection.h ../tnl2/ghost_connection.h ../tnl2/exceptions.h ../tnl2/event_connection.h window.h ../../torque_sockets/core/zone_allocator.h ../../torque_sockets/core/utils.h ../../torque_sockets/core/type_record.h ../../torque_sockets/core/type_database.h ../../torque_sockets/core/thread_queue.h ../../torque_sockets/core/thread.h ../../torque_sockets/core/system_includes_win32.h ../../torque_sockets/core/system_includes_mac_osx.h ../../torque_sockets/core/system_includes_linux.h ../../torque_sockets/core/string.h ../../torque_sockets/core/static_to_indexed_string_map.h ../../torque_sockets/core/small_block_allocator.h ../../torque_sockets/core/ref_object.h ../../torque_sockets/core/power_two_functions.h ../../torque_sockets/core/platform.h ../../torque_sockets/core/page_allocator.h ../../torque_sockets/core/memory_functions.h ../../torque_sockets/core/log.h ../../torque_sockets/core/indexed_string.h ../../torque_sockets/core/hash_table_flat.h ../../torque_sockets/core/hash_table_array.h ../../torque_sockets/core/hash.h ../../torque_sockets/core/functor.h ../../torque_sockets/core/function_record.h ../../torque_sockets/core/formatted_string_buffer.h ../../torque_sockets/core/dictionary.h ../../torque_sockets/core/cpu_endian.h ../../torque_sockets/core/core.h ../../torque_sockets/core/context.h ../../torque_sockets/core/construct.h ../../torque_sockets/core/byte_stream_fixed.h ../../torque_sockets/core/byte_buffer.h ../../torque_sockets/core/bit_stream.h ../../torque_sockets/core/base_types.h ../../torque_sockets/core/base_type_traits.h ../../torque_sockets/core/base_type_io.h ../../torque_sockets/core/base_type_declarations.h ../../torque_sockets/core/assert.h ../../torque_sockets/core/array.h ../../torque_sockets/core/algorithm_templates.h ../../torque_sockets/torque_sockets/udp_socket.h ../../torque_sockets/torque_sockets/torque_sockets.h ../../torque_sockets/torque_sockets/torque_socket_event.h ../../torque_sockets/torque_sockets/torque_socket.h ../../torque_sockets/torque_sockets/torque_connection.h ../../torque_sockets/torque_sockets/time.h ../../torque_sockets/torque_sockets/symmetric_cipher.h ../../torque_sockets/torque_sockets/sockets.h ../../torque_sockets/torque_sockets/random_generator.h ../../torque_sockets/torque_sockets/packet_stream.h ../../torque_sockets/torque_sockets/nonce.h ../../torque_sockets/torque_sockets/client_puzzle.h ../../torque_sockets/torque_sockets/buffer_utils.h ../../torque_sockets/torque_sockets/asymmetric_key.h ../../torque_sockets/torque_sockets/address.h .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents main.cpp tnl2_test_widget.cpp test_game.cpp window.cpp .tmp/tnl2_test1.0.0/ && (cd `dirname .tmp/tnl2_test1.0.0` && $(TAR) tnl2_test1.0.0.tar tnl2_test1.0.0 && $(COMPRESS) tnl2_test1.0.0.tar) && $(MOVE) `dirname .tmp/tnl2_test1.0.0`/tnl2_test1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tnl2_test1.0.0

	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents tnl2_test_widget.h test_player.h test_net_interface.h test_game.h test_connection.h test_building.h ../tnl2/tnl2.h ../tnl2/net_object.h ../tnl2/net_interface.h ../tnl2/net_connection.h ../tnl2/ghost_connection.h ../tnl2/exceptions.h ../tnl2/event_connection.h window.h ../../torque_sockets/core/zone_allocator.h ../../torque_sockets/core/utils.h ../../torque_sockets/core/type_record.h ../../torque_sockets/core/type_database.h ../../torque_sockets/core/thread_queue.h ../../torque_sockets/core/thread.h ../../torque_sockets/core/system_includes_win32.h ../../torque_sockets/core/system_includes_mac_osx.h ../../torque_sockets/core/system_includes_linux.h ../../torque_sockets/core/string.h ../../torque_sockets/core/static_to_indexed_string_map.h ../../torque_sockets/core/small_block_allocator.h ../../torque_sockets/core/ref_object.h ../../torque_sockets/core/power_two_functions.h ../../torque_sockets/core/platform.h ../../torque_sockets/core/page_allocator.h ../../torque_sockets/core/memory_functions.h ../../torque_sockets/core/log.h ../../torque_sockets/core/indexed_string.h ../../torque_sockets/core/hash_table_flat.h ../../torque_sockets/core/hash_table_array.h ../../torque_sockets/core/hash.h ../../torque_sockets/core/functor.h ../../torque_sockets/core/function_record.h ../../torque_sockets/core/formatted_string_buffer.h ../../torque_sockets/core/dictionary.h ../../torque_sockets/core/cpu_endian.h ../../torque_sockets/core/core.h ../../torque_sockets/core/context.h ../../torque_sockets/core/construct.h ../../torque_sockets/core/byte_stream_fixed.h ../../torque_sockets/core/byte_buffer.h ../../torque_sockets/core/bit_stream.h ../../torque_sockets/core/base_types.h ../../torque_sockets/core/base_type_traits.h ../../torque_sockets/core/base_type_io.h ../../torque_sockets/core/base_type_declarations.h ../../torque_sockets/core/assert.h ../../torque_sockets/core/array.h ../../torque_sockets/core/algorithm_templates.h ../../torque_sockets/torque_sockets/udp_socket.h ../../torque_sockets/torque_sockets/torque_sockets.h ../../torque_sockets/torque_sockets/torque_socket_event.h ../../torque_sockets/torque_sockets/torque_socket.h ../../torque_sockets/torque_sockets/torque_connection.h ../../torque_sockets/torque_sockets/time.h ../../torque_sockets/torque_sockets/symmetric_cipher.h ../../torque_sockets/torque_sockets/sockets.h ../../torque_sockets/torque_sockets/random_generator.h ../../torque_sockets/torque_sockets/packet_stream.h ../../torque_sockets/torque_sockets/nonce.h ../../torque_sockets/torque_sockets/client_puzzle.h ../../torque_sockets/torque_sockets/buffer_utils.h ../../torque_sockets/torque_sockets/asymmetric_key.h ../../torque_sockets/torque_sockets/address.h ../../torque_sockets/torque_sockets/pending_connection.h .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents main.cpp tnl2_test_widget.cpp test_game.cpp window.cpp .tmp/tnl2_test1.0.0/ && (cd `dirname .tmp/tnl2_test1.0.0` && $(TAR) tnl2_test1.0.0.tar tnl2_test1.0.0 && $(COMPRESS) tnl2_test1.0.0.tar) && $(MOVE) `dirname .tmp/tnl2_test1.0.0`/tnl2_test1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tnl2_test1.0.0





clean:compiler_clean

tnl2_test/tnl2_test.pro

+3 −2
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ HEADERS += tnl2_test_widget.h \ 
    ../../torque_sockets/torque_sockets/client_puzzle.h \

    ../../torque_sockets/torque_sockets/buffer_utils.h \

    ../../torque_sockets/torque_sockets/asymmetric_key.h \

    ../../torque_sockets/torque_sockets/address.h

    ../../torque_sockets/torque_sockets/address.h \

    ../../torque_sockets/torque_sockets/pending_connection.h

FORMS += 

INCLUDEPATH += ../tnl2 \

    ../../torque_sockets/ \

tnl2_test/test_game.cpp

+1 −1

File changed.

Contains only whitespace changes.