Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ITS - Intelligent Transport Systems
ITS
Commits
398105ef
Commit
398105ef
authored
Jan 05, 2017
by
garciay
Browse files
Bugs fixed reported by Dinnyq
parent
f276c950
Changes
1
Hide whitespace changes
Inline
Side-by-side
javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java
View file @
398105ef
...
...
@@ -51,7 +51,7 @@ public class PcapMultiplexer implements Runnable {
int
r
=
Pcap
.
findAllDevs
(
alldevs
,
errbuf
);
if
(
r
!
=
Pcap
.
OK
||
alldevs
.
isEmpty
())
{
if
(
r
=
=
Pcap
.
NOT_
OK
||
alldevs
.
isEmpty
())
{
TERFactory
.
getInstance
().
logError
(
"Can't read list of devices, error is %s"
+
errbuf
.
toString
());
return
;
}
...
...
@@ -102,22 +102,8 @@ public class PcapMultiplexer implements Runnable {
int
flags
=
Pcap
.
MODE_PROMISCUOUS
;
// capture all packets
int
timeout
=
10
;
// 10 millis
pcap
=
Pcap
.
openLive
(
device
.
getName
(),
snaplen
,
flags
,
timeout
,
errbuf
);
if
(
pcap
==
null
)
{
// Check result
TERFactory
.
getInstance
().
logError
(
"Error while opening device for capture: "
+
errbuf
.
toString
());
return
;
}
captureThread
=
new
Thread
(
this
);
captureThread
.
start
();
filter
=
""
;
}
else
{
// Open file
pcap
=
Pcap
.
openOffline
(
file
,
errbuf
);
if
(
pcap
==
null
)
{
// Check result
TERFactory
.
getInstance
().
logError
(
"Error while opening device for capture: "
+
errbuf
.
toString
());
return
;
}
captureThread
=
new
Thread
(
this
);
captureThread
.
start
();
filter
=
""
;
}
if
(
pcap
==
null
)
{
// Check result
TERFactory
.
getInstance
().
logError
(
"Error while opening device for capture: "
+
errbuf
.
toString
());
...
...
@@ -267,11 +253,11 @@ public class PcapMultiplexer implements Runnable {
int
optimize
=
0
;
// 1 means true, 0 means false
int
netmask
=
0
;
int
r
=
pcap
.
compile
(
bpfFilter
,
filter
,
optimize
,
netmask
);
if
(
r
!
=
Pcap
.
OK
)
{
if
(
r
=
=
Pcap
.
NOT_
OK
)
{
TERFactory
.
getInstance
().
logError
(
"Filter error: "
+
pcap
.
getErr
());
}
else
{
r
=
pcap
.
setFilter
(
bpfFilter
);
if
(
r
!
=
Pcap
.
OK
)
{
if
(
r
=
=
Pcap
.
NOT_
OK
)
{
TERFactory
.
getInstance
().
logError
(
"Filter error: "
+
pcap
.
getErr
());
}
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment