x64-tap-win32-dhcp-and-appletalk.patch

Index: BasiliskII/src/Windows/ether_windows.cpp
===================================================================
RCS file: /home/cvs/cebix/BasiliskII/src/Windows/ether_windows.cpp,v
retrieving revision 1.9
diff -r1.9 ether_windows.cpp
1419a1420,1421
> 	uint8 * cur_dest_ether_addr;
>
1449c1451,1481
< 				if (memcmp((LPBYTE)lpPacket->Buffer, ether_addr, 6) != 0)
---
> 				cur_dest_ether_addr = (LPBYTE)lpPacket->Buffer;
>
> 				if ( memcmp(cur_dest_ether_addr, ether_addr, 6) == 0 )
> 				{
> 					D(bug("Packet to our Ethernet address\n"));
> 				}
> 				else if (cur_dest_ether_addr[0] & cur_dest_ether_addr[1] & cur_dest_ether_addr[2]
> 				     & cur_dest_ether_addr[3] & cur_dest_ether_addr[4] & cur_dest_ether_addr[5] == 0xff )
> 				{
> 					D(bug("Packet to Ethernet broadcast address\n"));
> 				}
> 				else if ( cur_dest_ether_addr[0] == 0x09
> 						&& cur_dest_ether_addr[1] == 0x00
> 						&& cur_dest_ether_addr[2] == 0x07
> 						&& cur_dest_ether_addr[3] == 0xff
> 						&& cur_dest_ether_addr[4] == 0xff
> 						&& cur_dest_ether_addr[5] == 0xff)
> 				{
> 					D(bug("Packet to AppleTalk broadcast address\n"));
> 				}
> 				else if ( cur_dest_ether_addr[0] == 0x09
> 						&& cur_dest_ether_addr[1] == 0x00
> 						&& cur_dest_ether_addr[2] == 0x07
> 						&& cur_dest_ether_addr[3] == 0x00
> 						&& cur_dest_ether_addr[4] == 0x00)
> 				{
> 					D(bug("Packet to AppleTalk zone multicast address\n"));
> 				}
> 				else
> 				{
> 					D(bug("Dropping packet for %02x %02x %02x %02x %02x %02x\n", cur_dest_ether_addr[0], cur_dest_ether_addr[1], cur_dest_ether_addr[2], cur_dest_ether_addr[3], cur_dest_ether_addr[4], cur_dest_ether_addr[5]));
1450a1483
> 				}
Index: BasiliskII/src/Windows/util_windows.cpp
===================================================================
RCS file: /home/cvs/cebix/BasiliskII/src/Windows/util_windows.cpp,v
retrieving revision 1.7
diff -r1.7 util_windows.cpp
271c271
< #define TAP_COMPONENT_ID "tap0801"
---
> const char * tap_component_ids[] = {"tap0801", "tap0901", 0};
279a280,281
> 	const char * * cur_tap_component_id;
>
346,347c348,354
< 					if (!strcmp (component_id, TAP_COMPONENT_ID))
< 						devices.push_back(net_cfg_instance_id);
---
> 					for (cur_tap_component_id = tap_component_ids; *cur_tap_component_id != NULL;
> 							cur_tap_component_id++) {
> 						if (!strcmp (component_id, *cur_tap_component_id)) {
> 							devices.push_back(net_cfg_instance_id);
> 							break;
> 						}
> 					}