Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scapy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
scapy
Commits
9ca71249
Commit
9ca71249
authored
8 years ago
by
gpotter2
Browse files
Options
Downloads
Patches
Plain Diff
Small fixes
parent
3b36b636
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scapy/arch/windows/__init__.py
+3
-2
3 additions, 2 deletions
scapy/arch/windows/__init__.py
with
3 additions
and
2 deletions
scapy/arch/windows/__init__.py
+
3
−
2
View file @
9ca71249
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
"""
"""
Customizations needed to support Microsoft Windows.
Customizations needed to support Microsoft Windows.
"""
"""
import
os
,
re
,
sys
,
socket
,
time
,
itertools
,
platform
,
subprocess
import
os
,
re
,
sys
,
socket
,
time
,
itertools
,
platform
import
subprocess
as
sp
import
subprocess
as
sp
from
glob
import
glob
from
glob
import
glob
import
tempfile
import
tempfile
...
@@ -233,6 +233,7 @@ def win_find_exe(filename, installsubdir=None, env="ProgramFiles"):
...
@@ -233,6 +233,7 @@ def win_find_exe(filename, installsubdir=None, env="ProgramFiles"):
break
break
return
path
return
path
def
is_new_release
(
ignoreVBS
=
False
):
def
is_new_release
(
ignoreVBS
=
False
):
release
=
platform
.
release
()
release
=
platform
.
release
()
if
conf
.
prog
.
powershell
is
None
and
not
ignoreVBS
:
if
conf
.
prog
.
powershell
is
None
and
not
ignoreVBS
:
...
@@ -285,7 +286,7 @@ if conf.prog.tcpdump != "windump" and conf.use_npcap:
...
@@ -285,7 +286,7 @@ if conf.prog.tcpdump != "windump" and conf.use_npcap:
def
test_windump_npcap
():
def
test_windump_npcap
():
"""
Return wether windump version is correct or not
"""
"""
Return wether windump version is correct or not
"""
try
:
try
:
p_test_windump
=
s
ubprocess
.
Popen
([
conf
.
prog
.
tcpdump
,
"
-help
"
],
stdout
=
s
ubprocess
.
PIPE
,
stderr
=
s
ubprocess
.
STDOUT
)
p_test_windump
=
s
p
.
Popen
([
conf
.
prog
.
tcpdump
,
"
-help
"
],
stdout
=
s
p
.
PIPE
,
stderr
=
s
p
.
STDOUT
)
stdout
,
err
=
p_test_windump
.
communicate
()
stdout
,
err
=
p_test_windump
.
communicate
()
return
"
npcap
"
in
stdout
.
lower
()
return
"
npcap
"
in
stdout
.
lower
()
except
:
except
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment