Added PacketIsMonitorModeSupported() function to Packet.dll and made …

…wpcap.dll call it.
yaoyeyi · May 17, 2016 · fd683e0 · fd683e0
1 parent f5a3917
commit fd683e0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/Common/Packet32.h b/Common/Packet32.h
@@ -332,6 +332,7 @@ extern "C"
 	BOOLEAN PacketSetBuff(LPADAPTER AdapterObject, int dim);
 	BOOLEAN PacketGetNetType(LPADAPTER AdapterObject, NetType* type);
 	BOOLEAN PacketIsLoopbackAdapter(LPADAPTER AdapterObject);
+	BOOLEAN PacketIsMonitorModeSupported(LPADAPTER AdapterObject);
 	LPADAPTER PacketOpenAdapter(PCHAR AdapterName);
 	BOOLEAN PacketSendPacket(LPADAPTER AdapterObject, LPPACKET pPacket, BOOLEAN Sync);
 	INT PacketSendPackets(LPADAPTER AdapterObject, PVOID PacketBuff, ULONG Size, BOOLEAN Sync);

diff --git a/packetWin7/Dll/Packet.def b/packetWin7/Dll/Packet.def
@@ -22,6 +22,7 @@ EXPORTS
 		PacketGetStatsEx
 		PacketGetNetType
 		PacketIsLoopbackAdapter
+		PacketIsMonitorModeSupported
 		PacketSetReadTimeout
 		PacketSetMode
 		PacketSetNumWrites

diff --git a/packetWin7/Dll/Packet32.c b/packetWin7/Dll/Packet32.c
@@ -4652,6 +4652,49 @@ BOOLEAN PacketIsLoopbackAdapter(LPADAPTER AdapterObject)
 	return ret;
 }
 
+/*!
+\brief Returns whether a wireless adapter supports monitor mode.
+\param AdapterObject The adapter on which information is needed.
+\return TRUE if yes, FALSE if no.
+*/
+BOOLEAN PacketIsMonitorModeSupported(LPADAPTER AdapterObject)
+{
+	BOOLEAN    Status;
+	ULONG      IoCtlBufferLength = (sizeof(PACKET_OID_DATA) + sizeof(DOT11_OPERATION_MODE_CAPABILITY) - 1);
+	PPACKET_OID_DATA  OidData;
+	DOT11_OPERATION_MODE_CAPABILITY ModeCapability;
+
+	TRACE_ENTER("PacketIsMonitorModeSupported");
+
+	OidData = GlobalAllocPtr(GMEM_MOVEABLE | GMEM_ZEROINIT, IoCtlBufferLength);
+	if (OidData == NULL) {
+		TRACE_PRINT("PacketIsMonitorModeSupported failed");
+		TRACE_EXIT("PacketIsMonitorModeSupported");
+		return FALSE;
+	}
+	//get the mode capability
+	OidData->Oid = OID_DOT11_OPERATION_MODE_CAPABILITY;
+	OidData->Length = sizeof(DOT11_OPERATION_MODE_CAPABILITY);
+	Status = PacketRequest(AdapterObject, FALSE, OidData);
+	if (Status == TRUE)
+	{
+		ModeCapability = *((DOT11_OPERATION_MODE_CAPABILITY*)OidData->Data);
+		if ((ModeCapability.uOpModeCapability & DOT11_OPERATION_MODE_NETWORK_MONITOR) == DOT11_OPERATION_MODE_NETWORK_MONITOR)
+		{
+			Status = TRUE;
+		}
+		else
+		{
+			Status = FALSE;
+		}
+	}
+
+	GlobalFreePtr(OidData);
+
+	TRACE_EXIT("PacketIsMonitorModeSupported");
+	return Status;
+}
+
 /*!
   \brief Returns the AirPcap handler associated with an adapter. This handler can be used to change
            the wireless-related settings of the CACE Technologies AirPcap wireless capture adapters.

diff --git a/wpcap/libpcap/pcap-win32.c b/wpcap/libpcap/pcap-win32.c
@@ -825,9 +825,9 @@ pcap_activate_win32(pcap_t *p)
 * Check if rfmon mode is supported on the pcap_t for Windows systems.
 */
 static int
-pcap_can_set_rfmon_win32(pcap_t *p _U_)
+pcap_can_set_rfmon_win32(pcap_t *p)
 {
-	return (0);
+	return PacketIsMonitorModeSupported(p->adapter);
 }
 
 pcap_t *