MAC Address Change no longer causes viewer to die cr:Roxie

1 files changed, 100 insertions, 61 deletions

diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index bcbae06ec5..152223d524 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -36,6 +36,8 @@
 #	undef WIN32_LEAN_AND_MEAN
 #	include <winsock2.h>
 #	include <windows.h>
+#	pragma comment(lib, "IPHLPAPI.lib")

+#	include <iphlpapi.h>
 #endif
 
 #include "lldefs.h"
@@ -452,67 +454,104 @@ static void get_random_bytes(void *buf, int nbytes)
 	return;	
 }
 
-#if LL_WINDOWS
-typedef struct _ASTAT_
-{
-	ADAPTER_STATUS adapt;
-	NAME_BUFFER    NameBuff [30];
-}ASTAT, * PASTAT;
-
-// static
-S32 LLUUID::getNodeID(unsigned char * node_id)
-{
-	  ASTAT Adapter;
-      NCB Ncb;
-      UCHAR uRetCode;
-      LANA_ENUM   lenum;
-      int      i;
-	  int retval = 0;
-
-      memset( &Ncb, 0, sizeof(Ncb) );
-      Ncb.ncb_command = NCBENUM;
-      Ncb.ncb_buffer = (UCHAR *)&lenum;
-      Ncb.ncb_length = sizeof(lenum);
-      uRetCode = Netbios( &Ncb );
- //     printf( "The NCBENUM return code is: 0x%x \n", uRetCode );
-
-      for(i=0; i < lenum.length ;i++)
-      {
-          memset( &Ncb, 0, sizeof(Ncb) );
-          Ncb.ncb_command = NCBRESET;
-          Ncb.ncb_lana_num = lenum.lana[i];
-
-          uRetCode = Netbios( &Ncb );
- //         printf( "The NCBRESET on LANA %d return code is: 0x%x \n",
- //                 lenum.lana[i], uRetCode );
-
-          memset( &Ncb, 0, sizeof (Ncb) );
-          Ncb.ncb_command = NCBASTAT;
-          Ncb.ncb_lana_num = lenum.lana[i];
-
-          strcpy( (char *)Ncb.ncb_callname,  "*              " );		/* Flawfinder: ignore */
-          Ncb.ncb_buffer = (unsigned char *)&Adapter;
-          Ncb.ncb_length = sizeof(Adapter);
-
-          uRetCode = Netbios( &Ncb );
-//          printf( "The NCBASTAT on LANA %d return code is: 0x%x \n",
-//                 lenum.lana[i], uRetCode );
-          if ( uRetCode == 0 )
-          {
-//            printf( "The Ethernet Number on LANA %d is: %02x%02x%02x%02x%02x%02x\n",
-//	 			  lenum.lana[i],
-//                  Adapter.adapt.adapter_address[0],
-//                  Adapter.adapt.adapter_address[1],
-//                  Adapter.adapt.adapter_address[2],
-//                  Adapter.adapt.adapter_address[3],
-//                  Adapter.adapt.adapter_address[4],
-//                  Adapter.adapt.adapter_address[5] );
-			memcpy(node_id,Adapter.adapt.adapter_address,6);		/* Flawfinder: ignore */
-			retval = 1;
-
-          }
-	  }
-	return retval;
+#if	LL_WINDOWS

+// Code	copied from	http://msdn.microsoft.com/en-us/library/aa365939(VS.85).aspx

+// This	code grabs the first hardware	address, rather	than the first interface.

+// Using a VPN can cause the first returned	interface	to be	changed.

+

+#define	MALLOC(x)HeapAlloc(GetProcessHeap(),0,(x))

+#define	FREE(x)	HeapFree(GetProcessHeap(),0,(x))

+const	S32	MAC_ADDRESS_BYTES=6;

+

+

+// static

+S32	LLUUID::getNodeID(unsigned char	*node_id)

+{

+

+	// Declare and initialize variables.

+	DWORD	dwSize = 0;

+	DWORD	dwRetVal = 0;

+	int	i;

+

+/* variables used	for	GetIfTable and GetIfEntry	*/

+	MIB_IFTABLE	*pIfTable;

+	MIB_IFROW	*pIfRow;

+

+	// Allocate	memory for our pointers.

+	pIfTable = (MIB_IFTABLE	*) MALLOC(sizeof (MIB_IFTABLE));

+	if (pIfTable ==	NULL)	

+	{

+			printf("Error allocating memory needed to call GetIfTable\n");

+			return 0;

+	}

+

+	// Before	calling	GetIfEntry,	we call	GetIfTable to	make

+	// sure	there	are	entries	to get and retrieve	the	interface	index.

+

+	// Make	an initial call	to GetIfTable	to get the

+	// necessary size	into dwSize

+	if (GetIfTable(pIfTable, &dwSize,	0) ==	ERROR_INSUFFICIENT_BUFFER) {

+			FREE(pIfTable);

+			pIfTable = (MIB_IFTABLE	*) MALLOC(dwSize);

+			if (pIfTable ==	NULL)	

+			{

+					printf("Error	allocating memory\n");

+					return 0;

+			}

+	}

+	//	Make a second	call to	GetIfTable to	get	the	actual

+	// data	we want.

+	if ((dwRetVal = GetIfTable(pIfTable, &dwSize,	0))	== NO_ERROR) 

+	{

+		if (pIfTable->dwNumEntries > 0)	

+		{

+			pIfRow = (MIB_IFROW	*) MALLOC(sizeof (MIB_IFROW));

+			if (pIfRow ==	NULL)	

+			{

+					printf("Error allocating memory\n");

+					if (pIfTable != NULL)	

+					{

+						FREE(pIfTable);

+						pIfTable = NULL;

+					}

+					return 0;

+			}

+

+			int	limit	=	MAC_ADDRESS_BYTES;

+			memcpy(node_id,	"\0\0\0\0\0\0",	limit);	// zero	out	array	of bytes	 

+			for	(i = 0;	i < (int) pIfTable->dwNumEntries; i++) 

+			{

+				pIfRow->dwIndex	= pIfTable->table[i].dwIndex;

+				if ((dwRetVal = GetIfEntry(pIfRow)) == NO_ERROR) 

+				{

+					switch (pIfRow->dwType)	

+					{

+						case IF_TYPE_ETHERNET_CSMACD:

+						case IF_TYPE_IEEE80211:		 

+							 limit = min((int) pIfRow->dwPhysAddrLen, limit);

+							 if	(pIfRow->dwPhysAddrLen == 0)

+									 break;

+							 memcpy(node_id, (UCHAR *)&pIfRow->bPhysAddr[0], limit);		 //	just incase	the	PhysAddr is	not	the	expected MAC_Address size

+							 FREE(pIfTable);

+							 return 1;	//return first hardware	device found.	

+							break;

+

+						case IF_TYPE_OTHER:

+						case IF_TYPE_PPP:										 

+						case IF_TYPE_SOFTWARE_LOOPBACK:										 

+						case IF_TYPE_ISO88025_TOKENRING:										

+						case IF_TYPE_IEEE1394:																		

+						case IF_TYPE_ATM:										 

+						case IF_TYPE_TUNNEL:										

+								default:

+									break;

+					}

+				}

+			}

+		}

+	}

+	FREE(pIfTable);

+	return 0;

 }
 
 #elif LL_DARWIN