Merge pull request #535 from jg18/remove_ipx

Remove IPX support.

Author: The-E

code/menuui/mainhallmenu.cpp

@@ -319,9 +319,6 @@ void main_hall_do_multi_ready()
 	case NETWORK_ERROR_NO_PROTOCOL:
 		if (Multi_options_g.protocol == NET_TCP) {
 			popup( PF_USE_AFFIRMATIVE_ICON | PF_NO_NETWORKING, 1, POPUP_OK, XSTR( "TCP/IP protocol not found.  This protocol is required for multiplayer FreeSpace.", 1602));
-		} else {
-			Assert(Multi_options_g.protocol == NET_IPX);
-			popup( PF_USE_AFFIRMATIVE_ICON | PF_NO_NETWORKING, 1, POPUP_OK, XSTR( "IPX protocol not found.  This protocol is required for multiplayer FreeSpace.", 1603));
 		}
 		break;
 	case NETWORK_ERROR_CONNECT_TO_ISP:
@@ -346,11 +343,6 @@ void main_hall_do_multi_ready()
 		return;
 	}
 
-	if ((Multi_options_g.protocol == NET_IPX) && !Ipx_active) {
-		popup( PF_USE_AFFIRMATIVE_ICON | PF_NO_NETWORKING, 1, POPUP_OK, XSTR( "You have selected IPX for multiplayer FreeSpace, but the IPX protocol was not detected on your machine.", 1402));
-		return;
-	}
-
 	if (error != NETWORK_ERROR_NONE) {
 		return;
 	}

code/menuui/optionsmenumulti.cpp

@@ -714,10 +714,6 @@ void options_multi_load_protocol_controls()
 	Om_ip_input.hide();
 	Om_ip_input.disable();
 
-	// disable IPX button in demo
-	Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.disable();
-	Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.hide();
-
 	// bogus control
 	Om_pro_bogus.base_create(Om_window, UI_KIND_ICON, 0, 0, 0, 0);
 }
@@ -887,11 +883,7 @@ void options_multi_protocol_do(int key)
 	}
 
 	// force draw the proper protocol
-	if (Om_protocol == NET_IPX) {
-		Om_pro_buttons[gr_screen.res][OM_PRO_IPX].button.draw_forced(2);
-	} else {
-		Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.draw_forced(2);
-	}
+	Om_pro_buttons[gr_screen.res][OM_PRO_TCP].button.draw_forced(2);
 
 	// force draw the proper tab button
 	switch (Om_mode) {
@@ -1118,10 +1110,10 @@ void options_multi_protocol_button_pressed(int n)
 		gamesnd_play_iface(SND_USER_SELECT);
 		break;
 
-	// ipx mode
+	// ipx mode, no longer supported
 	case OM_PRO_IPX:
-		Om_protocol = NET_IPX;
-		gamesnd_play_iface(SND_USER_SELECT);
+		gamesnd_play_iface(SND_GENERAL_FAIL);
+		popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, "The old IPX protocol is no longer supported.");
 		break;
 	}
 }

code/network/multi.cpp

@@ -101,8 +101,8 @@ int Multi_button_info_ok = 0;										// flag saying it is ok to apply critical
 int Multi_button_info_id = 0;										// identifier of the stored button info to be applying
 
 // low level networking vars
-int ADDRESS_LENGTH;													// will be 6 for IPX, 4 for IP
-int PORT_LENGTH;														// will be 2 for IPX, 2 for IP
+int ADDRESS_LENGTH;
+int PORT_LENGTH;
 int HEADER_LENGTH;													// 1 byte (packet type)
 
 // misc data
@@ -952,7 +952,6 @@ void multi_process_bigdata(ubyte *data, int len, net_addr *from_addr, int reliab
 	// store fields that were passed along in the message
 	// store header information that was captured from the network-layer header
 	memcpy(header_info.addr, from_addr->addr, 6);
-	memcpy(header_info.net_id, from_addr->net_id, 4);
 	header_info.port = from_addr->port;	
 	if(player_num >= 0){
 		header_info.id = Net_players[player_num].player_id;
@@ -1439,32 +1438,25 @@ void standalone_main_init()
 	// multi_options_read_config();   
 #ifdef _WIN32
 	// if we failed to startup on our desired protocol, fail
-	if((Multi_options_g.protocol == NET_IPX) && !Ipx_active){
-		MessageBox((HWND)os_get_window(), XSTR( "You have selected IPX for multiplayer FreeSpace, but the IPX protocol was not detected on your machine.", 1402), "Error", MB_OK);
-		exit(1);
-	}
-	if((Multi_options_g.protocol == NET_TCP) && !Tcp_active){
+	if ((Multi_options_g.protocol == NET_TCP) && !Tcp_active){
 		if (Tcp_failure_code == WSAEADDRINUSE) {
 			MessageBox((HWND)os_get_window(), XSTR("You have selected TCP/IP for multiplayer FreeSpace, but the TCP socket is already in use.  Check for another instance and/or use the \"-port <port_num>\" command line option to select an available port.", 1620), "Error", MB_OK);
-		} else {
+		}
+		else {
 			MessageBox((HWND)os_get_window(), XSTR("You have selected TCP/IP for multiplayer FreeSpace, but the TCP/IP protocol was not detected on your machine.", 362), "Error", MB_OK);
 		}
 
 		exit(1);
 	}
 #endif // ifdef _WIN32
 
+
 	// set the protocol
 	psnet_use_protocol(Multi_options_g.protocol);
 	switch (Multi_options_g.protocol) {
-	case NET_IPX:
-		ADDRESS_LENGTH = IPX_ADDRESS_LENGTH;
-		PORT_LENGTH = IPX_PORT_LENGTH;
-		break;
-
 	case NET_TCP:
-		ADDRESS_LENGTH = IP_ADDRESS_LENGTH;		
-		PORT_LENGTH = IP_PORT_LENGTH;			
+		ADDRESS_LENGTH = IP_ADDRESS_LENGTH;
+		PORT_LENGTH = IP_PORT_LENGTH;
 		break;
 
 	default:

code/network/multi.h

@@ -92,8 +92,6 @@ class player;
 // low level networking defines
 #define IP_ADDRESS_LENGTH					4				// length of the address field for an IP address
 #define IP_PORT_LENGTH						2				// length of the port field for an IP address
-#define IPX_ADDRESS_LENGTH					6				// length of the address field for an IPX address
-#define IPX_PORT_LENGTH						2				// length of the port field for an IPX address
 
 // netgame defines
 #define MP_SINGLE_MISSION					0				// not playing a campaign - single mission
@@ -762,8 +760,8 @@ extern int Multi_button_info_ok;										// flag saying it is ok to apply criti
 extern int Multi_button_info_id;										// identifier of the stored button info to be applying
 
 // low level networking vars
-extern int ADDRESS_LENGTH;												// will be 6 for IPX, 4 for IP
-extern int PORT_LENGTH;													// will be 2 for IPX, 2 for IP
+extern int ADDRESS_LENGTH;												// will be 4 for IP
+extern int PORT_LENGTH;													// will be 2 for IP
 extern int HEADER_LENGTH;												// 1 byte (packet type)
 
 // misc data

code/network/multi_voice.cpp

@@ -1456,14 +1456,8 @@ int multi_voice_max_chunk_size(int msg_mode)
 		header_size += 2;									// targeted player's object net_signature
 	}
 
-	// if we're in IPX mode
-	if(Psnet_my_addr.type == NET_IPX){
-		header_size += 10;								// my address (10 bytes in IPX)		
-	}
-	// if we're in TCP mode
-	else {
-		header_size +=	4;									// my address (4 bytes in TCP)
-	}
+	// allocate header space for my address
+	header_size += 4;									// my address (4 bytes in TCP)
 
 	// calculate max chunk size
 	return (MAX_PACKET_SIZE -							// max freespace packet size

code/network/multilag.cpp

@@ -12,7 +12,6 @@
 #ifndef SCP_UNIX
 
 #include <winsock.h>
-#include <wsipx.h>
 
 #include "network/multilag.h"
 #include "io/timer.h"
@@ -59,8 +58,7 @@ typedef struct lag_buf {
 	int data_len;								// length of the data
 	uint socket;								// this can be either a PSNET_SOCKET or a PSNET_SOCKET_RELIABLE
 	int stamp;									// when this expires, make this packet available	
-	SOCKADDR_IN ip_addr;						// ip address when in TCP
-	SOCKADDR_IPX ipx_addr;					// ipx address when in IPX mode
+	SOCKADDR_IN ip_addr;						// ip address
 
 	struct	lag_buf * prev;				// prev in the list
 	struct	lag_buf * next;				// next in the list
@@ -172,7 +170,6 @@ int multi_lag_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except
 	char t_buf[1024];
 	int t_from_len;
 	SOCKADDR_IN ip_addr;
-	SOCKADDR_IPX ipx_addr;
 	int ret_val;
 	lag_buf *moveup, *item;
 
@@ -182,18 +179,13 @@ int multi_lag_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except
 
 	// clear out addresses
 	memset(&ip_addr, 0, sizeof(SOCKADDR_IN));
-	memset(&ipx_addr, 0, sizeof(SOCKADDR_IPX));
 
 	// if there's data on the socket, read it
 	if(select(nfds, readfds, writefds, except_fds, timeout)){		
 		// read the data and stuff it
-		if(Tcp_active){						
-			t_from_len = sizeof(SOCKADDR_IN);
-			ret_val = recvfrom(readfds->fd_array[0], t_buf, 1024, 0, (SOCKADDR*)&ip_addr, &t_from_len);
-		} else {
-			t_from_len = sizeof(SOCKADDR_IPX);
-			ret_val = recvfrom(readfds->fd_array[0], t_buf, 1024, 0, (SOCKADDR*)&ipx_addr, &t_from_len);
-		}
+		Assertion(Tcp_active, "multi_lag_select(): TCP/IP is not active!");
+		t_from_len = sizeof(SOCKADDR_IN);
+		ret_val = recvfrom(readfds->fd_array[0], t_buf, 1024, 0, (SOCKADDR*)&ip_addr, &t_from_len);
 
 		// wacky socket error
 		if(ret_val == SOCKET_ERROR){
@@ -209,7 +201,6 @@ int multi_lag_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except
 				memcpy(item->data, t_buf, ret_val);			
 				item->data_len = ret_val;
 				item->ip_addr = ip_addr;
-				item->ipx_addr = ipx_addr;
 				item->socket = readfds->fd_array[0];
 				item->stamp = timestamp(multi_lag_get_random_lag());
 			}		
@@ -260,11 +251,8 @@ int multi_lag_recvfrom(uint s, char *buf, int len, int flags, struct sockaddr *f
 	// stuff the data
 	Assert(item->data_len <= len);
 	memcpy(buf, item->data, item->data_len);
-	if(Tcp_active){
-		memcpy(from, &item->ip_addr, sizeof(SOCKADDR_IN));
-	} else {
-		memcpy(from, &item->ipx_addr, sizeof(SOCKADDR_IPX)); //-V512
-	}
+	Assertion(Tcp_active, "multi_lag_recvfrom(): TCP/IP is not active!");
+	memcpy(from, &item->ip_addr, sizeof(SOCKADDR_IN));
 
 	// stick the item back on the free list
 	multi_lag_put_free(item);

code/network/multimsgs.cpp

@@ -924,7 +924,7 @@ void process_join_packet(ubyte* data, header* hinfo)
 	PACKET_SET_SIZE();	
 
 	// fill in the address information of where this came from
-	fill_net_addr(&addr, hinfo->addr, hinfo->net_id, hinfo->port);
+	fill_net_addr(&addr, hinfo->addr, hinfo->port);
 
 	// determine if we should accept this guy, or return a reason we should reject him
 	// see the DENY_* codes in multi.h
@@ -1104,8 +1104,6 @@ void process_new_player_packet(ubyte* data, header* hinfo)
 		}
 
 		// create the player
-		memcpy(new_addr.net_id, Psnet_my_addr.net_id, 4);
-
 		if(new_flags & NETINFO_FLAG_OBSERVER){
 			multi_obs_create_player(new_player_num,new_player_name,&new_addr,&Players[player_num]);
 			Net_players[new_player_num].flags |= new_flags;
@@ -1349,7 +1347,7 @@ void process_accept_player_data( ubyte *data, header *hinfo )
 
 			// also - always set the server address to be where this data came from, NOT from 
 			// the data in the packet		
-			fill_net_addr(&Net_players[player_num].p_info.addr, hinfo->addr, hinfo->net_id, hinfo->port);
+			fill_net_addr(&Net_players[player_num].p_info.addr, hinfo->addr, hinfo->port);
 		}
 
 		// set the host pointer
@@ -1591,7 +1589,7 @@ void process_accept_packet(ubyte* data, header* hinfo)
 	}
 
 	// fill in the netgame server address
-	fill_net_addr( &Netgame.server_addr, hinfo->addr, hinfo->net_id, hinfo->port );	
+	fill_net_addr( &Netgame.server_addr, hinfo->addr, hinfo->port );	
 
 	// get the skill level setting
 	GET_INT(Game_skill_level);
@@ -1941,7 +1939,7 @@ void process_game_active_packet(ubyte* data, header* hinfo)
 	active_game ag;
 	int modes_compatible = 1;
 
-	fill_net_addr(&ag.server_addr, hinfo->addr, hinfo->net_id, hinfo->port);
+	fill_net_addr(&ag.server_addr, hinfo->addr, hinfo->port);
 
 	// read this game into a temporary structure
 	offset = HEADER_LENGTH;
@@ -2199,7 +2197,7 @@ void process_netgame_descript_packet( ubyte *data, header *hinfo )
 	char mission_desc[MISSION_DESC_LENGTH+2];
 	net_addr addr;
 
-	fill_net_addr(&addr, hinfo->addr, hinfo->net_id, hinfo->port);
+	fill_net_addr(&addr, hinfo->addr, hinfo->port);
 
 	// read this game into a temporary structure
 	offset = HEADER_LENGTH;
@@ -2232,7 +2230,7 @@ void process_netgame_descript_packet( ubyte *data, header *hinfo )
 	PACKET_SET_SIZE();	
 }
 
-// broadcast a query for active games. IPX will use net broadcast and TCP will either request from the MT or from the specified list
+// broadcast a query for active games. TCP will either request from the MT or from the specified list
 void broadcast_game_query()
 {
 	int packet_size;
@@ -2256,7 +2254,7 @@ void broadcast_game_query()
 		} while(s_moveup != Game_server_head);		
 	}	
 
-	fill_net_addr(&addr, Psnet_my_addr.addr, Psnet_my_addr.net_id, DEFAULT_GAME_PORT);
+	fill_net_addr(&addr, Psnet_my_addr.addr, DEFAULT_GAME_PORT);
 
 	// send out a broadcast if our options allow us
 	if(Net_player->p_info.options.flags & MLO_FLAG_LOCAL_BROADCAST){
@@ -2286,7 +2284,7 @@ void process_game_query(ubyte* data, header* hinfo)
 	PACKET_SET_SIZE();
 
 	// check to be sure that we don't capture our own broadcast message
-	fill_net_addr(&addr, hinfo->addr, hinfo->net_id, hinfo->port);
+	fill_net_addr(&addr, hinfo->addr, hinfo->port);
 	if ( psnet_same( &addr, &Psnet_my_addr) ){
 		return;
 	}
@@ -3474,7 +3472,7 @@ void process_ping_packet(ubyte *data, header *hinfo)
 	PACKET_SET_SIZE();
 
 	// get the address to return the pong to
-	fill_net_addr(&addr, hinfo->addr, hinfo->net_id, hinfo->port);	
+	fill_net_addr(&addr, hinfo->addr, hinfo->port);	
 
 	// send the pong
 	send_pong(&addr);	
@@ -3490,7 +3488,7 @@ void process_pong_packet(ubyte *data, header *hinfo)
 
 	offset = HEADER_LENGTH;
 
-	fill_net_addr(&addr, hinfo->addr, hinfo->net_id, hinfo->port);
+	fill_net_addr(&addr, hinfo->addr, hinfo->port);
 
 	PACKET_SET_SIZE();	
 

code/network/multimsgs.h

@@ -300,7 +300,7 @@ void send_mission_log_packet( int entry );
 // send a mission message packet
 void send_mission_message_packet(int id, char *who_from, int priority, int timing, int source, int builtin_type, int multi_target, int multi_team_filter, int delay = 0);
 
-// broadcast a query for active games. IPX will use net broadcast and TCP will either request from the MT or from the specified list
+// broadcast a query for active games. TCP will either request from the MT or from the specified list
 void broadcast_game_query();
 
 // send an individual query to an address to see if there is an active game

code/network/multiui.cpp

@@ -824,11 +824,6 @@ void multi_join_game_init()
 	Assert( Net_player != NULL );
 
 	switch (Multi_options_g.protocol) {	
-	case NET_IPX:
-		ADDRESS_LENGTH = IPX_ADDRESS_LENGTH;
-		PORT_LENGTH = IPX_PORT_LENGTH;
-		break;
-
 	case NET_TCP:
 		ADDRESS_LENGTH = IP_ADDRESS_LENGTH;		
 		PORT_LENGTH = IP_PORT_LENGTH;			
@@ -2077,17 +2072,7 @@ int multi_join_warn_pxo()
 void multi_join_blit_protocol()
 {
 	gr_set_color_fast(&Color_bright);
-
-	switch(Socket_type){
-	case NET_TCP:		
-		// straight TCP		
-		gr_string(5, 2, "TCP", GR_RESIZE_MENU);		
-		break;
-
-	case NET_IPX:
-		gr_string(5, 2, "IPX", GR_RESIZE_MENU);
-		break;
-	}
+	gr_string(5, 2, "TCP", GR_RESIZE_MENU);
 }