Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix indent

This commit is contained in:
gpotter2 2017-03-03 23:01:00 +01:00 committed by gpotter2
parent 40ad5b67b1
commit 0df4d63a7e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scapy/arch/windows/__init__.py
View File

@ -112,6 +112,7 @@ _VBS_WMI_OUTPUT = {
def _exec_query_vbs(cmd, fields): def _exec_query_vbs(cmd, fields):
"""Execute a query using VBS. Currently Get-WmiObject queries are """Execute a query using VBS. Currently Get-WmiObject queries are
supported. supported.
""" """
if not WINDOWS: if not WINDOWS:
return return
@ -143,6 +144,7 @@ Next
def exec_query(cmd, fields): def exec_query(cmd, fields):
"""Execute a system query using PowerShell if it is available, and """Execute a system query using PowerShell if it is available, and
using VBS/cscript as a fallback. using VBS/cscript as a fallback.
""" """
if conf.prog.powershell is None: if conf.prog.powershell is None:
return _exec_query_vbs(cmd, fields) return _exec_query_vbs(cmd, fields)
@ -240,7 +242,6 @@ def get_windows_if_list():
query = exec_query(['Get-NetAdapter'], query = exec_query(['Get-NetAdapter'],
['InterfaceDescription', 'InterfaceIndex', 'Name', ['InterfaceDescription', 'InterfaceIndex', 'Name',
'InterfaceGuid', 'MacAddress']) # It is normal that it is in this order 'InterfaceGuid', 'MacAddress']) # It is normal that it is in this order
else: else:
query = exec_query(['Get-WmiObject', 'Win32_NetworkAdapter'], query = exec_query(['Get-WmiObject', 'Win32_NetworkAdapter'],
['Name', 'InterfaceIndex', 'InterfaceDescription', ['Name', 'InterfaceIndex', 'InterfaceDescription',